@salla.sa/twilight-components 2.14.467 → 2.14.468

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

@@ -4810,6 +4810,8 @@ const sallaBulletDeliveryCss = "@supports (interpolate-size: allow-keywords) and
 
 const BRANCH_SEARCH_DEBOUNCE_MS = 1000;
 const GEOLOCATION_TIMEOUT = 10000;
+/** Final fallback center used only if `user.default_geo_location` is absent (Riyadh — matches checkout map-page). */
+const DEFAULT_MAP_CENTER = { lat: 24.7756042, lng: 46.7360729 };
 const DEBUG_KEY = 'salla-bullet-delivery-debug';
 const OVERRIDE_IP_KEY = 'salla-bullet-delivery-override-ip';
 function log(message, data) {
@@ -4862,6 +4864,8 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
         /** True after saved addresses have been loaded (lazy: only when address tab is shown). */
         this.savedAddressesLoaded = false;
         this.gmapRef = null;
+        /** Guards against re-prompting for geolocation each time the map (re)initializes within one flow. */
+        this.autoGeolocationTriggered = false;
         // Core state
         this.activeTab = "address";
         this.isLoggedIn = false;
@@ -5003,6 +5007,8 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
                 shortAddress: detail.place?.placeId ?? detail.place?.place_id ?? undefined,
                 formattedAddress: detail.place?.formattedAddress ?? detail.place?.formatted_address ?? undefined,
             };
