@shopgate/engage 7.31.6 → 7.32.0-beta.10

package/styles/theme/providers/ThemeProvider.js

@@ -1,13 +1,22 @@
-import { createContext, memo, useMemo, useLayoutEffect } from 'react';
+import "core-js/modules/es.array.includes.js";
+import { memo, useCallback, useEffect, useMemo, useLayoutEffect } from 'react';
+import { useSelector } from 'react-redux';
 import useLocalStorage from '@shopgate/engage/core/hooks/useLocalStorage';
+import { logger } from '@shopgate/engage/core/helpers';
 import { GlobalStyles } from '@shopgate/engage/styles';
+import { isFrontendSettingsAdminPreviewActive } from '@shopgate/engage/admin-preview/helpers';
+import { FrontendSettingsPreviewBridge } from '@shopgate/engage/admin-preview/components';
+// Imported via its module path rather than a settings barrel, to keep this module out of an import
+// cycle - the settings types reach back into the "styles/theme" barrel, which exports this file.
+import { getCanSelectColorScheme, getDefaultColorSchemeMode } from '@shopgate/engage/settings/selectors/appSettings';
 import ActiveBreakpointProvider from "./ActiveBreakpointProvider";
+import { ColorSchemeContext } from "./ColorSchemeContext";
+import { ThemeContext } from "./ThemeContext";
+import { useMatchMedia } from "../hooks/useMediaQuery";
+import { COLOR_SCHEME_SYSTEM } from "../createTheme";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-export const ThemeContext = /*#__PURE__*/createContext({});
-export const ColorSchemeContext = /*#__PURE__*/createContext({
-  mode: 'light',
-  setMode: () => ''
-});
+export { ColorSchemeContext } from "./ColorSchemeContext";
+export { ThemeContext } from "./ThemeContext";
 
 /**
  * The ThemeProvider component provides the theme context to its children.
@@ -16,32 +25,87 @@ const ThemeProvider = ({
   children,
   theme
 }) => {
-  const [activeColorScheme, setActiveColorScheme] = useLocalStorage('persistedColorScheme', {
-    initialValue: theme.defaultColorScheme
+  // The color schemes the active theme actually provides. createTheme() can be configured with only
+  // a subset of the possible schemes (it defaults to just `light`), so this list and the validation
+  // below are derived from the resolved theme rather than the full COLOR_SCHEME_NAMES tuple.
+  // Otherwise the provider could expose and accept a scheme (e.g. `dark`) the theme doesn't style,
+  // and setActiveColorScheme would flip the root selector to an unstyled scheme.
+  const colorSchemes = useMemo(() => Object.keys(theme.colorSchemes), [theme]);
+  const defaultMode = useSelector(getDefaultColorSchemeMode);
+  const isColorSchemeSelectable = useSelector(getCanSelectColorScheme);
+
+  // Whether the merchant lets visitors choose. A binding `light` or `dark` rules a pick out, so one
+  // left over from when selecting still was allowed does not keep overriding it. Development builds
+  // have no app settings to configure at all, so both schemes stay reachable there.
+  const canSelectColorScheme = isColorSchemeSelectable || process.env.NODE_ENV === 'development';
+  const prefersDarkColorScheme = useMatchMedia('(prefers-color-scheme: dark)');
+  const systemColorScheme = prefersDarkColorScheme ? 'dark' : 'light';
+  const [pickedMode, setPersistedMode] = useLocalStorage('persistedColorScheme', {
+    // The frontend settings preview runs the app in an iframe on the shop origin. Persisting the
+    // color scheme there would write the admin's preview choice into the visitor's own storage and
+    // outlive the preview, so the scheme is kept in memory only while previewing.
+    persist: !isFrontendSettingsAdminPreviewActive()
   });
+
+  // The preview forces a scheme through the same setter to show the admin either appearance, which
+  // has to work regardless of what the previewed settings configure. It stays out of
+  // `canSelectColorScheme`, so the previewed shop offers a picker exactly where visitors get one.
+  const isPickApplied = canSelectColorScheme || isFrontendSettingsAdminPreviewActive();
+
+  // The mode the visitor picked wins where it applies, otherwise the configured one does. Resolving
+  // that on every render rather than seeding the storage with it keeps `system` following the
+  // operating system and lets the preview apply the merchant's edits live.
+  const mode = isPickApplied && pickedMode || defaultMode;
+  const resolvedColorScheme = useMemo(() => mode === COLOR_SCHEME_SYSTEM ? systemColorScheme : mode, [mode, systemColorScheme]);
+  const isSupportedColorScheme = colorSchemes.includes(resolvedColorScheme);
+  const activeColorScheme = isSupportedColorScheme ? resolvedColorScheme : theme.defaultColorScheme ?? null;
+  useEffect(() => {
+    if (isSupportedColorScheme) return;
+    logger.warn(`ThemeProvider: "${resolvedColorScheme}" is not a supported color scheme.`);
+  }, [isSupportedColorScheme, resolvedColorScheme]);
+
+  // What a picker can offer and what setMode accepts. 'system' is not a scheme the theme styles -
+  // it resolves to one above - so it is added here rather than derived from the theme.
+  const modes = useMemo(() => [].concat(colorSchemes, [COLOR_SCHEME_SYSTEM]), [colorSchemes]);
+
+  // Wraps the raw storage setter, so an unsupported mode is rejected before it is persisted.
+  // Setting null is allowed and clears the stored preference, which returns to the configured one.
+  const setMode = useCallback(value => {
+    setPersistedMode(currentMode => {
+      // An updater is resolved the same way `mode` is, so it sees what the context exposes rather
+      // than the storage behind it - which holds no value yet, or one that is currently ignored.
+      const effectiveMode = isPickApplied && currentMode || defaultMode;
+      const nextMode = typeof value === 'function' ? value(effectiveMode) : value;
+      if (nextMode !== null && !modes.includes(nextMode)) {
+        logger.warn(`ThemeProvider: "${nextMode}" is not a supported color scheme.`);
+        return currentMode;
+      }
+      return nextMode;
+    });
+  }, [defaultMode, isPickApplied, modes, setPersistedMode]);
   const colorSchemeContextValue = useMemo(() => ({
-    mode: activeColorScheme,
-    setMode: setActiveColorScheme
-  }), [activeColorScheme, setActiveColorScheme]);
+    mode,
+    defaultMode,
+    activeColorScheme,
+    canSelectColorScheme,
+    setMode,
+    modes
+  }), [mode, defaultMode, activeColorScheme, canSelectColorScheme, modes, setMode]);
   useLayoutEffect(() => {
     if (!activeColorScheme) return;
     theme.setActiveColorScheme(activeColorScheme);
   }, [activeColorScheme, theme]);
   const styleSheets = useMemo(() => theme.generateStyleSheets(), [theme]);
-  return (
-    /*#__PURE__*/
-    // @ts-expect-error The input theme contains more properties than exposed to the Theme type
-    _jsx(ColorSchemeContext.Provider, {
-      value: colorSchemeContextValue,
-      children: /*#__PURE__*/_jsxs(ThemeContext.Provider, {
-        value: theme,
-        children: [/*#__PURE__*/_jsx(ActiveBreakpointProvider, {
-          children: children
-        }), /*#__PURE__*/_jsx(GlobalStyles, {
-          styles: styleSheets
-        })]
-      })
-    })
-  );
+  return /*#__PURE__*/_jsxs(ColorSchemeContext.Provider, {
+    value: colorSchemeContextValue,
+    children: [isFrontendSettingsAdminPreviewActive() && /*#__PURE__*/_jsx(FrontendSettingsPreviewBridge, {}), /*#__PURE__*/_jsxs(ThemeContext.Provider, {
+      value: theme,
+      children: [/*#__PURE__*/_jsx(ActiveBreakpointProvider, {
+        children: children
+      }), /*#__PURE__*/_jsx(GlobalStyles, {
+        styles: styleSheets
+      })]
+    })]
+  });
 };
 export default /*#__PURE__*/memo(ThemeProvider);

