Refactor category select
This commit is contained in:
Tiago Noronha
parent
cc05f947cd
commit
451a4722f5
|
|
@ -1623,21 +1623,117 @@ var ProductCategoryFilter = function ProductCategoryFilter(_ref) {
|
|||
/**
|
||||
* Fetch and build a tree of product categories.
|
||||
*/
|
||||
/*const ProductCategoryList = withAPIData( ( props ) => {
|
||||
return {
|
||||
categories: '/wc/v2/products/categories'
|
||||
|
||||
var ProductCategoryList = function (_React$Component2) {
|
||||
_inherits(ProductCategoryList, _React$Component2);
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
function ProductCategoryList(props) {
|
||||
_classCallCheck(this, ProductCategoryList);
|
||||
|
||||
var _this2 = _possibleConstructorReturn(this, (ProductCategoryList.__proto__ || Object.getPrototypeOf(ProductCategoryList)).call(this, props));
|
||||
|
||||
_this2.state = {
|
||||
categories: [],
|
||||
loaded: false,
|
||||
query: ''
|
||||
};
|
||||
} )( ( { categories, filterQuery, selectedCategories, checkboxChange, accordionToggle, openAccordion, firstLoad, setFirstLoad } ) => {
|
||||
if ( ! categories.data ) {
|
||||
|
||||
_this2.updatePreview = _this2.updatePreview.bind(_this2);
|
||||
_this2.getQuery = _this2.getQuery.bind(_this2);
|
||||
return _this2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the preview when component is first loaded.
|
||||
*/
|
||||
|
||||
|
||||
_createClass(ProductCategoryList, [{
|
||||
key: "componentDidMount",
|
||||
value: function componentDidMount() {
|
||||
if (this.getQuery() !== this.state.query) {
|
||||
this.updatePreview();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the preview when component is updated.
|
||||
*/
|
||||
|
||||
}, {
|
||||
key: "componentDidUpdate",
|
||||
value: function componentDidUpdate() {
|
||||
if (this.getQuery() !== this.state.query && this.state.loaded) {
|
||||
this.updatePreview();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the endpoint for the current state of the component.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
|
||||
}, {
|
||||
key: "getQuery",
|
||||
value: function getQuery() {
|
||||
var endpoint = '/wc/v2/products/categories';
|
||||
return endpoint;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the preview with the latest settings.
|
||||
*/
|
||||
|
||||
}, {
|
||||
key: "updatePreview",
|
||||
value: function updatePreview() {
|
||||
var self = this;
|
||||
var query = this.getQuery();
|
||||
|
||||
self.setState({
|
||||
loaded: false
|
||||
});
|
||||
|
||||
apiFetch({ path: query }).then(function (categories) {
|
||||
self.setState({
|
||||
categories: categories,
|
||||
loaded: true,
|
||||
query: query
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Render.
|
||||
*/
|
||||
|
||||
}, {
|
||||
key: "render",
|
||||
value: function render() {
|
||||
var _props = this.props,
|
||||
filterQuery = _props.filterQuery,
|
||||
selectedCategories = _props.selectedCategories,
|
||||
checkboxChange = _props.checkboxChange,
|
||||
accordionToggle = _props.accordionToggle,
|
||||
openAccordion = _props.openAccordion,
|
||||
firstLoad = _props.firstLoad,
|
||||
setFirstLoad = _props.setFirstLoad;
|
||||
|
||||
|
||||
if (!this.state.loaded) {
|
||||
return __('Loading');
|
||||
}
|
||||
|
||||
if ( 0 === categories.data.length ) {
|
||||
if (0 === this.state.categories.length) {
|
||||
return __('No categories found');
|
||||
}
|
||||
|
||||
const handleCategoriesToCheck = ( evt, parent, categories ) => {
|
||||
let ids = getCategoryChildren( parent, categories ).map( category => {
|
||||
var handleCategoriesToCheck = function handleCategoriesToCheck(evt, parent, categories) {
|
||||
var ids = getCategoryChildren(parent, categories).map(function (category) {
|
||||
return category.id;
|
||||
});
|
||||
|
||||
|
|
@ -1646,22 +1742,24 @@ var ProductCategoryFilter = function ProductCategoryFilter(_ref) {
|
|||
checkboxChange(evt.target.checked, ids);
|
||||
};
|
||||
|
||||
const getCategoryChildren = ( parent, categories ) => {
|
||||
let children = [];
|
||||
var getCategoryChildren = function getCategoryChildren(parent, categories) {
|
||||
var children = [];
|
||||
|
||||
categories.filter( ( category ) => category.parent === parent.id ).forEach( function( category ) {
|
||||
categories.filter(function (category) {
|
||||
return category.parent === parent.id;
|
||||
}).forEach(function (category) {
|
||||
children.push(category);
|
||||
children.push( ...getCategoryChildren( category, categories ) );
|
||||
children.push.apply(children, _toConsumableArray(getCategoryChildren(category, categories)));
|
||||
});
|
||||
|
||||
return children;
|
||||
};
|
||||
|
||||
const categoryHasChildren = ( parent, categories ) => {
|
||||
var categoryHasChildren = function categoryHasChildren(parent, categories) {
|
||||
return !!getCategoryChildren(parent, categories).length;
|
||||
};
|
||||
|
||||
const isIndeterminate = ( category, categories ) => {
|
||||
var isIndeterminate = function isIndeterminate(category, categories) {
|
||||
|
||||
// Currect category selected?
|
||||
if (selectedCategories.includes(category.id)) {
|
||||
|
|
@ -1669,97 +1767,167 @@ var ProductCategoryFilter = function ProductCategoryFilter(_ref) {
|
|||
}
|
||||
|
||||
// Has children?
|
||||
let children = getCategoryChildren( category, categories ).map( category => {
|
||||
var children = getCategoryChildren(category, categories).map(function (category) {
|
||||
return category.id;
|
||||
});
|
||||
|
||||
for ( let child of children ) {
|
||||
var _iteratorNormalCompletion = true;
|
||||
var _didIteratorError = false;
|
||||
var _iteratorError = undefined;
|
||||
|
||||
try {
|
||||
for (var _iterator = children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
|
||||
var child = _step.value;
|
||||
|
||||
if (selectedCategories.includes(child)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch (err) {
|
||||
_didIteratorError = true;
|
||||
_iteratorError = err;
|
||||
} finally {
|
||||
try {
|
||||
if (!_iteratorNormalCompletion && _iterator.return) {
|
||||
_iterator.return();
|
||||
}
|
||||
} finally {
|
||||
if (_didIteratorError) {
|
||||
throw _iteratorError;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const AccordionButton = ( { category, categories } ) => {
|
||||
let icon = 'arrow-down-alt2';
|
||||
return false;
|
||||
};
|
||||
|
||||
var AccordionButton = function AccordionButton(_ref2) {
|
||||
var category = _ref2.category,
|
||||
categories = _ref2.categories;
|
||||
|
||||
var icon = 'arrow-down-alt2';
|
||||
|
||||
if (openAccordion.includes(category.id)) {
|
||||
icon = 'arrow-up-alt2';
|
||||
}
|
||||
|
||||
let style = null;
|
||||
var style = null;
|
||||
|
||||
if (!categoryHasChildren(category, categories)) {
|
||||
style = {
|
||||
visibility: 'hidden',
|
||||
visibility: 'hidden'
|
||||
};
|
||||
};
|
||||
|
||||
return (
|
||||
<button onClick={ () => accordionToggle( category.id ) } className="wc-products-list-card__accordion-button" style={ style } type="button">
|
||||
<Dashicon icon={ icon } />
|
||||
</button>
|
||||
return wp.element.createElement(
|
||||
"button",
|
||||
{ onClick: function onClick() {
|
||||
return accordionToggle(category.id);
|
||||
}, className: "wc-products-list-card__accordion-button", style: style, type: "button" },
|
||||
wp.element.createElement(Dashicon, { icon: icon })
|
||||
);
|
||||
};
|
||||
|
||||
const CategoryTree = ( { categories, parent } ) => {
|
||||
let filteredCategories = categories.filter( ( category ) => category.parent === parent );
|
||||
var CategoryTree = function CategoryTree(_ref3) {
|
||||
var categories = _ref3.categories,
|
||||
parent = _ref3.parent;
|
||||
|
||||
var filteredCategories = categories.filter(function (category) {
|
||||
return category.parent === parent;
|
||||
});
|
||||
|
||||
if (firstLoad && selectedCategories.length > 0) {
|
||||
categoriesData.filter( ( category ) => category.parent === 0 ).forEach( function( category ) {
|
||||
let children = getCategoryChildren( category, categoriesData );
|
||||
categoriesData.filter(function (category) {
|
||||
return category.parent === 0;
|
||||
}).forEach(function (category) {
|
||||
var children = getCategoryChildren(category, categoriesData);
|
||||
|
||||
var _iteratorNormalCompletion2 = true;
|
||||
var _didIteratorError2 = false;
|
||||
var _iteratorError2 = undefined;
|
||||
|
||||
try {
|
||||
for (var _iterator2 = children[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
|
||||
var child = _step2.value;
|
||||
|
||||
for ( let child of children ) {
|
||||
if (selectedCategories.includes(child.id) && !openAccordion.includes(category.id)) {
|
||||
accordionToggle(category.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
_didIteratorError2 = true;
|
||||
_iteratorError2 = err;
|
||||
} finally {
|
||||
try {
|
||||
if (!_iteratorNormalCompletion2 && _iterator2.return) {
|
||||
_iterator2.return();
|
||||
}
|
||||
} finally {
|
||||
if (_didIteratorError2) {
|
||||
throw _iteratorError2;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
setFirstLoad(false);
|
||||
}
|
||||
|
||||
return ( filteredCategories.length > 0 ) && (
|
||||
<ul>
|
||||
{ filteredCategories.map( ( category ) => (
|
||||
<li key={ category.id } className={ ( openAccordion.includes( category.id ) ? 'wc-products-list-card__item wc-products-list-card__accordion-open' : 'wc-products-list-card__item' ) }>
|
||||
<label className={ ( 0 === category.parent ) ? 'wc-products-list-card__content' : '' } htmlFor={ 'product-category-' + category.id }>
|
||||
<input type="checkbox"
|
||||
id={ 'product-category-' + category.id }
|
||||
value={ category.id }
|
||||
checked={ selectedCategories.includes( category.id ) }
|
||||
onChange={ ( evt ) => handleCategoriesToCheck( evt, category, categories ) }
|
||||
ref={ el => el && ( el.indeterminate = isIndeterminate( category, categories ) ) }
|
||||
/> { category.name }
|
||||
{ 0 === category.parent &&
|
||||
<AccordionButton category={ category } categories={ categories } />
|
||||
return filteredCategories.length > 0 && wp.element.createElement(
|
||||
"ul",
|
||||
null,
|
||||
filteredCategories.map(function (category) {
|
||||
return wp.element.createElement(
|
||||
"li",
|
||||
{ key: category.id, className: openAccordion.includes(category.id) ? 'wc-products-list-card__item wc-products-list-card__accordion-open' : 'wc-products-list-card__item' },
|
||||
wp.element.createElement(
|
||||
"label",
|
||||
{ className: 0 === category.parent ? 'wc-products-list-card__content' : '', htmlFor: 'product-category-' + category.id },
|
||||
wp.element.createElement("input", { type: "checkbox",
|
||||
id: 'product-category-' + category.id,
|
||||
value: category.id,
|
||||
checked: selectedCategories.includes(category.id),
|
||||
onChange: function onChange(evt) {
|
||||
return handleCategoriesToCheck(evt, category, categories);
|
||||
},
|
||||
ref: function ref(el) {
|
||||
return el && (el.indeterminate = isIndeterminate(category, categories));
|
||||
}
|
||||
<span className="wc-products-list-card__taxonomy-count">{ category.count }</span>
|
||||
</label>
|
||||
<CategoryTree categories={ categories } parent={ category.id } />
|
||||
</li>
|
||||
) ) }
|
||||
</ul>
|
||||
}),
|
||||
" ",
|
||||
category.name,
|
||||
0 === category.parent && wp.element.createElement(AccordionButton, { category: category, categories: categories }),
|
||||
wp.element.createElement(
|
||||
"span",
|
||||
{ className: "wc-products-list-card__taxonomy-count" },
|
||||
category.count
|
||||
)
|
||||
),
|
||||
wp.element.createElement(CategoryTree, { categories: categories, parent: category.id })
|
||||
);
|
||||
})
|
||||
);
|
||||
};
|
||||
|
||||
let categoriesData = categories.data;
|
||||
var categoriesData = this.state.categories;
|
||||
|
||||
if ('' !== filterQuery) {
|
||||
categoriesData = categoriesData.filter( category => category.slug.includes( filterQuery.toLowerCase() ) );
|
||||
categoriesData = categoriesData.filter(function (category) {
|
||||
return category.slug.includes(filterQuery.toLowerCase());
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="wc-products-list-card__results">
|
||||
<CategoryTree categories={ categoriesData } parent={ 0 } />
|
||||
</div>
|
||||
return wp.element.createElement(
|
||||
"div",
|
||||
{ className: "wc-products-list-card__results" },
|
||||
wp.element.createElement(CategoryTree, { categories: categoriesData, parent: 0 })
|
||||
);
|
||||
}
|
||||
);*/
|
||||
var ProductCategoryList = null;
|
||||
}]);
|
||||
|
||||
return ProductCategoryList;
|
||||
}(React.Component);
|
||||
|
||||
/***/ }),
|
||||
/* 2 */
|
||||
|
|
|
|||
|
|
@ -125,16 +125,82 @@ const ProductCategoryFilter = ( { filterResults } ) => {
|
|||
/**
|
||||
* Fetch and build a tree of product categories.
|
||||
*/
|
||||
/*const ProductCategoryList = withAPIData( ( props ) => {
|
||||
return {
|
||||
categories: '/wc/v2/products/categories'
|
||||
class ProductCategoryList extends React.Component {
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor( props ) {
|
||||
super( props );
|
||||
this.state = {
|
||||
categories: [],
|
||||
loaded: false,
|
||||
query: '',
|
||||
};
|
||||
} )( ( { categories, filterQuery, selectedCategories, checkboxChange, accordionToggle, openAccordion, firstLoad, setFirstLoad } ) => {
|
||||
if ( ! categories.data ) {
|
||||
|
||||
this.updatePreview = this.updatePreview.bind( this );
|
||||
this.getQuery = this.getQuery.bind( this );
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the preview when component is first loaded.
|
||||
*/
|
||||
componentDidMount() {
|
||||
if ( this.getQuery() !== this.state.query ) {
|
||||
this.updatePreview();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the preview when component is updated.
|
||||
*/
|
||||
componentDidUpdate() {
|
||||
if ( this.getQuery() !== this.state.query && this.state.loaded ) {
|
||||
this.updatePreview();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the endpoint for the current state of the component.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
getQuery() {
|
||||
const endpoint = '/wc/v2/products/categories';
|
||||
return endpoint;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the preview with the latest settings.
|
||||
*/
|
||||
updatePreview() {
|
||||
const self = this;
|
||||
const query = this.getQuery();
|
||||
|
||||
self.setState( {
|
||||
loaded: false
|
||||
} );
|
||||
|
||||
apiFetch( { path: query } ).then( categories => {
|
||||
self.setState( {
|
||||
categories: categories,
|
||||
loaded: true,
|
||||
query: query
|
||||
} );
|
||||
} );
|
||||
}
|
||||
|
||||
/**
|
||||
* Render.
|
||||
*/
|
||||
render() {
|
||||
const { filterQuery, selectedCategories, checkboxChange, accordionToggle, openAccordion, firstLoad, setFirstLoad } = this.props;
|
||||
|
||||
if ( ! this.state.loaded ) {
|
||||
return __( 'Loading' );
|
||||
}
|
||||
|
||||
if ( 0 === categories.data.length ) {
|
||||
if ( 0 === this.state.categories.length ) {
|
||||
return __( 'No categories found' );
|
||||
}
|
||||
|
||||
|
|
@ -248,7 +314,7 @@ const ProductCategoryFilter = ( { filterResults } ) => {
|
|||
);
|
||||
};
|
||||
|
||||
let categoriesData = categories.data;
|
||||
let categoriesData = this.state.categories;
|
||||
|
||||
if ( '' !== filterQuery ) {
|
||||
categoriesData = categoriesData.filter( category => category.slug.includes( filterQuery.toLowerCase() ) );
|
||||
|
|
@ -260,5 +326,4 @@ const ProductCategoryFilter = ( { filterResults } ) => {
|
|||
</div>
|
||||
);
|
||||
}
|
||||
);*/
|
||||
const ProductCategoryList = null;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue