@salla.sa/twilight-components 3.0.17 → 3.0.19

package/dist/collection/components/salla-bullet-delivery/selector-tracker.js

@@ -0,0 +1,106 @@
+/*!
+ * Crafted with ❤ by Salla
+ */
+const SESSION_STORAGE_NAME = "sc_selector_session";
+const TRACKING_TIMEOUT_MS = 5000;
+const CLOSE_REASONS = {
+    closeButtonClick: "close_button",
+    backdropClick: "backdrop",
+};
+export const toCloseReason = (reason) => CLOSE_REASONS[reason ?? ""] ?? "escape";
+const uuid = () => typeof crypto.randomUUID === "function"
+    ? crypto.randomUUID()
+    : "10000000-1000-4000-8000-100000000000".replace(/[018]/g, (c) => (Number(c) ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (Number(c) / 4)))).toString(16));
+export const allocatedBranchIds = (intent) => {
+    const value = intent?.allocation_headers?.["s-scope-allocation-id"] ?? intent?.branch_id;
+    const ids = String(value ?? "")
+        .split(",")
+        .map(Number)
+        .filter((id) => Number.isSafeInteger(id) && id > 0);
+    return [...new Set(ids)].sort((a, b) => a - b);
+};
+const sameIds = (a, b) => a.length === b.length && a.every((id) => b.includes(id));
+export class SelectorTracker {
+    constructor() {
+        this.impressionId = null;
+        this.visibleAt = 0;
+    }
+    viewed(context) {
+        this.guarded(() => {
+            this.impressionId = uuid();
+            this.visibleAt = Date.now();
+            this.send("Branch Selector Viewed", { ...context });
+        });
+    }
+    dismissed(context, reason, hadAcceptedSelection) {
+        this.guarded(() => this.send("Branch Selector Dismissed", {
+            ...context,
+            close_reason: reason,
+            had_accepted_selection: hadAcceptedSelection,
+            elapsed_ms: this.visibleAt ? Date.now() - this.visibleAt : 0,
+        }));
+    }
+    result(context, result) {
+        this.guarded(() => {
+            const session = this.session();
+            const seq = session.seq + 1;
+            const accepted = result.outcome === "accepted";
+            const firstAccepted = session.first_accepted_branch_ids ?? (accepted ? result.new_branch_ids : null);
+            // A draft or a failed attempt replaces the stored intent, so the last accepted branches live here.
+            const previous = session.last_accepted_branch_ids ?? result.previous_branch_ids;
+            this.save({
+                ...session,
+                seq,
+                first_accepted_branch_ids: firstAccepted,
+                last_accepted_branch_ids: accepted ? result.new_branch_ids : previous,
+            });
+            this.send("Branch Selector Completed", {
+                ...context,
+                ...result,
+                previous_branch_ids: previous,
+                selection_attempt_id: uuid(),
+                selection_seq: seq,
+                first_accepted_branch_ids: firstAccepted,
+                changed: accepted && previous.length > 0 && !sameIds(previous, result.new_branch_ids),
+            });
+        });
+    }
+    guarded(track) {
+        try {
+            track();
+        }
+        catch {
+            // Tracking must never break the selector.
+        }
+    }
+    send(event, properties) {
+        const body = {
+            event,
+            session_id: this.session().id,
+            impression_id: this.impressionId,
+            ...properties,
+        };
+        // Use the configured transport without the SDK's shared notification suppression.
+        // Tracking failures stay silent while concurrent customer requests keep their alerts.
+        // keepalive lets the request outlive the reload that follows a confirmed selection.
+        Promise.resolve(salla.api.axios.post("selector-events", body, {
+            timeout: TRACKING_TIMEOUT_MS,
+            adapter: ["fetch", "xhr"],
+            fetchOptions: { keepalive: true },
+        })).catch(() => undefined);
+    }
+    session() {
+        const stored = Salla.storage.session.get(this.storageName());
+        if (stored?.id)
+            return stored;
+        const fresh = { id: uuid(), seq: 0, first_accepted_branch_ids: null };
+        this.save(fresh);
+        return fresh;
+    }
+    storageName() {
+        return `${SESSION_STORAGE_NAME}:${Salla.config.get("store.id")}`;
+    }
+    save(session) {
+        Salla.storage.session.set(this.storageName(), session);
+    }
+}

package/dist/collection/components/salla-free-shipping-banner/salla-free-shipping-banner.css