+            // Bias autocomplete results toward the currently selected location.
+            this.updateLocationBias();
             setTimeout(() => {
                 const marker = this.gmapRef?.locationMarker;
                 if (marker)
@@ -5014,6 +5020,25 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
             if (this.gmapRef && typeof this.gmapRef.resize === 'function') {
                 this.gmapRef.resize();
             }
+            this.updateLocationBias();
+            // Auto-locate the customer so the map never opens "empty" — matches checkout map-page
+            // (getCurrentLocation(true) pans to the resolved position). Skip if a location is already set
+            // (e.g. returning from the confirm step). Falls back silently to mapInitialCenter if denied.
+            if (!this.autoGeolocationTriggered && !this.hasMapLocation() && this.gmapRef) {
+                const getCurrentLocation = this.gmapRef.getCurrentLocation;
+                if (typeof getCurrentLocation === 'function') {
+                    this.autoGeolocationTriggered = true;
+                    try {
+                        const result = getCurrentLocation.call(this.gmapRef, true);
+                        if (result && typeof result.catch === 'function') {
+                            result.catch((err) => log('Auto geolocation failed', err));
+                        }
+                    }
+                    catch (err) {
+                        log('Auto geolocation threw', err);
+                    }
+                }
+            }
         };
         /**
          * Submit add-address form: create address via API then switch back to list.
@@ -5137,6 +5162,9 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     get isRequired() {
         return !!Salla.config.get("store.settings.bullet_delivery.settings.is_required");
     }
+    get isSupportsDelivery() {
+        return !!Salla.config.get("store.settings.bullet_delivery.supports_delivery");
+    }
     get isMobileApp() {
         return Salla.config.isMobileApp();
     }
@@ -5245,6 +5273,7 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     }
     resetState() {
         this.viewMode = "main";
+        this.autoGeolocationTriggered = false;
         this.selectedCountry = null;
         this.selectedRegion = null;
         this.selectedCity = null;
@@ -5322,12 +5351,27 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
         // only when it represents a valid session-style address.
         return hasSessionAddressIntent(intent);
     }
+    /**
+     * Whether the store still supports the delivery method captured in a stored
+     * intent. Shared by the cart pill and the cart-submit gate so an unsupported
+     * method (e.g. a remembered delivery address in a now pickup-only store) is
+     * never treated as a valid/complete selection.
+     */
+    isIntentMethodSupported(intent) {
+        if (intent.type === "branch")
+            return this.supportsPickup;
+        if (intent.type === "address")
+            return this.isSupportsDelivery;
+        return false;
+    }
     hasCompleteIntentForLoggedInUser() {
         if (this.isGuestUser())
             return false;
         const intent = this.getStoredIntent();
         if (!intent)
             return false;
+        if (!this.isIntentMethodSupported(intent))
+            return false;
         if (intent.type === "address")
             return !!intent.address_id;
         if (intent.type === "branch")
@@ -5905,6 +5949,7 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     async handleAddNewAddress() {
         this.viewMode = "add-address";
         this.mapLocationData = null;
+        this.autoGeolocationTriggered = false;
         this.fetchAddressToken();
         const intent = this.getStoredIntent();
         const sessionCountryId = getIntentCountryId(intent);
@@ -5927,6 +5972,7 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
         this.mapLocationData = null;
         this.mapStep = 'map';
         this.addressDescription = '';
+        this.autoGeolocationTriggered = false;
     }
     // ─── Map methods ───
     async fetchAddressToken() {
@@ -5951,6 +5997,15 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
             this.loadingToken = false;
         }
     }
+    /** Bias autocomplete toward the current selection (or the initial center) — mirrors checkout's map-page. */
+    updateLocationBias() {
+        if (!this.gmapRef)
+            return;
+        const center = this.hasMapLocation()
+            ? { lat: this.mapLocationData.lat, lng: this.mapLocationData.lng }
+            : this.mapInitialCenter;
+        this.gmapRef.autocompleteLocationBias = { center, radius: 500000 };
+    }
     hasMapLocation() {
         return this.mapLocationData?.lat != null && this.mapLocationData?.lng != null;
     }
@@ -5961,6 +6016,27 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     get isMapModeAvailable() {
         return this.isMapSettingEnabled && !!salla.config.get('store.settings.keys.maps') && !!this.addressToken;
     }
+    /** Center shown before geolocation resolves — the customer's IP-based default (falls back to Riyadh). */
+    get mapInitialCenter() {
+        const geo = salla.config.get('user.default_geo_location');
+        // Coerce defensively: config may arrive as strings, blank/whitespace, NaN, or out-of-range
+        // values. Reject blanks before coercion (Number('') === 0) and validate lat/lng ranges so we
+        // never feed (0,0) or an invalid point to the map; otherwise fall back to the default center.
+        const lat = this.toCoordinate(geo?.lat);
+        const lng = this.toCoordinate(geo?.lng);
+        const isValid = lat != null && lng != null &&
+            lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180;
+        return isValid ? { lat, lng } : DEFAULT_MAP_CENTER;
+    }
+    /** Parse a config coordinate to a finite number, treating blank/whitespace strings as missing. */
+    toCoordinate(value) {
+        if (typeof value === 'string' && value.trim() === '')
+            return null;
+        if (value == null)
+            return null;
+        const num = Number(value);
+        return Number.isFinite(num) ? num : null;
+    }
     // ─── End Map methods ───
     /**
      * Build address/location payload from guest-form state (same fields as add-address).
@@ -6531,10 +6607,10 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     getCartViewConfig(intent) {
         if (!intent || !Salla.url.is_page("cart"))
             return null;
+        if (!this.isIntentMethodSupported(intent))
+            return null;
         const isBranch = intent.type === "branch";
         const isAddress = intent.type === "address";
-        if ((isBranch && !this.supportsPickup) || (!isBranch && !isAddress))
-            return null;
         return {
             title: isBranch
                 ? Salla.lang.get("pages.checkout.pickup_option")
@@ -6584,13 +6660,15 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
         return wrapper;
     }
     renderTabs() {
-        // Show tabs only when pickup is supported; otherwise delivery-only view with no tabs
+        // Show tabs only when pickup is supported; otherwise delivery-only view with no tabs.
+        // The pickup tab is gated by this same `supportsPickup` check, while the delivery
+        // tab is shown only when bullet delivery supports delivery (`isSupportsDelivery`).
         if (!this.supportsPickup)
             return null;
-        return (h$4("div", { class: "s-bullet-delivery-tabs" }, h$4("button", { type: "button", class: {
+        return (h$4("div", { class: "s-bullet-delivery-tabs" }, this.isSupportsDelivery && (h$4("button", { type: "button", class: {
                 "s-bullet-delivery-tab": true,
                 "s-bullet-delivery-tab--active": this.activeTab === "address",
-            }, onClick: () => this.handleTabChange("address") }, h$4("span", { class: "s-bullet-delivery-tab-icon", innerHTML: Location, "aria-hidden": "true" }), h$4("span", null, Salla.lang.get("mobile_app.strings.delivery"))), h$4("button", { type: "button", class: {
+            }, onClick: () => this.handleTabChange("address") }, h$4("span", { class: "s-bullet-delivery-tab-icon", innerHTML: Location, "aria-hidden": "true" }), h$4("span", null, Salla.lang.get("mobile_app.strings.delivery")))), h$4("button", { type: "button", class: {
                 "s-bullet-delivery-tab": true,
                 "s-bullet-delivery-tab--active": this.activeTab === "branch",
             }, onClick: () => this.handleTabChange("branch") }, h$4("span", { class: "s-bullet-delivery-tab-icon", innerHTML: Store, "aria-hidden": "true" }), h$4("span", null, Salla.lang.get("mobile_app.strings.pickup")))));
@@ -6743,7 +6821,13 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     }
     renderMapSection() {
         const isSA = isSaudiArabia(this.selectedCountry?.code ?? '');
-        return (h$4("div", { class: "s-bullet-delivery-map-container" }, h$4("gmap-map", { ref: (el) => (this.gmapRef = el), zoom: 16, "map-id": "DEMO_MAP_ID", "enable-autocomplete": true, "enable-geolocation": true, "show-location-marker": true, language: Salla.lang.getLocale?.() ?? document.documentElement.lang ?? 'ar', "geolocation-button-label": Salla.lang.get('pages.checkout.current_location'), "autocomplete-placeholder": Salla.lang.get('pages.checkout.search_for_address'), "autocomplete-hint": isSA ? Salla.lang.get('pages.checkout.short_address_format_validation') : undefined, "autocomplete-country": this.selectedCountry?.code?.toLowerCase(), "autocomplete-resolve": false, "autocomplete-auth-token": this.addressToken, "location-marker-background": "#4285F4", "location-marker-border-color": "#1967D2", "location-marker-glyph-color": "#FFFFFF", "location-marker-scale": 1.3, "onGmap-location-changed": this.handleMapLocationChanged, "onGmap-ready": this.handleMapReady })));
+        const loc = this.mapLocationData;
+        const hasLoc = loc?.lat != null && loc?.lng != null;
+        // Resolve the center once (the getter reads salla.config) and reuse it for the marker so the
+        // map never opens "empty": before a selection the marker sits on the IP/Riyadh default and is
+        // dragged/replaced once auto-geolocation or the user picks a real position.
+        const center = hasLoc ? { lat: loc.lat, lng: loc.lng } : this.mapInitialCenter;
+        return (h$4("div", { class: "s-bullet-delivery-map-container" }, h$4("gmap-map", { ref: (el) => (this.gmapRef = el), center: center, zoom: 16, "min-zoom": 4, "max-zoom": 21, "map-id": "DEMO_MAP_ID", "enable-autocomplete": true, "enable-geolocation": true, "show-location-marker": true, "location-marker-position": hasLoc ? { lat: loc.lat, lng: loc.lng, accuracy: 50 } : { ...center, accuracy: 50 }, language: Salla.lang.getLocale?.() ?? document.documentElement.lang ?? 'ar', "geolocation-button-label": Salla.lang.get('pages.checkout.current_location'), "autocomplete-placeholder": Salla.lang.get('pages.checkout.search_for_address'), "autocomplete-hint": isSA ? Salla.lang.get('pages.checkout.short_address_format_validation') : undefined, "autocomplete-country": this.selectedCountry?.code?.toLowerCase(), "autocomplete-resolve": false, "autocomplete-auth-token": this.addressToken, "location-marker-background": "#4285F4", "location-marker-border-color": "#1967D2", "location-marker-glyph-color": "#FFFFFF", "location-marker-scale": 1.3, "onGmap-location-changed": this.handleMapLocationChanged, "onGmap-ready": this.handleMapReady })));
     }
     renderAddressConfirmation() {
         const address = this.mapLocationData?.formattedAddress ?? '';

package/dist/components/salla-gifting.js

@@ -38,7 +38,7 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         super();
         this.__registerHost();
         this.defaultEvent = "gifting:open";
-        this.selectImageForYourGift = salla.lang.get('blocks.buy_as_gift.select_image_or_upload');
+        this.selectImageForYourGift = salla.lang.get('blocks.buy_as_gift.select_image_for_your_gift');
         this.currentStep = 1;
         this.showCalendar = false;
         this.showGiftText = false;
@@ -74,6 +74,7 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         this.timeZone = null;
         this.receiverCountryCode = salla.config.get('store.scope.countries')?.[0] || salla.config.get('store.store_country') || 'SA';
         this.hostId = `salla-gifting-${Math.random().toString(36).slice(2, 10)}`;
+        this.disableClass = this.gift?.show_image_upload ? '' : 'pointer-events-none';
         /**
          * The form selector to be used to get the form data
          */
@@ -199,6 +200,13 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
             salla.event.dispatch('login::open', { withoutReload: true });
             return;
         }
