@shopgate/pwa-common 7.32.0-beta.5 → 7.32.0-beta.6

package/components/Image/Image.d.ts

@@ -0,0 +1,78 @@
+import type { ReactElement, SyntheticEvent } from 'react';
+import type { ImageResolution } from '@shopgate/engage/settings/types/appSettings';
+export interface ImageProps {
+    /**
+     * Optional alt text for the image. Without one the image is marked decorative.
+     */
+    alt?: string | null;
+    /**
+     * The background color of the image container.
+     */
+    backgroundColor?: string;
+    /**
+     * External class name for the image container.
+     */
+    className?: string | null;
+    /**
+     * External class name for the image itself.
+     */
+    classNameImg?: string | null;
+    /**
+     * Shows the `placeholder` even when the image could be loaded. For a parent that decides on
+     * grounds this component cannot see, e.g. a product that is not orderable.
+     */
+    forcePlaceholder?: boolean;
+    /**
+     * Callback that is invoked when the image with the highest resolution has been loaded.
+     */
+    highestResolutionLoaded?: () => void;
+    /**
+     * Microdata property name, e.g. "image" for a schema.org Product. Emitted as the itemprop
+     * attribute so crawlers can pick the image out of the surrounding item.
+     */
+    itemProp?: string;
+    /**
+     * Whether the image is loaded only once it comes near the viewport. Turn it off for images that
+     * are visible immediately, e.g. the first tile of a list.
+     */
+    lazy?: boolean;
+    /**
+     * Callback that is invoked when image loading failed. Handling the failure is not required - a
+     * `placeholder` covers that - so this is for callers that need to react beyond the image itself.
+     */
+    onError?: (event: SyntheticEvent<HTMLImageElement>) => void;
+    /**
+     * Callback that is invoked when the image has been loaded.
+     */
+    onLoad?: (event: SyntheticEvent<HTMLImageElement>) => void;
+    /**
+     * Rendered in place of the image when there is no `src`, when `forcePlaceholder` is set, or when
+     * the image failed to load. It renders inside the container, so it inherits the reserved aspect
+     * ratio box and needs no sizing of its own.
+     */
+    placeholder?: ReactElement | null;
+    /**
+     * Width and height parts of the rendered aspect ratio, e.g. [16, 9]. Without one the ratio is
+     * calculated from the highest resolution.
+     */
+    ratio?: number[] | null;
+    /**
+     * The resolutions to request, ordered ascending. The last is displayed; the second to last is
+     * loaded first as a preview, so something appears as soon as possible.
+     */
+    resolutions?: ImageResolution[];
+    /**
+     * Image source. A url the image service serves is rewritten to carry the requested dimensions and
+     * the app wide quality and fill settings. Any other url is used as it is, so `resolutions` and
+     * `ratio` then only affect the layout, not what is downloaded.
+     */
+    src?: string | null;
+    /**
+     * Renders a plain img tag without the container, for callers that position the image themselves.
+     * Nothing reserves its space while it loads, and `backgroundColor` has nothing to apply to.
+     */
+    unwrapped?: boolean;
+}
+declare const _default: import("react").MemoExoticComponent<(props: ImageProps) => import("react").JSX.Element | null>;
+export default _default;
+//# sourceMappingURL=Image.d.ts.map

package/components/Image/Image.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../components/Image/Image.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiB,YAAY,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAKzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAGnF,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IACrC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC5D;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC3D;;;;OAIG;IACH,WAAW,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACxB;;;OAGG;IACH,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;IAChC;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;oEA8EqB,UAAU;AAoMhC,wBAA2B"}

package/components/Image/Image.js

@@ -1,8 +1,8 @@
-import React, { useMemo, useState, useEffect, useRef, useCallback, memo } from 'react';
-import PropTypes from 'prop-types';
+import { useMemo, useState, useEffect, useRef, useCallback, memo } from 'react';
 import noop from 'lodash/noop';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getFullImageSource } from '@shopgate/engage/core/helpers';
