@salla.sa/twilight-components 2.14.587 → 2.14.588

package/dist/cjs/salla-wallet.cjs.entry.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var index = require('./index-DN51eLtp.js');
+var index = require('./index-C3RW52t1.js');
 
 const sallaWalletCss = "/*!twlt*/@charset \"UTF-8\";.s-wallet-table{min-width:100%}.s-wallet-table-balance-container{display:flex !important;align-items:center !important;justify-content:flex-start !important;gap:1rem}.s-wallet-table-balance-icon{border-radius:50%;width:52px;height:52px;font-size:25px;padding:16px 13px;background:var(--color-primary-reverse);color:var(--color-primary)}.s-wallet-table-empty-state{display:flex;flex-direction:column;align-items:center}.s-wallet-table-empty-state i{font-size:80px;margin:4rem 0 2rem;color:var(--infinte-color)}.s-wallet-table-transaction-status{padding:6px 19px !important;border-radius:20px;width:max-content;display:flex;align-items:center}.s-wallet-table-transaction-status-default{background:#fff6eb;color:#a46f29}.s-wallet-table-transaction-status-cashback{background:#effbf6;color:#00af6c}.s-wallet-table-transaction-status-refund{background:#ecf3fe;color:#5196f3}.s-wallet-table-transaction-status-purchase{background:#feecec;color:#f55157}.s-wallet-table-transaction-status-icons-success{color:#00af6c}.s-wallet-summary{display:flex;align-items:stretch;gap:16px;margin-bottom:28px}.s-wallet-balance-card{flex:0 0 34%;max-width:240px;background:#fff;border-radius:12px;padding:20px;box-sizing:border-box}.s-wallet-balance-mark{width:48px;height:48px;border-radius:9999px;background:var(--color-primary-reverse, #eaf7f0);color:var(--color-primary, #2e8b57);display:inline-flex;align-items:center;justify-content:center;font-size:22px;margin-bottom:12px}.s-wallet-balance-figure{font-size:18px;font-weight:700;color:#1c1c1c}.s-wallet-balance-label{margin-top:2px;font-size:12px;color:#9aa0a6}.s-wallet-amount{display:inline-flex;align-items:center;gap:4px;font-weight:700;white-space:nowrap}.s-wallet-amount-credit{color:#00af6c}.s-wallet-amount-debit{color:#f55157}.s-wallet-transaction-type{display:flex;align-items:center;color:#4b5563}@media screen and (min-width: 768px){.s-wallet-balance-card{display:flex;flex-direction:column;justify-content:center}}@media screen and (max-width: 767px){.s-wallet-summary{gap:12px;margin-bottom:20px}.s-wallet-balance-card{flex:0 0 38%;padding:16px;text-align:center}.s-wallet-balance-mark{margin-bottom:8px}}.absolute{position:absolute}.relative{position:relative}.flex{display:flex}.table{display:table}.hidden{display:none}.items-center{align-items:center}.p-3{padding:0.75rem}.text-center{text-align:center}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:0.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.font-bold{font-weight:700}.font-normal{font-weight:400}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175 / var(--tw-text-opacity, 1))}.s-wallet-container>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-top:calc(0.625rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(0.625rem * var(--tw-space-y-reverse))}@media (min-width: 768px){.s-wallet-container>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-top:calc(1.25rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.25rem * var(--tw-space-y-reverse))}}.s-wallet-mobile-title{display:inline-block;width:8rem;font-weight:400;--tw-text-opacity:1;color:rgb(156 163 175 / var(--tw-text-opacity, 1))}@media (min-width: 768px){.s-wallet-mobile-title{display:none}}.s-wallet-reference-id{display:none}@media (min-width: 768px){.s-wallet-reference-id{display:inline-block}}.s-wallet-buy-as-gift-icon{margin-left:0.25rem;margin-right:0.25rem;display:inline-block;color:var(--color-primary)}.s-wallet-copy-to-clipboard-button{display:flex;align-items:center}@media (min-width: 768px){.s-wallet-copy-to-clipboard-button{display:none}}.s-wallet-copy-to-clipboard-button salla-button{position:relative}.s-wallet-copy-to-clipboard-button-icon{pointer-events:none;font-size:0.75rem;line-height:1rem}.s-wallet-copy-to-clipboard-button-icon:where([dir=\"ltr\"],[dir=\"ltr\"] *){margin-left:0.25rem}.s-wallet-copy-to-clipboard-button-icon:where([dir=\"rtl\"],[dir=\"rtl\"] *){margin-right:0.25rem}@media (min-width: 768px){.s-wallet-status-container{margin-left:0px;margin-right:0px}}.s-wallet-status-container:where([dir=\"ltr\"],[dir=\"ltr\"] *){margin-left:auto}.s-wallet-status-container:where([dir=\"rtl\"],[dir=\"rtl\"] *){margin-right:auto}.s-wallet-status-container i{margin-top:0.25rem}.s-wallet-status-container i:where([dir=\"ltr\"],[dir=\"ltr\"] *){margin-right:0.25rem}.s-wallet-status-container i:where([dir=\"rtl\"],[dir=\"rtl\"] *){margin-left:0.25rem}.s-wallet-rated-text{--tw-text-opacity:1;color:rgb(251 191 36 / var(--tw-text-opacity, 1))}.s-wallet-unrated-text{--tw-text-opacity:1;color:rgb(229 231 235 / var(--tw-text-opacity, 1))}.s-wallet-no-content{display:flex;height:100%;flex-direction:column;align-items:center;justify-content:center;padding-top:2.5rem;padding-bottom:5rem;--tw-text-opacity:1;color:rgb(156 163 175 / var(--tw-text-opacity, 1))}.s-wallet-no-content .icon{margin-bottom:1rem;display:flex;height:8rem;width:8rem;align-items:center;justify-content:center;border-radius:9999px;--tw-bg-opacity:1;background-color:rgb(243 244 246 / var(--tw-bg-opacity, 1));font-size:3rem;line-height:1;--tw-text-opacity:1;color:rgb(209 213 219 / var(--tw-text-opacity, 1))}.s-wallet-no-content p{margin-bottom:1rem;font-size:1rem;line-height:1.5rem;--tw-text-opacity:1;color:rgb(107 114 128 / var(--tw-text-opacity, 1))}.s-wallet-table{min-width:100%;border-collapse:separate}@media (min-width: 768px){.s-wallet-table{margin-bottom:-0.75rem;--tw-border-spacing-y:1.25rem;border-spacing:var(--tw-border-spacing-x) var(--tw-border-spacing-y)}}.s-wallet-table-head{margin-bottom:1.25rem;display:none;--tw-bg-opacity:1;background-color:rgb(249 250 251 / var(--tw-bg-opacity, 1))}@media (min-width: 768px){.s-wallet-table-head{display:table-header-group}}.s-wallet-table-head-tr-th{padding-left:1.5rem;padding-right:1.5rem;text-align:start;font-size:0.875rem;line-height:1.25rem;font-weight:500;text-transform:uppercase;letter-spacing:0.05em}.s-wallet-table-head-tr-th:where([dir=\"ltr\"],[dir=\"ltr\"] *){text-align:left}.s-wallet-table-head-tr-th:last-child:where([dir=\"ltr\"],[dir=\"ltr\"] *){text-align:right}.s-wallet-table-head-tr-th:where([dir=\"rtl\"],[dir=\"rtl\"] *){text-align:right}.s-wallet-table-head-tr-th:last-child:where([dir=\"rtl\"],[dir=\"rtl\"] *){text-align:left}.s-wallet-table-tbody-tr{position:relative;display:flex;flex-direction:row;flex-wrap:wrap;overflow:hidden;border-radius:var(--s-radius, 0.25rem);border-bottom-width:8px;border-top-width:8px;--tw-border-opacity:1;border-color:rgb(249 250 251 / var(--tw-border-opacity, 1));--tw-bg-opacity:1;background-color:rgb(255 255 255 / var(--tw-bg-opacity, 1));padding:0.5rem;transition-property:box-shadow;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:500ms}@media (min-width: 768px){.s-wallet-table-tbody-tr{display:table-row;flex-direction:row;flex-wrap:nowrap;padding:0px}}.s-wallet-table-tbody-tr-td{width:100%;white-space:nowrap;font-size:0.875rem;line-height:1.25rem}.s-wallet-table-tbody-tr-td:first-child{font-weight:700}@media (min-width: 768px){.s-wallet-table-tbody-tr-td{height:5rem;width:auto}.s-wallet-table-tbody-tr-td:last-child{text-align:end}.s-wallet-table-tbody-tr-td:first-child:where([dir=\"ltr\"],[dir=\"ltr\"] *){border-top-left-radius:0.375rem;border-bottom-left-radius:0.375rem}.s-wallet-table-tbody-tr-td:first-child:where([dir=\"rtl\"],[dir=\"rtl\"] *){border-top-right-radius:0.375rem;border-bottom-right-radius:0.375rem}}.s-wallet-table-tbody-tr-td:first-child{font-weight:700}.s-wallet-table-tbody-tr-td-content{position:relative;display:flex;align-items:center;justify-content:space-between;padding-left:0.5rem;padding-right:0.5rem;padding-top:0.25rem;padding-bottom:0.25rem;font-size:0.75rem;line-height:1rem}@media (min-width: 768px){.s-wallet-table-tbody-tr-td-content{padding-left:1.5rem;padding-right:1.5rem;padding-top:1.5rem;padding-bottom:1.5rem}}.s-wallet-table-tbody-tr-td-content:where([dir=\"ltr\"],[dir=\"ltr\"] *){padding-right:0.5rem}.s-wallet-table-tbody-tr-td-content:where([dir=\"rtl\"],[dir=\"rtl\"] *){padding-left:0.5rem}.s-wallet-table-tbody-tr a{position:absolute;top:0px;bottom:0px;display:block;width:100%}.s-wallet-table-tbody-tr a:where([dir=\"ltr\"],[dir=\"ltr\"] *){left:0px}.s-wallet-table-tbody-tr a:where([dir=\"rtl\"],[dir=\"rtl\"] *){right:0px}@media (min-width: 768px){.md\\:mx-0{margin-left:0px;margin-right:0px}.md\\:inline-block{display:inline-block}.md\\:hidden{display:none}}.ltr\\:ml-auto:where([dir=\"ltr\"],[dir=\"ltr\"] *){margin-left:auto}.ltr\\:mr-4:where([dir=\"ltr\"],[dir=\"ltr\"] *){margin-right:1rem}.rtl\\:ml-4:where([dir=\"rtl\"],[dir=\"rtl\"] *){margin-left:1rem}.rtl\\:mr-auto:where([dir=\"rtl\"],[dir=\"rtl\"] *){margin-right:auto}";
 