@@ -93,7 +93,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.s-free-shipping-banner__chip {
+.s-free-shipping-banner__timer {
   position: relative;
   overflow: hidden;
   flex: none;
@@ -108,11 +108,11 @@
   white-space: nowrap;
   background: var(--s-fsb-tint-2);
 }
-.s-free-shipping-banner__chip svg {
+.s-free-shipping-banner__timer svg {
   inline-size: 15px;
   block-size: 15px;
 }
-.s-free-shipping-banner__chip::after {
+.s-free-shipping-banner__timer::after {
   content: "";
   position: absolute;
   top: 0;
@@ -124,6 +124,17 @@
   animation: s-fsb-shine 5s ease-in-out infinite;
   pointer-events: none;
 }
+.s-free-shipping-banner__clock {
+  font-size: 13.5px;
+  font-variant-numeric: tabular-nums;
+  font-feature-settings: "tnum";
+  direction: ltr;
+  unicode-bidi: isolate;
+}
+.s-free-shipping-banner.has-paper .s-free-shipping-banner__timer {
+  background: var(--s-fsb-ink);
+  color: var(--s-fsb-paper);
+}
 @media (prefers-reduced-motion: reduce) {
   .s-free-shipping-banner *, .s-free-shipping-banner *::after {
     animation: none !important;
@@ -136,7 +147,10 @@
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
   }
-  .s-free-shipping-banner__chip {
+  .s-free-shipping-banner__label {
+    display: none;
+  }
+  .s-free-shipping-banner__timer {
     padding-inline: 9px;
   }
 }

package/dist/collection/components/salla-free-shipping-banner/salla-free-shipping-banner.js

@@ -3,6 +3,7 @@
  */
 import { Host, h } from "@stencil/core";
 import { isEligibleForFreeShipping } from "../../shared/free-shipping";
+import { getFreeShippingTimerState, isTimerEnabled, startTimerIfNeeded, subscribeToFreeShippingTimer, } from "../../shared/free-shipping-timer";
 const LABELS = {
     title: {
         ar: 'الشحن علينا!',
@@ -12,22 +13,45 @@ const LABELS = {
         ar: 'لفترة محدودة! تسوّق واستفد من الشحن المجاني',
         en: 'Shop now and save on delivery for a limited time.',
     },
-    limited: {
-        ar: 'عرض لفترة محدودة',
-        en: 'Limited-time offer',
+    ends_in: {
+        ar: 'ينتهي خلال',
+        en: 'Ends in',
     },
 };
-/**
- * Non-dismissible banner announcing the store's free shipping offer.
- * Where it is rendered (`placement`) decides which banner data is requested, and the
- * response decides whether it is shown.
- */
+const pad = (n) => (n < 10 ? '0' : '') + n;
+function formatClock(ms) {
+    const seconds = Math.max(0, Math.floor(ms / 1000));
+    return `${pad(Math.floor(seconds / 3600))}:${pad(Math.floor((seconds % 3600) / 60))}:${pad(seconds % 60)}`;
+}
+function luminance(rgb) {
+    const m = /rgba?\((\d+),\s*(\d+),\s*(\d+)/.exec(rgb || '');
+    if (!m)
+        return null;
+    const f = (c) => {
+        c /= 255;
+        return c <= 0.03928 ? c / 12.92 : Math.pow((c + 0.055) / 1.055, 2.4);
+    };
+    return 0.2126 * f(+m[1]) + 0.7152 * f(+m[2]) + 0.0722 * f(+m[3]);
+}
+const isTransparent = (bg) => !bg || bg === 'transparent' || /rgba\(\d+,\s*\d+,\s*\d+,\s*0\)/.test(bg);
 export class SallaFreeShippingBanner {
     constructor() {
         /** Where the banner is rendered: the home page or the product page. */
         this.placement = 'home';
         this.locale = 'ar';
+        /** Whether free shipping applies here (feature on and the eligibility check passed). */
         this.visible = false;
+        this.timer = null;
+        this.onColorSchemeChange = () => this.measureInkAndPaper();
+    }
+    connectedCallback() {
+        this.colorScheme = window.matchMedia?.('(prefers-color-scheme: dark)');
+        this.colorScheme?.addEventListener?.('change', this.onColorSchemeChange);
+    }
+    disconnectedCallback() {
+        this.unsubscribe?.();
+        this.stopTick();
+        this.colorScheme?.removeEventListener?.('change', this.onColorSchemeChange);
     }
     async componentWillLoad() {
         try {
@@ -43,21 +67,78 @@ export class SallaFreeShippingBanner {
             // home: is the store offering free shipping; product page: is this product eligible
             const productId = this.placement === 'product' ? salla.config.get('page.id') : undefined;
             this.visible = await isEligibleForFreeShipping(productId);
+            if (this.visible) {
+                // The visitor sees the banner now: remember when, the first time only.
+                startTimerIfNeeded();
+                // Only a banner that can show, and has a timer, follows it (to hide at the end and come back after).
+                if (isTimerEnabled()) {
+                    this.unsubscribe = subscribeToFreeShippingTimer(() => this.refreshTimer());
+                }
+            }
+            this.refreshTimer();
         }
         catch (e) {
             salla?.logger?.warn?.('salla-free-shipping-banner: init failed', e);
         }
     }
+    refreshTimer() {
+        this.timer = getFreeShippingTimerState();
+        if (this.visible && this.timer?.visible) {
+            this.tick = this.tick ?? setInterval(() => this.refreshTimer(), 1000);
+        }
+        else {
+            this.stopTick();
+        }
+    }
+    stopTick() {
+        clearInterval(this.tick);
+        this.tick = undefined;
+    }
+    /**
+     * The timer chip is drawn from the theme's own colours: solid in the text colour ("ink")
+     * with the nearest opaque background behind the banner ("paper") as its text colour.
+     */
+    measureInkAndPaper() {
+        const bar = this.host?.querySelector('.s-free-shipping-banner');
+        if (!bar)
+            return;
+        this.measuredBar = bar;
+        const ink = getComputedStyle(bar.parentElement || bar).color;
+        let paper = null;
+        for (let node = bar.parentElement; node; node = node.parentElement) {
+            const bg = getComputedStyle(node).backgroundColor;
+            if (!isTransparent(bg)) {
+                paper = bg;
+                break;
+            }
+        }
+        if (!paper) {
+            const l = luminance(ink);
+            paper = l != null && l > 0.5 ? '#111418' : '#ffffff';
+        }
+        bar.style.setProperty('--s-fsb-ink', ink);
+        bar.style.setProperty('--s-fsb-paper', paper);
+        bar.classList.add('has-paper');
+    }
+    componentDidRender() {
+        // The colours do not change with the countdown: measure once per banner element (it is a new
+        // element each time the banner comes back), and again on a colour scheme change.
+        const bar = this.host?.querySelector('.s-free-shipping-banner');
+        if (bar && bar !== this.measuredBar) {
+            this.measureInkAndPaper();
+        }
+    }
     /** Store translation wins, the built-in label is the fallback for the current language. */
     label(name) {
         const label = LABELS?.[name]?.[this.locale];
         return salla.lang.getWithDefault?.(`blocks.free_shipping_banner.${name}`, label) || label;
     }
     render() {
-        if (!this.visible) {
+        const timer = this.timer;
+        if (!this.visible || !timer?.visible) {
             return null;
         }
-        return (h(Host, null, h("div", { class: "container" }, h("section", { class: "s-free-shipping-banner", "aria-label": this.label('title') }, h("div", { class: "s-free-shipping-banner__inner" }, h("svg", { class: "s-free-shipping-banner__icon", viewBox: "0 0 48 32", "aria-hidden": "true" }, h("g", { class: "s-fsb-speed" }, h("path", { class: "s-fsb-line", d: "M3 11h7" }), h("path", { class: "s-fsb-line", d: "M1 16h5" }), h("path", { class: "s-fsb-line", d: "M4 21h6" })), h("g", { class: "s-fsb-body" }, h("rect", { class: "s-fsb-fill", x: "12", y: "5", width: "21", height: "16", rx: "2.5" }), h("path", { class: "s-fsb-fill", d: "M33 10h6.5a2 2 0 0 1 1.6.8l4.1 5.5c.5.7.8 1.5.8 2.4V21H33z" }), h("rect", { class: "s-fsb-fill", x: "12", y: "20", width: "34", height: "3.5", rx: "1.2" }), h("rect", { class: "s-fsb-window", x: "35", y: "12", width: "5.5", height: "4", rx: "1" })), h("circle", { class: "s-fsb-wheel", cx: "19.5", cy: "25.5", r: "3" }), h("circle", { class: "s-fsb-wheel", cx: "38", cy: "25.5", r: "3" })), h("p", { class: "s-free-shipping-banner__text" }, h("strong", null, this.label('title')), h("span", { class: "s-free-shipping-banner__desc" }, this.label('description'))), h("span", { class: "s-free-shipping-banner__chip" }, h("svg", { viewBox: "0 0 24 24", "aria-hidden": "true" }, h("circle", { cx: "12", cy: "13.5", r: "7" }), h("path", { d: "M10 2.5h4M12 2.5v4M12 13.5V9.5M18 7.5l1.5-1.5" })), h("span", null, this.label('limited'))))))));
+        return (h(Host, null, h("div", { class: "container" }, h("section", { class: "s-free-shipping-banner", "aria-label": this.label('title') }, h("div", { class: "s-free-shipping-banner__inner" }, h("svg", { class: "s-free-shipping-banner__icon", viewBox: "0 0 48 32", "aria-hidden": "true" }, h("g", { class: "s-fsb-speed" }, h("path", { class: "s-fsb-line", d: "M3 11h7" }), h("path", { class: "s-fsb-line", d: "M1 16h5" }), h("path", { class: "s-fsb-line", d: "M4 21h6" })), h("g", { class: "s-fsb-body" }, h("rect", { class: "s-fsb-fill", x: "12", y: "5", width: "21", height: "16", rx: "2.5" }), h("path", { class: "s-fsb-fill", d: "M33 10h6.5a2 2 0 0 1 1.6.8l4.1 5.5c.5.7.8 1.5.8 2.4V21H33z" }), h("rect", { class: "s-fsb-fill", x: "12", y: "20", width: "34", height: "3.5", rx: "1.2" }), h("rect", { class: "s-fsb-window", x: "35", y: "12", width: "5.5", height: "4", rx: "1" })), h("circle", { class: "s-fsb-wheel", cx: "19.5", cy: "25.5", r: "3" }), h("circle", { class: "s-fsb-wheel", cx: "38", cy: "25.5", r: "3" })), h("p", { class: "s-free-shipping-banner__text" }, h("strong", null, this.label('title')), h("span", { class: "s-free-shipping-banner__desc" }, this.label('description'))), h("span", { class: "s-free-shipping-banner__timer" }, h("svg", { viewBox: "0 0 24 24", "aria-hidden": "true" }, h("circle", { cx: "12", cy: "12", r: "8" }), h("path", { d: "M12 8v4l3 2" })), h("span", { class: "s-free-shipping-banner__label" }, this.label('ends_in')), h("span", { class: "s-free-shipping-banner__clock", role: "timer" }, formatClock(timer.remainingMs))))))));
     }
     static get is() { return "salla-free-shipping-banner"; }
     static get originalStyleUrls() {
@@ -103,7 +184,9 @@ export class SallaFreeShippingBanner {
     static get states() {
         return {
             "locale": {},
-            "visible": {}
+            "visible": {},
+            "timer": {}
         };
     }
+    static get elementRef() { return "host"; }
 }

package/dist/collection/components/salla-free-shipping-tag/salla-free-shipping-tag.css

@@ -25,3 +25,9 @@
   stroke-linecap: round;
   stroke-linejoin: round;
 }
+.visible {
+  visibility: visible;
+}
+.hidden {
+  display: none;
+}

package/dist/collection/components/salla-free-shipping-tag/salla-free-shipping-tag.js

@@ -3,9 +3,11 @@
  */
 import { Host, h } from "@stencil/core";
 import { isEligibleForFreeShipping } from "../../shared/free-shipping";
+import { getFreeShippingTimerState, isTimerEnabled, subscribeToFreeShippingTimer } from "../../shared/free-shipping-timer";
 /**
  * Small "free shipping" tag for a product. Meant to be placed below the price in any
- * product card.
+ * product card. It follows the free shipping banner: while the banner's countdown is over and the
+ * banner is hidden, the tag is hidden too.
  */
 export class SallaFreeShippingTag {
     constructor() {
@@ -14,13 +16,26 @@ export class SallaFreeShippingTag {
         /** With `fromProductCard`, whether the tag is shown. */
         this.showFreeShipping = false;
         this.isFree = false;
+        this.timerHidden = false;
         this.label = '';
     }
+    disconnectedCallback() {
+        this.unsubscribe?.();
+    }
+    // The banner records when the visitor first saw it. Until then, or with the feature off, nothing hides the tag.
+    refreshTimer() {
+        this.timerHidden = getFreeShippingTimerState()?.visible === false;
+    }
     async componentWillLoad() {
         try {
             await salla.onReady();
             await salla.lang.onLoaded();
             const fallback = salla.lang.getLocale?.() === 'en' ? 'Free shipping' : 'شحن مجاني';
+            // Only follow the timer when there is one (feature on and timer settings present).
+            if (isTimerEnabled()) {
+                this.unsubscribe = subscribeToFreeShippingTimer(() => this.refreshTimer());
+            }
+            this.refreshTimer();
             this.label =
                 salla.lang.getWithDefault?.('pages.products.free_shipping', fallback) || fallback;
             if (this.fromProductCard) {
@@ -35,7 +50,7 @@ export class SallaFreeShippingTag {
         }
     }
     render() {
-        if (!this.isFree) {
+        if (!this.isFree || this.timerHidden) {
             return null;
         }
         return (h(Host, null, h("div", { class: "s-free-shipping-tag" }, h("svg", { viewBox: "0 0 24 24", "aria-hidden": "true" }, h("path", { d: "M3 6.5h11v9H3zM14 9.5h3.6l2.9 3.2v2.8H14" }), h("circle", { cx: "7.5", cy: "17", r: "1.8" }), h("circle", { cx: "17", cy: "17", r: "1.8" })), h("span", { class: "s-free-shipping-tag-label" }, this.label))));
@@ -117,6 +132,7 @@ export class SallaFreeShippingTag {
     static get states() {
         return {
             "isFree": {},
+            "timerHidden": {},
             "label": {}
         };
     }

package/dist/collection/components/salla-gifting/salla-gifting.css

@@ -403,6 +403,9 @@
 .pointer-events-auto {
   pointer-events: auto;
 }
+.visible {
+  visibility: visible;
+}
 .static {
   position: static;
 }
@@ -930,9 +933,21 @@
   opacity: 1;
 }
 .s-gifting-textarea.shown {
-  height: 122px;
+  height: 142px;
   opacity: 1;
 }
+.s-gifting-textarea-counter {
+  margin-top: 0.25rem;
+  text-align: end;
+  font-size: 0.75rem;
+  line-height: 1rem;
+  --tw-text-opacity: 1;
+  color: rgb(107 114 128 / var(--tw-text-opacity, 1));
+}
+.s-gifting-textarea-counter.limit {
+  --tw-text-opacity: 1;
+  color: rgb(239 68 68 / var(--tw-text-opacity, 1));
+}
 .s-gifting-calendar.hide {
   pointer-events: none;
   visibility: hidden;

package/dist/collection/components/salla-gifting/salla-gifting.js

@@ -460,7 +460,9 @@ export class SallaGifting {
         this.showGiftText = customID;
         if (dataID) {
             this.selectedGiftTextOption = dataID;
-            customID ? this.selectedText = undefined : this.selectedText = event.target.value;
+            // Returning to the custom option keeps whatever is still typed in the box,
+            // so the counter and the submitted payload match the visible text.
+            customID ? this.selectedText = this.textArea?.value || undefined : this.selectedText = event.target.value;
         }
         else {
             // empty textarea value
@@ -851,7 +853,7 @@ export class SallaGifting {
     }
     render() {
         return [
-            h("div", { key: '1211d713eaad2cddb4c36111ea67c867eecb3f41' }, h("salla-list-tile", { key: 'b994a3b555a568a0abf8f09acc0af68188363326', class: this.generateClass() }, h("div", { key: '579ee8a105b7fe2f9b9182f49deae77313e61ce5', slot: "title" }, this.vertical ? h("span", { innerHTML: GiftSharing }) : '', h("h3", { key: 'e0d1d5d731e9533398b5234aaff8d38bdd4fb63c' }, !!this.widgetTitle ? this.widgetTitle : this.sectionTitle)), h("div", { key: '358100f7148b29ffda793e81b4b5dd9bfc154025', slot: "subtitle" }, h("div", { key: '605920e1f9236fd09e51623ac1dd645c41929252' }, !!this.widgetSubtitle ? this.widgetSubtitle : this.sectionSubtitle)), h("div", { key: '5bd6e1c009e7a75cd920bdc0ac7f221b2b4ec30e', slot: "action" }, h("salla-button", { key: 'bf9900e5f76ac0492a64fac4a3bfbfadaf055135', color: "primary", fill: "outline", width: "wide", class: "s-gifting-widget-action", onClick: () => this.handleGiftButtonClick() }, h("slot", { key: 'b1f86fe483fea048c07284549dde0e6a0b6ffb48', name: "widget-btn-content" }, h("div", { key: 'acd7d213f553cc0154326dfb3641c8379171c732', class: "s-gifting-widget-action-content" }, h("span", { key: 'd6fbeaf056e8bccf48036f0e0ade47791a009025', innerHTML: GiftSharing }), " \u00A0", h("span", { key: '3647dd0a2797036060ec6d07bc1833caf74ae9df' }, this.sectionBtnText)))))), h("salla-modal", { key: 'bafbb84d6779189eee79d2c7c0ded404a85f09ac', id: this.hostId, isLoading: true, class: "s-gifting-modal", width: "sm", ref: modal => this.modal = modal }, h("div", { key: 'b9dedbfe55475ce2a4add90c2bc2733c719f0e7b', slot: "loading" }, h("div", { key: '1e36230096fb71e8859650de12f199719ad3adc8', class: "s-gifting-skeleton" }, h("div", { key: '17bee6df4d5d9758e952301e5a6bc3ef4d49b303', class: "s-gifting-modal-header" }, h("salla-skeleton", { key: 'b4665fa2bcd5c6bcd4f8bdb1930b69a63cce9e92', type: 'circle', height: '5rem', width: '5rem' }), h("h2", { key: '6a0feb57e5883e998d43eb924f0b84d81741436d', class: "s-gifting-modal-title" }, h("div", { key: 'b04fa98fc15c72f92f05d691456166670a0595ac', class: "s-gifting-modal-badge-wrapper" }, h("salla-skeleton", { key: '9c01e90f6877f498d9f89e584bcffb6802c81eab', height: '15px', width: '150px' })))), h("div", { key: '37a2bb5685b861f57ac6fd01d761cc13f10c1577', class: "s-gifting-skeleton-content" }, h("salla-skeleton", { key: '567484e0efed52dbb336ac4b14d1ff5971a331d4', height: '10px', width: '150px' }), h("salla-skeleton", { key: 'f5dbad3a9e32a1ee72259d9a459585836f1f6c98', height: '230px' }), h("salla-skeleton", { key: 'fc042b78c2ce49fcbe6a86f14b025504018c4236', height: '10px', width: '150px' }), h("salla-skeleton", { key: 'e7c707cb720e1e98cca9aa9d9de8e80b2a4b9b15', height: '30px' }), h("salla-skeleton", { key: '5b333361fc20890d1584135111dc2fdbb68c411f', height: '40px' })))), h("slot", { key: '27025859ab5e5b1f1e59c0c48a54edebd8e20da4', name: "header" }), !!this.hasError ?
+            h("div", { key: '3c86d3d5d9e610d9e6b802dce4355289c90329b0' }, h("salla-list-tile", { key: '5476098174aa8cb222c3240c8b07b3cbe757484e', class: this.generateClass() }, h("div", { key: '3759c2830dd8353c9a2294e936ae7b69d823ee36', slot: "title" }, this.vertical ? h("span", { innerHTML: GiftSharing }) : '', h("h3", { key: '603c25804e96cc80bbe2b8c802ae764947466ad2' }, !!this.widgetTitle ? this.widgetTitle : this.sectionTitle)), h("div", { key: '605f42d920a49ca2e761b99d6539cd404e89f498', slot: "subtitle" }, h("div", { key: 'd06dd23bf140007156dc2653653c809fd5c11feb' }, !!this.widgetSubtitle ? this.widgetSubtitle : this.sectionSubtitle)), h("div", { key: 'a344e34b453f1ff0289fc57ad08935434d774b4f', slot: "action" }, h("salla-button", { key: '2e6af7eabf350b60513edb9252fd110f0eccb4b7', color: "primary", fill: "outline", width: "wide", class: "s-gifting-widget-action", onClick: () => this.handleGiftButtonClick() }, h("slot", { key: '8bf491757bca99df94abbe2e6dacf54e15155e05', name: "widget-btn-content" }, h("div", { key: '9d45121e40c1f49936f9b2b6eb57a5605eca0e45', class: "s-gifting-widget-action-content" }, h("span", { key: '1a7524843066252c6148f1d57c6c08a255b2d70d', innerHTML: GiftSharing }), " \u00A0", h("span", { key: '5b82d168b21ee5651f28a80776303137af6cf81d' }, this.sectionBtnText)))))), h("salla-modal", { key: '7901154aa0aa9925ca79df482566b69e2c30ad0a', id: this.hostId, isLoading: true, class: "s-gifting-modal", width: "sm", ref: modal => this.modal = modal }, h("div", { key: '4de9f1e21e6bae9eac1a58a419809befeef4aa9b', slot: "loading" }, h("div", { key: '483d223daa491ebb09bcf6a814ef1f8de7ca2ada', class: "s-gifting-skeleton" }, h("div", { key: '495b5fc2978480dcc52abbba0d3da92b503901b4', class: "s-gifting-modal-header" }, h("salla-skeleton", { key: '993e9d6d0a9f7df11746b925296308576ea22cd2', type: 'circle', height: '5rem', width: '5rem' }), h("h2", { key: '08d6a35d3084a32c71437e4a00e789b154645f87', class: "s-gifting-modal-title" }, h("div", { key: '02a659c96a2039e4c7b28857348d2d5c246d4a40', class: "s-gifting-modal-badge-wrapper" }, h("salla-skeleton", { key: '3e1fb71d0cf7ed41f8dccd7dda035ed6c3463cbc', height: '15px', width: '150px' })))), h("div", { key: 'dd6a845ceff281683981b5685663b24c586abeb1', class: "s-gifting-skeleton-content" }, h("salla-skeleton", { key: 'f46a265bdb7e84e35ee7f78d8b039a29549ef235', height: '10px', width: '150px' }), h("salla-skeleton", { key: '6522ab7db38190320322d9cb7487d0873a03585a', height: '230px' }), h("salla-skeleton", { key: 'a17ae0ee2c71fa81ff346be989eb1db14d21c989', height: '10px', width: '150px' }), h("salla-skeleton", { key: '4f80b722d3b24ed9ee11e88b63e5f831b4eae377', height: '30px' }), h("salla-skeleton", { key: 'e4a9d769197cc6f58f96ce92affdf9dd2b38b8a6', height: '40px' })))), h("slot", { key: '7d76198a32dffd257d97873b0971ea8fa5aa8a0f', name: "header" }), !!this.hasError ?
                 h("salla-placeholder", { alignment: "center" }, h("span", { slot: "title" }, this.errorMessage || salla.lang.get('common.errors.empty_results')), h("span", { slot: "description" }, " "))
                 :
                     [
@@ -863,7 +865,10 @@ export class SallaGifting {
                                     this.gift?.gift_images.map((item) => h("a", { class: "s-gifting-clickable s-gifting-image", onClick: () => this.setPreview(item) }, h("img", { src: item.url, alt: `${item.id}` }))) : ''))
                                 : "")), this.gift && this.gift.show_texts ?
                             h("div", { class: "anime-item" }, h("div", { class: "s-gifting-modal-uploader-title s-gifting-text-title" }, this.giftText), h("div", { class: "s-form-group s-gifting-selectText", ref: el => this.textSelect = el }, h("select", { id: "gift-text-selection", name: "gift-text-selection", class: "s-form-control s-gifting-select", onChange: e => this.toggleGiftText(e) }, h("option", { "data-id": null, selected: !this.selectedGiftTextOption }, this.selectGiftMessage), this.gift && this.gift.gift_texts ?
-                                this.gift?.gift_texts.map((txt) => h("option", { "data-id": txt.id, value: txt.text, key: txt.id, selected: String(this.selectedGiftTextOption) === String(txt.id) }, txt.text)) : '', this.gift && this.gift.show_custom_text ? h("option", { "data-id": "custom", selected: this.selectedGiftTextOption === 'custom' }, this.giftCustomText) : null)), h("div", { class: this.showGiftText && this.gift && this.gift.show_custom_text ? "s-form-group s-gifting-textarea shown" : "s-form-group s-gifting-textarea hide", ref: (el) => this.customTextArea = el }, h("label", { htmlFor: "gift-custom-text", class: "s-form-label" }, this.giftCustomText), h("div", { class: "mt-1" }, h("textarea", { onInput: (event) => this.handleTextAreaChange(event), rows: 4, ref: (el) => this.textArea = el, name: "gift-custom-text", id: "gift-custom-text", class: "s-form-control" })))) : null, h("div", { class: "anime-item" }, h("salla-button", { color: "primary", width: "wide", onClick: () => this.goToStep2(!!this.gift?.show_texts) }, h("span", null, this.nextStep)))), h("div", { class: "s-gifting-step-two gift-step-2", style: this.skipStep1() ? { opacity: '1', transform: 'translateX(0)', position: 'relative' } : undefined, ref: el => this.step2Elems = el }, h("div", { class: this.step2ItemClass(this.errors?.['sender_name'] ? 's-form-group s-form-has-error' : 's-form-group') }, h("label", { htmlFor: "sender_name", class: "s-form-label" }, this.senderNameLabel), h("input", { type: "text", class: "s-form-control", name: "sender_name", id: "sender_name", value: this.senderName, onInput: (event) => this.handleSenderName(event), placeholder: "" }), this.errors && this.errors['sender_name'] ?
+                                this.gift?.gift_texts.map((txt) => h("option", { "data-id": txt.id, value: txt.text, key: txt.id, selected: String(this.selectedGiftTextOption) === String(txt.id) }, txt.text)) : '', this.gift && this.gift.show_custom_text ? h("option", { "data-id": "custom", selected: this.selectedGiftTextOption === 'custom' }, this.giftCustomText) : null)), h("div", { class: this.showGiftText && this.gift && this.gift.show_custom_text ? "s-form-group s-gifting-textarea shown" : "s-form-group s-gifting-textarea hide", ref: (el) => this.customTextArea = el }, h("label", { htmlFor: "gift-custom-text", class: "s-form-label" }, this.giftCustomText), h("div", { class: "mt-1" }, h("textarea", { onInput: (event) => this.handleTextAreaChange(event), rows: 4, maxLength: SallaGifting.CUSTOM_TEXT_MAX_LENGTH, ref: (el) => this.textArea = el, name: "gift-custom-text", id: "gift-custom-text", class: "s-form-control" })), h("p", { class: {
+                                    's-gifting-textarea-counter': true,
+                                    'limit': (this.selectedText?.length || 0) >= SallaGifting.CUSTOM_TEXT_MAX_LENGTH,
+                                } }, SallaGifting.CUSTOM_TEXT_MAX_LENGTH, "/", this.selectedText?.length || 0))) : null, h("div", { class: "anime-item" }, h("salla-button", { color: "primary", width: "wide", onClick: () => this.goToStep2(!!this.gift?.show_texts) }, h("span", null, this.nextStep)))), h("div", { class: "s-gifting-step-two gift-step-2", style: this.skipStep1() ? { opacity: '1', transform: 'translateX(0)', position: 'relative' } : undefined, ref: el => this.step2Elems = el }, h("div", { class: this.step2ItemClass(this.errors?.['sender_name'] ? 's-form-group s-form-has-error' : 's-form-group') }, h("label", { htmlFor: "sender_name", class: "s-form-label" }, this.senderNameLabel), h("input", { type: "text", class: "s-form-control", name: "sender_name", id: "sender_name", value: this.senderName, onInput: (event) => this.handleSenderName(event), placeholder: "" }), this.errors && this.errors['sender_name'] ?
                             h("span", { class: "s-gifting-error" }, this.errors['sender_name']) : ''), h("div", { class: this.step2ItemClass(this.errors?.['receiver.name'] ? 's-form-group s-form-has-error' : 's-form-group') }, h("label", { htmlFor: "receiver_name", class: "s-form-label" }, this.receiverNameFieldLabel), h("input", { type: "text", class: "s-form-control", name: "receiver_name", id: "receiver_name", value: "", onInput: (event) => this.handleReceiverName(event), placeholder: "" }), this.errors && this.errors['receiver.name'] ?
                             h("span", { class: "s-gifting-error" }, this.errors['receiver.name']) : ''), h("div", { class: this.step2ItemClass(this.errors?.['receiver.mobile'] ? 's-form-group s-form-has-error' : 's-form-group') }, h("label", { class: "s-form-label" }, this.receiverMobileFieldLabel), h("salla-tel-input", { class: "s-gifting-tel-input", phone: this.receiverMobile, countryCode: this.receiverCountryCode, onPhoneEntered: (e) => this.handlePhoneInputChange(e) }), this.errors && this.errors['receiver.mobile'] ?
                             h("span", { class: "s-gifting-error" }, this.errors['receiver.mobile']) : ''), this.isPhysical() &&
@@ -874,7 +879,7 @@ export class SallaGifting {
                             h("div", { class: this.step2ItemClass(this.errors?.['receiver.city_id'] ? 's-form-group s-form-has-error' : 's-form-group') }, h("label", { class: "s-form-label", htmlFor: `${this.hostId}-city` }, this.receiverCityFieldLabel), h("salla-searchable-dropdown", { placeholder: this.selectCity, items: this.displayedCities, selectedItem: this.selectedCity, loading: this.loadingCities, searching: this.searchingCities, disabled: this.loadingCities || (this.isKSA && !this.selectedRegionId), required: true, inputId: `${this.hostId}-city`, searchQuery: this.citySearchQuery, clientSearch: !this.enableCityAjaxSearch, dropUp: true, keepParentScroll: true, onItemSelected: (e) => this.handleCitySelected(e.detail), onSearchInput: (e) => this.handleCitySearch(e.detail), onDropdownClosed: () => this.handleCityDropdownClosed() }), this.errors && this.errors['receiver.city_id'] ?
                                 h("span", { class: "s-gifting-error" }, this.errors['receiver.city_id']) : ''), this.isPhysical() && this.cityNoticeText() &&
                             h("div", { class: this.step2ItemClass('s-gifting-info') }, h("span", { innerHTML: Alert }), h("span", null, this.cityNoticeText())), !this.isPhysical() && h("div", { class: this.step2ItemClass() }, h("label", { class: "s-gifting-schedule s-gifting-clickable", htmlFor: `schedule-${this.hostId}` }, h("input", { type: "checkbox", name: 'schedule', id: `schedule-${this.hostId}`, onChange: () => this.toggleCalendar(), class: "s-checkbox" }), h("span", { class: "s-form-label" }, " ", this.sendLater, " "))), h("div", { class: this.getCalendarClasses(), ref: (el) => this.calendarFormGroup = el }, h("label", { class: "s-form-label" }, this.selectSendDateAndTime), h("salla-datetime-picker", { value: this.deliveryDate, placeholder: this.selectSendDateAndTime, "enable-time": true, "date-format": "Y-m-d h:i K", onPicked: (event) => this.handleDateTimePicker(event) }), h("span", { class: "s-gifting-calendar-hint" }, this.canNotEditOrderAfterSelectDate)), h("div", { class: this.step2ItemClass('s-gifting-step-two-footer') }, !this.skipStep1() && h("a", { href: "#!", innerHTML: LeftArrow, onClick: (e) => this.goToStep1(e) }), h("salla-button", { onClick: () => this.submitForm(), color: "primary", width: 'wide' }, h("span", null, this.sendGift)))))
-                    ], h("slot", { key: 'f927e423d09dfcdc986fe28cebd0185ec9f54660', name: "footer" })))
+                    ], h("slot", { key: '187d744793464098a2eb9592ec7ad8ec3777918f', name: "footer" })))
         ];
     }
     static get is() { return "salla-gifting"; }
@@ -1166,4 +1171,6 @@ export class SallaGifting {
     }
 }
 SallaGifting.CITY_AJAX_THRESHOLD = 400;
+// Mirrors the API's `text => max:140` rule on AddItemAsGiftRequest.
+SallaGifting.CUSTOM_TEXT_MAX_LENGTH = 140;
 SallaGifting.CITY_SEARCH_DEBOUNCE_MS = 100;

package/dist/collection/components/salla-login-modal/salla-login-modal.js

@@ -343,9 +343,14 @@ export class SallaLoginModal {
         });
     }
     async handleGuestCheckout() {
+        // buy now resumes its own flow; emitted before closing so the dismissal doesn't race it
+        if (this.source === 'buy-now') {
+            Salla.event.emit('salla-login::guest-chosen', { source: this.source });
+            return this.modal.close();
+        }
         this.modal.close();
         if (salla.config.isGuest()) {
-            return salla.cart.submit(false, true);
+            return salla.cart.submit(false, true, true);
         }
     }
     openModal() {

package/dist/collection/components/salla-products-list/salla-products-list.js

@@ -131,7 +131,7 @@ export class SallaProductsList {
      * @param filters
      */
     async setFilters(filters) {
-        if (!filters || JSON.stringify(filters) === JSON.stringify(this.parsedFilters)) {
+        if (this.filtersResults !== true || !filters || JSON.stringify(filters) === JSON.stringify(this.parsedFilters)) {
             return;
         }
         window.scrollTo({ top: 0, behavior: 'smooth' });
@@ -1042,8 +1042,9 @@ export class SallaProductsList {
                 // A theme's catalog default must not replace the relevance order used by the search popup.
                 // A shopper's explicit sort, and subsequent sortBy updates followed by reload(), still apply.
                 this.sortBy = this.isSearchPageList() ? requestedSort || undefined : this.sortBy || requestedSort;
-                this.parsedFilters = Helper.extractFiltersFromUrl(searchParams);
-                if (this.parsedFilters && this.parsedFilters.category_id) {
+                // Page filters belong to the main listing, not independently configured sections.
+                this.parsedFilters = this.filtersResults === true ? Helper.extractFiltersFromUrl(searchParams) : {};
+                if (this.filtersResults === true && this.parsedFilters?.category_id) {
                     this.currentCategoryIdFilter = this.toCategoryIdFilter(this.parsedFilters.category_id);
                 }
             }
@@ -1180,6 +1181,13 @@ export class SallaProductsList {
                                 ?.find(filter => filter.key === 'category_id')
                                 // loose == : catId may be a number (auto-appended page.id) while API keys are strings
                                 ?.values?.find(cat => cat.key == catId)?.value ?? '';
+                        // without the filters feature the response has no `filters`, so the lookup above finds no name and the
+                        // theme would swap the page heading for a bare count; the page itself still names its own list.
+                        // page.title is raw text that themes drop into innerHTML, so it's escaped like the search term
+                        const pageId = salla.config.get('page.id');
+                        if (!title && catId != null && pageId != null && String(catId) === String(pageId)) {
+                            title = Helper.escapeHtml(salla.config.get('page.title'));
+                        }
                     }
                     title +=
                         (title ? ' - ' : '') +

package/dist/collection/components/salla-quick-buy/salla-quick-buy.js

@@ -47,6 +47,9 @@ export class SallaQuickBuy {
         /** Session from the initial gesture; begun later when there are no order options. */
         this.pendingApplePaySession = null;
         this.quickBuy = salla.lang.get('pages.products.buy_now');
+        /** The guest picked "continue as guest" on the login step, so don't ask again. */
+        this.choseGuest = false;
+        this.cancelLoginAsk = null;
         /** Apple Pay onStartedSession: first call defers begin() to run the OO check; second (resolved) begins. */
         this.handleApplePaySessionStarted = (session) => {
             // Previously gated on `order_options.mandatory`, which is unrelated to CP-2836: a store with
@@ -114,6 +117,7 @@ export class SallaQuickBuy {
         salla?.event?.off?.('product-options::donation-changed', this.donationChangedListener);
         salla?.product?.event?.offPriceUpdated?.(this.priceUpdatedListener);
         this.langUnsubscribe?.();
+        this.cancelLoginAsk?.();
     }
     quickBuyHandler() {
         if (salla.config.isGuest() && !this.isGuestCheckout()) {
@@ -121,6 +125,10 @@ export class SallaQuickBuy {
             salla.api.auth.requireLoginThen('salla-quick-buy::user.logged-in', () => this.quickBuyHandler());
             return;
         }
+        if (this.shouldAskLoginFirst()) {
+            this.askLoginFirst();
+            return;
+        }
         // Sync validate — AP needs the gesture preserved for new ApplePaySession().
         if (!this.validatePdpOptionsSync())
             return;
@@ -188,7 +196,10 @@ export class SallaQuickBuy {
         injectFreeProductsIntoPayload(data, this.collectedFreeProducts);
         // if the store doesn't have Apple Pay , just create a cart and then redirect to check out page
         if (!this.isApplePayActive) {
-            return salla.api.request('checkout/mini', data, 'post')
+            // tells checkout the guest already chose guest, so it opens on the guest form —
+            // re-check isGuest(): a login since the choice must not send guest params authenticated
+            const options = this.choseGuest && salla.config.isGuest() ? { params: { guest_checkout: 1, chose_guest: 1 } } : {};
+            return salla.api.request('checkout/mini', data, 'post', options)
                 .catch(err => this.legacyQuickPurchaseFallback(err, data))
                 .then(resp => {
                 // mini-checkout answers {to, url}; legacy quick-purchase answered {redirect}
@@ -313,6 +324,38 @@ export class SallaQuickBuy {
         salla.logger.warn('quick-buy: falling back to quick-purchase because of token_not_provided');
         return salla.api.request('checkout/quick-purchase/' + this.productId, data, 'post');
     }
+    /** login-before-checkout variant: offer login or guest before buy now. Not for Apple Pay, which must open on the tap. */
+    shouldAskLoginFirst() {
+        return salla.config.isGuest()
+            && !this.choseGuest
+            && !this.isApplePayActive
+            && salla.cart.loginBeforeCheckoutGroup?.() === 'variant';
+    }
+    askLoginFirst() {
+        // a second click before the popup settles must replace the pending ask, not stack a listener
+        this.cancelLoginAsk?.();
+        const stop = () => {
+            salla.event.off('salla-login::guest-chosen', onGuest);
+            salla.event.off('salla-login::dismissed', stop);
+            this.cancelLoginAsk = null;
+        };
+        this.cancelLoginAsk = stop;
+        const onGuest = (detail) => {
+            if (detail?.source !== 'buy-now')
+                return;
+            stop();
+            this.choseGuest = true;
+            this.quickBuyHandler();
+        };
+        salla.event.on('salla-login::guest-chosen', onGuest);
+        salla.event.on('salla-login::dismissed', stop);
+        this.requireLogin.emit({ productId: this.productId });
+        salla.api.auth.requireLoginThen('salla-quick-buy::user.logged-in', () => {
+            stop();
+            this.choseGuest = false;
+            this.quickBuyHandler();
+        }, null, 'buy-now');
+    }
     isGuestCheckout() {
         return salla.config.isGuest() && this.isGuestCheckoutAllowed() && this.isPhysicalProduct();
     }