@salla.sa/twilight-components 2.14.441 → 2.14.443

package/dist/collection/components/salla-product-card-embed/salla-product-card-embed.js

@@ -12,9 +12,29 @@ export class SallaProductCardEmbed {
         await salla.onReady();
         await this.fetchProduct();
     }
+    componentDidLoad() {
+        this.ensureParentContainsFloats();
+    }
     componentDidRender() {
         this.renderCardNode();
     }
+    /**
+     * The host floats for `align="left"|"right"`. If the parent is a plain
+     * block element with visible overflow it won't contain those floats,
+     * letting them spill into following siblings (e.g. a comments section).
+     * Promote such parents to a block formatting context.
+     */
+    ensureParentContainsFloats() {
+        if (this.align !== 'left' && this.align !== 'right')
+            return;
+        const parent = this.hostEl?.parentElement;
+        if (!parent)
+            return;
+        const cs = getComputedStyle(parent);
+        if (cs.display === 'block' && cs.overflow === 'visible' && cs.float === 'none') {
+            parent.style.display = 'flow-root';
+        }
+    }
     fetchProduct() {
         if (!this.productId) {
             this.productData = null;
@@ -59,7 +79,7 @@ export class SallaProductCardEmbed {
             's-product-card-embed-card-align-right': this.align === 'right',
             's-product-card-embed-card-align-center': this.align === 'center',
         };
-        return (h(Host, { key: '77c85dadd3d886ab94323d5676b3a8135157352e' }, this.hasError && h("span", { key: 'ee80e9375cbdbc08546ae6ad0d1020b32a3dafc8', class: "s-product-card-embed-fallback" }), h("div", { key: '50e35de032d0d66f7772a8e44b5744587307795c', class: cardClasses, ref: (el) => {
+        return (h(Host, { key: '4fcd0b6e5da26ac976b0f3c5c031b614dc9d04b1' }, this.hasError && h("span", { key: '55b4a2649d4912b61f6b75e3c2437bfaee7863e0', class: "s-product-card-embed-fallback" }), h("div", { key: 'ac5882e5dd36ac28cc6e5a24186156c7cadda820', class: cardClasses, ref: (el) => {
                 this.cardContainer = el;
             } })));
     }
@@ -123,4 +143,5 @@ export class SallaProductCardEmbed {
             "productData": {}
         };
     }
+    static get elementRef() { return "hostEl"; }
 }

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

@@ -54,15 +54,6 @@ export class SallaTieredOffer {
         // If coupon is applied but offer doesn't support coupons, widget should be hidden
         return !(cartCoupon && !offerData.details?.applied_with_coupon);
     }
-    shouldHideForGuest() {
-        return salla.config.isGuest();
-    }
-    shouldHideUntilThreshold(details, tierIndex) {
-        return !!(details?.hide_until_threshold && tierIndex === 0);
-    }
-    resolveTierName(tiers, index) {
-        return TierUtils.getTierNameByIndex(tiers, index) || '';
-    }
     async fetchTieredOfferData() {
         try {
             const { data } = await salla.api.cart.offers();
@@ -89,20 +80,14 @@ export class SallaTieredOffer {
         // Find current tier index based on current_value from API
         const currentValue = this.apiOfferData.details?.current_value || 0;
         const currentTierIndex = this.findCurrentTierIndex(currentValue);
-        // Hide entire widget for unauthenticated users
-        if (this.shouldHideForGuest()) {
-            this.canRender = false;
-            return;
-        }
-        // Only hide until threshold for merchants with the flag enabled (e.g. Arabian Oud)
-        if (this.shouldHideUntilThreshold(this.apiOfferData.details, currentTierIndex)) {
+        // Only render if user has reached at least the first tier
+        if (currentTierIndex === 0) {
             this.canRender = false;
             return;
         }
         this.currentTierIndex = currentTierIndex;
-        this.currentTier = this.resolveTierName(this.tieredOfferData.tiers, currentTierIndex);
-        // Default to first tab so tabs always have visible content
-        this.activeTabTier = this.currentTier || this.tieredOfferData.tiers[0]?.tier_name;
+        this.currentTier = TierUtils.getTierNameByIndex(this.tieredOfferData.tiers, currentTierIndex);
+        this.activeTabTier = this.currentTier;
         this.canRender = true;
     }
     componentDidLoad() {
@@ -137,46 +122,44 @@ export class SallaTieredOffer {
         if (!freshOfferData || !this.tieredOfferData) {
             return;
         }
-        if (!freshOfferData.details?.discounts?.length) {
-            this.canRender = false;
-            return;
-        }
         // Check coupon compatibility
         if (!this.validateCouponCompatibility(freshOfferData, updatedCart.coupon)) {
             this.canRender = false;
             return;
         }
-        // Hide entire widget for unauthenticated users
-        if (this.shouldHideForGuest()) {
-            this.canRender = false;
+        // If no coupon conflict, show widget
+        this.canRender = true;
+        // Check if this offer should update with cart changes
+        if (freshOfferData.details?.with_current_cart === false) {
             return;
         }
-        // Build fresh tier map so index computation uses up-to-date thresholds
-        const freshTieredData = this.mapApiDataToTiers(freshOfferData);
+        // Update current_value in API offer data
+        //  const currentValue = updatedCart.sub_total;
+        //  console.log('currentValue #####3', currentValue);
+        //  this.apiOfferData = {
+        //    ...this.apiOfferData,
+        //    details: {
+        //      ...this.apiOfferData.details,
+        //      current_value: currentValue
+        //    }
+        //  };
+        // Use current_value from fresh API data instead of cart sub_total
         const currentValue = freshOfferData.details?.current_value || 0;
-        const newTierIndex = this.findCurrentTierIndex(currentValue, freshTieredData.tiers);
-        // Only hide until threshold for merchants with the flag enabled (e.g. Arabian Oud)
-        if (this.shouldHideUntilThreshold(freshOfferData.details, newTierIndex)) {
+        this.apiOfferData = freshOfferData;
+        // Update current tier based on new value
+        const newTierIndex = this.findCurrentTierIndex(currentValue);
+        // Check if user qualifies for any tier
+        if (newTierIndex === 0) {
             this.canRender = false;
             return;
         }
-        // Offer progress is based on historical purchases only — skip state update on cart changes
-        // Use strict === false to avoid treating an omitted flag as false
-        if (freshOfferData.details?.with_current_cart === false) {
-            this.canRender = true;
-            return;
-        }
-        // All guards passed — update state atomically
-        this.apiOfferData = freshOfferData;
-        this.tieredOfferData = freshTieredData;
+        // user qualifies show widget
         this.canRender = true;
         this.currentTierIndex = newTierIndex;
-        // Tiers are 1-based; fall back to first tier when no tier has been reached yet
-        this.currentTier = this.resolveTierName(freshTieredData.tiers, newTierIndex);
-        // Update active tab if needed; default to first tab when no tier reached
-        const resolvedTab = this.currentTier || freshTieredData.tiers[0]?.tier_name;
-        if (this.activeTabTier !== resolvedTab) {
-            this.activeTabTier = resolvedTab;
+        this.currentTier = TierUtils.getTierNameByIndex(this.tieredOfferData.tiers, newTierIndex);
+        // Update active tab if needed
+        if (this.activeTabTier !== this.currentTier) {
+            this.activeTabTier = this.currentTier;
         }
     }
     getLoadingSkeletonView() {
@@ -274,7 +257,7 @@ export class SallaTieredOffer {
             return null;
         }
         const currentTierData = this.getCurrentTierData();
-        return (h(Host, null, h("div", { class: "s-tiered-offer-container" }, h("div", { class: "s-tiered-offer-header" }, h("div", { class: "s-tiered-offer-header-content" }, h("p", { class: "s-tiered-offer-program-title" }, this.loyaltyProgramText), this.currentTier && (h("div", { class: "s-tiered-offer-current-tier-name-wrapper" }, h("h2", { class: "s-tiered-offer-current-tier" }, this.currentTierText, " ", h("span", { class: "s-tiered-offer-tier-name" }, currentTierData.name)), h("span", { innerHTML: currentTierData.icon }))))), this.renderProgressBar(), this.renderTabs())));
+        return (h(Host, null, h("div", { class: "s-tiered-offer-container" }, h("div", { class: "s-tiered-offer-header" }, h("div", { class: "s-tiered-offer-header-content" }, h("p", { class: "s-tiered-offer-program-title" }, this.loyaltyProgramText), h("div", { class: "s-tiered-offer-current-tier-name-wrapper" }, h("h2", { class: "s-tiered-offer-current-tier" }, this.currentTierText, " ", h("span", { class: "s-tiered-offer-tier-name" }, currentTierData.name)), h("span", { innerHTML: currentTierData.icon })))), this.renderProgressBar(), this.renderTabs())));
     }
     static get is() { return "salla-tiered-offer"; }
     static get originalStyleUrls() {