package/dist/cjs/salla-wishlist-actions.cjs.entry.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var index = require('./index-DN51eLtp.js');
+var index = require('./index-C3RW52t1.js');
 
 const sallaWishlistActionsCss = "/*!twlt*/:host{display:block}.s-wishlist-actions-menu{min-width:200px;inset-inline-end:0;inset-inline-start:auto;list-style:none;margin:0;padding:4px 0;box-shadow:0 4px 16px rgba(0, 0, 0, 0.12)}.s-wishlist-actions-menu-item{display:block;width:100%;padding:10px 16px;text-align:start;font-size:0.875rem;color:#374151;background:transparent;cursor:pointer;white-space:nowrap}.s-wishlist-actions-menu-item:hover{background-color:#f3f4f6;color:var(--color-primary)}.s-wishlist-actions-panel{box-shadow:0 1px 3px rgba(0, 0, 0, 0.08)}.s-wishlist-actions-panel-select-all{user-select:none}.s-wishlist-actions-select-all:indeterminate,.s-wishlist-actions-select-all:indeterminate:hover,.s-wishlist-actions-select-all:indeterminate:focus{background-color:var(--color-primary);border-color:var(--color-primary)}.s-wishlist-actions-select-all:indeterminate::after{content:\"\";position:absolute;top:50%;left:50%;width:10px;height:2px;background:#fff;border:none;transform:translate(-50%, -50%)}.s-wishlist-actions-social-anchor{display:none}h1.s-wishlist-actions-page-title{text-align:start !important}.static{position:static}.absolute{position:absolute}.relative{position:relative}.z-20{z-index:20}.mb-3{margin-bottom:0.75rem}.mt-1{margin-top:0.25rem}.mt-3{margin-top:0.75rem}.flex{display:flex}.cursor-pointer{cursor:pointer}.flex-row{flex-direction:row}.flex-wrap{flex-wrap:wrap}.items-center{align-items:center}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-2{gap:0.5rem}.gap-3{gap:0.75rem}.gap-4{gap:1rem}.overflow-hidden{overflow:hidden}.rounded-lg{border-radius:0.5rem}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255 / var(--tw-bg-opacity, 1))}.p-4{padding:1rem}.text-sm{font-size:0.875rem;line-height:1.25rem}.font-bold{font-weight:700}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81 / var(--tw-text-opacity, 1))}.shadow{--tw-shadow:0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)}.outline{outline-style:solid}";
 

