@shopgate/engage 7.32.0-beta.2 → 7.32.0-beta.20

package/styles/helpers/index.d.ts

@@ -4,6 +4,8 @@ export { setPageContentWidth } from "./setPageContentWidth";
 export { setViewportHeight } from "./setViewportHeight";
 export { toggleBodyScroll } from "./toggleBodyScroll";
 export { loadCustomStyles } from "./loadCustomStyles";
+export { loadThemeCss } from "./loadThemeCss";
+export { loadFontCss } from "./loadFontCss";
 export * from "./color";
 export { responsiveMediaQuery } from "../../components/ResponsiveContainer/mediaQuery";
 export { responsiveCondition } from "../../components/ResponsiveContainer/condition";

package/styles/helpers/index.js

@@ -6,6 +6,8 @@ export { setViewportHeight } from "./setViewportHeight";
 export { toggleBodyScroll } from "./toggleBodyScroll";
 export { initCSSCustomProps, initCSSCustomPropsFallback } from "./initCSSCustomProperties";
 export { loadCustomStyles } from "./loadCustomStyles";
+export { loadThemeCss } from "./loadThemeCss";
+export { loadFontCss } from "./loadFontCss";
 export * from "./color";
 export { responsiveMediaQuery } from "../../components/ResponsiveContainer/mediaQuery";
 export { responsiveCondition } from "../../components/ResponsiveContainer/condition";

package/styles/helpers/loadFontCss.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Syncs the font css links in the document with the passed urls. Tags for urls that are no longer
+ * configured are removed, and the remaining ones end up in the dom in the order they were passed -
+ * so the global file, passed first, stays above the per variant ones however they were ordered
+ * before.
+ *
+ * Idempotent by design: the admin preview re-sends the app settings while a merchant edits them, so
+ * this runs again on every settings update. A tag that is already in place is left untouched, and a
+ * tag for a url that is still configured is moved rather than recreated, which would re-request the
+ * file.
+ *
+ * A url is only ever loaded once. Configuring the same file globally and for a variant is normal,
+ * and a second link tag for it would apply the same `@font-face` rules twice.
+ *
+ * Resolves once every newly added file settled, and never rejects - a font file is not guaranteed
+ * to exist and must not be able to block app start.
+ * @param urls The font css urls to load, in cascade order. Duplicates are dropped, keeping the
+ * first occurrence so the cascade order is preserved.
+ * @returns A promise that resolves once the new files settled.
+ */
+export declare const loadFontCss: (urls?: string[]) => Promise<void>;
+//# sourceMappingURL=loadFontCss.d.ts.map

package/styles/helpers/loadFontCss.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadFontCss.d.ts","sourceRoot":"","sources":["../../../styles/helpers/loadFontCss.ts"],"names":[],"mappings":"AAmGA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,WAAW,GAAU,OAAM,MAAM,EAAO,KAAG,OAAO,CAAC,IAAI,CAqCnE,CAAC"}

package/styles/helpers/loadFontCss.js

