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

package/styles/theme/hooks/useMediaQuery.d.ts

@@ -1,4 +1,11 @@
 import { type Theme } from '..';
+/**
+ * React hook to check if a media query matches the current viewport. Independent of the theme
+ * context, so it can be used by the provider that establishes it.
+ * @param query A media query string, e.g. '(min-width: 600px)'
+ * @returns Returns true if the media query matches, false otherwise.
+ */
+export declare const useMatchMedia: (query: string) => boolean;
 /**
  * @callback ThemeFn
  * @param {Theme} theme The current theme object.

package/styles/theme/hooks/useMediaQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMediaQuery.d.ts","sourceRoot":"","sources":["../../../../styles/theme/hooks/useMediaQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,IAAI,CAAC;AA8BhC;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,QAAA,MAAM,aAAa,GAAI,YAAY,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC,KAAG,OASxE,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"useMediaQuery.d.ts","sourceRoot":"","sources":["../../../../styles/theme/hooks/useMediaQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,IAAI,CAAC;AAEhC;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,OAoB7C,CAAC;AAEF;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,QAAA,MAAM,aAAa,GAAI,YAAY,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC,KAAG,OASxE,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/styles/theme/hooks/useMediaQuery.js

@@ -2,12 +2,12 @@ import "core-js/modules/es.string.replace.js";
 import { useState, useEffect } from 'react';
 import useTheme from "./useTheme";
 /**
- * React hook to check if a media query matches the current viewport.
- * Doesn't accept media query strings that start with '@media'.
+ * React hook to check if a media query matches the current viewport. Independent of the theme
+ * context, so it can be used by the provider that establishes it.
  * @param query A media query string, e.g. '(min-width: 600px)'
  * @returns Returns true if the media query matches, false otherwise.
  */