package/dist/cjs/salla-wishlist-summary.cjs.entry.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var index = require('./index-DN51eLtp.js');
+var index = require('./index-C3RW52t1.js');
 var heart = require('./heart-ClVn_Co8.js');
 var Helper = require('./Helper-DgRzYZwR.js');
 require('./anime.es-BqW8JHZi.js');

package/dist/cjs/twilight.cjs.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var index = require('./index-DN51eLtp.js');
+var index = require('./index-C3RW52t1.js');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 /*

package/dist/cjs/{vanilla-picker-BAqDsAyV.js → vanilla-picker-BCVMDRc5.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var index = require('./index-DN51eLtp.js');
+var index = require('./index-C3RW52t1.js');
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {

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

@@ -408,8 +408,9 @@ export class SallaBulletDelivery {
             else {
                 this.activeTab = 'address';
             }
-            // Fetch address token for map (fire-and-forget, non-blocking)
-            this.fetchAddressToken();
+            // Map SDK + token only when the opening view actually renders the map (fire-and-forget).
+            if (this.needsMap)
+                this.fetchAddressToken();
             // Load countries always; load saved addresses only when address tab is active (lazy tab data).
             if (this.isLoggedIn && this.activeTab === "address") {
                 this.loadingSavedAddresses = true;
@@ -1257,24 +1258,23 @@ export class SallaBulletDelivery {
     }
     // ─── Map methods ───
     async fetchAddressToken() {
-        if (this.addressToken || this.loadingToken)
+        // The token and Maps JS only serve map mode (setting on + maps key); otherwise they are ~180KB of unused JS.
+        if (!this.canUseMap || this.addressToken || this.loadingToken)
             return;
         this.loadingToken = true;
         try {
             const mapsKey = salla.config.get('store.settings.keys.maps');
-            if (mapsKey) {
-                const bootMaps = () => import('@salla.sa/ui-google-map-render')
-                    .then(({ load }) => load({
-                    key: mapsKey,
-                    libraries: ['marker', 'places'],
-                    language: salla.config.get('user.language_code') || 'ar',
-                }))
-                    .catch(err => log('Failed to load Google Maps SDK', err));
-                if (document.readyState === 'complete')
-                    bootMaps();
-                else
-                    window.addEventListener('load', bootMaps, { once: true });
-            }
+            const bootMaps = () => import('@salla.sa/ui-google-map-render')
+                .then(({ load }) => load({
+                key: mapsKey,
+                libraries: ['marker', 'places'],
+                language: salla.config.get('user.language_code') || 'ar',
+            }))
+                .catch(err => log('Failed to load Google Maps SDK', err));
+            if (document.readyState === 'complete')
+                bootMaps();
+            else
+                window.addEventListener('load', bootMaps, { once: true });
             this.addressToken = await bulletDeliveryAPI.getAddressToken();
         }
         catch {
@@ -1351,7 +1351,17 @@ export class SallaBulletDelivery {
         return Salla.config.get('store.settings.bullet_delivery.settings.map_enabled');
     }
     get isMapModeAvailable() {
-        return this.isMapSettingEnabled && !!salla.config.get('store.settings.keys.maps') && !!this.addressToken;
+        return this.canUseMap && !!this.addressToken;
+    }
+    /** Store config allows map mode (independent of whether the token has loaded yet). */
+    get canUseMap() {
+        return !!this.isMapSettingEnabled && !!salla.config.get('store.settings.keys.maps');
+    }
+    /** The current view will render <gmap-map>: guest delivery tab, or the add-address view. */
+    get needsMap() {
+        return (this.canUseMap &&
+            this.activeTab === 'address' &&
+            (this.viewMode === 'add-address' || !this.isLoggedIn));
     }
     /** In map mode and a pin has already been dropped (as opposed to still using the dropdowns), regardless of login state. */
     get isMapPick() {
@@ -1416,6 +1426,8 @@ export class SallaBulletDelivery {
                     this.selectedCountry = this.countries[0];
                 }
             }