@@ -0,0 +1,138 @@
+import { withScope, captureMessage, Severity as SentrySeverity } from '@sentry/browser';
+const REQUEST_TIMEOUT = 3000;
+const LINK_TAG_CLASS = 'font-css';
+const URL_ATTRIBUTE = 'data-font-css-url';
+const INSERTION_POINT_SELECTOR = 'meta[name="font-css-insertion-point"]';
+
+/**
+ * Reads the font css links that are currently in the document, in document order.
+ * @returns The link tags.
+ */
+const getExistingTags = () => Array.from(document.querySelectorAll(`link.${LINK_TAG_CLASS}`));
+
+/**
+ * Inserts a tag after the passed sibling, or appends it when there is none.
+ * @param tag The tag to insert.
+ * @param sibling The node to insert after.
+ */
+const insertAfter = (tag, sibling) => {
+  if (!sibling) {
+    document.head.appendChild(tag);
+    return;
+  }
+  sibling.parentNode?.insertBefore(tag, sibling.nextSibling);
+};
+
+/**
+ * Loads a single font css file and inserts its link after the passed sibling. The font css
+ * insertion point sits between the emotion one and the theme css one, so these files override the
+ * custom properties that theme initialization generates while the theme css file still overrides
+ * them in turn. Falls back to appending when the meta is absent.
+ *
+ * A link applies at its position in the dom rather than at the time it finished loading, so the
+ * timeout below only decides how long app start waits - never which styles win. The tag is left in
+ * place when it hits, so the file still applies once it eventually loads.
+ * @param href The url to load.
+ * @param sibling The node to insert after.
+ * @returns The inserted link tag and a promise that settles on load, error or timeout.
+ */
+const loadOne = (href, sibling) => {
+  const linkTag = document.createElement('link');
+  linkTag.rel = 'stylesheet';
+  linkTag.type = 'text/css';
+  linkTag.href = href;
+  linkTag.className = LINK_TAG_CLASS;
+  linkTag.setAttribute(URL_ATTRIBUTE, href);
+  const settled = new Promise(resolve => {
+    let done = false;
+    let timeout;
+
+    /**
+     * Resolves the promise once, whichever of load / error / timeout comes first.
+     */
+    const settle = () => {
+      if (done) {
+        return;
+      }
+      done = true;
+      clearTimeout(timeout);
+      resolve();
+    };
+    linkTag.onload = settle;
+    linkTag.onerror = () => {
+      withScope(scope => {
+        scope.setLevel(SentrySeverity.Error);
+        scope.setExtra('fontCssUrl', href);
+        captureMessage('Fetching font css failed');
+      });
+      settle();
+    };
+    timeout = setTimeout(() => {
+      withScope(scope => {
+        scope.setLevel(SentrySeverity.Warning);
+        scope.setExtra('fontCssUrl', href);
+        scope.setExtra('timeout', REQUEST_TIMEOUT);
+        captureMessage('Fetching font css took too long');
+      });
+      settle();
+    }, REQUEST_TIMEOUT);
+  });
+  insertAfter(linkTag, sibling);
+  return {
+    linkTag,
+    settled
+  };
+};
+
+/**
+ * Syncs the font css links in the document with the passed urls. Tags for urls that are no longer
+ * configured are removed, and the remaining ones end up in the dom in the order they were passed -
+ * so the global file, passed first, stays above the per variant ones however they were ordered
+ * before.
+ *
+ * Idempotent by design: the admin preview re-sends the app settings while a merchant edits them, so
+ * this runs again on every settings update. A tag that is already in place is left untouched, and a
+ * tag for a url that is still configured is moved rather than recreated, which would re-request the
+ * file.
+ *
+ * A url is only ever loaded once. Configuring the same file globally and for a variant is normal,
+ * and a second link tag for it would apply the same `@font-face` rules twice.
+ *
+ * Resolves once every newly added file settled, and never rejects - a font file is not guaranteed
+ * to exist and must not be able to block app start.
+ * @param urls The font css urls to load, in cascade order. Duplicates are dropped, keeping the
+ * first occurrence so the cascade order is preserved.
+ * @returns A promise that resolves once the new files settled.
+ */
+export const loadFontCss = async (urls = []) => {
+  const wanted = Array.from(new Set(urls));
+  const wantedUrls = new Set(wanted);
+  const kept = new Map();
+  getExistingTags().forEach(tag => {
+    const url = tag.getAttribute(URL_ATTRIBUTE) || '';
+    if (wantedUrls.has(url) && !kept.has(url)) {
+      kept.set(url, tag);
+      return;
+    }
+    tag.remove();
+  });
+  let sibling = document.querySelector(INSERTION_POINT_SELECTOR);
+  const pending = [];
+  wanted.forEach(url => {
+    const existing = kept.get(url);
+    if (existing) {
+      if (existing.previousElementSibling !== sibling) {
+        insertAfter(existing, sibling);
+      }
+      sibling = existing;
+      return;
+    }
+    const {
+      linkTag,
+      settled
+    } = loadOne(url, sibling);
+    sibling = linkTag;
+    pending.push(settled);
+  });
+  await Promise.all(pending);
+};

