@shopgate/engage 7.32.0-beta.1 → 7.32.0-beta.11

package/product/components/ProductSlider/constants.js

@@ -0,0 +1,2 @@
+export const WIDGET_ID = '@shopgate/engage/product/ProductSlider';
+export const DEFAULT_SLIDES_PER_VIEW = 2.3;

package/product/components/ProductSlider/hooks.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Resolves the number of slides the ProductSlider shows side by side for the active breakpoint.
+ * @param slidesPerViewProp The explicit prop value, if the caller passed one.
+ * @returns The resolved number of slides for the active breakpoint.
+ */
+export declare const useSlidesPerView: (slidesPerViewProp?: number) => number;
+//# sourceMappingURL=hooks.d.ts.map

package/product/components/ProductSlider/hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../../product/components/ProductSlider/hooks.ts"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,oBAAoB,MAAM,KAAG,MAgC7D,CAAC"}

package/product/components/ProductSlider/hooks.js

@@ -0,0 +1,40 @@
+import "core-js/modules/es.array.reduce.js";
+import { useContext, useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { WidgetContext } from '@shopgate/engage/page/components/Widgets/WidgetContext';
+import { useWidgetSettings } from '@shopgate/engage/core/hooks';
+import { useResponsiveValue } from '@shopgate/engage/styles';
+import { getAreAppSettingsHydrated, getProductSliderSlidesPerView } from '@shopgate/engage/settings/selectors/appSettings';
+import { SCREEN_SIZE_BREAKPOINTS } from '@shopgate/engage/settings/constants/appSettings';
+import { WIDGET_ID, DEFAULT_SLIDES_PER_VIEW } from "./constants";
+
+/**
+ * Resolves the number of slides the ProductSlider shows side by side for the active breakpoint.
+ * @param slidesPerViewProp The explicit prop value, if the caller passed one.
+ * @returns The resolved number of slides for the active breakpoint.
+ */
+export const useSlidesPerView = slidesPerViewProp => {
+  const {
+    code: widgetCode
+  } = useContext(WidgetContext);
+  const isInsideWidget = Boolean(widgetCode);
+  const areAppSettingsHydrated = useSelector(getAreAppSettingsHydrated);
+  const appSettingsSlidesPerView = useSelector(getProductSliderSlidesPerView);
+  const {
+    slidesPerView: legacySlidesPerView
+  } = useWidgetSettings(WIDGET_ID) || {};
+  const sizes = useMemo(() => {
+    if (!areAppSettingsHydrated && !isInsideWidget && typeof legacySlidesPerView === 'number') {
+      return {
+        small: legacySlidesPerView
+      };
+    }
+    return appSettingsSlidesPerView;
+  }, [areAppSettingsHydrated, isInsideWidget, legacySlidesPerView, appSettingsSlidesPerView]);
+  const breakpoints = useMemo(() => Object.entries(sizes).reduce((acc, [size, value]) => {
+    acc[SCREEN_SIZE_BREAKPOINTS[size]] = value;
+    return acc;
+  }, {}), [sizes]);
+  const resolved = useResponsiveValue(breakpoints);
+  return slidesPerViewProp || resolved || DEFAULT_SLIDES_PER_VIEW;
+};

package/product/components/ProductSlider/index.js

@@ -1,21 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useWidgetSettings } from '@shopgate/engage/core';
 import { useThemeComponents } from '@shopgate/engage/core/hooks';
 import { Swiper } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
 import { ProductListTypeProvider, ProductListEntryProvider } from '@shopgate/engage/product/providers';
+import { useSlidesPerView } from "./hooks";
+import { WIDGET_ID } from "./constants";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()({
   container: {
-    paddingBottom: 10
+    padding: '8px 0 16px !important'
   }
 });
 const items = {
   margin: '0 8px',
   height: '100%'
 };
