@useinsider/guido 3.22.0 → 3.23.0

package/dist/composables/useStripo.js

@@ -1,44 +1,54 @@
-import { useActionsApi as L } from "./useActionsApi.js";
-import { useBlocksConfig as O } from "./useBlocksConfig.js";
-import { useConfig as H } from "./useConfig.js";
-import { useCustomInterfaceAppearance as w } from "./useCustomInterfaceAppearance.js";
-import { useFullStoryBridge as N } from "./useFullStoryBridge.js";
-import { useModuleRepair as j } from "./useModuleRepair.js";
-import { useStripoEventHandler as z } from "./useStripoEventHandler.js";
-import { useStripoNotifications as $ } from "./useStripoNotifications.js";
-import { useToaster as G } from "./useToaster.js";
-import { localePatch as J } from "../config/i18n/index.js";
-import { en as b } from "../config/i18n/en/index.js";
-import { ToasterTypeOptions as X } from "../enums/toaster.js";
-import { useStripoApi as K } from "../services/stripoApi.js";
-import Q from "../static/styles/customEditorStyle.css.js";
-import { useEditorStore as k } from "../stores/editor.js";
-import { buildMergeTagEntries as W, flattenDynamicContentList as Y } from "../utils/genericUtil.js";
-import Z from "../package.json.js";
-let n = null;
-const he = () => {
-  const { features: c, template: u, isFeatureEnabled: p } = H(), { handleError: m, showToaster: v } = G(), { getToken: B, getCustomFonts: M, getSyncModulesStatus: T } = K(), { handleEvent: F } = z(), { handleModuleAdd: A } = j(), { getStripoBlocksConfig: V } = O(), { getStripoNotifications: _ } = $(), f = () => n || (n = new Promise((r, s) => {
-    var d;
+import { useActionsApi as M } from "./useActionsApi.js";
+import { useBlocksConfig as N } from "./useBlocksConfig.js";
+import { useConfig as j } from "./useConfig.js";
+import { useCustomInterfaceAppearance as _ } from "./useCustomInterfaceAppearance.js";
+import { useFullStoryBridge as z } from "./useFullStoryBridge.js";
+import { useModuleRepair as $ } from "./useModuleRepair.js";
+import { useStripoEventHandler as G } from "./useStripoEventHandler.js";
+import { useStripoNotifications as X } from "./useStripoNotifications.js";
+import { useToaster as J } from "./useToaster.js";
+import { localePatch as K } from "../config/i18n/index.js";
+import { en as B } from "../config/i18n/en/index.js";
+import { ToasterTypeOptions as Q } from "../enums/toaster.js";
+import { useStripoApi as W } from "../services/stripoApi.js";
+import Y from "../static/styles/customEditorStyle.css.js";
+import { useEditorStore as v } from "../stores/editor.js";
+import { buildMergeTagEntries as Z, flattenDynamicContentList as ee } from "../utils/genericUtil.js";
+import { getStripoRuntimeBaseUrl as te } from "../utils/stripoRuntime.js";
+let d = null, T = !1;
+const we = (e) => {
+  const { features: u, template: m, isFeatureEnabled: p } = j(), { handleError: f, showToaster: F } = J(), { getToken: A, getCustomFonts: P, getSyncModulesStatus: R } = W(), { handleEvent: U } = G(), { handleModuleAdd: V } = $(), { getStripoBlocksConfig: D } = N(), { getStripoNotifications: I } = X(), g = () => d || (d = new Promise((a, s) => {
     if (document.getElementById("UiEditorScript")) {
-      r();
+      a();
       return;
     }
-    const o = Z.guido, i = `https://email-static.useinsider.com/guido/${(d = o == null ? void 0 : o.stripo) == null ? void 0 : d.version}/UIEditor.js`, e = document.createElement("script");
-    e.id = "UiEditorScript", e.type = "module", e.src = i, e.onload = () => r(), e.onerror = () => {
-      e.remove(), s(new Error(`Failed to load Stripo UIEditor script from S3: ${i}`));
-    }, document.body.appendChild(e);
-  }), n.catch(() => {
-    n = null;
-  }), n), D = async (r, s, o, a = [], i = !1) => {
-    var y, E, h, C;
-    const e = k(), { html: d, css: P } = r, { baseBlocks: g, extensions: R } = await V(), S = ((y = c.value) == null ? void 0 : y.displayConditions) ?? !0, U = ((E = c.value) == null ? void 0 : E.modulesDisabled) ?? !1, I = !!d || (((h = u.value) == null ? void 0 : h.forceRecreate) ?? !1), q = "https://email-static.useinsider.com https://edge.fullstory.com https://rs.fullstory.com";
-    w().importCss(), await window.UIEditor.initEditor(
+    const i = te();
+    if (!i) {
+      s(
+        new Error("guido.stripo.version is not set in package.json. Please configure the Stripo version.")
+      );
+      return;
+    }
+    const n = `${i}UIEditor.js`, t = document.createElement("script");
+    t.id = "UiEditorScript", t.type = "module", t.src = n, t.onload = () => {
+      T = !0, a();
+    }, t.onerror = () => {
+      t.remove(), s(new Error(`Failed to load Stripo UIEditor script from S3: ${n}`));
+    }, document.body.appendChild(t);
+  }), d.catch(() => {
+    d = null;
+  }), d), L = async (a, s, i, n = [], t = !1) => {
+    var C, w, k, b;
+    const o = v(), { html: c, css: S } = a, { baseBlocks: y, extensions: q } = await D();
+    e.mark("blocks_config_ready");
+    const E = ((C = u.value) == null ? void 0 : C.displayConditions) ?? !0, x = ((w = u.value) == null ? void 0 : w.modulesDisabled) ?? !1, h = !!c || (((k = m.value) == null ? void 0 : k.forceRecreate) ?? !1), O = "https://email-static.useinsider.com https://edge.fullstory.com https://rs.fullstory.com";
+    e.setTemplate({ html: c, css: S, forceRecreate: h }), _().importCss(), e.mark("init_editor"), await window.UIEditor.initEditor(
       document.querySelector("#guido-editor"),
       {
         metadata: s,
-        html: d,
-        css: P,
-        forceRecreate: I,
+        html: c,
+        css: S,
+        forceRecreate: h,
         locale: "en",
         undoButtonSelector: "#guido__undo-button",
         redoButtonSelector: "#guido__redo-button",
@@ -48,12 +58,12 @@ const he = () => {
         customAppearanceMergetags: !p("liquidSyntax"),
         customAppearanceMergetagsBorderColor: "#f1f3fe",
         customAppearanceMergetagsBackgroundColor: "#f1f3fe",
-        customViewStyles: Q,
-        conditionsEnabled: S,
-        customConditionsEnabled: S,
+        customViewStyles: Y,
+        conditionsEnabled: E,
+        customConditionsEnabled: E,
         enableXSSSecurity: !0,
-        modulesDisabled: U,
-        syncModulesEnabled: i,
+        modulesDisabled: x,
+        syncModulesEnabled: t,
         messageSettingsEnabled: !0,
         displayGmailAnnotations: !0,
         displayHiddenPreheader: !1,
@@ -63,55 +73,56 @@ const he = () => {
         copyPasteEnabled: !1,
         selectElementAfterDrop: !0,
         sameFontSizeForOutlook: !0,
-        allowedScriptSourceDomains: q,
-        ...g ? { baseBlocks: g } : {},
+        allowedScriptSourceDomains: O,
+        ...y ? { baseBlocks: y } : {},
         editorFonts: {
           showDefaultStandardFonts: !0,
           showDefaultNotStandardFonts: !0,
-          customFonts: a
+          customFonts: n
         },
         mergeTags: [
           {
-            entries: W(
-              o.preselectedDynamicContentList,
-              Y((C = u.value) == null ? void 0 : C.dynamicContentList),
+            entries: Z(
+              i.preselectedDynamicContentList,
+              ee((b = m.value) == null ? void 0 : b.dynamicContentList),
               p("liquidSyntax")
             )
           }
         ],
-        async onTokenRefreshRequest(t) {
+        async onTokenRefreshRequest(r) {
           try {
-            const l = await B();
-            t(l);
+            e.mark("token_start");
+            const l = await A();
+            e.mark("token_end"), r(l);
           } catch (l) {
-            m(l, "Failed to refresh token");
+            f(l, "Failed to refresh token");
           }
         },
         onTemplateLoaded() {
           try {
-            const { activateCustomViewStyles: t, updateTimerInClonedTemplate: l } = L(), { injectFullStory: x } = N();
-            w().importCss(), t(), x(), l(), o.onReady(), e.isStripoInitialized = !0, e.loadingStatus = !1, setTimeout(() => {
-              e.hasChanges = !1;
-            }, 1e3);
-          } catch (t) {
-            m(t, "Failed to load custom interface appearance");
+            const { activateCustomViewStyles: r, updateTimerInClonedTemplate: l } = M(), { injectFullStory: H } = z();
+            _().importCss(), r(), H(), l(), i.onReady(), o.isStripoInitialized = !0, o.loadingStatus = !1, setTimeout(() => {
+              o.hasChanges = !1;
+            }, 1e3), e.markReady();
+          } catch (r) {
+            f(r, "Failed to load custom interface appearance");
           }
         },
-        onCodeEditorVisibilityChanged(t) {
-          e.isCodeEditorOpen = t;
+        onCodeEditorVisibilityChanged(r) {
+          o.isCodeEditorOpen = r;
         },
-        onEditorVisualModeChanged(t) {
-          e.editorVisualMode = t.toLowerCase();
+        onEditorVisualModeChanged(r) {
+          o.editorVisualMode = r.toLowerCase();
         },
-        onVersionHistoryVisibilityChanged(t) {
-          e.isVersionHistoryOpen = t;
+        onVersionHistoryVisibilityChanged(r) {
+          o.isVersionHistoryOpen = r;
         },
         onDataChanged() {
-          e.hasChanges = !0, e.changeSeq += 1;
+          o.hasChanges = !0, o.changeSeq += 1;
         },
-        onEvent: F,
-        onModuleAdd: A,
-        notifications: _(),
+        onEvent: U,
+        onModuleAdd: V,
+        notifications: I(),
         // Stripo deselects the block on any click outside the canvas, so every surface
         // that belongs to the block's own flow has to be listed here (SD-153273).
         ignoreClickOutsideSelectors: [
@@ -121,35 +132,35 @@ const he = () => {
           ".in-modal-v2-wrapper",
           ".in-toasts-wrapper"
         ],
-        extensions: R,
-        localePatch: J
+        extensions: q,
+        localePatch: K
       }
     );
   };
-  return { initPlugin: async (r, s, o) => {
-    const a = k();
+  return { initPlugin: async (a, s, i) => {
+    const n = v();
     try {
-      await f();
-      const [i, e] = await Promise.all([
-        M(),
-        T()
+      e.mark("plugin_start"), e.setScriptPreloaded(T), await g(), e.mark("script_ready");
+      const [t, o] = await Promise.all([
+        P(),
+        R()
       ]);
-      a.syncModulesEnabled = e, await D(r, s, o, i, e);
+      e.mark("fonts_sync_ready"), n.syncModulesEnabled = o, await L(a, s, i, t, o);
     } catch {
-      a.loadingStatus = !1, v({
-        type: X.Error,
-        message: b["An error has occurred. Please report the error code to support."],
+      n.loadingStatus = !1, F({
+        type: Q.Error,
+        message: B["An error has occurred. Please report the error code to support."],
         actionButton: {
-          text: b["Reload page"],
+          text: B["Reload page"],
           onClick: () => window.location.reload()
         }
-      });
+      }), e.markFailed();
     }
   }, preloadRuntime: () => {
-    f().catch(() => {
+    g().catch(() => {
     });
   } };
 };
 export {
-  he as useStripo
+  we as useStripo
 };

package/dist/config/compiler/utils/recommendationCompilerUtils.js

@@ -1,4 +1,4 @@
-import { useConfig as g } from "../../../composables/useConfig.js";
+import { useConfig as C } from "../../../composables/useConfig.js";
 import { useRecommendation as O } from "../../../composables/useRecommendation.js";
 import { MOBILE_ROW_SELECTOR as q, MOBILE_CONTAINER_SELECTOR as M, CSS_CLASS_RECO_BUTTON as B } from "../../../extensions/Blocks/Recommendation/constants/selectors.js";
 import { useRecommendationExtensionStore as N } from "../../../extensions/Blocks/Recommendation/store/recommendation.js";
@@ -13,7 +13,7 @@ function A(t) {
     [r] = r.children;
   return r;
 }
-function y(t, r, e, o, c, i) {
+function _(t, r, e, o, c, i) {
   switch (r) {
     case "productImage": {
       const n = t.querySelector("img");
@@ -78,7 +78,7 @@ function y(t, r, e, o, c, i) {
   }
 }
 const P = "name";
-function b(t, r, e, o) {
+function y(t, r, e, o) {
   const c = `${o}${r}_${e}_${P}`;
   return {
     open: t.createComment(`{% if ${c} and ${c} != "" %}`),
@@ -86,19 +86,19 @@ function b(t, r, e, o) {
   };
 }
 function R(t, r, e) {
-  return b(t, r, 0, e);
+  return y(t, r, 0, e);
 }
 function w(t, r, e, o) {
   if (!t.innerHTML.includes("{{"))
     return;
-  const { open: c, close: i } = b(t.ownerDocument, r, e, o);
+  const { open: c, close: i } = y(t.ownerDocument, r, e, o);
   t.insertBefore(c, t.firstChild), t.appendChild(i);
 }
 function D(t, r, e, o) {
   var n, s;
   if (!t.innerHTML.includes("{{"))
     return;
-  const { open: c, close: i } = b(t.ownerDocument, r, e, o);
+  const { open: c, close: i } = y(t.ownerDocument, r, e, o);
   (n = t.parentNode) == null || n.insertBefore(c, t), (s = t.parentNode) == null || s.insertBefore(i, t.nextSibling);
 }
 function v(t, r, e, o) {
@@ -106,8 +106,8 @@ function v(t, r, e, o) {
     i.querySelectorAll("[data-attribute-type]").forEach((d) => {
       const u = d.getAttribute("data-attribute-type") || "", a = d.querySelectorAll(".attribute-cell");
       a.length > 0 ? a.forEach((l) => {
-        y(l, u, r, n, e, o);
-      }) : y(d, u, r, n, e, o);
+        _(l, u, r, n, e, o);
+      }) : _(d, u, r, n, e, o);
     }), D(i, r, n, o);
   });
 }
@@ -119,9 +119,9 @@ function H(t, r, e, o) {
   c.forEach((d, u) => {
     d.querySelectorAll("[data-attribute-type]").forEach((l) => {
       const p = l.getAttribute("data-attribute-type") || "";
-      l.querySelectorAll(".attribute-cell").forEach((f, h) => {
+      l.querySelectorAll(".attribute-cell").forEach((m, h) => {
         const S = u * s + h;
-        y(f, p, r, S, e, o), w(f, r, S, o);
+        _(m, p, r, S, e, o), w(m, r, S, o);
       });
     });
   });
@@ -132,10 +132,10 @@ function W(t, r, e, o) {
   });
 }
 function F(t, r, e) {
-  const o = t.getAttribute("data-layout") || "grid", c = t.getAttribute("currency-alignment") || "after";
-  o === "list" ? v(t, r, c, e) : W(t, r, c, e);
+  const o = t.getAttribute("data-layout") || "grid", c = t.getAttribute("currency-alignment"), i = c === "0" || c === "before" ? "before" : "after";
+  o === "list" ? v(t, r, i, e) : W(t, r, i, e);
 }
-function _(t, r, e) {
+function b(t, r, e) {
   const o = new RegExp(`${r}\\s*:\\s*(\\d+)\\s*px`, "i"), c = t.match(o);
   return c ? parseInt(c[1]) : e;
 }
@@ -143,7 +143,7 @@ function $(t) {
   const r = t.trim();
   return r.endsWith("%") ? parseFloat(r) < 100 : /^\d+(?:\.\d+)?(?:px)?$/.test(r) && parseInt(r) > 0;
 }
-function C(t) {
+function g(t) {
   const r = t.getAttribute("width");
   if (r && $(r))
     return r.trim();
@@ -153,28 +153,28 @@ function C(t) {
 function x(t, r) {
   let e = t.parentElement;
   for (; e && e !== r; ) {
-    if (e.tagName === "TD" && C(e))
+    if (e.tagName === "TD" && g(e))
       return e;
     e = e.parentElement;
   }
   return null;
 }
 function G(t) {
-  const r = t.getAttribute("style") || "", e = _(r, "width", 600), o = _(r, "padding", 0) * 2, c = Math.max(0, e - o);
+  const r = t.getAttribute("style") || "", e = b(r, "width", 600), o = b(r, "padding", 0) * 2, c = Math.max(0, e - o);
   c !== 0 && t.querySelectorAll("img.adapt-img").forEach((i) => {
     if (i.hasAttribute("width"))
       return;
     const n = x(i, t);
     if (!n)
       return;
-    const s = C(n), d = _(n.getAttribute("style") || "", "padding", 0) * 2, u = s.endsWith("%") ? Math.floor(c * parseFloat(s) / 100) : parseInt(s), a = Math.max(1, u - d), l = i.getAttribute("style") || "", p = /(?:^|[;\s])max-height\s*:\s*(\d+(?:\.\d+)?)px/i.exec(l);
+    const s = g(n), d = b(n.getAttribute("style") || "", "padding", 0) * 2, u = s.endsWith("%") ? Math.floor(c * parseFloat(s) / 100) : parseInt(s), a = Math.max(1, u - d), l = i.getAttribute("style") || "", p = /(?:^|[;\s])max-height\s*:\s*(\d+(?:\.\d+)?)px/i.exec(l);
     if (p) {
       i.setAttribute("width", String(Math.max(1, Math.min(a, Math.floor(parseFloat(p[1])))))), i.removeAttribute("height");
       return;
     }
     if (i.setAttribute("width", String(a)), !/\bwidth\s*:\s*\d/i.test(l)) {
-      const m = l && !l.trim().endsWith(";") ? "; " : "";
-      i.setAttribute("style", `${l}${m}width: ${a}px`);
+      const f = l && !l.trim().endsWith(";") ? "; " : "";
+      i.setAttribute("style", `${l}${f}width: ${a}px`);
     }
   });
 }
@@ -200,15 +200,15 @@ function Q(t) {
     return t;
   const { buildCampaignUrl: c } = O(), i = N();
   i.recommendationCampaignUrls = {};
-  const { isFeatureEnabled: n } = g(), s = n("liquidSyntax") ? "reco_" : "";
+  const { isFeatureEnabled: n } = C(), s = n("liquidSyntax") ? "reco_" : "";
   return o.forEach((u) => {
-    var l, p, m, f;
+    var l, p, f, m;
     const a = u.getAttribute("recommendation-id");
     if (a) {
       if ((l = u.parentNode) == null || l.insertBefore(e.createComment("REC_START"), u), (p = u.parentNode) == null || p.insertBefore(e.createComment("REC_END"), u.nextSibling), u.querySelectorAll('[data-visibility="0"]').forEach((h) => h.remove()), c(a), U(u, e), !T(u)) {
         F(u, a, s);
         const { open: h, close: S } = R(e, a, s);
-        (m = u.parentNode) == null || m.insertBefore(h, u), (f = u.parentNode) == null || f.insertBefore(S, u.nextSibling);
+        (f = u.parentNode) == null || f.insertBefore(h, u), (m = u.parentNode) == null || m.insertBefore(S, u.nextSibling);
       }
       G(u);
     }

package/dist/config/migrator/recommendation/compositionMapper.js

@@ -1,101 +1,108 @@
-import { DEFAULT_COMPOSITION as p, DEFAULT_VISIBILITY as I } from "../../../extensions/Blocks/Recommendation/constants/defaultConfig.js";
-import { ATTR_RECOMMENDATION_TITLE as l, ATTR_CUSTOM_PREFIX as k, ATTR_PRODUCT_BUTTON as A, ATTR_PRODUCT_OMNIBUS_DISCOUNT as R, ATTR_PRODUCT_OMNIBUS_PRICE as x, ATTR_PRODUCT_OLD_PRICE as f, ATTR_PRODUCT_PRICE as h, ATTR_PRODUCT_NAME as E, ATTR_PRODUCT_IMAGE as O } from "../../../extensions/Blocks/Recommendation/constants/selectors.js";
-import { mapTextTheme as b, mapButtonTheme as y, mapImageTheme as N } from "./themeMapper.js";
-const C = "__title__", T = "product_attribute.";
-function P(r) {
-  const t = r.variable ?? "";
-  switch (t) {
+import { DEFAULT_COMPOSITION as k, DEFAULT_VISIBILITY as f } from "../../../extensions/Blocks/Recommendation/constants/defaultConfig.js";
+import { ATTR_RECOMMENDATION_TITLE as R, ATTR_CUSTOM_PREFIX as x, ATTR_PRODUCT_BUTTON as E, ATTR_PRODUCT_OMNIBUS_DISCOUNT as h, ATTR_PRODUCT_OMNIBUS_PRICE as O, ATTR_PRODUCT_OLD_PRICE as a, ATTR_PRODUCT_PRICE as d, ATTR_PRODUCT_NAME as y, ATTR_PRODUCT_IMAGE as b } from "../../../extensions/Blocks/Recommendation/constants/selectors.js";
+import { mapTextTheme as C, mapButtonTheme as N, mapImageTheme as P } from "./themeMapper.js";
+const U = "__title__", _ = "product_attribute.";
+function D(n) {
+  const s = n.variable ?? "";
+  switch (s) {
     case "p_recommendation_title":
-      return { key: C, kind: "title" };
+      return { key: U, kind: "title" };
     case "p_image":
-      return { key: O, kind: "image" };
+      return { key: b, kind: "image" };
     case "p_name":
-      return { key: E, kind: "text" };
+      return { key: y, kind: "text" };
     case "p_price":
-      return { key: h, kind: "text" };
+      return { key: d, kind: "text" };
     case "p_original_price":
-      return { key: f, kind: "text" };
+      return { key: a, kind: "text" };
     case "p_omnibus_price":
-      return { key: x, kind: "text" };
+      return { key: O, kind: "text" };
     case "p_omnibus_discount":
-      return { key: R, kind: "text" };
+      return { key: h, kind: "text" };
     case "p_button":
-      return { key: A, kind: "button" };
+      return { key: E, kind: "button" };
     default:
-      if (r.variableType === "p_attribute" || t.startsWith("p_attribute_")) {
-        const o = r.value ?? "", s = o.startsWith(T) ? o.slice(T.length) : o;
-        if (!s)
+      if (n.variableType === "p_attribute" || s.startsWith("p_attribute_")) {
+        const t = n.value ?? "", o = t.startsWith(_) ? t.slice(_.length) : t;
+        if (!o)
           return null;
-        const e = o || `${T}${s}`;
+        const u = t || `${_}${o}`;
         return {
-          key: `${k}${e}`,
+          key: `${x}${u}`,
           kind: "custom",
-          customAttrName: s,
-          customAttrValue: e
+          customAttrName: o,
+          customAttrValue: u
         };
       }
       return null;
   }
 }
-function _(r) {
-  const t = p.indexOf(r);
-  return t === -1 ? Number.POSITIVE_INFINITY : t;
+function I(n) {
+  const s = k.indexOf(n);
+  return s === -1 ? Number.POSITIVE_INFINITY : s;
+}
+const l = [d, a];
+function S(n, s, t) {
+  return n === s || !l.includes(n) || !l.includes(s) ? 0 : n === (t ? a : d) ? -1 : 1;
 }
-function V(r) {
+function F(n, { oldPriceFirst: s = !1 } = {}) {
   const t = {
     composition: [],
-    visibility: { ...I },
+    visibility: { ...f },
     customAttributes: [],
     customAttrValues: {},
     perElementStyles: {},
     anyTextTrimming: !1
   };
-  if (!r || r.length === 0)
-    return t.composition = [...p], t;
+  if (!n || n.length === 0)
+    return t.composition = [...k], t;
   const o = [];
-  r.forEach((e, i) => {
-    const n = P(e);
-    if (n) {
-      if (n.kind === "title") {
-        t.titleVariable = e, t.visibility[l] = e.hidden !== !0;
+  n.forEach((e, i) => {
+    const r = D(e);
+    if (r) {
+      if (r.kind === "title") {
+        t.titleVariable = e, t.visibility[R] = e.hidden !== !0;
         return;
       }
       o.push({
-        key: n.key,
-        kind: n.kind,
+        key: r.key,
+        kind: r.kind,
         hidden: e.hidden === !0,
         positionIdx: typeof e.positionIdx == "number" ? e.positionIdx : Number.MAX_SAFE_INTEGER,
         legacy: e,
-        customAttrName: n.customAttrName,
-        customAttrValue: n.customAttrValue,
+        customAttrName: r.customAttrName,
+        customAttrValue: r.customAttrValue,
         originalIndex: i
       });
     }
   }), o.sort((e, i) => {
     if (e.positionIdx !== i.positionIdx)
       return e.positionIdx - i.positionIdx;
-    const n = _(e.key), u = _(i.key);
-    return n !== u ? n - u : e.originalIndex - i.originalIndex;
+    const r = S(e.key, i.key, s);
+    if (r !== 0)
+      return r;
+    const m = I(e.key), c = I(i.key);
+    return m !== c ? m - c : e.originalIndex - i.originalIndex;
   });
-  const s = {};
+  const u = {};
   return o.forEach((e) => {
-    const { key: i, kind: n, hidden: u, legacy: c, customAttrName: d, customAttrValue: m } = e;
-    switch (t.composition.push(i), t.visibility[i] = !u, n === "custom" && d && m && (t.customAttributes.includes(m) || t.customAttributes.push(m), t.customAttrValues[i] = m), n) {
+    const { key: i, kind: r, hidden: m, legacy: c, customAttrName: A, customAttrValue: T } = e;
+    switch (t.composition.push(i), t.visibility[i] = !m, r === "custom" && A && T && (t.customAttributes.includes(T) || t.customAttributes.push(T), t.customAttrValues[i] = T), r) {
       case "image":
-        s[i] = N(c.theme);
+        u[i] = P(c.theme);
         break;
       case "button":
-        s[i] = y(c.theme);
+        u[i] = N(c.theme);
         break;
       case "text":
       case "custom": {
-        const a = b(c.theme);
-        s[i] = a, a.textTrimming && (t.anyTextTrimming = !0);
+        const p = C(c.theme);
+        u[i] = p, p.textTrimming && (t.anyTextTrimming = !0);
         break;
       }
     }
-  }), t.perElementStyles = s, t;
+  }), t.perElementStyles = u, t;
 }
 export {
-  V as mapComposition
+  F as mapComposition
 };