package/styles/theme/utils/color.d.ts

@@ -24,7 +24,7 @@ export declare const getContrastRatio: (color: string, color2: string, backgroun
  * @param returnType The type of return value to create. Defaults to 'hex'.
  * @returns The desired color value
  */
-export declare const toHex: (color: ColorInstance, returnType?: ColorType) => string | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
+export declare const toHex: (color: ColorInstance, returnType?: ColorType) => string | number[] | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
@@ -48,14 +48,14 @@ export declare const toHex: (color: ColorInstance, returnType?: ColorType) => st
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
-}> | number[];
+}>;
 /**
  * Converts a passed color to an RGB color
  * @param color The color to convert.
  * @param returnType The type of return value to create. Defaults to 'rgb'.
  * @returns The desired color value
  */
-export declare const toRgb: (color: ColorInstance, returnType?: ColorType) => string | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
+export declare const toRgb: (color: ColorInstance, returnType?: ColorType) => string | number[] | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
@@ -79,14 +79,14 @@ export declare const toRgb: (color: ColorInstance, returnType?: ColorType) => st
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
-}> | number[];
+}>;
 /**
  * Converts a passed color to an HSL color
  * @param color The color to convert.
  * @param returnType The type of return value to create. Defaults to 'hsl'.
  * @returns The desired color value
  */