+            if (tab === "address" && this.needsMap)
+                this.fetchAddressToken();
             // Load appropriate data when switching tabs if country is selected
             if (this.selectedCountry) {
                 if (tab === "branch") {

package/dist/collection/components/salla-conditional-offer/salla-conditional-offer.css

@@ -16,15 +16,9 @@
 .mb-1 {
   margin-bottom: 0.25rem;
 }
-.block {
-  display: block;
-}
 .flex {
   display: flex;
 }
-.hidden {
-  display: none;
-}
 .h-12 {
   height: 3rem;
 }
@@ -157,13 +151,13 @@
   display: flex;
   height: 8rem;
   width: 100%;
-  flex-wrap: wrap;
   align-items: center;
-  justify-content: center;
+  overflow-x: auto;
 }
 @media (min-width: 768px) {
   .s-conditional-offer-progress-container {
     height: 4rem;
+    overflow: visible;
   }
 }
 .s-conditional-offer-item-avatar-content {
@@ -287,8 +281,3 @@
   display: flex;
   align-items: center;
 }
-@media (min-width: 640px) {
-  .sm\:block {
-    display: block;
-  }
-}

package/dist/collection/components/salla-conditional-offer/salla-conditional-offer.js

@@ -136,7 +136,7 @@ export class SallaConditionalOffer {
             h("div", { key: "progress-line", class: "s-conditional-offer-progress-line-container" }, h("div", { class: "s-conditional-offer-progress-line-inactive" }), h("div", { class: "s-conditional-offer-progress-line-active", style: { width: `${progressPercentage}%` } })),
             h("div", { key: "checkpoint", class: `s-conditional-offer-checkpoint ${isActive ? "s-conditional-offer-active-checkpoint" : ""}` }, h("div", { class: `s-conditional-offer-item-avatar-content ${isActive ? "active" : ""}`, id: discount.type === DiscountType.FREE_PRODUCT ? `avatar-product-${discount.value}` : `avatar-${discount.value ?? index}` }, this.products && this.getCheckpointContent(discount)), this.products && discount.type === DiscountType.FREE_PRODUCT && this.renderTooltip(discount), h("div", { class: `s-conditional-offer-checkpoint-label ${isActive ? "active" : ""}`, innerHTML: this.getOfferType(discount) }))
         ] :
-            h("div", { key: "label", class: { "s-conditional-offer-checkpoint-label": true, "first-checkpoint": index === 0, active: isActive, "hidden": index === 0, "sm:block": index === 0 }, innerHTML: this.getOfferType(discount) })));
+            h("div", { key: "label", class: { "s-conditional-offer-checkpoint-label": true, "first-checkpoint": index === 0, active: isActive }, innerHTML: this.getOfferType(discount) })));
     }
     getLoadingSkeletonView() {
         return h(Host, { class: "s-conditional-offer-container" }, h("div", { class: "s-conditional-offer-skeleton-inner-container" }, h("div", { class: "s-conditional-offer-skeleton-subtitle" }, h("salla-skeleton", { height: "16px", width: "30%" })), h("div", { class: "s-conditional-offer-skeleton-subtitle" }, h("salla-skeleton", { height: "16px", width: "35%" })), h("div", { class: "s-conditional-offer-skeleton-checkpoints-wrapper" }, Array(3).fill(null).map(() => ([h("salla-skeleton", { key: "checkpoint-line", height: "8px" }), h("div", { key: "checkpoint" }, h("salla-skeleton", { height: "60px", width: "60px", type: "circle" }))])))));

package/dist/collection/components/salla-cookies-bar/salla-cookies-bar.css

@@ -153,6 +153,9 @@
 .ms-1 {
   margin-inline-start: 0.25rem;
 }
+.hidden {
+  display: none;
+}
 .resize {
   resize: both;
 }

package/dist/collection/components/salla-cookies-bar/salla-cookies-bar.js

@@ -22,7 +22,7 @@ export class SallaCookiesBar {
         this.mobileQueryHandler = (e) => (this.isMobile = e.matches);
         this.openRequestedHandler = () => this.open();
         this.authLoggedInHandler = () => this.syncConsentAfterLogin();
-        this.authLoggedOutHandler = () => this.clearLocalConsent();
+        this.authLoggedOutHandler = () => this.handleLogout();
         /**
          * Consent cookie names, matching the category keys the backend expects.
          */
@@ -31,6 +31,18 @@ export class SallaCookiesBar {
         this.functionalCookieKey = 'functional_cookies';
         this.advertisingCookieKey = 'advertising_cookies';
         this.consentCookieDays = 365;
+        /**
+         * Storage keys for the consent choice. The persistent choice lives in `Salla.storage`
+         * (localStorage); after a logout a copy is kept in `Salla.storage.session` so the bar
+         * stays hidden until the browsing session ends.
+         */
+        this.consentStorageKey = 'cookies-consent';
+        this.sessionConsentPointsKey = 'cookies-consent-points';
+        /**
+         * Set when the persistent choice was made (or attributed) while signed in, i.e. it
+         * belongs to that account and must never be carried over to whoever signs in next.
+         */
+        this.consentByUserKey = 'cookies-consent-by-user';
         /**
          * Known first-party cookie names (a trailing `*` matches by prefix) set by common
          * third-party scripts, grouped by the category they belong to. Only first-party
@@ -112,6 +124,14 @@ export class SallaCookiesBar {
         this.functionsEnabled = false;
         this.adsEnabled = false;
     }
+    /**
+     * Stores can share an origin (`salla.sa/store_one`, `salla.sa/store_two`), so the
+     * post-logout session copy and the signed-in marker are keyed by store id to stay out
+     * of the other stores.
+     */
+    storeKey(key) {
+        return `${key}_${Salla.config.get('store.id')}`;
+    }
     async componentWillLoad() {
         await Salla.onReady();
         await Salla.lang.onLoaded();
@@ -121,7 +141,7 @@ export class SallaCookiesBar {
         Salla.event.on('auth::logged.out', this.authLoggedOutHandler);
         this.unregisterAfterFetchMenuItemsHook = Salla.hooks.registerHook('salla-menu', 'afterFetchMenuItems', (menuComponent) => this.appendCookiesSettingsLink(menuComponent));
         this.hydrateToggleState();
-        if (Salla.storage.get('cookies-consent')) {
+        if (this.currentConsentPoints()) {
             this.isVisible = false;
         }
         // Keep tracking cookies enforced on every load/refresh, not just when the
@@ -190,23 +210,50 @@ export class SallaCookiesBar {
      */
     applyConsent(points) {
         this.writeLocalConsentCookies(points);
+        // A fresh choice is stored persistently, so any post-logout session copy is stale.
+        this.clearSessionConsent();
+        Salla.storage.set(this.storeKey(this.consentByUserKey), !Salla.config.isGuest());
         this.sweepDisabledCategoryCookies(points);
         if (!Salla.config.isGuest()) {
             Salla.api.request('account/data-privacy', { points }, 'post').catch(() => { });
         }
     }
     /**
-     * The currently known accepted categories, read from local cookies — there is no
-     * backend endpoint to read the customer's saved preference back, so the cookies
-     * written on save are the only source of truth we have. Returns `null` when no
-     * choice has been made yet — the bar itself is the source of truth in that case,
-     * not a sweep.
+     * The currently known accepted categories: the persistent choice if there is one,
+     * otherwise the post-logout session copy. Returns `null` when no choice has been
+     * made yet — the bar itself is the source of truth in that case, not a sweep.
      */
     currentConsentPoints() {
-        if (!Salla.storage.get('cookies-consent'))
+        return this.persistentConsentPoints() ?? this.sessionConsentPoints();
+    }
+    /**
+     * The accepted categories read from local cookies — there is no backend endpoint to
+     * read the customer's saved preference back, so the cookies written on save are the
+     * only source of truth we have.
+     */
+    persistentConsentPoints() {
+        if (!Salla.storage.get(this.consentStorageKey))
             return null;
         return this.allCategoryKeys().filter(key => key === this.necessaryCookieKey || Salla.cookie.get(key) === 'true');
     }
+    /**
+     * The choice carried over from before a logout, kept only for the current browsing
+     * session (see `handleLogout`). It belongs to the customer who logged out, so it only
+     * applies while the visitor is a guest — never to whoever signs in next.
+     */
+    sessionConsentPoints() {
+        if (!Salla.config.isGuest())
+            return null;
+        if (!Salla.storage.session?.get(this.storeKey(this.consentStorageKey)))
+            return null;
+        const points = Salla.storage.session.get(this.storeKey(this.sessionConsentPointsKey));
+        const savedPoints = Array.isArray(points) ? points : [];
+        return this.allCategoryKeys().filter(key => key === this.necessaryCookieKey || savedPoints.includes(key));
+    }
+    clearSessionConsent() {
+        Salla.storage.session?.remove(this.storeKey(this.consentStorageKey));
+        Salla.storage.session?.remove(this.storeKey(this.sessionConsentPointsKey));
+    }
     enforceCurrentConsent() {
         const points = this.currentConsentPoints();
         if (points)
@@ -226,31 +273,76 @@ export class SallaCookiesBar {
         this.adsEnabled = points.includes(this.advertisingCookieKey);
     }
     /**
-     * Wipe the locally-stored choice on logout. Local cookies/storage are scoped to the
-     * browser, not the account — without this, whatever the previous customer chose would
-     * be misread as "the visitor's own prior choice" and pushed to the next account that
-     * logs in (or is created) on this same browser.
+     * On logout, stop keeping the choice persistently: local cookies/storage are scoped to
+     * the browser, not the account — without this, whatever the previous customer chose
+     * would be misread as "the visitor's own prior choice" and pushed to the next account
+     * that logs in (or is created) on this same browser.
+     *
+     * The choice is still honoured for the rest of the browsing session (copied to session
+     * storage), so the bar doesn't pop up again right after logging out; it shows again
+     * once the store is closed and reopened.
+     *
+     * A logout fired while the visitor is already a guest is the automatic `force_logout`
+     * cleanup (the session already ended server-side), not the customer's doing, so a choice
+     * the visitor made as a guest is kept as is. A choice made while signed in belongs to
+     * that account, so it's handled like any other logout.
      */
-    clearLocalConsent() {
+    handleLogout() {
+        if (Salla.config.isGuest() && !Salla.storage.get(this.storeKey(this.consentByUserKey)))
+            return;
+        const state = Salla.storage.get(this.consentStorageKey);
+        const points = this.persistentConsentPoints();
+        if (state && points) {
+            Salla.storage.session?.set(this.storeKey(this.consentStorageKey), state);
+            Salla.storage.session?.set(this.storeKey(this.sessionConsentPointsKey), points);
+        }
         for (const key of this.allCategoryKeys()) {
             Salla.cookie.remove(key);
         }
-        Salla.storage.remove('cookies-consent');
-        // Whoever continues on this browser next (guest or a different account) hasn't
-        // made a choice yet, so the bar should show again right away.
-        this.isVisible = true;
+        Salla.storage.remove(this.consentStorageKey);
+        Salla.storage.remove(this.storeKey(this.consentByUserKey));
     }
     /**
      * Runs when a guest signs in. There is no backend endpoint to check whether the
      * account already has a saved preference, so if the visitor already made a choice
      * as a guest (guest choices are never sent server-side), attribute that local
      * choice to the account now — this is the only source of truth available.
+     * The post-logout session copy belongs to the previous customer, so it's dropped here
+     * and never synced.
+     * `auth::logged.in` is dispatched even when the profile fetch fails, so a login that
+     * didn't resolve a user (still a guest) changes nothing.
      */
     syncConsentAfterLogin() {
-        const points = this.currentConsentPoints();
-        if (!points)
+        if (Salla.config.isGuest())
+            return;
+        this.clearSessionConsent();
+        const points = this.persistentConsentPoints();
+        if (!points) {
+            // Nothing chosen on this browser for the account that just signed in — e.g. after a
+            // logout that kept the bar hidden on this page — so ask them now.
+            this.step = 'consent';
+            this.isVisible = true;
+            return;
+        }
+        // A choice that already belongs to an account isn't this visitor's to hand over.
+        if (Salla.storage.get(this.storeKey(this.consentByUserKey)))
             return;
-        Salla.api.request('account/data-privacy', { points }, 'post').catch(() => { });
+        // Only once the account actually has the choice does it count as theirs; if the POST
+        // fails, a later login can try again. The response can arrive after the visitor logged
+        // out or chose again, so only mark it if it's still the same account and choice.
+        const userId = Salla.config.get('user.id');
+        Salla.api
+            .request('account/data-privacy', { points }, 'post')
+            .then(() => {
+            const currentPoints = this.persistentConsentPoints();
+            const unchanged = !Salla.config.isGuest() &&
+                Salla.config.get('user.id') === userId &&
+                currentPoints?.length === points.length &&
+                points.every(key => currentPoints.includes(key));
+            if (unchanged)
+                Salla.storage.set(this.storeKey(this.consentByUserKey), true);
+        })
+            .catch(() => { });
     }
     cookieNameMatchesPattern(cookieName, pattern) {
         return pattern.endsWith('*')
@@ -277,8 +369,15 @@ export class SallaCookiesBar {
     dismiss(eventName) {
         this.isVisible = false;
         //We will call event first because we need to compare between old and new data inside session
-        Salla.event.emit(`salla-cookies-bar::${eventName}`);
-        Salla.storage.set('cookies-consent', eventName);
+        try {
+            Salla.event.emit(`salla-cookies-bar::${eventName}`);
+        }
+        finally {
+            // Listeners (themes, apps, third-party scripts) run synchronously and their errors
+            // propagate; always persist the choice so a throwing listener can't make the bar
+            // show again on the next page. The error is still rethrown after this.
+            Salla.storage.set(this.consentStorageKey, eventName);
+        }
     }
     /**
      * Persist the customized per-category toggle choices, then dismiss.