@shopgate/engage 7.32.0-beta.14 → 7.32.0-beta.16

package/filter/components/FilterPageContent/index.js

@@ -1,78 +1,72 @@
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { SurroundPortals, ResponsiveContainer } from '@shopgate/engage/components';
+import { Fragment } from 'react';
+import { SurroundPortals } from '@shopgate/engage/components';
 import { useFilterPage } from '@shopgate/engage/filter/hooks';
+import { makeStyles } from '@shopgate/engage/styles';
 import { PORTAL_FILTER_PRICE_RANGE, PORTAL_FILTER_PAGE_CONTENT, FILTER_TYPE_RANGE, FILTER_TYPE_MULTISELECT, PriceSlider } from '@shopgate/engage/filter';
 import Selector from "./components/Selector";
-import ApplyButton from "./components/ApplyButton";
-import ResetButton from "./components/ResetButton";
-
+import FilterButtonBar from "./components/FilterButtonBar";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const useStyles = makeStyles()(theme => ({
+  content: {
+    color: theme.palette.text.primary,
+    [theme.breakpoints.up('md')]: {
+      width: '100%',
+      maxWidth: 640,
+      margin: '0 auto'
+    }
+  }
+}));
 /**
  * The FilterPageContent component renders all filters for the filter page.
- * @param {Object} props The component props.
- * @param {React.ComponentType} props.AppBarComponent The component to be rendered as the app bar
- * @returns {JSX.Element}
+ * @returns The rendered component.
  */
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const FilterPageContent = ({
-  AppBarComponent
+  AppBarComponent = null
 }) => {
+  const {
+    classes
+  } = useStyles();
   const {
     apiFilters,
-    resetPossible,
-    hasChanged,
-    applyFilters,
-    resetAllFilters,
     getSelectedFilterValues,
     updateSelectedFilterValues
   } = useFilterPage();
   return /*#__PURE__*/_jsxs(SurroundPortals, {
     portalName: PORTAL_FILTER_PAGE_CONTENT,
     children: [AppBarComponent && /*#__PURE__*/_jsx(AppBarComponent, {
-      title: "titles.filter",
-      right: /*#__PURE__*/_jsx(ApplyButton, {
-        disabled: !hasChanged,
-        onClick: applyFilters
-      })
-    }), apiFilters.map(filter => {
-      const portalProps = {
-        filter
-      };
-      const value = getSelectedFilterValues(filter.id);
-      if (filter.type === FILTER_TYPE_RANGE) {
-        return /*#__PURE__*/_jsx(Fragment, {
-          children: /*#__PURE__*/_jsx(SurroundPortals, {
-            portalName: PORTAL_FILTER_PRICE_RANGE,
-            portalProps: portalProps,
-            children: /*#__PURE__*/_jsx(PriceSlider, {
-              id: filter.id,
-              min: filter.minimum,
-              max: filter.maximum,
-              onChange: updateSelectedFilterValues,
-              value: value
-            }, filter.id)
-          })
+      title: "titles.filter"
+    }), /*#__PURE__*/_jsx("div", {
+      className: classes.content,
+      children: apiFilters.map(filter => {
+        const portalProps = {
+          filter
+        };
+        const value = getSelectedFilterValues(filter.id);
+        if (filter.type === FILTER_TYPE_RANGE) {
+          return /*#__PURE__*/_jsx(Fragment, {
+            children: /*#__PURE__*/_jsx(SurroundPortals, {
+              portalName: PORTAL_FILTER_PRICE_RANGE,
+              portalProps: portalProps,
+              children: /*#__PURE__*/_jsx(PriceSlider, {
+                id: filter.id,
+                min: filter.minimum,
+                max: filter.maximum,
+                onChange: updateSelectedFilterValues,
+                value: value
+              }, filter.id)
+            })
+          }, filter.id);
+        }
+        return /*#__PURE__*/_jsx(Selector, {
+          id: filter.id,
+          label: filter.label,
+          values: filter.values,
+          multi: filter.type === FILTER_TYPE_MULTISELECT,
+          onChange: updateSelectedFilterValues,
+          selected: value
         }, filter.id);
-      }
-      return /*#__PURE__*/_jsx(Selector, {
-        id: filter.id,
-        label: filter.label,
-        values: filter.values,
-        multi: filter.type === FILTER_TYPE_MULTISELECT,
-        onChange: updateSelectedFilterValues,
-        selected: value
-      }, filter.id);
-    }), /*#__PURE__*/_jsx(ResponsiveContainer, {
-      breakpoint: "<sm",
-      appAlways: true,
-      children: /*#__PURE__*/_jsx(ResetButton, {
-        disabled: !resetPossible,
-        onClick: resetAllFilters
       })
-    })]
+    }), /*#__PURE__*/_jsx(FilterButtonBar, {})]
   });
 };
-FilterPageContent.defaultProps = {
-  AppBarComponent: null
-};
 export default FilterPageContent;

package/filter/components/PriceSlider/components/Label/index.js

@@ -1,5 +1,5 @@
 import "core-js/modules/es.string.replace.js";
-import React, { memo, useState, useEffect, useRef } from 'react';
+import React, { memo, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import appConfig from '@shopgate/pwa-common/helpers/config';
 import { makeStyles, responsiveMediaQuery } from '@shopgate/engage/styles';
@@ -10,39 +10,23 @@ const {
   currency
 } = appConfig;
 const useStyles = makeStyles()(theme => ({
-  price: {
-    color: theme.palette.secondary.main,
-    display: 'inline-block',
-    fontWeight: theme.typography.fontWeightMedium,
-    textAlign: 'center'
-  },
-  editableContainer: {
-    position: 'relative'
-  },
   editableField: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
+    color: theme.palette.text.primary,
+    fontWeight: theme.typography.fontWeightMedium,
     textAlign: 'center',
-    background: 'transparent',
-    zIndex: 2,
-    textIndent: -800,
+    background: theme.palette.background.surface,
     outline: 'none',
-    padding: 0,
-    margin: 0,
-    border: '1px solid transparent',
+    padding: theme.spacing(0.5, 0),
+    margin: theme.spacing(0, 0.5),
+    border: `1px solid ${theme.components.input.border}`,
     borderRadius: 3,
     ':focus': {
-      background: theme.components.input.background,
-      textIndent: 0,
       borderColor: theme.components.border.medium
     },
     [responsiveMediaQuery('>=xs', {
       webOnly: true
     })]: {
       borderColor: theme.palette.primary.main,
-      padding: '4px 0',
-      top: -4,
       ':focus': {
         borderColor: theme.palette.primary.main
       }
@@ -58,9 +42,24 @@ const useStyles = makeStyles()(theme => ({
     clip: 'rect(0, 0, 0, 0)',
     whiteSpace: 'nowrap',
     border: 0
+  },
+  priceField: {
+    display: 'inline-flex',
+    alignItems: 'center'
+  },
+  currencySymbol: {
+    color: theme.palette.text.secondary,
+    marginRight: theme.spacing(0.25)
   }
 }));
 
+/**
+ * Builds the width a price field needs to fit the longer of its value and the highest price.
+ * @param {number} length Amount of characters the field has to fit.
+ * @returns {string}
+ */
+const fieldWidth = length => `${length + 2}ch`;
+
 /**
  * The filter price range slider label component.
  * @param {Object} props The component props.
@@ -78,10 +77,6 @@ function Label(props) {
   } = props;
   const [minValue, setMinValue] = useState(priceMin);
   const [maxValue, setMaxValue] = useState(priceMax);
-  const [minOffset, setMinOffset] = useState(0);
-  const [maxOffset, setMMaxOffset] = useState(0);
-  const minRef = useRef(null);
-  const maxRef = useRef(null);
 
   // Set new values, when prices change from outside.
   useEffect(() => {
@@ -89,12 +84,6 @@ function Label(props) {
     setMaxValue(priceMax);
   }, [priceMin, priceMax]);
 
-  // Store the leftOffset when the reference changes.
-  useEffect(() => {
-    setMinOffset(minRef.current.offsetLeft);
-    setMMaxOffset(maxRef.current.offsetLeft);
-  }, [minRef, maxRef]);
-
   /**
    * Selects the field content on click.
    * @param {SyntheticEvent} event The click event object.
@@ -102,7 +91,7 @@ function Label(props) {
   function handleFieldClick({
     target
   }) {
-    target.setSelectionRange(0, target.value.length);
+    target.select();
   }
 
   /**
@@ -135,7 +124,6 @@ function Label(props) {
     currency
   }).format('0').replace('0.00', '');
   return /*#__PURE__*/_jsxs("div", {
-    className: classes.editableContainer,
     children: [/*#__PURE__*/_jsx("span", {
       className: classes.srOnly,
       children: i18n.text('price.range', {
@@ -147,70 +135,57 @@ function Label(props) {
       "aria-hidden": true,
       children: [/*#__PURE__*/_jsx(I18n.Placeholder, {
         forKey: "fromPrice",
-        children: /*#__PURE__*/_jsx("span", {
-          className: classes.price,
-          style: {
-            minWidth: priceLength
-          },
-          ref: minRef,
-          children: /*#__PURE__*/_jsx(I18n.Price, {
-            price: priceMin,
-            currency: currency,
-            fractions: false
-          })
+        children: /*#__PURE__*/_jsxs("span", {
+          className: classes.priceField,
+          children: [/*#__PURE__*/_jsx("span", {
+            "aria-hidden": true,
+            className: classes.currencySymbol,
+            id: "price-slider-currency-label-min",
+            children: currencySymbol
+          }), /*#__PURE__*/_jsx("input", {
+            type: "number",
+            inputMode: "numeric",
+            pattern: "[0-9]*",
+            id: "priceMin",
+            name: "priceMin",
+            value: minValue,
+            onChange: handleChangeMin,
+            onClick: handleFieldClick,
+            style: {
+              width: fieldWidth(Math.max(priceLength, String(minValue).length))
+            },
+            className: classes.editableField,
+            "aria-label": i18n.text('price.range_from'),
+            "aria-describedby": "price-slider-currency-label-min"
+          })]
         })
       }), /*#__PURE__*/_jsx(I18n.Placeholder, {
         forKey: "toPrice",
-        children: /*#__PURE__*/_jsx("span", {
-          className: classes.price,
-          style: {
-            minWidth: priceLength
-          },
-          ref: maxRef,
-          children: /*#__PURE__*/_jsx(I18n.Price, {
-            price: priceMax,
-            currency: currency,
-            fractions: false
-          })
+        children: /*#__PURE__*/_jsxs("span", {
+          className: classes.priceField,
+          children: [/*#__PURE__*/_jsx("span", {
+            "aria-hidden": true,
+            className: classes.currencySymbol,
+            id: "price-slider-currency-label-max",
+            children: currencySymbol
+          }), /*#__PURE__*/_jsx("input", {
+            type: "number",
+            inputMode: "numeric",
+            pattern: "[0-9]*",
+            id: "priceMax",
+            name: "priceMax",
+            value: maxValue,
+            onChange: handleChangeMax,
+            onClick: handleFieldClick,
+            style: {
+              width: fieldWidth(Math.max(priceLength, String(maxValue).length))
+            },
+            className: classes.editableField,
+            "aria-label": i18n.text('price.range_to'),
+            "aria-describedby": "price-slider-currency-label-max"
+          })]
         })
       })]
-    }), /*#__PURE__*/_jsx("span", {
-      "aria-hidden": true,
-      hidden: true,
-      id: "price-slider-currency-label",
-      children: currencySymbol
-    }), /*#__PURE__*/_jsx("input", {
-      type: "number",
-      inputMode: "numeric",
-      pattern: "[0-9]*",
-      id: "priceMin",
-      name: "priceMin",
-      value: minValue,
-      onChange: handleChangeMin,
-      onClick: handleFieldClick,
-      style: {
-        width: priceLength,
-        left: minOffset
-      },
-      className: classes.editableField,
-      "aria-label": i18n.text('price.range_from'),
-      "aria-describedby": "price-slider-currency-label"
-    }), /*#__PURE__*/_jsx("input", {
-      type: "number",
-      inputMode: "numeric",
-      pattern: "[0-9]*",
-      id: "priceMax",
-      name: "priceMax",
-      value: maxValue,
-      onChange: handleChangeMax,
-      onClick: handleFieldClick,
-      style: {
-        width: priceLength,
-        left: maxOffset
-      },
-      className: classes.editableField,
-      "aria-label": i18n.text('price.range_to'),
-      "aria-describedby": "price-slider-currency-label"
     })]
   });
 }

package/filter/components/PriceSlider/index.js

@@ -2,13 +2,14 @@ import React, { useState, useEffect, useCallback, useRef, memo } from 'react';
 import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
 import { makeStyles } from '@shopgate/engage/styles';
-import { RangeSlider } from '@shopgate/engage/components';
+import { Accordion, RangeSlider } from '@shopgate/engage/components';
+import { i18n } from '@shopgate/engage/core/helpers';
 import { FilterItem } from '@shopgate/engage/filter';
 import Label from "./components/Label";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
-  wrapper: {
-    padding: theme.spacing(1.5, 2)
+  accordionContent: {
+    padding: theme.spacing(0, 2, 1)
   },
   rangeSliderContainer: {
     paddingTop: theme.spacing(2),
@@ -27,18 +28,18 @@ const useStyles = makeStyles()(theme => ({
     marginRight: theme.spacing(1)
   },
   rangeSliderHandleInner: {
-    background: theme.palette.common.white,
-    border: `1px solid ${theme.components.border.light}`,
-    boxShadow: theme.shadows[2],
+    background: theme.palette.grey.light,
+    boxShadow: '0 0 8px rgba(0, 0, 0, .32)',
     ...theme.applyStyles('dark', {
-      boxShadow: 'none',
-      border: 'none'
+      background: '#F2F2F2'
     }),
     borderRadius: '50%',
     width: theme.spacing(3),
     height: theme.spacing(3)
   },
-  rangeSliderHandleOuter: {}
+  rangeSliderHandleOuter: {
+    padding: theme.spacing(1)
+  }
 }));
 
 /**
@@ -79,31 +80,40 @@ const PriceSlider = ({
   }, [id, onChange]);
   const priceMin = Math.floor(value[0] / 100);
   const priceMax = Math.ceil(value[1] / 100);
-  const priceLength = `${(max / 100).toString().length + 2}ch`;
+  const priceLength = (max / 100).toString().length;
+  const renderLabel = useCallback(() => /*#__PURE__*/_jsx(Label, {
+    priceLength: priceLength,
+    priceMax: priceMax,
+    priceMin: priceMin,
+    onChange: handleChange
+  }), [handleChange, priceLength, priceMax, priceMin]);
   return /*#__PURE__*/_jsx(FilterItem, {
-    children: /*#__PURE__*/_jsxs("div", {
-      className: classes.wrapper,
+    children: /*#__PURE__*/_jsx("div", {
       "data-test-id": "priceRangeSlider",
-      children: [/*#__PURE__*/_jsx(Label, {
-        priceLength: priceLength,
-        priceMax: priceMax,
-        priceMin: priceMin,
-        onChange: handleChange
-      }), /*#__PURE__*/_jsx(RangeSlider, {
-        classNames: {
-          container: classes.rangeSliderContainer,
-          outerRange: classes.rangeSliderOuterRange,
-          range: classes.rangeSliderRange,
-          handleInner: classes.rangeSliderHandleInner,
-          handleOuter: classes.rangeSliderHandleOuter
-        },
-        easing: useLinearEasing ? 'linear' : 'exponential',
-        factor: 3,
-        max: max,
-        min: min,
-        onChange: handleChange,
-        value: value
-      })]
+      children: /*#__PURE__*/_jsx(Accordion, {
+        openWithChevron: true,
+        startOpened: true,
+        renderLabel: renderLabel,
+        contentClassName: classes.accordionContent,
+        handleLabel: i18n.text('filter.filter_by', {
+          label: i18n.text('filter.label.price')
+        }),
+        children: /*#__PURE__*/_jsx(RangeSlider, {
+          classNames: {
+            container: classes.rangeSliderContainer,
+            outerRange: classes.rangeSliderOuterRange,
+            range: classes.rangeSliderRange,
+            handleInner: classes.rangeSliderHandleInner,
+            handleOuter: classes.rangeSliderHandleOuter
+          },
+          easing: useLinearEasing ? 'linear' : 'exponential',
+          factor: 3,
+          max: max,
+          min: min,
+          onChange: handleChange,
+          value: value
+        })
+      })
     })
   });
 };

package/filter/helpers/buildFilterParamsForFetchFiltersRequest.d.ts

@@ -0,0 +1,8 @@
+export default buildFilterParamsForFetchFiltersRequest;
+/**
+ * Creates the filter params to be used with a fetchFilters request.
+ * @param {Object} filters All configured filters
+ * @return {Object}
+ */
+declare function buildFilterParamsForFetchFiltersRequest(filters?: Object): Object;
+//# sourceMappingURL=buildFilterParamsForFetchFiltersRequest.d.ts.map

package/filter/helpers/buildFilterParamsForFetchFiltersRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildFilterParamsForFetchFiltersRequest.d.ts","sourceRoot":"","sources":["../../../filter/helpers/buildFilterParamsForFetchFiltersRequest.js"],"names":[],"mappings":";AAEA;;;;GAIG;AACH,mEAHW,MAAM,GACL,MAAM,CAuCjB"}

package/filter/helpers/buildInitialFilters.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @param {Object} filters The available filters.
+ * @param {Object} activeFilters The selected filters.
+ * @returns {Object}
+ */
+export default function buildInitialFilters(filters: Object, activeFilters: Object): Object;
+//# sourceMappingURL=buildInitialFilters.d.ts.map

package/filter/helpers/buildInitialFilters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildInitialFilters.d.ts","sourceRoot":"","sources":["../../../filter/helpers/buildInitialFilters.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qDAJW,MAAM,iBACN,MAAM,GACJ,MAAM,CAwBlB"}

package/filter/helpers/buildUpdatedFilters.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @param {Object} initialFilters The filters before they where modified.
+ * @param {Object} updatedFilters The filters after they where modified.
+ * @return {Object}
+ */
+export default function buildUpdatedFilters(initialFilters: Object, updatedFilters: Object): Object;
+//# sourceMappingURL=buildUpdatedFilters.d.ts.map

package/filter/helpers/buildUpdatedFilters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildUpdatedFilters.d.ts","sourceRoot":"","sources":["../../../filter/helpers/buildUpdatedFilters.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,4DAJW,MAAM,kBACN,MAAM,GACL,MAAM,CAgCjB"}

package/filter/helpers/index.d.ts

@@ -0,0 +1,5 @@
+export { default as buildInitialFilters } from "./buildInitialFilters";
+export { default as buildUpdatedFilters } from "./buildUpdatedFilters";
+export { default as buildFilterParamsForFetchFiltersRequest } from "./buildFilterParamsForFetchFiltersRequest";
+export { translateFilterLabel } from "./translateFilterLabel";
+//# sourceMappingURL=index.d.ts.map

package/filter/helpers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../filter/helpers/index.js"],"names":[],"mappings":""}

package/filter/helpers/translateFilterLabel.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Translate filter label
+ * @param {string} id filter id.
+ * @param {string} label filter label.
+ * @returns {string}
+ */
+export function translateFilterLabel(id: string, label: string): string;
+//# sourceMappingURL=translateFilterLabel.d.ts.map

package/filter/helpers/translateFilterLabel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"translateFilterLabel.d.ts","sourceRoot":"","sources":["../../../filter/helpers/translateFilterLabel.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,yCAJW,MAAM,SACN,MAAM,GACJ,MAAM,CAIlB"}