-export declare const toHsl: (color: ColorInstance, returnType?: ColorType) => string | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
+export declare const toHsl: (color: ColorInstance, returnType?: ColorType) => string | number[] | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
@@ -110,7 +110,7 @@ export declare const toHsl: (color: ColorInstance, returnType?: ColorType) => st
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
-}> | number[];
+}>;
 /**
  * Adds hsl lightness to a color
  * @param color The color to modify.
@@ -118,7 +118,7 @@ export declare const toHsl: (color: ColorInstance, returnType?: ColorType) => st
  * @param type The type of return value to create. Defaults to 'hsl'.
  * @returns The desired color value
  */
-export declare const addLightness: (color: ColorInstance, value: number, type?: ColorType) => string | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
+export declare const addLightness: (color: ColorInstance, value: number, type?: ColorType) => string | number[] | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
@@ -142,7 +142,7 @@ export declare const addLightness: (color: ColorInstance, value: number, type?:
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
-}> | number[];
+}>;
 /**
  * Lightens a color by a given offset
  * @param color The color to modify.
@@ -150,7 +150,7 @@ export declare const addLightness: (color: ColorInstance, value: number, type?:
  * @param type The type of return value to create. Defaults to 'hsl'.
  * @returns The desired color value
  */
-export declare const lighten: (color: ColorInstance, totalOffset: number, type?: ColorType) => string | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
+export declare const lighten: (color: ColorInstance, totalOffset: number, type?: ColorType) => string | number[] | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
@@ -174,7 +174,7 @@ export declare const lighten: (color: ColorInstance, totalOffset: number, type?:
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
-}> | number[];
+}>;
 /**
  * Darkens a color by a given offset
  * @param color The color to modify.
@@ -182,7 +182,7 @@ export declare const lighten: (color: ColorInstance, totalOffset: number, type?:
  * @param type The type of return value to create. Defaults to 'hsl'.
  * @returns The desired color value
  */
-export declare const darken: (color: ColorInstance, totalOffset: number, type?: ColorType) => string | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
+export declare const darken: (color: ColorInstance, totalOffset: number, type?: ColorType) => string | number[] | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | Color<string | number | /*elided*/ any | ArrayLike<number> | {
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
@@ -206,6 +206,6 @@ export declare const darken: (color: ColorInstance, totalOffset: number, type?:
     [key: string]: any;
 }> | ArrayLike<number> | {
     [key: string]: any;
-}> | number[];
+}>;
 export {};
 //# sourceMappingURL=color.d.ts.map