package/styles/helpers/loadThemeCss.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Loads the theme css file. It overrides the css custom properties that are generated during
+ * theme initialization, so it has to win the cascade against them - see `insertLinkTag` for how
+ * that order is established.
+ *
+ * A link applies at its position in the dom rather than at the time it finished loading, so the
+ * timeout below only decides how long app start waits - never which styles win.
+ *
+ * Resolves when the file loaded, when it failed, or when REQUEST_TIMEOUT elapsed - it never
+ * rejects, since the file is not guaranteed to exist and must not be able to block app start.
+ * @returns A promise that resolves once the file settled.
+ */
+export declare const loadThemeCss: () => Promise<void>;
+//# sourceMappingURL=loadThemeCss.d.ts.map

package/styles/helpers/loadThemeCss.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadThemeCss.d.ts","sourceRoot":"","sources":["../../../styles/helpers/loadThemeCss.ts"],"names":[],"mappings":"AAuCA;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,QAAO,OAAO,CAAC,IAAI,CAqF1C,CAAC"}

package/styles/helpers/loadThemeCss.js

@@ -0,0 +1,123 @@
+import { withScope, captureMessage, Severity as SentrySeverity } from '@sentry/browser';
+import { appConfig } from '@shopgate/engage';
+import { isFrontendSettingsAdminPreviewActive } from '@shopgate/engage/admin-preview/helpers';
+const REQUEST_TIMEOUT = 3000;
+const LINK_TAG_ID = 'theme-css';
+const INSERTION_POINT_SELECTOR = 'meta[name="theme-css-insertion-point"]';
+
+/**
+ * Temporary switch. Set to false to load the theme css file in the frontend settings preview
+ * again, or remove it together with the guard in loadThemeCss and the import above.
+ */
+const SKIP_IN_FRONTEND_SETTINGS_PREVIEW = true;
+
+/**
+ * Inserts the link at the theme css insertion point, which the html template declares between the
+ * emotion insertion point and the preview one. That position is what makes the cascade order
+ * structural rather than incidental: every tss style is pinned above it, and the admin preview
+ * pins its style tag to the anchor below it.
+ *
+ * Falls back to appending when the meta is absent - a head without the anchor still yields the
+ * desired order for anything that was already inserted, it just no longer guarantees it.
+ * @param linkTag The link tag to insert.
+ */
+const insertLinkTag = linkTag => {
+  const insertionPoint = document.querySelector(INSERTION_POINT_SELECTOR);
+  if (!insertionPoint) {
+    document.head.appendChild(linkTag);
+    return;
+  }
+  insertionPoint.parentNode?.insertBefore(linkTag, insertionPoint.nextSibling);
+};
+
+/**
+ * Loads the theme css file. It overrides the css custom properties that are generated during
+ * theme initialization, so it has to win the cascade against them - see `insertLinkTag` for how
+ * that order is established.
+ *
+ * A link applies at its position in the dom rather than at the time it finished loading, so the
+ * timeout below only decides how long app start waits - never which styles win.
+ *
+ * Resolves when the file loaded, when it failed, or when REQUEST_TIMEOUT elapsed - it never
+ * rejects, since the file is not guaranteed to exist and must not be able to block app start.
+ * @returns A promise that resolves once the file settled.
+ */
+export const loadThemeCss = () => new Promise(resolve => {
+  if (SKIP_IN_FRONTEND_SETTINGS_PREVIEW && isFrontendSettingsAdminPreviewActive()) {
+    resolve();
+    return;
+  }
+  const {
+    themeCssUrl: href
+  } = appConfig;
+  if (!href) {
+    resolve();
+    return;
+  }
+  let settled = false;
+  let timeout;
+
+  /**
+   * Resolves the promise once, whichever of load / error / timeout comes first.
+   */
+  const settle = () => {
+    if (settled) {
+      return;
+    }
+    settled = true;
+    clearTimeout(timeout);
+    resolve();
+  };
+
+  /**
+   * Starts the fallback that keeps app start from waiting on a stalled request. The link is
+   * deliberately left in place when the timeout hits: it still applies once it eventually loads,
+   * it just no longer holds up app start.
+   */
+  const startTimeoutFallback = () => {
+    timeout = setTimeout(() => {
+      withScope(scope => {
+        scope.setLevel(SentrySeverity.Warning);
+        scope.setExtra('themeCssUrl', href);
+        scope.setExtra('timeout', REQUEST_TIMEOUT);
+        captureMessage('Fetching theme css took too long');
+      });
+      settle();
+    }, REQUEST_TIMEOUT);
+  };
+  const existingTag = document.querySelector(`#${LINK_TAG_ID}`);
+  if (existingTag) {
+    // Already loaded
+    if (existingTag.sheet) {
+      resolve();
+      return;
+    }
+
+    // Still loading - a stalled request must not leave the promise pending, so arm the timeout
+    // here too rather than relying on the load / error events alone.
+    existingTag.addEventListener('load', settle, {
+      once: true
+    });
+    existingTag.addEventListener('error', settle, {
+      once: true
+    });
+    startTimeoutFallback();
+    return;
+  }
+  const linkTag = document.createElement('link');
+  linkTag.rel = 'stylesheet';
+  linkTag.type = 'text/css';
+  linkTag.href = href;
+  linkTag.id = LINK_TAG_ID;
+  linkTag.onload = settle;
+  linkTag.onerror = () => {
+    withScope(scope => {
+      scope.setLevel(SentrySeverity.Error);
+      scope.setExtra('themeCssUrl', href);
+      captureMessage('Fetching theme css failed');
+    });
+    settle();
+  };
+  insertLinkTag(linkTag);
+  startTimeoutFallback();
+});

