@riosst100/pwa-marketplace 1.7.6 → 1.7.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/components/FilterTop/FilterBlockList/filterTopItem.js

@@ -27,7 +27,7 @@ const FilterTopItem = props => {
         [group, item, onApply, removeGroup, toggleItem]
     );
 
-    const element = group == "shopby" ? (
+    const element = group == "shopby" || group == "shopby_with_all" ? (
         <Link className={classes.item} to={search ? search + '&shopby=' + value : '?shopby=' + value}>{title}</Link>
     ) : (
         activeFilters.includes(value) ? (

package/src/components/FilterTop/FilterBlockList/filterTopItemGroup.js

@@ -84,6 +84,7 @@ const FilterTopItemGroup = props => {
     return (
         <div className={classes.root}>
             {radioItems}
+            {filterElements && filterElements.length > 10 ? <span className={classes.item}><b>More Item</b></span> : ''}
             {filterElements && filterElements.length ? filterElements : group != "shopby" ? (<span className={classes.item}><b>All</b></span>) : ''}
         </div>
     );

package/src/components/ShopBy/shopBy.js

@@ -89,6 +89,7 @@ const ShopBy = props => {
 
     const [searchQuery, setSearchQuery] = useState('');
 
+    const { search } = useLocation();
     
     const sortProps = useCustomSort({ sortFromSearch: false, defaultSort: {
         sortText: 'All (A-Z)',
@@ -127,6 +128,10 @@ const ShopBy = props => {
         return result;
     }
 
+    const filterSearchArr = search ? search.split('&') : [];
+    filterSearchArr.pop();
+    const filterSearch = filterSearchArr.join('&')
+
     const setRelases = newAvailableGroups.map((group, index) => {
         const optionsResult = [];
 
@@ -134,8 +139,11 @@ const ShopBy = props => {
             dataResult[group].map((option, index) => {
                 const { label, value } = option;
 
+                const filter = attributeData.attribute_code + '[filter]=' + label + ',' + value;
+                const params = filterSearch ? filterSearch + '&' + filter : '?' + filter;
+
                 const categoryUrl = resourceUrl(
-                    `/${category.url_path}${categoryUrlSuffix || ''}?${attributeData.attribute_code}[filter]=${label},${value}`
+                    `/${category.url_path}${categoryUrlSuffix || ''}${params}`
                 );
 
                 optionsResult.push(<li className='list-none'>
@@ -143,7 +151,7 @@ const ShopBy = props => {
                         {label}
                     </Link>
                 </li>)
-            })
+            });
 
             let optionsResultSplitted = [];
             if (active == group) {