package/styles/theme/utils/color.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../../styles/theme/utils/color.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,KAAK,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5D,KAAK,aAAa,GAAG,YAAY,CAAC,OAAO,KAAK,CAAC,CAAC;AAEhD;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,OAAO,YAWrC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAC3B,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,mBAAmB,WAYpB,CAAC;AA6BF;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,OAAO,aAAa,EACpB,aAAY,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;aACuB,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,OAAO,aAAa,EACpB,aAAY,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;aACuB,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,OAAO,aAAa,EACpB,aAAY,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;aACuB,CAAC;AAEvD;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,aAAa,EACpB,OAAO,MAAM,EACb,OAAM,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;aACkC,CAAC;AAC5D;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,GAClB,OAAO,aAAa,EACpB,aAAa,MAAM,EACnB,OAAM,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;aACsC,CAAC;AAEhE;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,GACjB,OAAO,aAAa,EACpB,aAAa,MAAM,EACnB,OAAM,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;aACqC,CAAC"}
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../../styles/theme/utils/color.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,KAAK,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5D,KAAK,aAAa,GAAG,YAAY,CAAC,OAAO,KAAK,CAAC,CAAC;AAEhD;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,OAAO,YAWrC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAC3B,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,mBAAmB,WAYpB,CAAC;AA6BF;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,OAAO,aAAa,EACpB,aAAY,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;EACuB,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,OAAO,aAAa,EACpB,aAAY,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;EACuB,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,OAAO,aAAa,EACpB,aAAY,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;EACuB,CAAC;AAEvD;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,aAAa,EACpB,OAAO,MAAM,EACb,OAAM,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;EACkC,CAAC;AAC5D;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,GAClB,OAAO,aAAa,EACpB,aAAa,MAAM,EACnB,OAAM,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;EACsC,CAAC;AAEhE;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,GACjB,OAAO,aAAa,EACpB,aAAa,MAAM,EACnB,OAAM,SAAiB;;;;;;;;;;;;;;;;;;;;;;;;EACqC,CAAC"}

package/tracking/components/CookieConsentModal/index.js