+        this.currentStep = 1;
+        this.parentClass = 'is-current-step-1';
+        this.step2Animated = false;
+        this.selectedText = undefined;
+        this.selectedGiftTextOption = undefined;
+        this.uploadedImage = undefined;
+        this.selectedImage = undefined;
         await this.modal.open();
         // Determine the appropriate method to call based on the `physicalProducts` flag
         const giftDetailsMethod = this.productId ? () => salla.product.getGiftProductDetails(this.productId) : () => salla.cart.getGiftCartDetails();
@@ -206,6 +214,20 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
             .then((response) => {
             this.gift = response.data;
             this.senderName = this.gift.sender_name;
+            this.disableClass = this.gift?.show_image_upload ? '' : 'pointer-events-none';
+            if (!this.gift.show_texts) {
+                this.selectedGiftTextOption = undefined;
+                this.selectedText = undefined;
+            }
+            if (!this.gift.show_images) {
+                this.selectedImage = undefined;
+                this.uploadedImage = undefined;
+            }
+            if (this.skipStep1()) {
+                this.currentStep = 2;
+                this.parentClass = 'is-current-step-2';
+                this.step2Animated = true;
+            }
         })
             .catch(e => {
             this.hasError = true;
@@ -213,6 +235,9 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         })
             .finally(() => this.modal.stopLoading());
     }
