@riosst100/pwa-marketplace 1.5.8 → 1.5.9

package/package.json

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

package/src/components/FilterTop/CustomFilters/customFilter.js

@@ -26,9 +26,6 @@ const CustomFilter = props => {
         }
     );
 
-    console.log(group)
-    console.log(item)
-
     const normalizedData = [
         {
             'label': 'Sealed Products',

package/src/overwrites/peregrine/lib/talons/FilterSidebar/useFilterSidebar.js

@@ -140,8 +140,8 @@ export const useFilterSidebar = props => {
                     // Add frontend input type
                     frontendInput.set(group, null);
                     // add items
-                    for (const { label, value } of options) {
-                        items.push({ title: stripHtml(label), value });
+                    for (const { label, value, path } of options) {
+                        items.push({ title: stripHtml(label), value, path });
                     }
                 }
                 itemsByGroup.set(group, items);

package/src/overwrites/peregrine/lib/talons/RootComponents/Category/useCategoryContent.js

@@ -106,7 +106,8 @@ export const useCategoryContent = props => {
             children && children.map((category, index) => {
                 filterOptions.push({
                     'label': category.name,
-                    'value': category.uid
+                    'value': category.uid,
+                    'path': category.url_path
                 });
             });
 
@@ -117,6 +118,7 @@ export const useCategoryContent = props => {
             attribute_code: filter.attribute_code,
             count: filter.count,
             label: label,
+            position: filter.position,
             options: filterOptions.length ? filterOptions : filter.options
         };
 

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterItem.js

@@ -71,7 +71,8 @@ FilterItem.propTypes = {
     group: string.isRequired,
     item: shape({
         title: string.isRequired,
-        value: oneOfType([number, string]).isRequired
+        value: oneOfType([number, string]).isRequired,
+        path: string
     }).isRequired,
     onChange: func
 };

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterItemRadio.js

@@ -26,9 +26,11 @@ const FilterItemRadio = props => {
 
     const handleOnchange = useCallback(
         e => {
-            removeGroup({ group });
-            if (e.target.value === item.value) {
-                toggleItem({ group, item });
+            if (group != "category_uid") {
+                removeGroup({ group });
+                if (e.target.value === item.value) {
+                    toggleItem({ group, item });
+                }
             }
             if (typeof onApply === 'function') {
                 onApply(group, item);
@@ -67,7 +69,8 @@ FilterItemRadio.propTypes = {
     item: shape({
         title: string.isRequired,
         value: oneOfType([number, string]).isRequired,
-        label: string
+        label: string,
+        path: string
     }).isRequired,
     onApply: func,
     labels: instanceOf(Map).isRequired

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterItemRadioGroup.js

@@ -76,7 +76,8 @@ FilterItemRadioGroup.propTypes = {
     items: arrayOf(
         shape({
             title: string.isRequired,
-            value: oneOfType([number, string]).isRequired
+            value: oneOfType([number, string]).isRequired,
+            path: string
         })
     ).isRequired,
     onApply: func,

package/src/overwrites/venia-ui/lib/components/FilterSidebar/filterSidebar.js

@@ -10,6 +10,8 @@ import FilterBlock from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/
 import defaultClasses from './filterSidebar.module.css';
 import { Filter } from 'iconsax-react';
 import cn from 'classnames';
+import { useHistory } from 'react-router-dom';
+
 
 const SCROLL_OFFSET = 150;
 
@@ -52,6 +54,30 @@ const FilterSidebar = props => {
         [handleApply, filterRef]
     );
 
+    const history = useHistory();
+
+    const handleCategoryApplyFilter = useCallback(
+        (...args) => {
+            // const filterElement = filterRef.current;
+            // if (
+            //     filterElement &&
+            //     typeof filterElement.getBoundingClientRect === 'function'
+            // ) {
+                // const filterTop = filterElement.getBoundingClientRect().top;
+                // const windowScrollY =
+                //     window.scrollY + filterTop - SCROLL_OFFSET;
+                // window.scrollTo(0, windowScrollY);
+            // }
+
+            history.push('/'+args[1].path+'.html');
+
+            if (args[0] != "category_uid") {
+                handleApply(...args);
+            }
+        },
+        [handleApply, filterRef]
+    );
+
     const allowedFiltersArr = [];
 
     allowedFilters.length && allowedFilters.map((val, index) => {
@@ -65,6 +91,8 @@ const FilterSidebar = props => {
                 const groupName = filterNames.get(group);
                 const frontendInput = filterFrontendInput.get(group);
                 if (!allowedFiltersArr.length && group != "category_uid" || allowedFiltersArr.length && allowedFiltersArr.includes(group)) {
+                    
+
                     return (
                         <FilterBlock
                             key={group}
@@ -74,7 +102,7 @@ const FilterSidebar = props => {
                             group={group}
                             items={items}
                             name={groupName}
-                            onApply={handleApplyFilter}
+                            onApply={group == "category_uid" ? handleCategoryApplyFilter : handleApplyFilter}
                             initialOpen={iteration < filterCountToOpen}
                         />
                     );