package/styles/index.d.ts

@@ -1,4 +1,4 @@
 export * from './helpers';
-export { ThemeProvider, createTheme, useActiveBreakpoint, useMediaQuery, useResponsiveValue, useTheme, useColorScheme, withTheme, type Theme, type PaletteColorsWithMain, type WithThemeProps, } from './theme';
+export { ThemeProvider, createTheme, useActiveBreakpoint, useMediaQuery, useResponsiveValue, useTheme, useColorScheme, withTheme, type Theme, type ShadowSize, type ColorSchemeName, type ColorSchemeMode, type ColorSchemeContextValue, type PaletteColorsWithMain, type WithThemeProps, } from './theme';
 export { makeStyles, withStyles, useStyles, css, cx, tss, GlobalStyles, injectGlobal, keyframes, } from './tss';
 //# sourceMappingURL=index.d.ts.map

package/styles/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../styles/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EACL,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,cAAc,EACd,SAAS,EACT,KAAK,KAAK,EACV,KAAK,qBAAqB,EAC1B,KAAK,cAAc,GACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,GAAG,EACH,EAAE,EACF,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,SAAS,GACV,MAAM,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../styles/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EACL,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,cAAc,EACd,SAAS,EACT,KAAK,KAAK,EACV,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,cAAc,GACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,GAAG,EACH,EAAE,EACF,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,SAAS,GACV,MAAM,OAAO,CAAC"}

package/styles/reset/root.js

@@ -1,11 +1,18 @@
 import "core-js/modules/es.array.includes.js";
 import { applyScrollContainer, hasWebBridge, isIOSTheme } from '@shopgate/engage/core/helpers';
+import { configuration } from '@shopgate/engage/core/collections';
+import { CONFIGURATION_COLLECTION_KEY_HAS_ROOT_TYPOGRAPHY } from '@shopgate/engage/core/constants';
 import { themeConfig } from '@shopgate/engage';
 import { injectGlobal } from '..';
+import { CSS_ROOT_FONT_FAMILY, CSS_ROOT_FONT_SIZE } from "./typographyCustomProps";
 const {
   typography
 } = themeConfig;
 const iosThemeActive = isIOSTheme();
