@useinsider/guido 3.23.0-beta.31d0f5f → 3.23.0-beta.9f6bfbf

package/dist/extensions/Blocks/Items/block.js

@@ -1,33 +1,42 @@
 var k = Object.defineProperty;
-var S = (d, l, t) => l in d ? k(d, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[l] = t;
-var g = (d, l, t) => S(d, typeof l != "symbol" ? l + "" : l, t);
-import { BlockId as D } from "../../../enums/block.js";
-import { useOnboardingStore as T } from "../../../stores/onboarding.js";
-import { getMigrationBannerHtml as N } from "../../../utils/migrationBannerHtml.js";
-import { Block as H, BlockCompositionType as R, ModificationDescription as u } from "../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
-import { PRODUCT_WRAPPER_SELECTOR as M, isZeroWidthValue as m } from "./constants/cardWidth.js";
-import { currencyAttrTargets as w, ITEMS_CURRENCY_ATTR as y } from "./constants/currency.js";
-import { ItemsBlockId as E } from "./enums/controlEnums.js";
-import { SETTINGS_ENUMS as b, DefaultConfigValues as p } from "./enums/settingsEnums.js";
-import { getDefaultTemplate as O } from "./template.js";
-import { getItemsBlockContainer as _, getItemsBlockConfig as C, deriveItemNumber as B, generateBlockInstanceId as P, getDefaultItemsBlockConfig as v } from "./utils/nodeConfigUtils.js";
-const A = D.Items, V = "Reconcile Items currency DOM attributes";
-class $ extends H {
+var E = (h, d, t) => d in h ? k(h, d, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[d] = t;
+var C = (h, d, t) => E(h, typeof d != "symbol" ? d + "" : d, t);
+import { useConfig as P } from "../../../composables/useConfig.js";
+import { BlockId as H } from "../../../enums/block.js";
+import { useOnboardingStore as N } from "../../../stores/onboarding.js";
+import { getMigrationBannerHtml as R } from "../../../utils/migrationBannerHtml.js";
+import { Block as M, BlockCompositionType as O, ModificationDescription as p } from "../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
+import { PRODUCT_WRAPPER_SELECTOR as w, isZeroWidthValue as g } from "./constants/cardWidth.js";
+import { DEFAULT_ITEMS_PRICE_FORMAT as I, isNewPriceFormatRoot as v, currencyAttrTargets as B, ITEMS_CURRENCY_ATTR as y } from "./constants/currency.js";
+import { ItemsBlockId as A } from "./enums/controlEnums.js";
+import { SETTINGS_ENUMS as S, DefaultConfigValues as b } from "./enums/settingsEnums.js";
+import { getDefaultTemplate as F } from "./template.js";
+import { getItemsBlockContainer as T, getItemsBlockConfig as _, deriveItemNumber as L, generateBlockInstanceId as x, getDefaultItemsBlockConfig as V } from "./utils/nodeConfigUtils.js";
+import { buildPriceFormatSnapshot as W, planPriceFormatOps as z, samePriceText as U, replacePriceText as Y, paragraphKindOf as j } from "./utils/priceFormatOps.js";
+const D = H.Items, q = "Reconcile Items currency DOM attributes";
+function K() {
+  return {
+    priceThousandSeparator: I.thousandSeparator,
+    priceDecimalSeparator: I.decimalSeparator,
+    priceDecimalCount: I.decimalCount
+  };
+}
+class at extends M {
   constructor() {
     super(...arguments);
     /** Block instances whose currency attrs were already self-healed this session (SD-147588 — undo-safe). */
-    g(this, "_currencyHealed", /* @__PURE__ */ new Set());
+    C(this, "_currencyHealed", /* @__PURE__ */ new Set());
     /** blockInstanceIds already claimed by a live block this session (SD-147588 collision detection). */
-    g(this, "_seenInstanceIds", /* @__PURE__ */ new Set());
+    C(this, "_seenInstanceIds", /* @__PURE__ */ new Set());
   }
   getId() {
-    return A;
+    return D;
   }
   getIcon() {
     return "items-icon";
   }
   getBlockCompositionType() {
-    return R.CONTAINER;
+    return O.CONTAINER;
   }
   getName() {
     return this.api.translate("Items");
@@ -36,20 +45,21 @@ class $ extends H {
     return this.api.translate("Items lets you display personalized products based on user behavior.");
   }
   getSettingsPanelTitleHtml() {
-    return N(
-      A,
+    return R(
+      D,
       this.api.translate("Items"),
       this.api.translate("This block is switched from the Old Version to the New Version. We recommend you check the Items block and test your message to ensure it works properly.")
     );
   }
   getTemplate() {
-    return O({
-      orientation: b.ORIENTATION.VERTICAL,
-      itemsType: b.ITEMS_TYPE.CART_ITEMS,
+    return F({
+      orientation: S.ORIENTATION.VERTICAL,
+      itemsType: S.ITEMS_TYPE.CART_ITEMS,
       itemId: "{{Abandoned Cart Item (1) Url}}",
-      currencySymbol: p.productPriceCurrencySymbolControlValue,
-      currencyLocation: p.productPriceCurrencyLocationControlValue,
-      formattedPrice: p.productPriceFormattedControlValue === "1"
+      currencySymbol: b.productPriceCurrencySymbolControlValue,
+      currencyLocation: b.productPriceCurrencyLocationControlValue,
+      formattedPrice: b.productPriceFormattedControlValue === "1",
+      priceFormat: this._isPriceFormattingEnabled() ? I : void 0
     });
   }
   allowInnerBlocksDND() {
@@ -59,26 +69,29 @@ class $ extends H {
     return !0;
   }
   onCreated(t) {
-    const e = this.api.getDocumentModifier(), c = this.api.getDocumentRootCssNode();
-    c.querySelector('[product-attr="imageSrc"] img') || e.modifyCss(c).appendRule('[product-attr="imageSrc"] img {object-fit: contain;}');
-    const r = _(t);
-    if (!r)
+    const e = this.api.getDocumentModifier(), s = this.api.getDocumentRootCssNode();
+    s.querySelector('[product-attr="imageSrc"] img') || e.modifyCss(s).appendRule('[product-attr="imageSrc"] img {object-fit: contain;}');
+    const o = T(t);
+    if (!o)
       return;
-    const o = r.getNodeConfig(), n = o && Object.keys(o).length > 0, i = C(t);
-    if (i != null && i.initialized) {
-      if (!n) {
-        const a = this.api.getDocumentModifier();
-        a.modifyHtml(r).setNodeConfig(i), this._stampProductTdDomAttributes(r, i, a), this._healCollapsedWidths(r, a), this._shouldReconcileCurrency(i) && this._reconcileCurrencyDomAttributes(r, i, a), a.apply(new u("Migrate legacy config to nodeConfig")), this._markCurrencyHealed(i.blockInstanceId);
+    const i = o.getNodeConfig(), c = i && Object.keys(i).length > 0, r = _(t);
+    if (r != null && r.initialized) {
+      if (!c) {
+        const l = this.api.getDocumentModifier();
+        l.modifyHtml(o).setNodeConfig(r), this._stampProductTdDomAttributes(o, r, l), this._healCollapsedWidths(o, l), this._shouldReconcileCurrency(r) && this._reconcileCurrencyDomAttributes(o, r, l), l.apply(new p("Migrate legacy config to nodeConfig")), this._markCurrencyHealed(r.blockInstanceId);
         return;
       }
     } else {
-      const a = v(), I = this.api.getDocumentModifier();
-      I.modifyHtml(r).setNodeConfig(a), this._stampProductTdDomAttributes(r, a, I, !0), I.apply(new u("Initialize Items block with default configuration")), T().startOnboarding("itemsOnboarding");
+      const l = {
+        ...V(),
+        ...this._isPriceFormattingEnabled() ? K() : {}
+      }, f = this.api.getDocumentModifier();
+      f.modifyHtml(o).setNodeConfig(l), this._stampProductTdDomAttributes(o, l, f, !0), f.apply(new p("Initialize Items block with default configuration")), N().startOnboarding("itemsOnboarding");
       return;
     }
-    const s = this._resolveInstanceId(i.blockInstanceId), f = this.api.getDocumentModifier();
-    let h = !1;
-    s !== i.blockInstanceId && (f.modifyHtml(r).setNodeConfig({ ...i, blockInstanceId: s }), h = !0), !this._currencyHealed.has(s) && this._reconcileCurrencyDomAttributes(r, i, f) && (h = !0), this._healCollapsedWidths(r, f) && (h = !0), h && f.apply(new u("Assign Items block instance ID and reconcile currency")), this._markCurrencyHealed(s);
+    const n = this._resolveInstanceId(r.blockInstanceId), a = { ...r, blockInstanceId: n }, u = this.api.getDocumentModifier();
+    let m = !1;
+    n !== r.blockInstanceId && (u.modifyHtml(o).setNodeConfig(a), m = !0), !this._currencyHealed.has(n) && this._reconcileCurrencyDomAttributes(o, a, u) && (m = !0), this._healCollapsedWidths(o, u) && (m = !0), m && u.apply(new p("Assign Items block instance ID and reconcile currency")), this._markCurrencyHealed(n);
   }
   /**
    * Re-seeds nodeConfig from the persisted esd-ext-config when a saved module
@@ -87,23 +100,23 @@ class $ extends H {
    * Guarded to the nodeConfig-empty case so it runs once and never loops.
    */
   onDocumentChanged(t) {
-    const e = _(t);
+    const e = T(t);
     if (!e)
       return;
-    const c = e.getNodeConfig();
-    if (c && Object.keys(c).length > 0) {
-      const i = C(t);
-      if (i != null && i.initialized && this._shouldReconcileCurrency(i)) {
-        const s = this.api.getDocumentModifier();
-        this._reconcileCurrencyDomAttributes(e, i, s) && s.apply(new u(V)), this._markCurrencyHealed(i.blockInstanceId);
+    const s = e.getNodeConfig();
+    if (s && Object.keys(s).length > 0) {
+      const r = _(t);
+      if (r != null && r.initialized && this._shouldReconcileCurrency(r)) {
+        const n = this.api.getDocumentModifier();
+        this._reconcileCurrencyDomAttributes(e, r, n) && n.apply(new p(q)), this._markCurrencyHealed(r.blockInstanceId);
       }
       return;
     }
-    const o = C(t);
-    if (!(o != null && o.initialized))
+    const i = _(t);
+    if (!(i != null && i.initialized))
       return;
-    const n = this.api.getDocumentModifier();
-    n.modifyHtml(e).setNodeConfig(o), this._stampProductTdDomAttributes(e, o, n), this._healCollapsedWidths(e, n), this._shouldReconcileCurrency(o) && this._reconcileCurrencyDomAttributes(e, o, n), n.apply(new u("Recover Items block config from saved module")), this._markCurrencyHealed(o.blockInstanceId);
+    const c = this.api.getDocumentModifier();
+    c.modifyHtml(e).setNodeConfig(i), this._stampProductTdDomAttributes(e, i, c), this._healCollapsedWidths(e, c), this._shouldReconcileCurrency(i) && this._reconcileCurrencyDomAttributes(e, i, c), c.apply(new p("Recover Items block config from saved module")), this._markCurrencyHealed(i.blockInstanceId);
   }
   /**
    * Bakes the compiler-read DOM attributes (`data-type`, `data-number`, `data-nodup`) onto the
@@ -113,21 +126,21 @@ class $ extends H {
    * restored before export. The name `<a>` carries no data-type/data-number of its own and
    * relies on this td-level fallback in pairProductVariables.
    */
-  _stampProductTdDomAttributes(t, e, c, r = !1) {
-    const o = B(e.itemsSelectValue, e.type), n = (i, s) => {
-      r && t.getAttribute(i) || c.modifyHtml(t).setAttribute(i, s);
+  _stampProductTdDomAttributes(t, e, s, o = !1) {
+    const i = L(e.itemsSelectValue, e.type), c = (r, n) => {
+      o && t.getAttribute(r) || s.modifyHtml(t).setAttribute(r, n);
     };
-    n("data-type", e.type), n("data-number", o), n("data-nodup", String(e.priceHideDiscount));
+    c("data-type", e.type), c("data-number", i), c("data-nodup", String(e.priceHideDiscount));
   }
   /**
    * Repairs a saved module's collapsed card into the state the load migrator produces. Acts only
    * on a zero width, so Stripo's non-zero drop-time width never triggers it and a healed block no-ops.
    */
   _healCollapsedWidths(t, e) {
-    const r = t.querySelectorAll(M).filter((o) => m(o.getAttribute("width")) || m(o.getStyle("width")));
-    return !m(t.getAttribute("width")) && !r.length ? !1 : (t.hasClass("esd-container-frame") && e.modifyHtml(t).removeClass("esd-container-frame"), t.getAttribute("width") !== null && e.modifyHtml(t).removeAttribute("width"), r.forEach((o) => {
-      const n = o.getAttribute("width");
-      (n === null || m(n)) && e.modifyHtml(o).setAttribute("width", "100%"), m(o.getStyle("width")) && e.modifyHtml(o).setStyle("width", "100%");
+    const o = t.querySelectorAll(w).filter((i) => g(i.getAttribute("width")) || g(i.getStyle("width")));
+    return !g(t.getAttribute("width")) && !o.length ? !1 : (t.hasClass("esd-container-frame") && e.modifyHtml(t).removeClass("esd-container-frame"), t.getAttribute("width") !== null && e.modifyHtml(t).removeAttribute("width"), o.forEach((i) => {
+      const c = i.getAttribute("width");
+      (c === null || g(c)) && e.modifyHtml(i).setAttribute("width", "100%"), g(i.getStyle("width")) && e.modifyHtml(i).setStyle("width", "100%");
     }), !0);
   }
   /**
@@ -156,30 +169,55 @@ class $ extends H {
     let e = t;
     if (!e || this._seenInstanceIds.has(e))
       do
-        e = P();
+        e = x();
       while (this._seenInstanceIds.has(e));
     return this._seenInstanceIds.add(e), e;
   }
   /**
-   * Stamps the export-read currency attrs onto every price `<p>` from config, so a template whose
-   * attrs drifted (e.g. a location toggle before the sync fix) self-heals to match the editor.
-   * Config is the source of truth — never derive from visible text.
-   *
-   * Authority split lives in `currencyAttrTargets` (SD-147588) — position only when a location
-   * is recorded, symbol only when customized — so this heal and the module-drop repair can't drift.
-   *
-   * Returns true only when an attr actually changed, so the caller can skip an empty apply that
-   * would otherwise re-trigger onDocumentChanged and loop.
+   * Single self-heal slot: the flag only decides whether a legacy root is converted; a root
+   * already in the new format is reconciled from config regardless. Returns whether anything was queued.
    */
-  _reconcileCurrencyDomAttributes(t, e, c) {
-    const { position: r, symbol: o } = w(e), n = t.querySelectorAll(`.${E.PRICE} p`);
-    let i = !1;
-    return n.forEach((s) => {
-      r !== void 0 && s.getAttribute(y.POSITION) !== r && (c.modifyHtml(s).setAttribute(y.POSITION, r), i = !0), o !== void 0 && s.getAttribute(y.SYMBOL) !== o && (c.modifyHtml(s).setAttribute(y.SYMBOL, o), i = !0);
-    }), i;
+  _reconcileCurrencyDomAttributes(t, e, s) {
+    const o = this._isPriceFormattingEnabled();
+    if (!o && !v(t))
+      return this._reconcileLegacyCurrencyAttributes(t, e, s);
+    const i = this._priceParagraphs(t), c = W({
+      rootAttr: (n) => t.getAttribute(n),
+      config: e,
+      paragraphs: i.map(({ kind: n, node: a }) => ({
+        kind: n,
+        attr: (u) => a.getAttribute(u),
+        text: a.getInnerText()
+      }))
+    }), r = z(c, { convertLegacy: o });
+    return r.changed ? (Object.entries(r.rootSet).forEach(([n, a]) => {
+      s.modifyHtml(t).setAttribute(n, a);
+    }), i.forEach(({ kind: n, node: a }) => {
+      var l;
+      r.paragraphRemove.filter((f) => a.getAttribute(f) !== null).forEach((f) => s.modifyHtml(a).removeAttribute(f));
+      const u = (l = r.texts) == null ? void 0 : l[n], m = a.getInnerText();
+      u !== void 0 && !U(m, u) && s.modifyHtml(a).setInnerHtml(Y(a.getInnerHTML(), m, u));
+    }), r.configPatch && s.modifyHtml(t).setNodeConfig({ ...e, ...r.configPatch }), !0) : !1;
+  }
+  /** Legacy `<p>` contract via `currencyAttrTargets`: position when recorded, symbol only when custom. */
+  _reconcileLegacyCurrencyAttributes(t, e, s) {
+    const { position: o, symbol: i } = B(e), c = t.querySelectorAll(`.${A.PRICE} p`);
+    let r = !1;
+    return c.forEach((n) => {
+      o !== void 0 && n.getAttribute(y.POSITION) !== o && (s.modifyHtml(n).setAttribute(y.POSITION, o), r = !0), i !== void 0 && n.getAttribute(y.SYMBOL) !== i && (s.modifyHtml(n).setAttribute(y.SYMBOL, i), r = !0);
+    }), r;
+  }
+  _priceParagraphs(t) {
+    return t.querySelectorAll(`.${A.PRICE} p`).flatMap((s) => {
+      const o = j(s.getAttribute("product-attr"));
+      return o ? [{ kind: o, node: s }] : [];
+    });
+  }
+  _isPriceFormattingEnabled() {
+    return P().isFeatureEnabled("itemsPriceFormatting");
   }
 }
 export {
-  A as BLOCK_ID,
-  $ as ItemsBlock
+  D as BLOCK_ID,
+  at as ItemsBlock
 };

package/dist/extensions/Blocks/Items/constants/currency.js

@@ -1,25 +1,70 @@
 import { DefaultConfigValues as c } from "../enums/settingsEnums.js";
-const s = {
+const n = {
   POSITION: "data-curency",
   SYMBOL: "data-currency_symbol"
 };
-function e(r) {
-  return r === "1" ? "after" : "before";
+function u(t) {
+  return t === "1" ? "after" : "before";
 }
-function i(r) {
-  const o = (r ?? "").trim();
-  return o !== "" && o !== c.productPriceCurrencySymbolControlValue;
+function i(t) {
+  const r = (t ?? "").trim();
+  return r !== "" && r !== c.productPriceCurrencySymbolControlValue;
 }
-function a(r) {
-  const o = r.priceCurrencyLocation, n = typeof o == "string" && o.trim() !== "", t = (r.priceCurrencySymbol ?? "").trim();
+function p(t) {
+  const r = t.priceCurrencyLocation, e = typeof r == "string" && r.trim() !== "", a = (t.priceCurrencySymbol ?? "").trim();
   return {
-    position: n ? e(o) : void 0,
-    symbol: i(t) ? t : void 0
+    position: e ? u(r) : void 0,
+    symbol: i(a) ? a : void 0
   };
 }
+const s = {
+  SYMBOL: "currency-symbol",
+  ALIGNMENT: "currency-alignment",
+  THOUSAND_SEPARATOR: "currency-thousand-separator",
+  DECIMAL_SEPARATOR: "currency-decimal-separator",
+  DECIMAL_COUNT: "currency-decimal-count",
+  SINGLE_PRICE: "data-single_price"
+}, C = [
+  "data-formated",
+  "data-single_price",
+  n.POSITION,
+  n.SYMBOL
+], o = {
+  thousandSeparator: ",",
+  decimalSeparator: ".",
+  decimalCount: 2
+};
+function m(t) {
+  const r = typeof t == "string" ? parseInt(t) : t;
+  return typeof r == "number" && Number.isFinite(r) && r >= 0 ? Math.trunc(r) : o.decimalCount;
+}
+function d(t) {
+  const r = t == null ? void 0 : t.priceThousandSeparator, e = t == null ? void 0 : t.priceDecimalSeparator;
+  return {
+    thousandSeparator: typeof r == "string" && r !== "" ? r : o.thousandSeparator,
+    decimalSeparator: typeof e == "string" && e !== "" ? e : o.decimalSeparator,
+    decimalCount: (t == null ? void 0 : t.priceDecimalCount) === void 0 ? o.decimalCount : m(t.priceDecimalCount)
+  };
+}
+function y(t) {
+  return typeof (t == null ? void 0 : t.priceDecimalCount) == "number";
+}
+function S(t) {
+  if (!t || typeof t.getAttribute != "function")
+    return !1;
+  const r = t.getAttribute(s.DECIMAL_COUNT);
+  return r != null;
+}
 export {
-  s as ITEMS_CURRENCY_ATTR,
-  a as currencyAttrTargets,
-  e as currencyPositionFromLocation,
-  i as isCustomCurrencySymbol
+  o as DEFAULT_ITEMS_PRICE_FORMAT,
+  n as ITEMS_CURRENCY_ATTR,
+  s as ITEMS_PRICE_FORMAT_ATTR,
+  C as LEGACY_PRICE_PARAGRAPH_ATTRS,
+  p as currencyAttrTargets,
+  u as currencyPositionFromLocation,
+  i as isCustomCurrencySymbol,
+  y as isNewPriceFormatConfig,
+  S as isNewPriceFormatRoot,
+  m as normalizeDecimalCount,
+  d as priceFormatFromConfig
 };

package/dist/extensions/Blocks/Items/controls/price/currencyLocation.js

@@ -1,48 +1,59 @@
-import { currencyLocationMaps as m } from "../../../../../enums/extensions/recommendationBlock.js";
-import { UEAttr as I, ModificationDescription as L } from "../../../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
-import { CommonControl as N } from "../../../common-control.js";
-import { ITEMS_CURRENCY_ATTR as T, currencyPositionFromLocation as E } from "../../constants/currency.js";
-import { ItemsBlockControlId as p } from "../../enums/controlEnums.js";
-import { getItemsBlockConfig as u, setItemsBlockConfig as O, escapeReplacement as f } from "../../utils/nodeConfigUtils.js";
-const b = p.PRICE_CURRENCY_LOCATION, a = {
+import { currencyLocationMaps as u } from "../../../../../enums/extensions/recommendationBlock.js";
+import { UEAttr as I, ModificationDescription as T } from "../../../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
+import { CommonControl as E } from "../../../common-control.js";
+import { ITEMS_CURRENCY_ATTR as f, currencyPositionFromLocation as h } from "../../constants/currency.js";
+import { ItemsBlockControlId as d } from "../../enums/controlEnums.js";
+import { getItemsBlockConfig as C, setItemsBlockConfig as O, escapeReplacement as P } from "../../utils/nodeConfigUtils.js";
+import { isNewPriceFormatBlock as b, applyPriceFormatChange as U } from "../priceFormat.js";
+const x = d.PRICE_CURRENCY_LOCATION, a = {
   CURRENCY_LOCATION: "currencyLocation"
 };
-class B extends N {
+class H extends E {
   getId() {
-    return b;
+    return x;
   }
   getTemplate() {
     return `
-            <div class="container ${p.PRICE_CURRENCY_LOCATION}">
+            <div class="container ${d.PRICE_CURRENCY_LOCATION}">
                 ${this._getCurrencyLocation()}
             </div>
         `;
   }
   onRender() {
-    this.forgetLastPanelNode(), this.api.setUIEAttribute(a.CURRENCY_LOCATION, I.SELECTPICKER.items, m), this.api.onValueChanged(a.CURRENCY_LOCATION, (e) => {
+    this.forgetLastPanelNode(), this.api.setUIEAttribute(a.CURRENCY_LOCATION, I.SELECTPICKER.items, u), this.api.onValueChanged(a.CURRENCY_LOCATION, (e) => {
       this._onCurrencyLocationChange(e);
     });
   }
   onTemplateNodeUpdated(e) {
     super.onTemplateNodeUpdated(e), this.handleBlockInstanceChange(() => {
-      const t = u(this.currentNode);
+      const t = C(this.currentNode);
       this.api.updateValues({ [a.CURRENCY_LOCATION]: (t == null ? void 0 : t.priceCurrencyLocation) ?? "0" });
     });
   }
   _onCurrencyLocationChange(e) {
-    if (console.debug("Currency location changed to: ", e), O(this.currentNode, this.api, { priceCurrencyLocation: e }), !this.currentNode)
+    var l;
+    if (console.debug("Currency location changed to: ", e), b(this.currentNode)) {
+      ((l = C(this.currentNode)) == null ? void 0 : l.priceCurrencyLocation) !== e && U(
+        this.currentNode,
+        this.api,
+        { priceCurrencyLocation: e },
+        `Updated currency location to ${h(e)}`
+      );
+      return;
+    }
+    if (O(this.currentNode, this.api, { priceCurrencyLocation: e }), !this.currentNode)
       return;
     const t = this._getPriceBlocks();
     if (!t || t.length === 0)
       return;
-    const r = u(this.currentNode), n = e || "0", o = (r == null ? void 0 : r.priceCurrencySymbol) ?? "", c = E(n), i = this.api.getDocumentModifier();
-    t.forEach((h) => {
-      const s = this._getParagraph(h);
+    const r = C(this.currentNode), n = e || "0", o = (r == null ? void 0 : r.priceCurrencySymbol) ?? "", c = h(n), i = this.api.getDocumentModifier();
+    t.forEach((g) => {
+      const s = this._getParagraph(g);
       if (!s)
         return;
-      const d = s.getInnerHTML().trim() || "", l = s.getInnerText().trim() || "", C = (o == null ? void 0 : o.trim()) || "", g = this._removeCurrencySymbol(l, C), _ = this._detectSymbolInText(l) || C, y = this._buildPriceContent(g, _, n), R = d.replace(l, f(y));
-      i.modifyHtml(s).setInnerHtml(R).setAttribute(T.POSITION, c);
-    }), i.apply(new L(
+      const _ = s.getInnerHTML().trim() || "", p = s.getInnerText().trim() || "", m = (o == null ? void 0 : o.trim()) || "", y = this._removeCurrencySymbol(p, m), N = this._detectSymbolInText(p) || m, L = this._buildPriceContent(y, N, n), R = _.replace(p, P(L));
+      i.modifyHtml(s).setInnerHtml(R).setAttribute(f.POSITION, c);
+    }), i.apply(new T(
       `Updated currency location to ${c}`
     ));
   }
@@ -85,13 +96,13 @@ class B extends N {
       this._GuSelect({
         name: a.CURRENCY_LOCATION,
         placeholder: "",
-        options: m
+        options: u
       })
     ])}
         `;
   }
 }
 export {
-  b as CONTROL_BLOCK_ID,
-  B as PriceCurrencyLocationControl
+  x as CONTROL_BLOCK_ID,
+  H as PriceCurrencyLocationControl
 };

package/dist/extensions/Blocks/Items/controls/price/currencySymbol.js

@@ -1,25 +1,28 @@
 var R = Object.defineProperty;
-var N = (s, c, e) => c in s ? R(s, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[c] = e;
-var h = (s, c, e) => N(s, typeof c != "symbol" ? c + "" : c, e);
-import { ModificationDescription as E } from "../../../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
-import { CommonControl as f } from "../../../common-control.js";
-import { ITEMS_CURRENCY_ATTR as B } from "../../constants/currency.js";
-import { ItemsBlockControlId as y } from "../../enums/controlEnums.js";
-import { getItemsBlockConfig as p, setItemsBlockConfig as T, escapeReplacement as x } from "../../utils/nodeConfigUtils.js";
-const I = y.PRICE_CURRENCY_SYMBOL, u = {
+var f = (i, c, e) => c in i ? R(i, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[c] = e;
+var y = (i, c, e) => f(i, typeof c != "symbol" ? c + "" : c, e);
+import { useConfig as E } from "../../../../../composables/useConfig.js";
+import { ModificationDescription as B } from "../../../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
+import { CommonControl as P } from "../../../common-control.js";
+import { ITEMS_CURRENCY_ATTR as T } from "../../constants/currency.js";
+import { ItemsBlockControlId as d } from "../../enums/controlEnums.js";
+import { getItemsBlockConfig as p, setItemsBlockConfig as x, escapeReplacement as I } from "../../utils/nodeConfigUtils.js";
+import { isNewPriceFormatBlock as L, applyPriceFormatChange as M } from "../priceFormat.js";
+const Y = d.PRICE_CURRENCY_SYMBOL, u = {
   CURRENCY_SYMBOL: "currencySymbol"
 };
-class $ extends f {
+class A extends P {
   constructor() {
     super(...arguments);
-    h(this, "originalPriceContents", /* @__PURE__ */ new Map());
+    y(this, "originalPriceContents", /* @__PURE__ */ new Map());
   }
   getId() {
-    return I;
+    return Y;
   }
   getTemplate() {
+    const e = E().isFeatureEnabled("itemsPriceFormatting") ? " no-separator" : "";
     return `
-            <div class="container ${y.PRICE_CURRENCY_SYMBOL}">
+            <div class="container ${d.PRICE_CURRENCY_SYMBOL}${e}">
                 ${this._getCurrencySymbol()}
             </div>
         `;
@@ -34,28 +37,36 @@ class $ extends f {
   }
   onTemplateNodeUpdated(e) {
     super.onTemplateNodeUpdated(e), this.handleBlockInstanceChange(() => {
-      const t = p(this.currentNode);
-      this.api.updateValues({ [u.CURRENCY_SYMBOL]: (t == null ? void 0 : t.priceCurrencySymbol) ?? "" }), this._storeOriginalContents();
+      const r = p(this.currentNode);
+      this.api.updateValues({ [u.CURRENCY_SYMBOL]: (r == null ? void 0 : r.priceCurrencySymbol) ?? "" }), this._storeOriginalContents();
     });
   }
   _onCurrencySymbolChange(e) {
-    var a;
-    console.debug("Currency symbol changed to: ", e);
-    const t = p(this.currentNode), o = ((a = t == null ? void 0 : t.priceCurrencySymbol) == null ? void 0 : a.trim()) || "";
-    if (T(this.currentNode, this.api, { priceCurrencySymbol: e }), !this.currentNode)
+    var m, C;
+    if (console.debug("Currency symbol changed to: ", e), L(this.currentNode)) {
+      ((m = p(this.currentNode)) == null ? void 0 : m.priceCurrencySymbol) !== e && M(
+        this.currentNode,
+        this.api,
+        { priceCurrencySymbol: e },
+        `Updated currency symbol to ${(e == null ? void 0 : e.trim()) || "removed"}`
+      );
       return;
-    const r = this._getPriceBlocks();
-    if (!r || r.length === 0)
+    }
+    const r = p(this.currentNode), n = ((C = r == null ? void 0 : r.priceCurrencySymbol) == null ? void 0 : C.trim()) || "";
+    if (x(this.currentNode, this.api, { priceCurrencySymbol: e }), !this.currentNode)
+      return;
+    const t = this._getPriceBlocks();
+    if (!t || t.length === 0)
       return;
-    const n = (e == null ? void 0 : e.trim()) || "", l = (t == null ? void 0 : t.priceCurrencyLocation) ?? "0", i = this.api.getDocumentModifier();
-    r.forEach((d) => {
-      const m = this._getParagraph(d);
-      if (!m)
+    const o = (e == null ? void 0 : e.trim()) || "", a = (r == null ? void 0 : r.priceCurrencyLocation) ?? "0", s = this.api.getDocumentModifier();
+    t.forEach((g) => {
+      const l = this._getParagraph(g);
+      if (!l)
         return;
-      const g = m.getInnerHTML().trim() || "", C = m.getInnerText().trim() || "", _ = this._removeCurrencySymbol(C, o), S = this._buildPriceContent(_, n, l), b = g.replace(C, x(S));
-      i.modifyHtml(m).setInnerHtml(b).setAttribute(B.SYMBOL, n);
-    }), i.apply(new E(
-      `Updated currency symbol to ${n || "removed"}`
+      const S = l.getInnerHTML().trim() || "", h = l.getInnerText().trim() || "", _ = this._removeCurrencySymbol(h, n), b = this._buildPriceContent(_, o, a), N = S.replace(h, I(b));
+      s.modifyHtml(l).setInnerHtml(N).setAttribute(T.SYMBOL, o);
+    }), s.apply(new B(
+      `Updated currency symbol to ${o || "removed"}`
     ));
   }
   _storeOriginalContents() {
@@ -64,18 +75,18 @@ class $ extends f {
     const e = p(this.currentNode);
     this.currentNode.querySelectorAll(
       ".items-block-price"
-    ).forEach((o) => {
-      var n;
-      const r = o.querySelector("p");
-      if (r && !this.originalPriceContents.has(r)) {
-        const l = r.getInnerText() || "", i = ((n = e == null ? void 0 : e.priceCurrencySymbol) == null ? void 0 : n.trim()) || "", a = this._removeCurrencySymbol(l, i);
-        this.originalPriceContents.set(r, a);
+    ).forEach((n) => {
+      var o;
+      const t = n.querySelector("p");
+      if (t && !this.originalPriceContents.has(t)) {
+        const a = t.getInnerText() || "", s = ((o = e == null ? void 0 : e.priceCurrencySymbol) == null ? void 0 : o.trim()) || "", m = this._removeCurrencySymbol(a, s);
+        this.originalPriceContents.set(t, m);
       }
     });
   }
   _getPriceBlocks() {
-    var e, t;
-    return ((t = (e = this.currentNode) == null ? void 0 : e.closest(".items-block")) == null ? void 0 : t.querySelectorAll(".items-block-price")) || [];
+    var e, r;
+    return ((r = (e = this.currentNode) == null ? void 0 : e.closest(".items-block")) == null ? void 0 : r.querySelectorAll(".items-block-price")) || [];
   }
   _getParagraph(e) {
     return e.querySelector("p");
@@ -83,23 +94,23 @@ class $ extends f {
   _escapeRegex(e) {
     return e.replace(/[-\\^$*+?().|[\]{}]/g, "\\$&");
   }
-  _removeCurrencySymbol(e, t) {
-    const o = e || "";
-    let r = o;
-    if (t) {
-      const n = new RegExp(`\\s*${this._escapeRegex(t)}\\s*`);
-      r = o.replace(n, "").trim();
+  _removeCurrencySymbol(e, r) {
+    const n = e || "";
+    let t = n;
+    if (r) {
+      const o = new RegExp(`\\s*${this._escapeRegex(r)}\\s*`);
+      t = n.replace(o, "").trim();
     } else {
-      const n = o.match(/([^0-9.,\s]+)/);
-      if (n && n[1]) {
-        const l = n[1].trim(), i = new RegExp(`\\s*${this._escapeRegex(l)}\\s*`);
-        r = o.replace(i, "").trim();
+      const o = n.match(/([^0-9.,\s]+)/);
+      if (o && o[1]) {
+        const a = o[1].trim(), s = new RegExp(`\\s*${this._escapeRegex(a)}\\s*`);
+        t = n.replace(s, "").trim();
       }
     }
-    return r;
+    return t;
   }
-  _buildPriceContent(e, t, o) {
-    return t ? o === "1" ? `${e}&nbsp;${t}` : `${t}&nbsp;${e}` : e;
+  _buildPriceContent(e, r, n) {
+    return r ? n === "1" ? `${e}&nbsp;${r}` : `${r}&nbsp;${e}` : e;
   }
   _getCurrencySymbol() {
     return `
@@ -115,6 +126,6 @@ class $ extends f {
   }
 }
 export {
-  I as CONTROL_BLOCK_ID,
-  $ as PriceCurrencySymbolControl
+  Y as CONTROL_BLOCK_ID,
+  A as PriceCurrencySymbolControl
 };