+import { useImageServiceSettings } from '@shopgate/engage/settings/hooks';
 import ImageInner from "./ImageInner";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()((_theme, {
@@ -23,57 +23,112 @@ const useStyles = makeStyles()((_theme, {
 }));
 
 /**
- * Calculates the Greatest Common Divisor (GCD) of two numbers using the Euclidean algorithm.
- *
- * @param {number} a - The first number (must be a positive integer).
- * @param {number} b - The second number (must be a positive integer).
- * @returns {number} The greatest common divisor of `a` and `b`.
- *
- * @example
- * gcd(1920, 1080); // Returns 120
- * gcd(10, 15);     // Returns 5
- * gcd(100, 25);    // Returns 25
+ * Calculates the Greatest Common Divisor of two numbers using the Euclidean algorithm.
+ * @param a The first number.
+ * @param b The second number.
+ * @returns The greatest common divisor, or 1 when the pair cannot be reduced.
  */
-const gcd = (a, b) => b === 0 ? a : gcd(b, a % b);
+const gcd = (a, b) => {
+  // Anything but a pair of positive whole numbers is left unreduced. The values can originate from
+  // an admin field a merchant is still typing into, and NaN or Infinity would otherwise recurse
+  // until the stack overflows, while a fraction would reduce to a near-zero divisor.
+  if (!Number.isInteger(a) || !Number.isInteger(b) || a <= 0 || b <= 0) {
+    return 1;
+  }
+  let dividend = a;
+  let remainder = b;
+  while (remainder !== 0) {
+    const next = dividend % remainder;
+    dividend = remainder;
+    remainder = next;
+  }
+  return dividend;
+};
 
 /**
- * The image component.
- * @param {Object} props The components props.
- * @returns {JSX.Element}
+ * Whether a value can be used as one side of an aspect ratio.
+ * @param value The value to check.
+ * @returns Whether it is a usable length.
+ */
+const isUsableLength = value => Number.isFinite(value) && value > 0;
+const defaultResolutions = [{
+  width: 440,
+  height: 440
+}];
+
+/**
+ * Renders an image at the configured resolutions, inside a container that reserves its aspect ratio
+ * so the layout does not shift while it loads.
+ *
+ * What a caller should know:
+ *
+ * - **Nothing is rendered until there is something to render.** Without a `src`, the container is
+ *   still there and keeps its space, but it stays empty unless a `placeholder` is given.
+ * - **A failed image is remembered per source, not per component.** Once a `placeholder` is given,
+ *   it takes over on failure, and the image returns by itself as soon as the requested url changes -
+ *   a new `src`, different `resolutions`, or an app wide image setting edited in the admin. Callers
+ *   that pass no `placeholder` keep the failed image, and `onError` keeps reporting every attempt.
+ * - **`onLoad` and `onError` are always forwarded**, whether or not a placeholder is involved.
+ * - **`unwrapped` gives up the container**, and with it the reserved aspect ratio box and the
+ *   background color. The caller has to provide the space itself.
+ * @param props The components props.
+ * @returns The rendered component.
  */
-const Image = ({
-  alt,
-  backgroundColor,
-  className,
-  classNameImg,
-  forcePlaceholder: parentRendersPlaceholder,
-  highestResolutionLoaded,
-  onError,
-  onLoad,
-  ratio,
-  resolutions,
-  src,
-  lazy,
-  unwrapped
-}) => {
+const Image = props => {
+  const {
+    alt = null,
+    backgroundColor = 'var(--sg-palette-background-emphasized)',
+    className = '',
+    classNameImg = '',
+    forcePlaceholder: parentRendersPlaceholder = false,
+    highestResolutionLoaded = noop,
+    itemProp,
+    onError = noop,
+    onLoad = noop,
+    placeholder = null,
+    ratio = null,
+    resolutions = defaultResolutions,
+    src = null,
+    lazy = true,
+    unwrapped = false
+  } = props;
+
+  // Quality and fill color are configured app wide, so they are resolved here rather than passed
+  // in by every caller. The returned object is reference stable, so it does not defeat the memo.
+  const imageServiceSettings = useImageServiceSettings();
+
   // Prepare two image sources - a small preview image and a large main image. The idea is to
   // display an image as soon as possible. Small images might be also available in the cache from
   // the previous page.
   const sources = useMemo(() => {
     // Create a preview source when resolutions array has more than one element
-    const preview = resolutions.length > 1 ? getFullImageSource(src, resolutions[resolutions.length - 2]) : null;
+    const preview = resolutions.length > 1 ? getFullImageSource(src, resolutions[resolutions.length - 2], imageServiceSettings) : null;
 
     // Create a main source when resolutions array has at least one element (highest resolution)
-    const main = resolutions.length > 0 ? getFullImageSource(src, resolutions[resolutions.length - 1]) : null;
+    const main = resolutions.length > 0 ? getFullImageSource(src, resolutions[resolutions.length - 1], imageServiceSettings) : null;
     return {
       // Only assign preview source if it is different from the main source. Image swap logic
       // will not run when no preview source is available.
       preview: preview !== main ? preview : null,
       main
     };
-  }, [resolutions, src]);
+  }, [resolutions, src, imageServiceSettings]);
   const imgRef = useRef(null);
   const [isInView, setIsInView] = useState(!lazy);
+  const [failedSource, setFailedSource] = useState(null);
+
+  // A failure counts against the source that produced it, not against the component. Anything that
+  // rebuilds the url - a new src, a reconfigured ratio, a different fill color - is by itself the
+  // decision to try again, so the placeholder gives way without anyone having to reset a flag.
+  //
+  // Only callers that provide a placeholder have the image taken away from them. Without one there
+  // is nothing to swap to, so a failed image stays mounted and keeps reporting through onError,
+  // exactly as it behaved before this prop existed.
+  //
+  // The null check matters: an empty resolutions array leaves no source to request, and would
+  // otherwise match the initial state and report a failure that never happened.
+  const hasFailed = sources.main !== null && failedSource === sources.main;
+  const showPlaceholder = !src || parentRendersPlaceholder || !!placeholder && hasFailed;
 
   // Effect to create an Intersection Observer to enable lazy loading of preview images
   useEffect(() => {
@@ -103,40 +158,41 @@ const Image = ({
 
   /**
    * Handles the onLoad event of the image.
+   * @param event The load event.
    */
-  const handleOnLoad = useCallback(e => {
+  const handleOnLoad = useCallback(event => {
     highestResolutionLoaded();
-    onLoad(e);
+    onLoad(event);
   }, [highestResolutionLoaded, onLoad]);
 
   /**
    * Handles the onError event of the image.
+   * @param event The error event.
    */
-  const handleOnError = useCallback(e => {
-    onError(e);
-  }, [onError]);
+  const handleOnError = useCallback(event => {
+    setFailedSource(sources.main);
+    onError(event);
+  }, [onError, sources.main]);
 
   /**
    * Memoized calculation of aspect ratio and CSS padding-hack ratio for responsive elements.
    *
-   * Returns n object containing:
-   * - `aspectRatio` {string} - The aspect ratio in the format `width / height` (e.g., `16 / 9`).
-   * - `paddingHackRatio` {string} - The CSS padding-hack ratio as a percentage for older browsers
-   * (e.g., `56.250%` for a 16:9 ratio).
+   * aspectRatio is the ratio in the format `width / height` (e.g. `16 / 9`), paddingHackRatio the
+   * same as a percentage for older browsers (e.g. `56.250%` for a 16:9 ratio).
    */
   const {
     aspectRatio,
     paddingHackRatio
   } = useMemo(() => {
-    let width;
-    let height;
-    if (ratio) {
-      [width, height] = ratio;
-    } else {
-      ({
-        width,
-        height
-      } = resolutions[resolutions.length - 1]);
+    const [width, height] = ratio ?? [resolutions[resolutions.length - 1]?.width, resolutions[resolutions.length - 1]?.height];
+
+    // Fall back to a square rather than emitting "NaN / NaN" or dividing by zero. Reached when the
+    // resolutions are empty, or when a ratio arrives half typed from the admin.
+    if (!isUsableLength(width) || !isUsableLength(height)) {
+      return {
+        aspectRatio: '1 / 1',
+        paddingHackRatio: '100.000%'
+      };
     }
     const divisor = gcd(width, height);
     return {
@@ -151,22 +207,24 @@ const Image = ({
     background: backgroundColor,
     paddingTop: paddingHackRatio
   });
+  const innerStyle = {
+    aspectRatio,
+    ...(isInView && sources.preview && {
+      backgroundImage: `url(${sources.preview})`,
+      backgroundSize: 'contain',
+      backgroundRepeat: 'no-repeat',
+      backgroundPosition: 'center'
+    })
+  };
   if (unwrapped) {
-    if (!(src && !parentRendersPlaceholder)) return null;
+    if (showPlaceholder) return placeholder;
     return /*#__PURE__*/_jsx(ImageInner, {
       ref: imgRef,
       src: sources.main,
       className: cx(classNameImg),
-      style: {
-        aspectRatio,
-        ...(isInView && sources.preview && {
-          backgroundImage: `url(${sources.preview})`,
-          backgroundSize: 'contain',
-          backgroundRepeat: 'no-repeat',
-          backgroundPosition: 'center'
-        })
-      },
+      style: innerStyle,
       alt: alt,
+      itemProp: itemProp,
       lazy: lazy,
       onLoad: handleOnLoad,
       onError: handleOnError
@@ -174,43 +232,17 @@ const Image = ({
   }
   return /*#__PURE__*/_jsx("div", {
     className: cx(classes.container, className, 'common__image__container'),
-    children: src && !parentRendersPlaceholder && /*#__PURE__*/_jsx(ImageInner, {
+    children: showPlaceholder ? placeholder : /*#__PURE__*/_jsx(ImageInner, {
       ref: imgRef,
       src: sources.main,
       className: cx(classNameImg),
-      style: {
-        aspectRatio,
-        ...(isInView && sources.preview && {
-          backgroundImage: `url(${sources.preview})`,
-          backgroundSize: 'contain',
-          backgroundRepeat: 'no-repeat',
-          backgroundPosition: 'center'
-        })
-      },
+      style: innerStyle,
       alt: alt,
+      itemProp: itemProp,
       lazy: lazy,
       onLoad: handleOnLoad,
       onError: handleOnError
     })
   });
 };
-const defaultResolutions = [{
-  width: 440,
-  height: 440
-}];
-Image.defaultProps = {
-  alt: null,
-  backgroundColor: 'var(--sg-palette-background-emphasized)',
-  className: '',
-  classNameImg: '',
-  forcePlaceholder: false,
-  highestResolutionLoaded: noop,
-  onError: noop,
-  onLoad: noop,
-  ratio: null,
-  resolutions: defaultResolutions,
-  src: null,
-  unwrapped: false,
-  lazy: true
-};
 export default /*#__PURE__*/memo(Image);

package/components/Image/ImageInner.d.ts

@@ -0,0 +1,45 @@
+import type { CSSProperties, SyntheticEvent } from 'react';
+export interface ImageInnerProps {
+    /**
+     * Alt text. Without one the image is marked decorative.
+     */
+    alt?: string | null;
+    /**
+     * External class name for the img element.
+     */
+    className?: string | null;
+    /**
+     * Microdata property name, e.g. "image" for a schema.org Product. Emitted as the itemprop
+     * attribute so crawlers can pick the image out of the surrounding item.
+     */
+    itemProp?: string;
+    /**
+     * Whether the browser defers loading until the image is near the viewport.
+     */
+    lazy?: boolean;
+    /**
+     * Callback that is invoked when image loading failed.
+     */
+    onError?: (event: SyntheticEvent<HTMLImageElement>) => void;
+    /**
+     * Callback that is invoked when the image has been loaded.
+     */
+    onLoad?: (event: SyntheticEvent<HTMLImageElement>) => void;
+    /**
+     * The resolved image url.
+     */
+    src?: string | null;
+    /**
+     * Inline styles, used to pin the aspect ratio and paint the preview behind the image.
+     */
+    style?: CSSProperties | null;
+}
+/**
+ * The ImageInner component renders the actual image of the Image component.
+ * @param props The component props.
+ * @param ref The component reference.
+ * @returns The rendered component.
+ */
+declare const ImageInner: import("react").ForwardRefExoticComponent<ImageInnerProps & import("react").RefAttributes<HTMLImageElement>>;
+export default ImageInner;
+//# sourceMappingURL=ImageInner.d.ts.map

package/components/Image/ImageInner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageInner.d.ts","sourceRoot":"","sources":["../../../components/Image/ImageInner.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAI3D,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC5D;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC3D;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,KAAK,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;CAC9B;AAeD;;;;;GAKG;AACH,QAAA,MAAM,UAAU,8GAkCd,CAAC;AAEH,eAAe,UAAU,CAAC"}

package/components/Image/ImageInner.js

@@ -1,5 +1,4 @@
-import React, { forwardRef } from 'react';
-import PropTypes from 'prop-types';
+import { forwardRef } from 'react';
 import noop from 'lodash/noop';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -11,25 +10,28 @@ const useStyles = makeStyles()({
     width: '100%',
     maxHeight: '100%',
     WebkitTouchCallout: 'none',
-    fontSize: 0
+    fontSize: 0,
+    objectFit: 'contain'
   }
 });
 
 /**
- * The ImageInner component renders tha actual image of the Image component.
- * @param {Object} props The component props
- * @param {Function} ref The component reference
- * @returns {JSX.Element}
+ * The ImageInner component renders the actual image of the Image component.
+ * @param props The component props.
+ * @param ref The component reference.
+ * @returns The rendered component.
  */
-const ImageInner = /*#__PURE__*/forwardRef(({
-  src,
-  className,
-  alt,
-  lazy,
-  onLoad,
-  onError,
-  style
-}, ref) => {
+const ImageInner = /*#__PURE__*/forwardRef((props, ref) => {
+  const {
+    src = null,
+    className = null,
+    alt = null,
+    itemProp,
+    lazy = false,
+    onLoad = noop,
+    onError = noop,
+    style = null
+  } = props;
   const {
     classes,
     cx
@@ -37,24 +39,16 @@ const ImageInner = /*#__PURE__*/forwardRef(({
   return /*#__PURE__*/_jsx("img", {
     ref: ref,
     loading: lazy ? 'lazy' : 'eager',
-    src: src,
+    src: src ?? undefined,
     className: cx(classes.image, 'common__image', className),
-    alt: alt,
-    "aria-label": alt,
+    alt: alt ?? undefined,
+    "aria-label": alt ?? undefined,
     "aria-hidden": !alt,
     "data-test-id": "image",
+    itemProp: itemProp,
     onLoad: onLoad,
     onError: onError,
-    style: style
+    style: style ?? undefined
   });
 });
-ImageInner.defaultProps = {
-  src: null,
-  alt: null,
-  className: null,
-  lazy: false,
-  style: null,
-  onError: noop,
-  onLoad: noop
-};
 export default ImageInner;

package/components/Image/index.d.ts

@@ -0,0 +1,3 @@
+export { default } from './Image';
+export type { ImageProps } from './Image';
+//# sourceMappingURL=index.d.ts.map

package/components/Image/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../components/Image/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC"}

package/constants/Configuration.js

@@ -34,4 +34,11 @@ export const IS_CONNECT_EXTENSION_ATTACHED = 'IS_CONNECT_EXTENSION_ATTACHED';
  */
 export const CONFIGURATION_COLLECTION_CREATE_EXTERNAL_IMAGE_URL = 'CONFIGURATION_COLLECTION_CREATE_EXTERNAL_IMAGE_URL';
 export const CONFIGURATION_COLLECTION_KEY_THEME_TYPOGRAPHY = 'CONFIGURATION_COLLECTION_KEY_THEME_TYPOGRAPHY';
+
+/**
+ * Capability flag the PWA sets to signal that base typography is applied on the root (`<html>`)
+ * element rather than the legacy `<body>` element. Consumers can read it to adjust behavior
+ * accordingly. Absent on older PWAs.
+ */
+export const CONFIGURATION_COLLECTION_KEY_HAS_ROOT_TYPOGRAPHY = 'CONFIGURATION_COLLECTION_KEY_HAS_ROOT_TYPOGRAPHY';
 export const CONFIGURATION_COLLECTION_KEY_UNIVERSAL_LINK_HANDLER = 'universalLinkHandler';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common",
-  "version": "7.32.0-beta.5",
+  "version": "7.32.0-beta.6",
   "description": "Common library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@redux-devtools/extension": "^3.3.0",
     "@sentry/browser": "6.0.1",
-    "@shopgate/pwa-benchmark": "7.32.0-beta.5",
+    "@shopgate/pwa-benchmark": "7.32.0-beta.6",
     "@virtuous/conductor": "~2.5.0",
     "@virtuous/react-conductor": "~2.5.0",
     "@virtuous/redux-persister": "1.1.0-beta.7",
@@ -40,7 +40,7 @@
     "swiper": "12.2.0"
   },
   "devDependencies": {
-    "@shopgate/pwa-core": "7.32.0-beta.5",
+    "@shopgate/pwa-core": "7.32.0-beta.6",
     "@types/lodash": "^4.17.24",
     "@types/react-portal": "^3.0.9",
     "lodash": "^4.17.23",

package/providers/toast/index.js

@@ -32,47 +32,41 @@ let ToastProvider = /*#__PURE__*/function (_Component) {
       if (!toast.message) {
         return;
       }
-      const {
-        toasts
-      } = _this.state;
-
-      // Check if the toast id already is present.
-      const found = toasts.find(({
-        id
-      }) => toast.id === id);
+      const nextToast = {
+        id: toast.id,
+        action: toast.action,
+        actionLabel: toast.actionLabel,
+        onLongPress: toast.onLongPress,
+        message: toast.message,
+        messageParams: toast.messageParams,
+        duration: toast.duration || _this.props.theme.transitions.duration.toast
+      };
 
-      // If found, update the toast with the new data.
-      if (found) {
-        found.action = toast.action;
-        found.actionLabel = toast.actionLabel;
-        found.message = toast.message;
-        found.messageParams = toast.messageParams;
-        found.duration = toast.duration || _this.props.theme.transitions.duration.toast;
-      } else {
-        toasts.push({
-          id: toast.id,
-          action: toast.action,
-          actionLabel: toast.actionLabel,
-          message: toast.message,
-          messageParams: toast.messageParams,
-          duration: toast.duration || _this.props.theme.transitions.duration.toast
-        });
-      }
-      _this.setState({
+      // Update the queue immutably: consumers rely on the array reference changing to re-render
+      // (e.g. the SnackBar memoizes the currently shown toast on this reference). A toast whose id
+      // is already queued replaces that entry with the new data; otherwise it is appended.
+      _this.setState(({
         toasts
+      }) => {
+        const exists = toasts.some(({
+          id
+        }) => id === toast.id);
+        return {
+          toasts: exists ? toasts.map(item => item.id === toast.id ? nextToast : item) : [].concat(toasts, [nextToast])
+        };
       });
     };
     /**
      * Removes the first toast from the list.
      */
     _this.removeToast = () => {
-      const {
-        toasts
-      } = _this.state;
-      toasts.shift();
-      _this.setState({
+      // Drop the first toast immutably so the array reference changes and the SnackBar advances to
+      // the next queued toast (rather than re-rendering the same, now-stale, memoized toast).
+      _this.setState(({
         toasts
-      });
+      }) => ({
+        toasts: toasts.slice(1)
+      }));
     };
     _this.flushToasts = () => {
       if (_this.state.toasts.length) {
@@ -90,11 +84,21 @@ let ToastProvider = /*#__PURE__*/function (_Component) {
   }
 
   /**
-   * Returns the context value to be passed to consumers.
-   * @returns {Object}
+   * Removes the UIEvents listeners registered in the constructor.
    */
   _inheritsLoose(ToastProvider, _Component);
   var _proto = ToastProvider.prototype;
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    UIEvents.removeListener(this.constructor.ADD, this.addToast);
+    UIEvents.removeListener(this.constructor.FLUSH, this.flushToasts);
+  }
+
+  /**
+   * Returns the context value to be passed to consumers. The object reference is cached and only
+   * rebuilt when `toasts` changes, so consumers (Toaster → SnackBarContainer → SnackBar) don't
+   * re-render on every unrelated ToastProvider render.
+   * @returns {Object}
+   */;
   /**
    * @returns {JSX}
    */
@@ -107,14 +111,24 @@ let ToastProvider = /*#__PURE__*/function (_Component) {
   return _createClass(ToastProvider, [{
     key: "provided",
     get: function () {
-      return {
-        addToast: this.addToast,
-        removeToast: this.removeToast,
-        toasts: this.state.toasts
-      };
+      if (!this.providedCache || this.providedCache.toasts !== this.state.toasts) {
+        this.providedCache = {
+          addToast: this.addToast,
+          removeToast: this.removeToast,
+          toasts: this.state.toasts
+        };
+      }
+      return this.providedCache;
     }
   }]);
 }(Component);
 ToastProvider.ADD = 'toast_add';
 ToastProvider.FLUSH = 'toast_flush';
-export default withTheme(ToastProvider);
+const ThemedToastProvider = withTheme(ToastProvider);
+
+// The HOC returns a new component which doesn't carry over the statics of the wrapped class. They
+// are part of the public API of this module (consumers emit UIEvents on ToastProvider.ADD), so they
+// are re-attached explicitly.
+ThemedToastProvider.ADD = ToastProvider.ADD;
+ThemedToastProvider.FLUSH = ToastProvider.FLUSH;
+export default ThemedToastProvider;

package/providers/toast/spec.js

@@ -0,0 +1,110 @@
+import React, { useContext } from 'react';
+import { render, act } from '@testing-library/react';
+import ToastProvider from "./index";
+import ToastContext from "./context";
+import { jsx as _jsx } from "react/jsx-runtime";
+jest.mock('@shopgate/pwa-core', () => ({
+  UIEvents: {
+    addListener: jest.fn(),
+    removeListener: jest.fn(),
+    emit: jest.fn()
+  }
+}));
+jest.mock('@shopgate/pwa-common/helpers/config', () => ({
+  themeConfig: {
+    variables: {
+      toast: {
+        duration: 5000
+      }
+    }
+  }
+}));
+let ctx;
+const Capture = () => {
+  ctx = useContext(ToastContext);
+  return null;
+};
+const renderProvider = () => render(/*#__PURE__*/_jsx(ToastProvider, {
+  children: /*#__PURE__*/_jsx(Capture, {})
+}));
+const toast = (id, message) => ({
+  id,
+  message
+});
+describe('ToastProvider', () => {
+  beforeEach(() => {
+    ctx = undefined;
+  });
+  it('exposes the event name statics on the exported component', () => {
+    // They survive the withTheme() wrapping - consumers emit UIEvents on them.
+    expect(ToastProvider.ADD).toBe('toast_add');
+    expect(ToastProvider.FLUSH).toBe('toast_flush');
+  });
+  it('appends a toast and applies the default duration', () => {
+    renderProvider();
+    act(() => {
+      ctx.addToast(toast('a', 'A'));
+    });
+    expect(ctx.toasts).toHaveLength(1);
+    expect(ctx.toasts[0]).toMatchObject({
+      id: 'a',
+      message: 'A',
+      duration: 5000
+    });
+  });
+  it('ignores a toast without a message', () => {
+    renderProvider();
+    act(() => {
+      ctx.addToast({
+        id: 'x'
+      });
+    });
+    expect(ctx.toasts).toHaveLength(0);
+  });
+  it('replaces a same-id toast in place, keeping its length and position', () => {
+    renderProvider();
+    act(() => {
+      ctx.addToast(toast('a', 'A'));
+    });
+    act(() => {
+      ctx.addToast(toast('b', 'B'));
+    });
+    const before = ctx.toasts;
+    act(() => {
+      ctx.addToast(toast('a', 'A2'));
+    });
+    expect(ctx.toasts).toHaveLength(2);
+    expect(ctx.toasts[0]).toMatchObject(toast('a', 'A2')); // content updated
+    expect(ctx.toasts[1]).toMatchObject(toast('b', 'B')); // sibling untouched
+    expect(ctx.toasts).not.toBe(before); // new array reference (immutable update)
+    expect(ctx.toasts[0]).not.toBe(before[0]); // new head object
+  });
+  it('removes the first toast (FIFO) on removeToast', () => {
+    renderProvider();
+    act(() => {
+      ctx.addToast(toast('a', 'A'));
+    });
+    act(() => {
+      ctx.addToast(toast('b', 'B'));
+    });
+    act(() => {
+      ctx.removeToast();
+    });
+    expect(ctx.toasts).toHaveLength(1);
+    expect(ctx.toasts[0]).toMatchObject(toast('b', 'B'));
+  });
+  it('keeps the context value referentially stable when toasts do not change', () => {
+    const {
+      rerender
+    } = renderProvider();
+    act(() => {
+      ctx.addToast(toast('a', 'A'));
+    });
+    const provided = ctx;
+    // Re-render the provider without changing the queue.
+    rerender(/*#__PURE__*/_jsx(ToastProvider, {
+      children: /*#__PURE__*/_jsx(Capture, {})
+    }));
+    expect(ctx).toBe(provided); // same context object → consumers don't needlessly re-render
+  });
+});

package/subscriptions/error.js

@@ -1,7 +1,4 @@
 import "core-js/modules/es.array.includes.js";
-import after from 'lodash/after';
-import before from 'lodash/before';
-import over from 'lodash/over';
 import { isAvailable } from '@shopgate/native-modules';
 import { init, addBreadcrumb, configureScope, captureException, captureMessage, captureEvent, withScope, Severity as SentrySeverity } from '@sentry/browser';
 import { EBIGAPI, emitter, errorManager, ETIMEOUT, ENETUNREACH, EUNKNOWN, EFAVORITE } from '@shopgate/pwa-core';
@@ -12,7 +9,7 @@ import {
 // eslint-disable-next-line import/no-named-default
 default as appConfig, themeName, pckVersion } from "../helpers/config";
 import { env } from "../helpers/environment";
-import { transformGeneralPipelineError } from "./helpers/pipeline";
+import { transformGeneralPipelineError, getDisplayErrorMessage } from "./helpers/pipeline";
 import { historyPop } from "../actions/router";
 import showModal from "../actions/modal/showModal";
 import { getUserData } from "../selectors/user";
@@ -24,6 +21,9 @@ import { getRouterStack } from "../selectors/router";
 import { MODAL_PIPELINE_ERROR } from "../constants/ModalTypes";
 import ToastProvider from "../providers/toast";
 
+// Generic, translated fallback shown when a backend error carries no code we can map to a message.
+const GENERIC_ERROR_MESSAGE = 'modal.body_error';
+
 /**
  * App errors subscriptions.
  * @param {Function} subscribe The subscribe function.
@@ -60,15 +60,35 @@ export default subscribe => {
       error
     } = action;
     const {
-      message,
       code,
       context,
       meta = {}
     } = error;
     const {
-      behavior
+      behavior,
+      message: originalMessage
     } = meta;
-    if (behavior) {
+
+    // Never surface a raw backend message to the user: show the extension's own translated
+    // message, a code-mapped translated message, or a generic fallback. The resolver is the single
+    // source of truth for both the text and whether it is ready-to-display (`displayTranslated`) or
+    // a locale key that must still go through I18n.Text.
+    const {
+      message: displayMessage,
+      translated: displayTranslated
+    } = getDisplayErrorMessage(error, GENERIC_ERROR_MESSAGE);
+
+    // Unknown/generic and connection-style backend errors are treated as general platform issues.
+    // EUNKNOWN is always treated as general — even when the backend supplied a translated message —
+    // so it is shown as a toast with its translated message or generic fallback, never a modal.
+    const isConnectionError = displayMessage === 'error.general' || [ETIMEOUT, ENETUNREACH].includes(code);
+    const isGeneralError = isConnectionError || displayMessage === GENERIC_ERROR_MESSAGE || code === EUNKNOWN;
+
+    // Some pipeline actions (e.g. fetchCategory) register an error behavior for *every* error via
+    // `setResponseBehavior`. Those behaviors are only meaningful for the specific errors they
+    // expect; when the platform fails with an unexpected/unmappable message we skip the behavior
+    // and fall through to the generic toast handling instead of, for example, showing a modal.
+    if (behavior && !isGeneralError) {
       behavior({
         dispatch,
         getState,
@@ -78,38 +98,41 @@ export default subscribe => {
       return;
     }
 
-    /** Show modal thunk */
-    const showModalError = () => {
+    /**
+     * Shows the pipeline error modal. When openWithDetails is set, the modal opens directly on the
+     * developer detail view (pipeline, code, raw message, params) — used for the toast long-press.
+     * @param {boolean} [openWithDetails=false] Whether to open the modal in developer detail mode.
+     */
+    const showModalError = (openWithDetails = false) => {
       dispatch(showModal({
         confirm: 'modal.ok',
         dismiss: null,
         title: null,
-        message,
+        message: displayMessage,
         type: MODAL_PIPELINE_ERROR,
         params: {
           pipeline: context,
           request: meta.input,
-          message: meta.message,
-          code
+          message: originalMessage,
+          code,
+          translated: displayTranslated,
+          messageParams: meta.additionalParams,
+          openWithDetails
         }
       }));
     };
-    let shouldShowToast = message === 'error.general';
-    if ([ETIMEOUT, ENETUNREACH].includes(code) && message === 'modal.body_error') {
-      shouldShowToast = true;
-    }
-    // It was transformed general error. let it popup after 10 toast clicks
-    if (shouldShowToast) {
-      const showToastAfter = after(9, showModalError);
-      // Recursively show same toast message until clicked 10 times
-      const showToast = before(10, () => {
-        events.emit(ToastProvider.ADD, {
-          id: 'pipeline.error',
-          message: 'error.general',
-          action: over([showToast, showToastAfter])
-        });
+
+    // General platform errors surface as a toast instead of a modal.
+    // Long-pressing the toast opens the error modal in developer detail mode.
+    if (isGeneralError) {
+      // Connection-style errors show the generic connection message, but never override a message
+      // an extension already translated for us.
+      const useGenericConnectionText = isConnectionError && !displayTranslated;
+      events.emit(ToastProvider.ADD, {
+        id: 'pipeline.error',
+        message: useGenericConnectionText ? 'error.general' : displayMessage,
+        onLongPress: () => showModalError(true)
       });
-      showToast();
       return;
     }
     showModalError();

package/subscriptions/helpers/pipeline.js

@@ -1,3 +1,5 @@
+import { i18n } from '@shopgate/engage/core/helpers';
+
 /**
  * @param {Object} error error
  * @returns {string|*}
@@ -12,4 +14,70 @@ export function transformGeneralPipelineError(error) {
     return 'error.general';
   }
   return message;
+}
+
+/**
+ * @typedef {Object} DisplayErrorMessage
+ * @property {string} message The text to display — an already-translated string or a locale key.
+ * @property {boolean} translated Whether `message` is ready-to-display text (`true`) or a locale
+ *   key that still needs to go through I18n.Text (`false`).
+ */
+
+/**
+ * Resolves the message to display for a pipeline error, without ever surfacing raw backend text.
+ * Also reports whether the result is ready-to-display text or a locale key
+ * Precedence:
+ * 1. An extension's own message when it is explicitly flagged as already translated.
+ * 2. A resolvable i18n key — safe to surface even when errorManager did not remap it, because a
+ *    translation key (e.g. `cart.error_out_of_stock`) is not raw backend text. `i18n.has` confirms
+ *    the key actually resolves in the loaded locales, rather than merely looking like a key.
+ * 3. The code-mapped message. When errorManager maps the error code it resolves a message that
+ *    differs from the raw backend text (`error.meta.message`).
+ * 4. A generic, translated fallback otherwise — including when nothing mapped and errorManager fell
+ *    back to the raw backend message (`error.message === error.meta.message`).
+ * @param {Object} error The queued pipeline error.
+ * @param {string} error.message The message resolved by errorManager (code-mapped or raw fallback).
+ * @param {Object} [error.meta] The error meta data.
+ * @param {boolean} [error.meta.translated] Whether the backend message is already translated.
+ * @param {string} [error.meta.message] The original, raw backend message.
+ * @param {string} genericMessage The generic fallback message key.
+ * @returns {DisplayErrorMessage}
+ */
+export function getDisplayErrorMessage(error, genericMessage) {
+  const {
+    message,
+    meta = {}
+  } = error;
+  const {
+    translated,
+    message: originalMessage
+  } = meta;
+  if (translated && originalMessage) {
+    return {
+      message: originalMessage,
+      translated: true
+    };
+  }
+
+  // A translation key is never raw backend text, so surface it even when errorManager left it
+  // untouched (`message === originalMessage`).
+  if (typeof message === 'string' && i18n.has(message)) {
+    return {
+      message,
+      translated: false
+    };
+  }
+
+  // Only trust `message` when we have the raw backend message to compare against and a mapping
+  // actually replaced it. Without the raw message we cannot rule out that `message` is raw text.
+  if (originalMessage !== undefined && message !== originalMessage) {
+    return {
+      message,
+      translated: false
+    };
+  }
+  return {
+    message: genericMessage,
+    translated: false
+  };
 }

package/styles/reset/form.js

@@ -1,58 +0,0 @@
-/**
- * @deprecated used @shopgate/engage/styles instead
- */
-
-import { injectGlobal } from '@shopgate/engage/styles';
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * since iOS 15 button has a default color of blue rgb(0, 122, 255);
- *
- * 1. Change font properties to `inherit` in Safari.
- * 2. Correct the inability to style clickable types in iOS and Safari.
- *
- * Remove the inner padding and cancel buttons in Chrome and Safari for OS X.
- */
-injectGlobal({
-  'button, html [type="button"], [type="reset"], [type="submit"]': {
-    WebkitAppearance: 'button'
-  },
-  button: {
-    color: 'inherit',
-    borderRadius: 0
-  },
-  '::-webkit-file-upload-button': {
-    font: 'inherit',
-    WebkitAppearance: 'button'
-  },
-  '::-webkit-search-cancel-button, ::-webkit-search-decoration': {
-    WebkitAppearance: 'none'
-  },
-  'button, input, select, textarea': {
-    background: 'transparent',
-    border: 0,
-    fontSize: '1em',
-    margin: 0
-  },
-  'input, select, textarea': {
-    fontFamily: 'inherit'
-  },
-  'button, textarea': {
-    fontFamily: 'inherit',
-    lineHeight: 'inherit'
-  },
-  'button, label, [type="checkbox"], [type="radio"]': {
-    cursor: 'pointer'
-  },
-  label: {
-    display: 'inline-block'
-  },
-  textarea: {
-    minHeight: '5em',
-    maxWidth: '100%',
-    resize: 'none'
-  },
-  '[type="search"]': {
-    WebkitAppearance: 'textfield'
-  }
-});

package/styles/reset/index.js

@@ -1,8 +0,0 @@
-/**
- * @deprecated used @shopgate/engage/styles/reset instead
- */
-import "./root";
-import "./typography";
-import "./media";
-import "./form";
-import "./table";

package/styles/reset/media.js

@@ -1,26 +0,0 @@
-/**
- * @deprecated used @shopgate/engage/styles/reset instead
- */
-
-import { injectGlobal } from '@shopgate/engage/styles';
-injectGlobal({
-  'audio:not([controls])': {
-    display: 'none',
-    height: 0
-  },
-  figure: {
-    margin: 0
-  },
-  iframe: {
-    border: 0,
-    display: 'block',
-    width: '100%'
-  },
-  'img, svg': {
-    display: 'block',
-    maxWidth: '100%'
-  },
-  progress: {
-    verticalAlign: 'baseline'
-  }
-});

package/styles/reset/root.js

@@ -1,37 +0,0 @@
-/**
- * @deprecated used @shopgate/engage/styles instead
- */
-
-import { injectGlobal } from '@shopgate/engage/styles';
-import { themeConfig } from "../../helpers/config";
-const {
-  typography
-} = themeConfig;
-injectGlobal({
-  '*, *:before, *:after': {
-    boxSizing: 'border-box'
-  },
-  'html, body': {
-    WebkitTapHighlightColor: 'transparent',
-    width: '100%',
-    height: '100%'
-  },
-  html: {
-    overflow: 'hidden',
-    MozOsxFontSmoothing: 'grayscale',
-    WebkitFontSmoothing: 'antialiased',
-    MsTextSizeAdjust: '100%',
-    WebkitTextSizeAdjust: '100%',
-    minHeight: '100%'
-  },
-  body: {
-    font: `${typography.rootSize}px/${typography.lineHeight} ${typography.family}`,
-    overflow: 'auto',
-    margin: 0,
-    WebkitOverflowScrolling: 'touch',
-    WebkitUserSelect: 'none'
-  },
-  '[data-pattern]': {
-    height: '100% !important'
-  }
-});

package/styles/reset/table.js

@@ -1,14 +0,0 @@
-/**
- * @deprecated used @shopgate/engage/styles instead
- */
-
-import { injectGlobal } from '@shopgate/engage/styles';
-injectGlobal({
-  table: {
-    borderCollapse: 'collapse',
-    minWidth: '100%'
-  },
-  'td, th': {
-    verticalAlign: 'top'
-  }
-});

package/styles/reset/typography.js

@@ -1,30 +0,0 @@
-/**
- * @deprecated used @shopgate/engage/styles instead
- */
-
-import { injectGlobal } from '@shopgate/engage/styles';
-import { rem } from "../../helpers/style";
-injectGlobal({
-  a: {
-    color: 'inherit',
-    textDecoration: 'none',
-    WebkitTextDecorationSkip: 'objects'
-  },
-  'a:hover, a:focus, a:active, [tabindex]': {
-    outline: 0
-  },
-  'ol, ul': {
-    listStyle: 'none',
-    margin: 0,
-    paddingLeft: 0
-  },
-  'b, strong': {
-    fontWeight: 700
-  },
-  small: {
-    fontSize: rem(13)
-  },
-  'sub, sup': {
-    lineHeight: 0
-  }
-});