-export const WIDGET_ID = '@shopgate/engage/product/ProductSlider';
 
 /**
  * @param {Object} props The component props.
@@ -36,12 +36,10 @@ function ProductSlider(props) {
     meta,
     productItemProps,
     item,
+    slidesPerView: slidesPerViewProp,
     ...swiperProps
   } = props;
-  const widgetSettings = useWidgetSettings(WIDGET_ID) || {};
-  const {
-    slidesPerView = 2.3
-  } = props.slidesPerView ? props : widgetSettings;
+  const slidesPerView = useSlidesPerView(slidesPerViewProp);
   // ProductSlider items are rendered with the ProductCard component provided by the theme.
   const {
     ProductCard
@@ -63,8 +61,10 @@ function ProductSlider(props) {
       freeMode: !snap,
       ...swiperProps,
       slidesPerView: slidesPerView,
+      classNames: {
+        container: classes.container
+      },
       children: productIds.map(id => /*#__PURE__*/_jsx(Swiper.Item, {
-        className: classes.container,
         children: /*#__PURE__*/_jsx(ProductListEntryProvider, {
           productId: id,
           children: /*#__PURE__*/_jsx(Item, {

package/product/components/Rating/index.js

@@ -4,7 +4,7 @@ import appConfig from '@shopgate/pwa-common/helpers/config';
 import { RatingStars, SurroundPortals } from '@shopgate/engage/components';
 import { PRODUCT_RATING } from '@shopgate/engage/product/constants';
 import RatingCount from '@shopgate/engage/reviews/components/Reviews/components/RatingCount';
-import { useWidgetSettings } from '@shopgate/engage/core/hooks';
+import { useShowEmptyRatingStars } from '@shopgate/engage/product/hooks';
 import { makeStyles } from '@shopgate/engage/styles';
 import connect from "./connector";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -42,9 +42,7 @@ const Rating = ({
   const {
     classes
   } = useStyles();
-  const {
-    showEmptyRatingStars = false
-  } = useWidgetSettings('@shopgate/engage/rating');
+  const showEmptyRatingStars = useShowEmptyRatingStars();
   const showRatings = useMemo(() => {
     if (hasReviews && (rating?.average ?? 0) > 0) {
       return true;

package/product/components/RelationsSlider/RelationsSheet.js

@@ -1,15 +1,11 @@
 import React, { useState, useCallback, memo } from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
-import { themeConfig } from '@shopgate/pwa-common/helpers/config';
 import { useWidgetSettings, useTheme } from "../../../core";
 import { SheetDrawer, I18n, Button } from "../../../components";
 import { WIDGET_ID } from "./constants";
 import connect from "./RelationsSheet.connector";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-const {
-  variables
-} = themeConfig;
 const useStyles = makeStyles()(theme => ({
   showMore: {
     position: 'absolute !important',
@@ -18,7 +14,7 @@ const useStyles = makeStyles()(theme => ({
     padding: `${theme.spacing(0.5, 0)} !important`
   },
   sheet: {
-    maxHeight: `calc(100vh - ${variables.navigator.height}px)`
+    maxHeight: `calc(100vh - ${theme.components.navigator.height})`
   }
 }));
 

package/product/components/RelationsSlider/RelationsSliderContent.js

@@ -6,6 +6,7 @@ import ProductCard from "../ProductCard";
 import RelationsSheet from "./RelationsSheet";
 import { useWidgetSettings, useCurrentProduct } from "../../../core";
 import connect from "./RelationsSlider.connector";
+import { useSlidesPerView } from "./hooks";
 import { WIDGET_ID } from "./constants";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
@@ -51,12 +52,12 @@ const RelationsSliderContent = /*#__PURE__*/memo(({
     hideRating,
     titleRows,
     showMoreButton,
-    type,
-    slidesPerView = 2.3
+    type
   } = useWidgetSettings(WIDGET_ID);
   const {
     productId
   } = useCurrentProduct();
+  const slidesPerView = useSlidesPerView();
   useEffect(() => {
     getRelations();
   }, [getRelations]);

package/product/components/RelationsSlider/constants.d.ts

@@ -0,0 +1,3 @@
+export const WIDGET_ID: "@shopgate/engage/product/RelationsSlider";
+export const DEFAULT_SLIDES_PER_VIEW: 2.3;
+//# sourceMappingURL=constants.d.ts.map

package/product/components/RelationsSlider/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../product/components/RelationsSlider/constants.js"],"names":[],"mappings":"AAAA,wBAAyB,0CAA0C,CAAC;AAEpE,sCAAuC,GAAG,CAAC"}

package/product/components/RelationsSlider/constants.js

@@ -1 +1,2 @@
-export const WIDGET_ID = '@shopgate/engage/product/RelationsSlider';
+export const WIDGET_ID = '@shopgate/engage/product/RelationsSlider';
+export const DEFAULT_SLIDES_PER_VIEW = 2.3;

package/product/components/RelationsSlider/hooks.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Resolves the number of slides the RelationsSlider shows side by side for the active breakpoint.
+ * @returns The resolved number of slides for the active breakpoint.
+ */
+export declare const useSlidesPerView: () => number;
+//# sourceMappingURL=hooks.d.ts.map

package/product/components/RelationsSlider/hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../../product/components/RelationsSlider/hooks.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,eAAO,MAAM,gBAAgB,QAAO,MA6BnC,CAAC"}

package/product/components/RelationsSlider/hooks.js

@@ -0,0 +1,34 @@
+import "core-js/modules/es.array.reduce.js";
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { useWidgetSettings } from '@shopgate/engage/core/hooks';
+import { useResponsiveValue } from '@shopgate/engage/styles';
+import { getAreAppSettingsHydrated, getProductSliderSlidesPerView } from '@shopgate/engage/settings/selectors/appSettings';
+import { SCREEN_SIZE_BREAKPOINTS } from '@shopgate/engage/settings/constants/appSettings';
+import { WIDGET_ID, DEFAULT_SLIDES_PER_VIEW } from "./constants";
+
+/**
+ * Resolves the number of slides the RelationsSlider shows side by side for the active breakpoint.
+ * @returns The resolved number of slides for the active breakpoint.
+ */
+export const useSlidesPerView = () => {
+  const areAppSettingsHydrated = useSelector(getAreAppSettingsHydrated);
+  const appSettingsSlidesPerView = useSelector(getProductSliderSlidesPerView);
+  const {
+    slidesPerView: legacySlidesPerView
+  } = useWidgetSettings(WIDGET_ID) || {};
+  const sizes = useMemo(() => {
+    if (!areAppSettingsHydrated && typeof legacySlidesPerView === 'number') {
+      return {
+        small: legacySlidesPerView
+      };
+    }
+    return appSettingsSlidesPerView;
+  }, [areAppSettingsHydrated, legacySlidesPerView, appSettingsSlidesPerView]);
+  const breakpoints = useMemo(() => Object.entries(sizes).reduce((acc, [size, value]) => {
+    acc[SCREEN_SIZE_BREAKPOINTS[size]] = value;
+    return acc;
+  }, {}), [sizes]);
+  const resolved = useResponsiveValue(breakpoints);
+  return resolved || DEFAULT_SLIDES_PER_VIEW;
+};

package/product/components/UnitQuantityPicker/UnitQuantityPicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnitQuantityPicker.d.ts","sourceRoot":"","sources":["../../../../product/components/UnitQuantityPicker/UnitQuantityPicker.jsx"],"names":[],"mappings":";AA0GA;;;GAGG;AACH;;;;;;;;;;;;;;;;;IAFa,GAAG,CAAC,OAAO,CAmNvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA5TqB,YAAY"}
+{"version":3,"file":"UnitQuantityPicker.d.ts","sourceRoot":"","sources":["../../../../product/components/UnitQuantityPicker/UnitQuantityPicker.jsx"],"names":[],"mappings":";AA8FA;;;GAGG;AACH;;;;;;;;;;;;;;;;;IAFa,GAAG,CAAC,OAAO,CAqMvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAlSqB,YAAY"}

package/product/components/UnitQuantityPicker/UnitQuantityPicker.js

@@ -4,7 +4,8 @@ import { i18n, hasNewServices } from '@shopgate/engage/core/helpers';
 import { UIEvents } from '@shopgate/engage/core';
 import { useWidgetSettings } from '@shopgate/engage/core/hooks';
 import { makeStyles, useTheme } from '@shopgate/engage/styles';
-import { RippleButton, QuantityInput } from '@shopgate/engage/components';
+import { QuantityInput } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { broadcastLiveMessage } from '@shopgate/engage/a11y/helpers';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const useStyles = makeStyles()((theme, {
@@ -60,6 +61,7 @@ const useStyles = makeStyles()((theme, {
       fontWeight,
       height: '100%',
       width: '100%',
+      color: theme.contrastColor(inputBgColor || theme.components.input.background),
       ...(inputColor && {
         color: `${inputColor}`
       }),
@@ -76,10 +78,8 @@ const useStyles = makeStyles()((theme, {
     },
     button: {
       width: sizeValue,
-      ' &&': {
-        minWidth: sizeValue,
-        padding: 0
-      },
+      minWidth: sizeValue,
+      padding: 0,
       height: sizeValue,
       fontSize: `${Math.floor(sizeValue / 28 * 100)}%`,
       '&:not(:disabled)': {
@@ -91,25 +91,13 @@ const useStyles = makeStyles()((theme, {
         })
       }
     },
-    buttonRipple: {
-      padding: 0
-    },
     buttonNoRadiusLeft: {
-      ' &&': {
-        borderTopLeftRadius: 0,
-        borderBottomLeftRadius: 0
-      }
+      borderTopLeftRadius: 0,
+      borderBottomLeftRadius: 0
     },
     buttonNoRadiusRight: {
-      ' &&': {
-        borderTopRightRadius: 0,
-        borderBottomRightRadius: 0
-      }
-    },
-    disabled: {
-      ' > div': {
-        padding: 0
-      }
+      borderTopRightRadius: 0,
+      borderBottomRightRadius: 0
     }
   };
 });
@@ -145,7 +133,7 @@ const UnitQuantityPicker = ({
       return {};
     }
     return {
-      buttonColor: theme.contrastColor(theme.palette.primary.main),
+      buttonColor: theme.palette.primary.contrastText,
       buttonBgColor: theme.palette.primary.main,
       inputColor: theme.palette.text.primary,
       inputBgColor: theme.palette.grey.light,
@@ -251,13 +239,10 @@ const UnitQuantityPicker = ({
       className: classes.backdrop
     }), /*#__PURE__*/_jsxs("div", {
       className: cx(classes.root, className),
-      children: [/*#__PURE__*/_jsx(RippleButton, {
-        type: "secondary",
+      children: [/*#__PURE__*/_jsx(Button, {
+        color: "primary",
         disabled: !allowDecrement || disabled,
-        rippleClassName: classes.buttonRipple,
-        className: cx(classes.button, classes.buttonNoRadiusRight, {
-          [classes.disabled]: !allowDecrement || disabled
-        }),
+        className: cx(classes.button, classes.buttonNoRadiusRight),
         onClick: handleDecrement,
         "aria-label": i18n.text('product.decrease_quantity'),
         children: "-"
@@ -282,13 +267,10 @@ const UnitQuantityPicker = ({
           onKeyDown: handleKeyDown,
           ref: inputRef
         })]
-      }), /*#__PURE__*/_jsx(RippleButton, {
-        type: "secondary",
+      }), /*#__PURE__*/_jsx(Button, {
+        color: "primary",
         disabled: !allowIncrement || disabled,
-        rippleClassName: classes.buttonRipple,
-        className: cx(classes.button, classes.buttonNoRadiusLeft, {
-          [classes.disabled]: !allowIncrement || disabled
-        }),
+        className: cx(classes.button, classes.buttonNoRadiusLeft),
         onClick: handleIncrement,
         "aria-label": i18n.text('product.increase_quantity'),
         children: "+"

package/product/helpers/index.js

@@ -1,7 +1,9 @@
 import configuration from '@shopgate/pwa-common/collections/Configuration';
+import { logger } from '@shopgate/pwa-core/helpers';
 import { DEFAULT_PRODUCTS_FETCH_PARAMS } from '@shopgate/pwa-common/constants/Configuration';
 import { getFullImageSource, isBeta, loadImage } from '@shopgate/engage/core/helpers';
 import { getThemeSettings } from '@shopgate/engage/core/config';
+import { PRODUCT_IMAGE_BASE_WIDTHS } from '@shopgate/engage/settings/constants/imageSettings';
 import { buildShowScheduledParams } from "../components/EffectivityDates/helpers";
 export * from '@shopgate/pwa-common-commerce/product/helpers';
 export * from "../components/Media/helpers";
@@ -47,11 +49,23 @@ export const setDefaultProductFetchParams = () => {
   });
 };
 
+/**
+ * Whether the deprecation warning for getProductImageSettings has already been logged. Nulled
+ * after the first log, so a single warning is emitted per session rather than one per render.
+ */
+let productImageSettingsWarning = 'getProductImageSettings() is deprecated. Use the "context" prop of ProductImage, or the useProductImageSettings hook from @shopgate/engage/settings/hooks, so that images follow the configured aspect ratio.';
+
 /**
  * Provides the settings for ProductImages
+ * @deprecated Use the "context" prop of ProductImage, or useProductImageSettings. This accessor
+ * only reads the legacy theme configuration, so it does not pick up admin configured ratios.
  * @return {Object}
  */
 export const getProductImageSettings = () => {
+  if (productImageSettingsWarning) {
+    logger.warn(productImageSettingsWarning);
+    productImageSettingsWarning = null;
+  }
   const appImages = getThemeSettings('AppImages');
   return {
     quality: 75,
@@ -79,18 +93,22 @@ export const getProductImageSettings = () => {
 };
 
 /**
- * Load product image with given resolution
+ * Load product image with given resolution.
+ *
+ * A preload only pays off when it requests the same url the rendered image does, so pass the
+ * resolution and settings that image resolves. Anything omitted falls back to the built-in
+ * defaults.
  * @param {string} src .
- * @param {Object} resolution .
+ * @param {Object} [resolution] The resolution to preload. Falls back to the smallest built-in pdp
+ * resolution at a 1:1 ratio.
+ * @param {Object} [settings] The image service settings, as resolved by useImageServiceSettings.
  * @returns {Promise}
  */
-export const loadProductImage = (src, resolution = null) => {
-  let res = resolution;
-  if (!res) {
-    const {
-      HeroImage: resolutions
-    } = getProductImageSettings();
-    [res] = resolutions;
-  }
-  return loadImage(getFullImageSource(src, res));
+export const loadProductImage = (src, resolution = null, settings = undefined) => {
+  const [baseWidth] = PRODUCT_IMAGE_BASE_WIDTHS.pdp;
+  const res = resolution ?? {
+    width: baseWidth,
+    height: baseWidth
+  };
+  return loadImage(getFullImageSource(src, res, settings));
 };

package/product/hooks/index.js

@@ -1,3 +1,5 @@
 export { useLoadProductImage } from "./useLoadProductImage";
 export { default as useProductListEntry } from "./useProductListEntry";
-export { default as useProductListType } from "./useProductListType";
+export { default as useProductListType } from "./useProductListType";
+export { default as useShowEmptyRatingStars } from "./useShowEmptyRatingStars";
+export { useSlidesPerView } from "../components/ProductSlider/hooks";

package/product/hooks/useLoadProductImage.js

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import { useImageServiceSettings } from '@shopgate/engage/settings/hooks';
 import { loadProductImage } from "../helpers/index";
 
 /**
@@ -9,6 +10,7 @@ import { loadProductImage } from "../helpers/index";
  */
 export function useLoadProductImage(src, resolution = null) {
   const [loadedImage, setLoadedImage] = useState(null);
+  const imageServiceSettings = useImageServiceSettings();
   useEffect(() => {
     if (src) {
       setLoadedImage(null);
@@ -16,8 +18,8 @@ export function useLoadProductImage(src, resolution = null) {
   }, [src]);
   useEffect(() => {
     if (src && !loadedImage) {
-      loadProductImage(src, resolution).then(imageSrc => setLoadedImage(imageSrc));
+      loadProductImage(src, resolution, imageServiceSettings).then(imageSrc => setLoadedImage(imageSrc));
     }
-  }, [loadedImage, resolution, src]);
+  }, [imageServiceSettings, loadedImage, resolution, src]);
   return loadedImage;
 }

package/product/hooks/useShowEmptyRatingStars.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Resolves whether rating stars are also rendered for products without a rating.
+ * @returns Whether empty rating stars are shown.
+ */
+declare const useShowEmptyRatingStars: () => boolean;
+export default useShowEmptyRatingStars;
+//# sourceMappingURL=useShowEmptyRatingStars.d.ts.map

package/product/hooks/useShowEmptyRatingStars.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useShowEmptyRatingStars.d.ts","sourceRoot":"","sources":["../../../product/hooks/useShowEmptyRatingStars.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,QAAA,MAAM,uBAAuB,QAAO,OAYnC,CAAC;AAEF,eAAe,uBAAuB,CAAC"}

package/product/hooks/useShowEmptyRatingStars.js

@@ -0,0 +1,21 @@
+import { useSelector } from 'react-redux';
+import { useWidgetSettings } from '@shopgate/engage/core/hooks';
+import { getAreAppSettingsHydrated, getShowEmptyRatingStars } from '@shopgate/engage/settings/selectors/appSettings';
+const RATING_WIDGET_ID = '@shopgate/engage/rating';
+
+/**
+ * Resolves whether rating stars are also rendered for products without a rating.
+ * @returns Whether empty rating stars are shown.
+ */
+const useShowEmptyRatingStars = () => {
+  const areAppSettingsHydrated = useSelector(getAreAppSettingsHydrated);
+  const showEmptyStars = useSelector(getShowEmptyRatingStars);
+  const {
+    showEmptyRatingStars: legacyShowEmptyRatingStars = false
+  } = useWidgetSettings(RATING_WIDGET_ID) || {};
+  if (!areAppSettingsHydrated) {
+    return legacyShowEmptyRatingStars;
+  }
+  return showEmptyStars;
+};
+export default useShowEmptyRatingStars;

package/product/index.js

@@ -37,7 +37,6 @@ export * from "./selectors/relations";
 export { ProductContext, VariantContext } from "./components/context";
 export { default as ProductListTypeContext } from "./providers/ProductListType/context";
 export { default as ProductListEntryContext } from "./providers/ProductListEntry/context";
-export * from "./collections";
 export * from "./constants";
 export * from "./helpers";
 export * from "./components";

package/product/selectors/mocks/productProperties.mock.js

@@ -0,0 +1,49 @@
+export default [{
+  label: 'TestProperty1',
+  value: '15kg',
+  displayGroup: 'Weights'
+}, {
+  label: 'TestProperty2',
+  value: '120kg',
+  displayGroup: 'Weights'
+}, {
+  label: 'TestProperty3',
+  value: 'kg = lbs',
+  displayGroup: 'Weights',
+  subDisplayGroup: 'Units'
+}, {
+  label: 'TestProperty4',
+  value: 'sep = sup',
+  displayGroup: 'Weights',
+  subDisplayGroup: 'Units'
+}, {
+  label: 'TestProperty5',
+  value: 'Foo',
+  displayGroup: 'Weights',
+  subDisplayGroup: 'Something'
+}, {
+  label: 'TestProperty6',
+  value: 'Bar',
+  displayGroup: 'Weights',
+  subDisplayGroup: 'Something'
+}, {
+  label: 'TestProperty3',
+  value: 'kg = lbs',
+  displayGroup: 'Something Else',
+  subDisplayGroup: 'Units'
+}, {
+  label: 'TestProperty4',
+  value: 'sep = sup',
+  displayGroup: 'Something Else',
+  subDisplayGroup: 'Units'
+}, {
+  label: 'TestProperty5',
+  value: 'Foo',
+  displayGroup: 'Something Else',
+  subDisplayGroup: 'Something'
+}, {
+  label: 'TestProperty6',
+  value: 'Bar',
+  displayGroup: 'Something Else',
+  subDisplayGroup: 'Something'
+}];

package/push-opt-in/components/PushOptInModal/index.js

@@ -2,7 +2,8 @@ import React, { useMemo, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import throttle from 'lodash/throttle';
 import { makeStyles } from '@shopgate/engage/styles';
-import { Grid, I18n, Button, Modal, Typography } from '@shopgate/engage/components';
+import { Grid, I18n, Modal, Typography } from '@shopgate/engage/components';
+import { Button, ButtonBase } from '@shopgate/engage/components/v2';
 import { appConfig } from '@shopgate/engage';
 import pushImage from "./push-opt-in.svg";
 import connect from "./connector";
@@ -127,14 +128,13 @@ const PushOptInModal = ({
           id: "pushOptInDialogMessage"
         }), /*#__PURE__*/_jsx(Button, {
           onClick: handleAllowPushOptIn,
-          type: "primary",
+          color: "secondary",
           className: cx(classes.button, 'push-opt-in-modal__button-allow'),
           children: /*#__PURE__*/_jsx(I18n.Text, {
             string: modalButtonAllow || 'pushOptInModal.buttonAllow'
           })
-        }), /*#__PURE__*/_jsx(Button, {
+        }), /*#__PURE__*/_jsx(ButtonBase, {
           onClick: handleDenyPushOptIn,
-          type: "plain",
           className: cx(classes.button, 'push-opt-in-modal__button-deny'),
           children: /*#__PURE__*/_jsx(I18n.Text, {
             string: modalButtonDeny || 'pushOptInModal.buttonDeny',

package/registration/components/Registration/RegistrationFormActions.js

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { i18n, isIOSTheme } from '@shopgate/engage/core';
 import { makeStyles } from '@shopgate/engage/styles';
-import { RippleButton } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { useRegistration } from "../../hooks";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
@@ -15,7 +15,6 @@ const useStyles = makeStyles()(theme => ({
     } : null)
   },
   submitButton: {
-    width: '100%',
     marginTop: 8
   }
 }));
@@ -48,8 +47,9 @@ const RegisterFormActions = ({
   }, [guestRegistrationEditMode, isGuest, orderNeedsPayment]);
   return /*#__PURE__*/_jsx("div", {
     className: classes.submitButtonContainer,
-    children: /*#__PURE__*/_jsx(RippleButton, {
-      type: "secondary",
+    children: /*#__PURE__*/_jsx(Button, {
+      color: "primary",
+      fullWidth: true,
       onClick: handleSubmit,
       disabled: isLocked,
       className: classes.submitButton,

package/reviews/components/Reviews/components/AllReviewsLink/index.js

@@ -4,17 +4,15 @@ import { bin2hex } from '@shopgate/pwa-common/helpers/data';
 import { I18n } from '@shopgate/engage/components';
 import { ITEM_PATH } from '@shopgate/pwa-common-commerce/product/constants/index';
 import { REVIEW_PREVIEW_COUNT } from '@shopgate/pwa-common-commerce/reviews/constants';
-import ButtonLink from '@shopgate/pwa-ui-shared/ButtonLink';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import connect from "./connector";
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()(theme => ({
+const useStyles = makeStyles()(() => ({
   container: {
     display: 'flex',
     justifyContent: 'flex-end',
-    textAlign: 'right',
-    marginTop: theme.spacing(-1),
-    marginBottom: theme.spacing(-2)
+    textAlign: 'right'
   }
 }));
 
@@ -33,7 +31,9 @@ const AllReviewsLink = props => {
   return /*#__PURE__*/_jsx("div", {
     className: cx(classes.container, 'engage__reviews__all-reviews-link'),
     "data-test-id": "showAllReviewsButton",
-    children: /*#__PURE__*/_jsx(ButtonLink, {
+    children: /*#__PURE__*/_jsx(Button, {
+      variant: "text",
+      color: "primary",
       href: `${ITEM_PATH}/${bin2hex(props.productId)}/reviews`,
       children: /*#__PURE__*/_jsx(I18n.Text, {
         string: "reviews.button_all",