@@ -2,24 +2,22 @@ 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, Link, ConditionalWrapper } from '@shopgate/engage/components';
-import { appConfig, themeConfig } from '@shopgate/engage';
+import { Grid, I18n, Modal, Link, ConditionalWrapper, Typography } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
+import { appConfig } from '@shopgate/engage';
 import connect from "./connector";
 import cookieImage from "./tracking-opt-in.svg";
 import { svgToDataUrl } from "../../../core";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const {
-  colors
-} = themeConfig;
 const useStyles = makeStyles()(theme => ({
   modalContent: {
     width: '100%'
   },
   modalLayout: {
-    backgroundColor: colors.lightOverlay
+    backgroundColor: theme.palette.background.surface
   },
   container: {
-    backgroundColor: colors.lightOverlay,
+    backgroundColor: theme.palette.background.surface,
     padding: '30px',
     justifyContent: 'center',
     display: 'flex',
@@ -27,8 +25,6 @@ const useStyles = makeStyles()(theme => ({
     textAlign: 'center'
   },
   title: {
-    fontWeight: 'bold',
-    fontSize: '1.35rem',
     paddingTop: '30px',
     paddingBottom: '30px'
   },
@@ -135,10 +131,15 @@ const CookieConsentModal = ({
           className: cx(classes.image, 'cookie-consent-modal__image'),
           alt: "",
           "aria-hidden": "true"
-        }), /*#__PURE__*/_jsx(I18n.Text, {
+        }), /*#__PURE__*/_jsx(Typography, {
+          variant: "h3",
+          component: "div",
+          fontWeight: "bold",
           className: cx(classes.title, 'cookie-consent-modal__title'),
-          string: modalTitle || 'cookieConsentModal.title',
-          id: "cookieConsentDialogTitle"
+          id: "cookieConsentDialogTitle",
+          children: /*#__PURE__*/_jsx(I18n.Text, {
+            string: modalTitle || 'cookieConsentModal.title'
+          })
         }), /*#__PURE__*/_jsx(I18n.Text, {
           string: modalMessage || 'cookieConsentModal.message',
           className: cx('cookie-consent-modal__message'),
@@ -164,21 +165,19 @@ const CookieConsentModal = ({
           className: classes.buttonWrapper,
           children: [/*#__PURE__*/_jsx(Button, {
             onClick: handleAcceptAllCookies,
-            type: "primary",
+            color: "secondary",
             className: cx(classes.button, 'cookie-consent-modal__button-accept-all'),
             children: /*#__PURE__*/_jsx(I18n.Text, {
               string: modalButtonAcceptAll || 'cookieConsentModal.buttonAcceptAll'
             })
           }), showRequiredCookiesButton ? /*#__PURE__*/_jsx(Button, {
             onClick: handleAcceptRequiredCookies,
-            type: "simple",
             className: cx(classes.button, 'cookie-consent-modal__button-accept-required'),
             children: /*#__PURE__*/_jsx(I18n.Text, {
               string: modalButtonOnlyRequired || 'cookieConsentModal.modalButtonOnlyRequired'
             })
           }) : null, /*#__PURE__*/_jsx(Button, {
             onClick: handleOpenPrivacySettings,
-            type: "simple",
             className: cx(classes.button, 'cookie-consent-modal__button-open-settings'),
             children: /*#__PURE__*/_jsx(I18n.Text, {
               string: modalButtonConfigureSettings || 'cookieConsentModal.buttonConfigure'

package/tracking/components/PrivacySettings/index.js

@@ -1,12 +1,13 @@
 import React, { useCallback, useState } from 'react';
-import { Button, Grid, I18n, Link, Switch, ConditionalWrapper } from '@shopgate/engage/components';
+import { Grid, I18n, Link, Switch, ConditionalWrapper } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
 import { appConfig } from '@shopgate/engage';
 import { i18n } from '@shopgate/engage/core/helpers';
 import connect from "./connector";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   button: {
     marginTop: '20px'
   },
@@ -28,7 +29,7 @@ const useStyles = makeStyles()({
     flexDirection: 'column'
   },
   link: {
-    color: 'var(--color-secondary)',
+    color: theme.palette.secondary.main,
     textDecoration: 'underline'
   },
   switchWrapper: {
@@ -38,10 +39,10 @@ const useStyles = makeStyles()({
     justifyContent: 'space-between'
   },
   title: {
-    fontWeight: 'bold',
+    fontWeight: theme.typography.fontWeightBold,
     display: 'block'
   }
-});
+}));
 
 /**
  * The PrivacySettings component.
@@ -148,7 +149,7 @@ const PrivacySettings = ({
       className: classes.buttonWrapper,
       children: [/*#__PURE__*/_jsx(Button, {
         onClick: () => handleAcceptAllCookies(),
-        type: "primary",
+        color: "secondary",
         className: cx(classes.button, 'privacy-settings__button-accept-all'),
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "cookieConsentModal.buttonAcceptAll"
@@ -158,7 +159,6 @@ const PrivacySettings = ({
           comfortCookiesAccepted: areComfortCookiesSelected,
           statisticsCookiesAccepted: areStatisticsCookiesSelected
         }),
-        type: "simple",
         className: cx(classes.button, 'privacy-settings__button-accept-selected'),
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "cookieConsentModal.modalButtonConfirmSelected"

package/tracking/selectors/cookieConsent.js

@@ -1,6 +1,6 @@
 import { createSelector } from 'reselect';
 import { appConfig } from '@shopgate/engage';
-import { IS_PAGE_PREVIEW_ACTIVE } from '@shopgate/engage/page/constants';
+import { isAdminPreviewActive } from '@shopgate/engage/admin-preview/helpers';
 import { appSupportsCookieConsent } from '@shopgate/engage/core/helpers';
 const {
   cookieConsent: {
@@ -30,7 +30,7 @@ export const getCookieSettingsState = state => state?.tracking?.cookieSettings |
  * or by app/feature settings
  */
 export const getIsCookieConsentHandled = createSelector(getCookieSettingsState, settingsState => {
-  if (!isCookieConsentActivated || !appSupportsCookieConsent() || IS_PAGE_PREVIEW_ACTIVE) {
+  if (!isCookieConsentActivated || !appSupportsCookieConsent() || isAdminPreviewActive()) {
     return true;
   }
   return settingsState?.comfortCookiesAccepted !== null || settingsState?.statisticsCookiesAccepted !== null;

package/cart/components/PaymentBar/PaymentBarReserveButton.connector.js

@@ -1,6 +0,0 @@
-import { connect } from 'react-redux';
-import { historyReset } from '@shopgate/pwa-common/actions/router';
-const mapDispatchToProps = {
-  historyReset
-};
-export default connect(null, mapDispatchToProps);

package/cart/components/PaymentBar/PaymentBarReserveButton.js

@@ -1,75 +0,0 @@
-import "core-js/modules/es.regexp.flags.js";
-import React from 'react';
-import PropTypes from 'prop-types';
-import { I18n, SurroundPortals, RippleButton } from '@shopgate/engage/components';
-import { makeStyles } from '@shopgate/engage/styles';
-import { themeConfig } from '@shopgate/pwa-common/helpers/config';
-import { CART_CHECKOUT_BUTTON } from '@shopgate/pwa-common-commerce/cart/constants/Portals';
-import { FulfillmentSheet, STAGE_RESERVE_FORM } from "../../../locations";
-import { CartContext } from "../../cart.context";
-import connect from "./PaymentBarReserveButton.connector";
-import { jsx as _jsx } from "react/jsx-runtime";
-const {
-  colors
-} = themeConfig;
-const useStyles = makeStyles()({
-  button: {
-    width: '100%',
-    background: 'var(--color-button-cta)',
-    color: 'var(--color-button-cta-contrast)!important'
-  },
-  disabledButton: {
-    width: '100%',
-    background: colors.shade7,
-    color: `${colors.shade4}!important`
-  }
-});
-
-/**
- * The reserve button component.
- * @param {Object} props The component props.
- * @param {Function} props.historyReset The history reset function.
- * @return {JSX.Element} The rendered component.
- */
-const PaymentBarReserveButton = ({
-  historyReset
-}) => {
-  const {
-    classes
-  } = useStyles();
-  const {
-    flags: {
-      orderable
-    }
-  } = React.useContext(CartContext);
-
-  /**
-   * Handles the click on the button.
-   */
-  const handleClick = React.useCallback(() => {
-    FulfillmentSheet.open({
-      stage: STAGE_RESERVE_FORM,
-      callback: (_location, _product, orderSuccess) => {
-        if (orderSuccess === true) {
-          historyReset();
-        }
-      }
-    });
-  }, [historyReset]);
-  return /*#__PURE__*/_jsx(SurroundPortals, {
-    portalName: CART_CHECKOUT_BUTTON,
-    portalProps: {
-      isActive: orderable
-    },
-    children: /*#__PURE__*/_jsx(RippleButton, {
-      onClick: handleClick,
-      disabled: !orderable,
-      type: "regular",
-      className: orderable ? classes.button : classes.disabledButton,
-      children: /*#__PURE__*/_jsx(I18n.Text, {
-        string: "cart.reserve"
-      })
-    })
-  });
-};
-export default connect(PaymentBarReserveButton);

package/locations/components/StoreFinder/StoreFinderGetDirectionsButton.connector.js

@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { historyPush } from '@shopgate/pwa-common/actions/router/historyPush';
-
-/**
- * @param {Function} dispatch The redux dispatch function.
- * @return {Object} The extended component props.
- */
-const mapDispatchToProps = dispatch => ({
-  openMap: url => dispatch(historyPush({
-    pathname: url,
-    state: {
-      target: '_blank'
-    }
-  }))
-});
-export default connect(null, mapDispatchToProps);

package/locations/components/StoreFinder/StoreFinderGetDirectionsButton.js

@@ -1,52 +0,0 @@
-import React, { useMemo, useCallback } from 'react';
-import PropTypes from 'prop-types';
-import { i18n, generateGoogleMapsDirectionsUrl } from '@shopgate/engage/core';
-import { makeStyles } from '@shopgate/engage/styles';
-import { RippleButton } from '@shopgate/engage/components';
-import connect from "./StoreFinderGetDirectionsButton.connector";
-import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()({
-  container: {},
-  button: {
-    width: '100%',
-    background: 'var(--color-primary)!important',
-    color: 'var(--color-primary-contrast)!important',
-    fontSize: '0.875rem !important'
-  }
-});
-
-/**
- * @param {Object} props The component props
- * @returns {JSX}
- */
-const StoreFinderGetDirectionsButton = ({
-  address,
-  openMap,
-  className
-}) => {
-  const {
-    classes,
-    cx
-  } = useStyles();
-  const url = useMemo(() => address && generateGoogleMapsDirectionsUrl(address), [address]);
-  const handleClick = useCallback(() => {
-    openMap(url);
-  }, [openMap, url]);
-  if (!address) {
-    return null;
-  }
-  return /*#__PURE__*/_jsx("div", {
-    className: cx(classes.container, className),
-    children: /*#__PURE__*/_jsx(RippleButton, {
-      onClick: handleClick,
-      className: classes.button,
-      children: i18n.text('locations.get_directions')
-    })
-  });
-};
-StoreFinderGetDirectionsButton.defaultProps = {
-  address: null,
-  openMap: () => {},
-  className: null
-};
-export default connect(StoreFinderGetDirectionsButton);

package/product/collections/index.js

@@ -1 +0,0 @@
-export { default as productImageFormats } from '@shopgate/pwa-common-commerce/product/collections/ProductImageFormats';

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

@@ -1,3 +0,0 @@
-export const ALWAYS: "always";
-export const NEVER: "never";
-//# sourceMappingURL=constants.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../product/components/EffectivityDates/constants.js"],"names":[],"mappings":"AAAA,qBAAsB,QAAQ,CAAC;AAC/B,oBAAqB,OAAO,CAAC"}

package/product/components/EffectivityDates/helpers.d.ts

@@ -1,6 +0,0 @@
-export function buildShowScheduledParams(): Object | {
-    showScheduled: string;
-};
-export function showScheduledLabel(startDate: Date, settings?: Object): boolean;
-export function showExpiringLabel(endDate: Date, settings?: Object): boolean;
-//# sourceMappingURL=helpers.d.ts.map

package/product/components/EffectivityDates/helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../product/components/EffectivityDates/helpers.js"],"names":[],"mappings":"AAUO,4CAFM,MAAM,GAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAC,CAuB1C;AAQM,8CAJI,IAAI,aACJ,MAAM,GACJ,OAAO,CA6BnB;AAQM,2CAJI,IAAI,aACJ,MAAM,GACJ,OAAO,CAyBnB"}

package/product/components/Media/helpers.d.ts

@@ -1,2 +0,0 @@
-export function buildMediaImageUrl(url: string, params?: Object): string;
-//# sourceMappingURL=helpers.d.ts.map

package/product/components/Media/helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../product/components/Media/helpers.js"],"names":[],"mappings":"AAsBO,wCAJI,MAAM,WACN,MAAM,GACJ,MAAM,CAiBlB"}

package/product/components/ProductImage/connector.js

@@ -1,12 +0,0 @@
-import { connect } from 'react-redux';
-import { getProductImagePlaceholder } from "../../../core";
-
-/**
- * Maps the current application state to the component props.
- * @param {Object} state The current application state.
- * @return {Object} The populated component props.
- */
-const mapStateToProps = state => ({
-  placeholderSrc: getProductImagePlaceholder(state)
-});
-export default connect(mapStateToProps);

package/product/helpers/index.d.ts

@@ -1,13 +0,0 @@
-export * from "@shopgate/pwa-common-commerce/product/helpers";
-export * from "../components/Media/helpers";
-export * from "./redirects";
-export function buildFetchCategoryProductsParams(): undefined | {
-    params: Object;
-};
-export function buildFetchSearchResultsParams(): undefined | {
-    params: Object;
-};
-export function setDefaultProductFetchParams(): void;
-export function getProductImageSettings(): Object;
-export function loadProductImage(src: string, resolution?: Object): Promise<any>;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../product/helpers/index.js"],"names":[],"mappings":";;;AAcO,oDAFM,SAAS,GAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAkBtC;AAhBM,iDAFM,SAAS,GAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAkBtC;AAWM,qDAON;AAMM,2CAFK,MAAM,CAoCjB;AAQM,sCAJI,MAAM,eACN,MAAM,gBAWhB"}

package/product/helpers/redirects.d.ts

@@ -1,2 +0,0 @@
-export function enableRedirectHandler(): void;
-//# sourceMappingURL=redirects.d.ts.map

package/product/helpers/redirects.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"redirects.d.ts","sourceRoot":"","sources":["../../../product/helpers/redirects.js"],"names":[],"mappings":"AAUO,yCAFM,IAAI,CA4BhB"}

package/product/selectors/helpers/filterProperties.d.ts

@@ -1,8 +0,0 @@
-/**
- * Reads the setting for product properties whitelisting/blacklisting
- * and filters the properties accordingly.
- * @param {Array} properties Array of properties with label and value attributes.
- * @return {Array} Filtered properties.
- */
-export function filterProperties(properties: any[]): any[];
-//# sourceMappingURL=filterProperties.d.ts.map

package/product/selectors/helpers/filterProperties.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"filterProperties.d.ts","sourceRoot":"","sources":["../../../../product/selectors/helpers/filterProperties.js"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,2DAyBC"}