-const useMediaQueryInternal = query => {
+export const useMatchMedia = query => {
   const [match, setMatch] = useState(() => window.matchMedia(query).matches);
   useEffect(() => {
     const queryList = window.matchMedia(query);
@@ -60,9 +60,9 @@ const useMediaQueryInternal = query => {
 const useMediaQuery = queryInput => {
   const theme = useTheme();
   let query = typeof queryInput === 'function' ? queryInput(theme) : queryInput;
-  // Remove the '@media' prefix if it exists, as useMediaQueryInternal expects a plain media query.
+  // Remove the '@media' prefix if it exists, as useMatchMedia expects a plain media query.
   query = query.replace(/^@media( ?)/m, '');
-  const match = useMediaQueryInternal(query);
+  const match = useMatchMedia(query);
   return match;
 };
 export default useMediaQuery;

package/styles/theme/hooks/useTheme.js

@@ -1,5 +1,5 @@
 import { useContext } from 'react';
-import { ThemeContext } from "../providers/ThemeProvider";
+import { ThemeContext } from "../providers/ThemeContext";
 
 /**
  * Returns the theme object.

package/styles/theme/index.d.ts

@@ -1,5 +1,9 @@
 export { default as ThemeProvider } from './providers/ThemeProvider';
 export { createTheme } from './createTheme';
-export type { Theme, Breakpoint, PaletteColorsWithMain } from './createTheme';
+export { type ShadowSize } from './createTheme/shadows';
+export type { Variant as TypographyVariant } from './createTheme/createTypography';
+export type { Theme, Breakpoint, PaletteColorsWithMain, ColorSchemeName, ColorSchemeMode, } from './createTheme';
 export { useActiveBreakpoint, useMediaQuery, useResponsiveValue, useTheme, useColorScheme, } from './hooks';
+export { withTheme, type WithThemeProps } from './hocs';
+export type { ColorSchemeContextValue } from './providers/ColorSchemeContext';
 //# sourceMappingURL=index.d.ts.map

package/styles/theme/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../styles/theme/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,cAAc,GACf,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../styles/theme/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,YAAY,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnF,YAAY,EACV,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,eAAe,EAAE,eAAe,GAC3E,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,cAAc,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxD,YAAY,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC"}

package/styles/theme/index.js

@@ -1,3 +1,4 @@
 export { default as ThemeProvider } from "./providers/ThemeProvider";
 export { createTheme } from "./createTheme";
-export { useActiveBreakpoint, useMediaQuery, useResponsiveValue, useTheme, useColorScheme } from "./hooks";
+export { useActiveBreakpoint, useMediaQuery, useResponsiveValue, useTheme, useColorScheme } from "./hooks";
+export { withTheme } from "./hocs";

package/styles/theme/providers/ActiveBreakpointProvider.d.ts

@@ -4,6 +4,6 @@ export declare const ActiveBreakpointContext: React.Context<Breakpoint | undefin
 type ActiveBreakpointProviderProps = {
     children: React.ReactNode;
 };
-declare const _default: React.MemoExoticComponent<({ children }: ActiveBreakpointProviderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ children }: ActiveBreakpointProviderProps) => React.JSX.Element>;
 export default _default;
 //# sourceMappingURL=ActiveBreakpointProvider.d.ts.map

package/styles/theme/providers/ColorSchemeContext.d.ts

@@ -0,0 +1,40 @@
+import { type ColorSchemeMode, type ColorSchemeName } from '../createTheme';
+/**
+ * A new mode, or an updater that receives the effective one. Null clears the visitor's pick.
+ */
+export type SetColorSchemeMode = ColorSchemeMode | null | ((current: ColorSchemeMode) => ColorSchemeMode | null);
+export interface ColorSchemeContextValue {
+    /**
+     * The mode in effect: the one the visitor picked, or the configured default while they picked
+     * none.
+     */
+    mode: ColorSchemeMode;
+    /**
+     * The mode that applies while the visitor picked none, as configured within the app settings.
+     */
+    defaultMode: ColorSchemeMode;
+    /**
+     * The color scheme that is applied - the mode resolved against the operating system and the
+     * configured default. Components style against this one.
+     */
+    activeColorScheme: ColorSchemeName | null;
+    /**
+     * Whether visitors may pick a color scheme themselves. False while the app settings configure a
+     * binding color scheme, in which case a stored pick is ignored. Always true in development
+     * builds, which have no app settings to configure. A picker should render only where this is
+     * true.
+     */
+    canSelectColorScheme: boolean;
+    /**
+     * Updates the color scheme. Setting null clears the visitor's pick, so the configured default
+     * applies again. Takes effect only while `canSelectColorScheme` is true.
+     */
+    setMode: (value: SetColorSchemeMode) => void;
+    /**
+     * Everything that can be set: the color schemes the active theme styles, plus 'system'. Passing
+     * anything else to setMode has no effect.
+     */
+    modes: ColorSchemeMode[];
+}
+export declare const ColorSchemeContext: import("react").Context<ColorSchemeContextValue>;
+//# sourceMappingURL=ColorSchemeContext.d.ts.map

package/styles/theme/providers/ColorSchemeContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ColorSchemeContext.d.ts","sourceRoot":"","sources":["../../../../styles/theme/providers/ColorSchemeContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAE5E;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,eAAe,GACf,IAAI,GACJ,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,eAAe,GAAG,IAAI,CAAC,CAAC;AAE3D,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,IAAI,EAAE,eAAe,CAAC;IACtB;;OAEG;IACH,WAAW,EAAE,eAAe,CAAC;IAC7B;;;OAGG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAC1C;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC7C;;;OAGG;IACH,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAED,eAAO,MAAM,kBAAkB,kDAO7B,CAAC"}

package/styles/theme/providers/ColorSchemeContext.js

@@ -0,0 +1,14 @@
+import { createContext } from 'react';
+
+/**
+ * A new mode, or an updater that receives the effective one. Null clears the visitor's pick.
+ */
+
+export const ColorSchemeContext = /*#__PURE__*/createContext({
+  mode: 'light',
+  defaultMode: 'light',
+  activeColorScheme: 'light',
+  canSelectColorScheme: false,
+  setMode: () => undefined,
+  modes: ['light']
+});

package/styles/theme/providers/ThemeContext.d.ts

@@ -0,0 +1,3 @@
+import { type Theme } from '../createTheme';
+export declare const ThemeContext: import("react").Context<Theme>;
+//# sourceMappingURL=ThemeContext.d.ts.map

package/styles/theme/providers/ThemeContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ThemeContext.d.ts","sourceRoot":"","sources":["../../../../styles/theme/providers/ThemeContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,eAAO,MAAM,YAAY,gCAAqC,CAAC"}

package/styles/theme/providers/ThemeContext.js

@@ -0,0 +1,2 @@
+import { createContext } from 'react';
+export const ThemeContext = /*#__PURE__*/createContext({});

package/styles/theme/providers/ThemeProvider.d.ts

@@ -1,16 +1,6 @@
-import { type Theme, type ThemeInternal, type ColorSchemeName } from '../createTheme';
-export interface ColorSchemeContextValue {
-    /**
-     * The current color scheme (e.g., 'light' or 'dark')
-     */
-    mode: ColorSchemeName;
-    /**
-     * Function to update the color scheme
-     */
-    setMode: React.Dispatch<React.SetStateAction<ColorSchemeName>>;
-}
-export declare const ThemeContext: import("react").Context<Theme>;
-export declare const ColorSchemeContext: import("react").Context<ColorSchemeContextValue>;
+import { type ThemeInternal } from '../createTheme';
+export { ColorSchemeContext, type ColorSchemeContextValue } from './ColorSchemeContext';
+export { ThemeContext } from './ThemeContext';
 type ThemeProviderProps = {
     /**
      * The theme object to provide to the context.
@@ -18,6 +8,6 @@ type ThemeProviderProps = {
     theme: ThemeInternal;
     children: React.ReactNode;
 };
-declare const _default: import("react").MemoExoticComponent<({ children, theme, }: ThemeProviderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<({ children, theme, }: ThemeProviderProps) => import("react").JSX.Element>;
 export default _default;
 //# sourceMappingURL=ThemeProvider.d.ts.map

package/styles/theme/providers/ThemeProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeProvider.d.ts","sourceRoot":"","sources":["../../../../styles/theme/providers/ThemeProvider.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtF,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,IAAI,EAAE,eAAe,CAAC;IACtB;;OAEG;IACH,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC;CAChE;AAED,eAAO,MAAM,YAAY,gCAAqC,CAAC;AAE/D,eAAO,MAAM,kBAAkB,kDAG7B,CAAC;AAyCH,KAAK,kBAAkB,GAAG;IACxB;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAA;mFAvCE,kBAAkB;AAyCrB,wBAAmC"}
+{"version":3,"file":"ThemeProvider.d.ts","sourceRoot":"","sources":["../../../../styles/theme/providers/ThemeProvider.tsx"],"names":[],"mappings":"AAgBA,OAAO,EACgB,KAAK,aAAa,EACxC,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAuH9C,KAAK,kBAAkB,GAAG;IACxB;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAA;mFArHE,kBAAkB;AAuHrB,wBAAmC"}

package/styles/theme/providers/ThemeProvider.js

@@ -1,15 +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 { IS_FRONTEND_SETTINGS_ADMIN_PREVIEW_ACTIVE } from '@shopgate/engage/admin-preview/constants';
+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.
@@ -18,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
-    _jsxs(ColorSchemeContext.Provider, {
-      value: colorSchemeContextValue,
-      children: [IS_FRONTEND_SETTINGS_ADMIN_PREVIEW_ACTIVE && /*#__PURE__*/_jsx(FrontendSettingsPreviewBridge, {}), /*#__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,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, Link, ConditionalWrapper, Typography } from '@shopgate/engage/components';
+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";
@@ -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,5 +1,6 @@
 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';
@@ -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/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,71 +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 { 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 useStyles = makeStyles()(theme => ({
-  button: {
-    width: '100%',
-    background: theme.components.ctaButton.background,
-    color: `${theme.contrastColor(theme.components.ctaButton.background)}!important`
-  },
-  disabledButton: {
-    width: '100%',
-    background: theme.palette.action.disabledBackground,
-    color: `${theme.contrastColor(theme.palette.action.disabledBackground)}!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/components/ChipLayout/spec.js

@@ -1,41 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import Chip from '@shopgate/pwa-ui-shared/Chip';
-import ChipsLayout from "./index";
-
-/**
- * Since the component uses the <Measure> component it needs an actual
- * browser to be tested as it needs a full browser that supports styling and
- * width/height calculation.
- */
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-describe('<ChipsLayout />', () => {
-  it('should render with one chip', () => {
-    const Component = /*#__PURE__*/_jsx(ChipsLayout, {
-      children: /*#__PURE__*/_jsx(Chip, {
-        id: "some-id",
-        children: "foo"
-      })
-    });
-    const wrapper = mount(Component);
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.find(Chip).length).toEqual(1);
-    expect(wrapper.find(Chip).at(0).find('button').at(1).text()).toEqual('foo');
-  });
-  it('should render with two chips', () => {
-    const Component = /*#__PURE__*/_jsxs(ChipsLayout, {
-      children: [/*#__PURE__*/_jsx(Chip, {
-        id: "some-id",
-        children: "foo"
-      }), /*#__PURE__*/_jsx(Chip, {
-        id: "some-other-id",
-        children: "bar"
-      })]
-    });
-    const wrapper = mount(Component);
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.find(Chip).length).toEqual(2);
-    expect(wrapper.find(Chip).at(0).find('button').at(1).text()).toEqual('foo');
-    expect(wrapper.find(Chip).at(1).find('button').at(1).text()).toEqual('bar');
-  });
-});