+
+// Flag (for feature-detecting extensions) that base typography uses the `--sg-root-*` custom
+// properties and the `body1` variant.
+configuration.set(CONFIGURATION_COLLECTION_KEY_HAS_ROOT_TYPOGRAPHY, true);
 injectGlobal({
   '*, *:before, *:after': {
     boxSizing: 'border-box'
@@ -23,6 +30,14 @@ injectGlobal({
     backgroundColor: 'var(--page-background-color)'
   },
   html: {
+    // Publish the shared font family (used by every variant) and the rem anchor here. The base body
+    // text itself is the `body1` variant, applied to `<body>` below. A higher-specificity `:root`
+    // override (admin css / live preview / extension) wins. The family default is the property
+    // value, not a `var()` fallback (a comma list can't be a fallback). Roboto is an iOS fallback.
+    [CSS_ROOT_FONT_FAMILY]: `${typography.family}${iosThemeActive && !(typography.family || '').includes('Roboto') ? ', Roboto' : ''}`,
+    [CSS_ROOT_FONT_SIZE]: `${typography.rootSize}px`,
+    fontSize: `var(${CSS_ROOT_FONT_SIZE})`,
+    color: 'var(--sg-palette-text-primary, var(--color-text-high-emphasis))',
     overflow: applyScrollContainer() ? 'hidden' : 'inherit',
     MozOsxFontSmoothing: 'grayscale',
     WebkitFontSmoothing: 'antialiased',
@@ -31,14 +46,18 @@ injectGlobal({
     minHeight: '100%'
   },
   body: {
-    // Include Roboto font as a fallback to the iOS theme when other fonts are not available
-    font: `${typography.rootSize}px/${typography.lineHeight} ${typography.family}${iosThemeActive && !(typography.family || '').includes('Roboto') ? ', Roboto' : ''}`,
+    // Base body text = the `body1` variant. Family is the shared root var; weight/size/line-height
+    // come from the theme's `body1` css vars, with fallbacks so there is no flash before the theme
+    // injects them. Configuring `body1` drives both this base text and the variant.
+    fontFamily: `var(${CSS_ROOT_FONT_FAMILY})`,
+    fontWeight: 'var(--sg-typography-body1-fontWeight, 400)',
+    fontSize: 'var(--sg-typography-body1-fontSize, 1rem)',
+    lineHeight: 'var(--sg-typography-body1-lineHeight, 1.5)',
     overflow: 'auto',
     margin: 0,
     WebkitOverflowScrolling: 'touch',
     WebkitUserSelect: hasWebBridge() ? 'inherit' : 'none',
-    userSelect: hasWebBridge() ? 'inherit' : 'none',
-    color: 'var(--color-text-high-emphasis)'
+    userSelect: hasWebBridge() ? 'inherit' : 'none'
   },
   '[data-pattern]': {
     height: '100% !important'

package/styles/reset/typographyCustomProps.d.ts

@@ -0,0 +1,12 @@
+/**
+ * CSS custom property names for the shared base typography. Internal to the styles layer: the css
+ * reset publishes them on `<html>` — `--sg-root-font-family` is the shared family used by every
+ * typography variant, `--sg-root-font-size` is the rem anchor. They're an optional override layer: a
+ * higher-specificity `:root` rule (admin css file / live preview / an extension) overrides the
+ * shipped default. The base body text itself is the `body1` variant, applied to `<body>` by the reset.
+ *
+ * Not re-exported from the styles barrel - import from this module directly where needed.
+ */
+export declare const CSS_ROOT_FONT_FAMILY = "--sg-root-font-family";
+export declare const CSS_ROOT_FONT_SIZE = "--sg-root-font-size";
+//# sourceMappingURL=typographyCustomProps.d.ts.map

package/styles/reset/typographyCustomProps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typographyCustomProps.d.ts","sourceRoot":"","sources":["../../../styles/reset/typographyCustomProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAC5D,eAAO,MAAM,kBAAkB,wBAAwB,CAAC"}

package/styles/reset/typographyCustomProps.js

@@ -0,0 +1,11 @@
+/**
+ * CSS custom property names for the shared base typography. Internal to the styles layer: the css
+ * reset publishes them on `<html>` — `--sg-root-font-family` is the shared family used by every
+ * typography variant, `--sg-root-font-size` is the rem anchor. They're an optional override layer: a
+ * higher-specificity `:root` rule (admin css file / live preview / an extension) overrides the
+ * shipped default. The base body text itself is the `body1` variant, applied to `<body>` by the reset.
+ *
+ * Not re-exported from the styles barrel - import from this module directly where needed.
+ */
+export const CSS_ROOT_FONT_FAMILY = '--sg-root-font-family';
+export const CSS_ROOT_FONT_SIZE = '--sg-root-font-size';

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

@@ -1,7 +1,17 @@
 import type { ThemeOptions } from '../createTheme';
+/**
+ * Options of `createDefaultThemeOptions`.
+ */
+type DefaultThemeOptions = {
+    /** Whether the app settings have been hydrated from a source (admin sync / jsonp). */
+    isHydrated?: boolean;
+};
 /**
  * Creates the default theme options with legacy palette values.
+ * @param options Options.
+ * @param options.isHydrated Whether the app settings have been hydrated.
  * @returns The theme object
  */
-export declare const createDefaultThemeOptions: () => ThemeOptions;
+export declare const createDefaultThemeOptions: ({ isHydrated }?: DefaultThemeOptions) => ThemeOptions;
+export {};
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../styles/theme/createDefaultThemeOptions/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAInD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,QAAO,YA6G3C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../styles/theme/createDefaultThemeOptions/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAInD;;GAEG;AACH,KAAK,mBAAmB,GAAG;IACzB,sFAAsF;IACtF,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,GACpC,iBAAwB,mBAAwB,KAC/C,YA2ND,CAAC"}

package/styles/theme/createDefaultThemeOptions/index.js

@@ -1,14 +1,23 @@
 import { getCSSCustomProp } from '@shopgate/engage/styles';
 import { themeConfig } from '@shopgate/engage';
 const {
-  colors
+  colors,
+  settings
 } = themeConfig;
 
+/**
+ * Options of `createDefaultThemeOptions`.
+ */
+
 /**
  * Creates the default theme options with legacy palette values.
+ * @param options Options.
+ * @param options.isHydrated Whether the app settings have been hydrated.
  * @returns The theme object
  */
-export const createDefaultThemeOptions = () => ({
+export const createDefaultThemeOptions = ({
+  isHydrated = false
+} = {}) => ({
   colorSchemes: {
     light: {
       palette: {
@@ -47,7 +56,7 @@ export const createDefaultThemeOptions = () => ({
         },
         price: {
           vars: {
-            color: getCSSCustomProp('--color-primary')
+            saleColor: getCSSCustomProp('--color-primary')
           }
         },
         input: {
@@ -61,9 +70,18 @@ export const createDefaultThemeOptions = () => ({
             borderColor: '#EBEBEF'
           }
         },
-        ctaButton: {
+        // CTA button legacy fallbacks are only used when the shop has no theme configuration yet.
+        // When app settings / theme configuration is present, CTA buttons use the primary color.
+        ...(!isHydrated && {
+          ctaButton: {
+            vars: {
+              background: getCSSCustomProp('--color-button-cta') || getCSSCustomProp('--color-primary')
+            }
+          }
+        }),
+        badge: {
           vars: {
-            background: getCSSCustomProp('--color-button-cta') || getCSSCustomProp('--color-primary')
+            background: getCSSCustomProp('--color-secondary')
           }
         },
         snackbar: {
@@ -74,11 +92,10 @@ export const createDefaultThemeOptions = () => ({
         tabBar: {
           vars: {
             background: 'var(--tab-bar-background, #FFFFFF)',
-            minHeight: 'var(--tab-bar-min-height, 0px)',
+            minHeight: 'var(--tab-bar-min-height, 49px)',
             border: '#E6E6E6',
             inactive: 'var(--tab-bar-item-default-color, #747474)',
             active: `var(--tab-bar-item-highlighted-color, ${getCSSCustomProp('--color-secondary')})`,
-            floatingBorderRadius: 'var(--tab-bar-floating-border-radius, 16px)',
             floatingBoxShadow: 'var(--tab-bar-floating-box-shadow, 0 0 12px rgba(0, 0, 0, 0.24))',
             floatingMinHeight: 'var(--tab-bar-floating-min-height, 59px)',
             badgeColor: 'var(--tab-bar-item-badge-color, #FFFFFF)',
@@ -88,6 +105,16 @@ export const createDefaultThemeOptions = () => ({
             badgeLeft: 'var(--tab-bar-item-badge-left, calc(50% + 20px))'
           }
         },
+        appBar: {
+          vars: {
+            background: settings?.['@shopgate/engage/components/AppBar']?.background || '#FFF'
+          }
+        },
+        discountBadge: {
+          vars: {
+            background: 'var(--sg-palette-primary-main)'
+          }
+        },
         ratingStars: {
           vars: {
             filled: `var(--rating-stars-filled, ${getCSSCustomProp('--color-primary')})`,
@@ -107,12 +134,104 @@ export const createDefaultThemeOptions = () => ({
     },
     dark: {
       palette: {
+        // No primary or secondary here on purpose. Both inherit from the light scheme, so a
+        // merchant's brand colors carry over instead of being replaced by a hard coded pair.
+        error: {
+          main: '#FF6B6B'
+        },
+        warning: {
+          main: '#FFA726'
+        },
+        success: {
+          main: '#5DD954'
+        },
         background: {
-          default: '#000'
+          default: '#000000',
+          surface: '#1C1C1E',
+          emphasized: '#2C2C2E'
         },
         text: {
-          primary: '#fff',
-          secondary: '#808080'
+          primary: '#F2F2F7',
+          secondary: '#AEAEB2'
+        },
+        grey: {
+          light: '#2C2C2E',
+          medium: '#48484A',
+          dark: '#8E8E93'
+        },
+        action: {
+          disabled: '#8E8E93',
+          disabledBackground: '#48484A',
+          pressed: '#2C2C2E'
+        }
+      },
+      components: {
+        border: {
+          vars: {
+            light: '#38383A',
+            medium: '#48484A',
+            dark: '#8E8E93'
+          }
+        },
+        input: {
+          vars: {
+            background: '#2C2C2E',
+            border: '#48484A'
+          }
+        },
+        separatorLine: {
+          vars: {
+            borderColor: '#38383A'
+          }
+        },
+        snackbar: {
+          vars: {
+            background: '#2C2C2E'
+          }
+        },
+        tabBar: {
+          vars: {
+            background: '#1C1C1E',
+            border: '#374151',
+            inactive: '#9CA3AF',
+            floatingBoxShadow: '0 0 12px rgba(0, 0, 0, 0.6)'
+          }
+        },
+        appBar: {
+          vars: {
+            background: '#1C1C1E'
+          }
+        },
+        discountBadge: {
+          vars: {
+            background: '#FF0000'
+          }
+        },
+        ratingStars: {
+          vars: {
+            empty: '#48484A'
+          }
+        },
+        cards: {
+          vars: {
+            backgroundColor: '#1C1C1E',
+            borderColor: '#38383A'
+          }
+        },
+        tiles: {
+          vars: {
+            backgroundColor: '#1C1C1E',
+            borderColor: '#38383A'
+          }
+        },
+        swiper: {
+          vars: {
+            paginationBulletColor: '#AEAEB2',
+            paginationBulletActiveColor: '#F2F2F7',
+            paginationFractionBackground: '#2C2C2E',
+            paginationProgressbarBackground: '#48484A',
+            paginationProgressbarActiveColor: '#FFFFFF'
+          }
         }
       }
     }