+    skipStep1() {
+        return !!this.gift && !this.gift.show_images && !this.gift.show_texts;
+    }
     /**
      *
      * Hide / close the gifting modal window
@@ -267,21 +292,12 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
      *
      * Go to the step 2
      */
-    async goToStep2() {
-        if (!this.selectedGiftTextOption) {
-            this.textSelect.classList.add('s-form-has-error');
-            this.customTextArea.classList.remove('s-form-has-error');
+    async goToStep2(withValidation = true) {
+        if (!this.step1Elems)
             return;
-        }
-        else if (this.selectedGiftTextOption == 'custom' && !this.selectedText) {
-            this.textSelect.classList.remove('s-form-has-error');
-            this.customTextArea.classList.add('s-form-has-error');
+        if (withValidation && !this.validateStep1()) {
             return;
         }
-        else {
-            this.textSelect.classList.remove('s-form-has-error');
-            this.customTextArea.classList.remove('s-form-has-error');
-        }
         this.setWrapperHeight(2, 600, 0);
         let stepNextAnime = new anime.timeline();
         stepNextAnime.add({
@@ -314,6 +330,23 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         this.currentStep = 2;
         this.parentClass = `is-current-step-${this.currentStep}`;
     }
+    validateStep1() {
+        if (!this.gift?.show_texts)
+            return true;
+        if (!this.selectedGiftTextOption) {
+            this.textSelect?.classList.add('s-form-has-error');
+            this.customTextArea?.classList.remove('s-form-has-error');
+            return false;
+        }
+        else if (this.selectedGiftTextOption == 'custom' && !this.selectedText) {
+            this.textSelect?.classList.remove('s-form-has-error');
+            this.customTextArea?.classList.add('s-form-has-error');
+            return false;
+        }
+        this.textSelect?.classList.remove('s-form-has-error');
+        this.customTextArea?.classList.remove('s-form-has-error');
+        return true;
+    }
     /**
      *
      * Go to the step 1
@@ -356,7 +389,7 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         this.parentClass = `is-current-step-${this.currentStep}`;
     }
     getFilepondPlaceholder() {
-        return `<div class="s-gifting-filepond-placeholder"><span class="s-gifting-filepond-placeholder-icon">${Images}</span><p class="s-gifting-filepond-placeholder-text">${this.selectImageOrUpload ? this.selectImageOrUpload : ''}</p></div>`;
+        return `<div class="s-gifting-filepond-placeholder"><span class="s-gifting-filepond-placeholder-icon">${Images}</span><p class="s-gifting-filepond-placeholder-text">${this.selectImageOrUpload && this.gift.show_image_upload ? this.selectImageOrUpload : this.selectImageForYourGift}</p></div>`;
     }
     setPreview(image) {
         this.uploader?.classList.add('has-bg');
@@ -366,7 +399,7 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         bg.style.backgroundImage = "url('" + image.url + "')";
         this.uploader?.querySelector('.filepond--root')?.appendChild(bg);
         this.uploadedImage = image.url;
-        if (!!this.gift && this.gift.gift_images.length) {
+        if (!!this.gift && this.gift.gift_images?.length) {
             this.setWrapperHeight(1, 150, 0);
         }
     }
@@ -379,7 +412,7 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
     }
     handleTextAreaChange(event) {
         this.selectedText = event.target.value;
-        this.customTextArea.classList.remove('s-form-has-error');
+        this.customTextArea?.classList.remove('s-form-has-error');
     }
     clearError(key) {
         if (this.errors?.[key]) {
@@ -530,13 +563,13 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
     }
     handleUploadImage(img) {
         this.uploadedImage = img;
-        if (!!this.gift && this.gift.gift_images.length) {
+        if (!!this.gift && this.gift.gift_images?.length) {
             this.setWrapperHeight(1, 150, 0);
         }
     }
     handleRemoveImage() {
         this.uploadedImage = '';
-        if (!!this.gift && this.gift.gift_images.length) {
+        if (!!this.gift && this.gift.gift_images?.length) {
             this.setWrapperHeight(1, 150, 0);
         }
     }
@@ -670,16 +703,18 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
     }
     render() {
         return [
-            h("div", { key: 'db700f9ec96a6974f3b815bb017ebe97ae8fe5c0' }, h("salla-list-tile", { key: '1e2fd1c0b375c85fcd4af1ea071c36879e6913c5', class: this.generateClass() }, h("div", { key: 'a9d02c933bc13bf8765e7e91ce08b2c9495954e5', slot: "title" }, this.vertical ? h("span", { innerHTML: SIGiftSharing }) : '', h("h3", { key: '56bd850368806c6ed5770ea5f6b0339749a77dfa' }, !!this.widgetTitle ? this.widgetTitle : this.sectionTitle)), h("div", { key: 'fbb4940fd3e3578f2f5a479d9d44be8dfbda7e43', slot: "subtitle" }, h("div", { key: 'fb7e8532984fbfc6fd61c55a6d44d7cdbb4bc9a2' }, !!this.widgetSubtitle ? this.widgetSubtitle : this.sectionSubtitle)), h("div", { key: '04f27f1ddbfa0b06be111b6c3176fbda5ea6d43a', slot: "action" }, h("salla-button", { key: 'fe71a1a773e5275ede7d1b3ea535c330688028b7', color: "primary", fill: "outline", width: "wide", class: "s-gifting-widget-action", onClick: () => this.handleGiftButtonClick() }, h("slot", { key: 'd62127d30254df2d8add55e0e1dbcfefb686e359', name: "widget-btn-content" }, h("div", { key: '5ddbb695af142baf3bb6986627f97a7a7607eb31', class: "s-gifting-widget-action-content" }, h("span", { key: '7820fb6abd9d7a9c1035c0f80191a3ff2a4c5fe8', innerHTML: SIGiftSharing }), " \u00A0", h("span", { key: '2cfc69862d3d087375efaed3bcec0ff0c1587989' }, this.sectionBtnText)))))), h("salla-modal", { key: '32c19391248ba6186f43fea59493171079e7bf07', id: this.hostId, isLoading: true, class: "s-gifting-modal", width: "sm", ref: modal => this.modal = modal }, h("div", { key: 'e4b5829416314f25793158dae0c530b8057b4085', slot: "loading" }, h("div", { key: '6ee873add5868f105b7ec7291c2a8c8fc033c588', class: "s-gifting-skeleton" }, h("div", { key: '40aae38f8b2d62b434394811a3ef6d8bc00f6f32', class: "s-gifting-modal-header" }, h("salla-skeleton", { key: 'a652cd74a16d0db662ea4a518ebfab366a3c3899', type: 'circle', height: '5rem', width: '5rem' }), h("h2", { key: 'edb4a1477893246e98207aeba7bfb5af686f20b9', class: "s-gifting-modal-title" }, h("div", { key: '83ef942b15450cc59ad32d8c5b3ba43a32bcb29c', class: "s-gifting-modal-badge-wrapper" }, h("salla-skeleton", { key: 'd9041c777a2fa0aa7ffc752958c7441916a02f85', height: '15px', width: '150px' })))), h("div", { key: 'fe3bb9dad01becba87486c4886037fd67b059919', class: "s-gifting-skeleton-content" }, h("salla-skeleton", { key: '08bd8304b66264b70f6df68e64da3560a1f75461', height: '10px', width: '150px' }), h("salla-skeleton", { key: 'bbea0d7ff0c846897af2ef5d3696b252a2f4e662', height: '230px' }), h("salla-skeleton", { key: '8cb1fde02e31a1accabd2e26409983e7ba56eeb1', height: '10px', width: '150px' }), h("salla-skeleton", { key: 'f80a986b953278bac41505506adf8d611566a167', height: '30px' }), h("salla-skeleton", { key: 'f7eccce69b619de385872642e1fb62b2cf6c3082', height: '40px' })))), h("slot", { key: 'd299e46040193b441f8171d05e0048849e3df8d5', name: "header" }), !!this.hasError ?
+            h("div", { key: '7872fb48bbc18682b2dffec6e45469ed1f348cd2' }, h("salla-list-tile", { key: 'c1885fdb40f33d203b857de13644f43964570f71', class: this.generateClass() }, h("div", { key: '77bd3860e23af43f088ee96b74901e2048baaafc', slot: "title" }, this.vertical ? h("span", { innerHTML: SIGiftSharing }) : '', h("h3", { key: '72e2e4d99b227b48bdd1f13866c3eea874139096' }, !!this.widgetTitle ? this.widgetTitle : this.sectionTitle)), h("div", { key: '63c219936015b9d5ee3a8102dbbce748ce0e62c5', slot: "subtitle" }, h("div", { key: '4f31a0c50120697a9b96a2b77411d74f4efc5e66' }, !!this.widgetSubtitle ? this.widgetSubtitle : this.sectionSubtitle)), h("div", { key: '47f0c995ad0f921a2fdca1c8e5f0e25d897e1fb0', slot: "action" }, h("salla-button", { key: '40145bed2bc9464279d1ae16a358b5a30d255ffd', color: "primary", fill: "outline", width: "wide", class: "s-gifting-widget-action", onClick: () => this.handleGiftButtonClick() }, h("slot", { key: 'd5620606453e0af1a5186f84fa12e1f4957a9747', name: "widget-btn-content" }, h("div", { key: '038ff62e726de1800907f8a8c136a434c7c6d036', class: "s-gifting-widget-action-content" }, h("span", { key: '4e785b4e17db238b6bfeb7646709006c9a4502bb', innerHTML: SIGiftSharing }), " \u00A0", h("span", { key: '5965ed90aeaf684db53d3241a9287de290f10b4a' }, this.sectionBtnText)))))), h("salla-modal", { key: 'b150b2b29f751fa4db3bfff17c4e617eb7b6db5d', id: this.hostId, isLoading: true, class: "s-gifting-modal", width: "sm", ref: modal => this.modal = modal }, h("div", { key: '57167453738915bb235da0bc44498f66daaa9454', slot: "loading" }, h("div", { key: 'fd0eab2fd0d46a76dcd00511ec05366862d86d2c', class: "s-gifting-skeleton" }, h("div", { key: '6d2bb659ca06a2cadf203d83e4f5966a78bc5f01', class: "s-gifting-modal-header" }, h("salla-skeleton", { key: 'cb47841822cf9fed5b5c20664617ac52bad135ce', type: 'circle', height: '5rem', width: '5rem' }), h("h2", { key: 'e9823fc0c00a326b495e4e7e6ff6567f03d1423e', class: "s-gifting-modal-title" }, h("div", { key: '584d50ba2c1bec0fb8e530418be60fc8a0b9c2d8', class: "s-gifting-modal-badge-wrapper" }, h("salla-skeleton", { key: '493b5e6f9fa7a1d45fa52a6f3f4602e5737b9632', height: '15px', width: '150px' })))), h("div", { key: 'd33d22031f8cd6084a1c177ada6657a89ff45ad8', class: "s-gifting-skeleton-content" }, h("salla-skeleton", { key: '792e91cdcd7ede6896653fa147124cfcdc649a9f', height: '10px', width: '150px' }), h("salla-skeleton", { key: '88ca984320729528e2a3e7cab350a96202a81da6', height: '230px' }), h("salla-skeleton", { key: 'fad81ac6972eaa37766cb489d175516249afb5e6', height: '10px', width: '150px' }), h("salla-skeleton", { key: 'a4e82c29d7940b7af14af4251cc6f97e811be99a', height: '30px' }), h("salla-skeleton", { key: '6339a34ffc0deb925f69b5b0a0ed540d986e0a0b', height: '40px' })))), h("slot", { key: '8fd7cad6fbc2d73fb770ae75301f327906817c6f', 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" }, " "))
                 :
                     [
-                        h("div", { class: "s-gifting-modal-header" }, h("span", { class: "s-gifting-modal-icon" }, h("span", { innerHTML: SIGiftSharing })), h("h2", { class: "s-gifting-modal-title" }, h("div", { class: "s-gifting-modal-badge-wrapper" }, h("div", { class: "s-gifting-modal-badge" }, h("span", null, h("span", null, this.currentStep), "/2")), h("span", null, this.giftDetails)))),
-                        h("div", { class: "s-gifting-steps-wrapper " + this.parentClass, ref: el => this.stepsWrapper = el }, h("div", { class: "s-gifting-step-one gift-step-1", ref: el => this.step1Elems = el }, h("div", { class: "s-gifting-modal-uploader-title anime-item" }, this.selectImageForYourGift), h("div", { class: "s-gifting-modal-uploader anime-item", ref: el => this.uploader = el }, h("span", { class: "s-gifting-remove-preview", onClick: () => this.removePreview(), innerHTML: Cancel }), this.selectImageOrUpload && h("salla-file-upload", { "instant-upload": true, name: "image_url", url: salla.url.api(salla.product.api.getUrl('giftImage')), onUploaded: event => this.handleUploadImage(event.detail), labelIdle: this.getFilepondPlaceholder(), onRemoved: () => this.handleRemoveImage() })), h("div", { class: "anime-item" }, !this.uploadedImage && !!this.gift && !!this.gift.gift_images && this.gift.gift_images.length > 0 ?
-                            h("salla-slider", { id: "gifting-slider", loop: false, "controls-outer": true, class: "s-gifting-slider", type: "carousel" }, h("div", { slot: "items" }, this.gift && this.gift.gift_images ?
-                                this.gift?.gift_images.map((item) => h("a", { class: "s-gifting-clickable s-gifting-image", onClick: () => this.setPreview(item) }, h("img", { style: { "width": "120px" }, src: item.url, alt: `${item.id}` }))) : ''))
-                            : ""), h("div", { class: "anime-item" }, 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: true }, 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 }, txt.text)) : '', h("option", { "data-id": "custom" }, this.giftCustomText))), h("div", { class: this.showGiftText ? "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" })))), h("div", { class: "anime-item" }, h("salla-button", { color: "primary", width: "wide", onClick: () => this.goToStep2() }, h("span", null, this.nextStep)))), h("div", { class: "s-gifting-step-two gift-step-2", 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("div", { class: "s-gifting-modal-header" }, h("span", { class: "s-gifting-modal-icon" }, h("span", { innerHTML: SIGiftSharing })), h("h2", { class: "s-gifting-modal-title" }, h("div", { class: "s-gifting-modal-badge-wrapper" }, !this.skipStep1() && h("div", { class: "s-gifting-modal-badge" }, h("span", null, h("span", null, this.currentStep), "/2")), h("span", null, this.giftDetails)))),
+                        h("div", { class: "s-gifting-steps-wrapper " + this.parentClass, ref: el => this.stepsWrapper = el }, !this.skipStep1() && h("div", { class: "s-gifting-step-one gift-step-1", ref: el => this.step1Elems = el }, h("div", { class: "s-gifting-modal-uploader-title anime-item" }, this.selectImageForYourGift), this.gift && this.gift.show_images &&
+                            h("div", null, h("div", { class: `s-gifting-modal-uploader anime-item ${this.disableClass}`, ref: el => this.uploader = el }, h("span", { class: "s-gifting-remove-preview pointer-events-auto", onClick: () => this.removePreview(), innerHTML: Cancel }), this.selectImageOrUpload && this.gift && h("salla-file-upload", { "instant-upload": true, name: "image_url", url: salla.url.api(salla.product.api.getUrl('giftImage')), onUploaded: event => this.handleUploadImage(event.detail), labelIdle: this.getFilepondPlaceholder(), onRemoved: () => this.handleRemoveImage() })), h("div", { class: "anime-item" }, !this.uploadedImage && !!this.gift && !!this.gift.gift_images && this.gift.gift_images.length > 0 ?
+                                h("salla-slider", { id: "gifting-slider", loop: false, "controls-outer": true, class: "s-gifting-slider", type: "carousel" }, h("div", { slot: "items" }, this.gift && this.gift.gift_images ?
+                                    this.gift?.gift_images.map((item) => h("a", { class: "s-gifting-clickable s-gifting-image", onClick: () => this.setPreview(item) }, h("img", { style: { "width": "120px" }, src: item.url, alt: `${item.id}` }))) : ''))
+                                : "")), this.gift && this.gift.show_texts ?
+                            h("div", { class: "anime-item" }, 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: true }, 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 }, txt.text)) : '', this.gift && this.gift.show_custom_text ? h("option", { "data-id": "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'] ?
                             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() &&
@@ -689,8 +724,8 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
                                 h("span", { class: "s-gifting-error" }, this.errors['receiver.region']) : ''), this.isPhysical() &&
                             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() &&
-                            h("div", { class: this.step2ItemClass('s-gifting-info') }, h("span", { innerHTML: Alert }), h("span", null, this.selectCityInfo)), !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') }, h("a", { href: "#!", innerHTML: IconArrowLeft, onClick: (e) => this.goToStep1(e) }), h("salla-button", { onClick: () => this.submitForm(), color: "primary", width: 'wide' }, h("span", null, this.sendGift)))))
-                    ], h("slot", { key: 'bd8cd1628ed4282b177f0ddcd5fb93289c47b4d6', name: "footer" })))
+                            h("div", { class: this.step2ItemClass('s-gifting-info') }, h("span", { innerHTML: Alert }), h("span", null, this.selectCityInfo)), !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: IconArrowLeft, onClick: (e) => this.goToStep1(e) }), h("salla-button", { onClick: () => this.submitForm(), color: "primary", width: 'wide' }, h("span", null, this.sendGift)))))
+                    ], h("slot", { key: 'bdc014a95dab59f9f1e22f71741b5ba5f2ea3ee8', name: "footer" })))
         ];
     }
     static get style() { return sallaGiftingCss; }
@@ -769,6 +804,7 @@ const SallaGifting$1 = /*@__PURE__*/ proxyCustomElement(class SallaGifting exten
         "receiverCountryCode": [32],
         "receiverEmail": [32],
         "hostId": [32],
+        "disableClass": [32],
         "receiverCity": [32],
         "open": [64],
         "close": [64],

package/dist/components/salla-login-modal2.js

@@ -63,7 +63,8 @@ const SallaLoginModal = /*@__PURE__*/ proxyCustomElement(class SallaLoginModal e
     }
     componentDidLoad() {
         window.addEventListener('message', (event) => {
-            if (event.data.source != "login") {
+            // Trust only our login iframe/passkey popup at the accounts origin.
+            if (!this.isTrustedMessage(event) || event.data?.source != "login") {
                 return;
             }
             if (!this.inline && !this.canRenderIframe) {
@@ -140,6 +141,8 @@ const SallaLoginModal = /*@__PURE__*/ proxyCustomElement(class SallaLoginModal e
                 return window.location.reload();
             }
             if (action === 'open_page') {
+                if (!this.isSafeUrl(value?.url))
+                    return;
                 return window.location.href = value.url;
             }
             if (action === 'open_passkey_page') {
@@ -252,6 +255,33 @@ const SallaLoginModal = /*@__PURE__*/ proxyCustomElement(class SallaLoginModal e
         }
         withCartReset && Salla.cart.reset();
     }
+    // Accept postMessage only from our own login iframe/passkey popup at the accounts origin.
+    isTrustedMessage(event) {
+        const fromIframe = !!this.iframe && event.source === this.iframe.contentWindow;
+        const fromPasskey = !!this.createPassKey && event.source === this.createPassKey;
+        if (!fromIframe && !fromPasskey)
+            return false;
+        let origin;
+        try {
+            origin = new URL(salla.config.get('login.url', 'https://accounts.salla.com')).origin;
+        }
+        catch (e) {
+            origin = 'https://accounts.salla.com';
+        }
+        return event.origin === origin;
+    }
+    // Reject javascript:/data: and other non-http(s) navigation targets.
+    isSafeUrl(url) {
+        if (typeof url !== 'string' || !url)
+            return false;
+        try {
+            const { protocol } = new URL(url, location.href);
+            return protocol === 'https:' || protocol === 'http:';
+        }
+        catch (e) {
+            return false;
+        }
+    }
     sendMessageToIframe(message) {
         if (!this.iframe)
             return;