@anker-in/shopify-react 0.1.1-beta.2 → 0.1.1-beta.4

package/dist/provider/index.d.mts

@@ -96,6 +96,8 @@ interface CartContextValue {
     giftNeedAddToCartLines: any[];
     /** Auto free gift config */
     autoFreeGiftConfig?: any;
+    /** Gradient gifts config */
+    gradientGiftsConfig?: any;
     /** Metafield identifiers */
     metafieldIdentifiers?: {
         variant: HasMetafieldsIdentifier[];

package/dist/provider/index.d.ts

@@ -96,6 +96,8 @@ interface CartContextValue {
     giftNeedAddToCartLines: any[];
     /** Auto free gift config */
     autoFreeGiftConfig?: any;
+    /** Gradient gifts config */
+    gradientGiftsConfig?: any;
     /** Metafield identifiers */
     metafieldIdentifiers?: {
         variant: HasMetafieldsIdentifier[];

package/dist/provider/index.js

@@ -104,6 +104,81 @@ var CODE_AMOUNT_KEY = "_sku_code_money";
 var SCRIPT_CODE_AMOUNT_KEY = "_code_money";
 var MAIN_PRODUCT_CODE = ["WS24", "WSTD", "WS7D", "WSCP", "WSPE", "WSPD"];
 
+// src/hooks/cart/utils/normalize-add-to-cart-lines.ts
+function normalizeAddToCartLines(lines) {
+  return lines.filter((line) => line.variant?.id).map((line, index) => {
+    const variant = line.variant;
+    const product = variant.product;
+    const quantity = line.quantity || 1;
+    const price = variant.finalPrice?.amount ? Number(variant.finalPrice.amount) : variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : variant.price?.amount ? Number(variant.price.amount) : 0;
+    const subtotalAmount = price * quantity;
+    const totalAmount = subtotalAmount;
+    return {
+      id: `temp-line-${index}-${variant.id}`,
+      // Temporary ID for pre-cart lines
+      name: product?.title || variant.title || "",
+      quantity,
+      variantId: variant.id,
+      productId: product?.id || variant.id.split("/").slice(0, -2).join("/"),
+      totalAmount,
+      subtotalAmount,
+      discountAllocations: [],
+      customAttributes: line.attributes || [],
+      variant: {
+        id: variant.id,
+        price,
+        listPrice: variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : 0,
+        sku: variant.sku || "",
+        name: variant.title || "",
+        image: variant.image ? {
+          url: variant.image.url,
+          altText: variant.image.altText || void 0
+        } : void 0,
+        requiresShipping: false,
+        // Default value, not available in NormalizedProductVariant
+        availableForSale: variant.availableForSale ?? true,
+        quantityAvailable: variant.quantityAvailable ?? 0,
+        currentlyNotInStock: false,
+        // Default value, will be updated when added to cart
+        weight: variant.weight,
+        metafields: variant.metafields
+      },
+      product,
+      path: product?.handle ? `/products/${product.handle}` : "",
+      discounts: [],
+      options: variant.selectedOptions?.map((opt) => ({
+        name: opt.name,
+        value: opt.value
+      }))
+    };
+  });
+}
+function createMockCartFromLines(lines, existingCart) {
+  const normalizedLines = normalizeAddToCartLines(lines);
+  const subtotalPrice = normalizedLines.reduce((sum, line) => sum + line.subtotalAmount, 0);
+  const totalPrice = normalizedLines.reduce((sum, line) => sum + line.totalAmount, 0);
+  return {
+    id: existingCart?.id || "temp-cart-id",
+    customerId: existingCart?.customerId,
+    email: existingCart?.email,
+    createdAt: existingCart?.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
+    currency: existingCart?.currency || { code: "USD" },
+    taxesIncluded: existingCart?.taxesIncluded,
+    lineItems: normalizedLines,
+    totallineItemsDiscount: 0,
+    orderDiscounts: 0,
+    lineItemsSubtotalPrice: subtotalPrice,
+    subtotalPrice,
+    totalPrice,
+    totalTaxAmount: 0,
+    discountCodes: existingCart?.discountCodes || [],
+    discountAllocations: [],
+    url: existingCart?.url || "",
+    ready: true,
+    customAttributes: existingCart?.customAttributes
+  };
+}
+
 // src/hooks/cart/utils/index.ts
 var getQuery = () => {
   const url = typeof window !== "undefined" ? window.location.search : "";
@@ -328,12 +403,15 @@ var formatFunctionAutoFreeGift = ({
   };
   return result;
 };
-var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
+var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
   const tags = react.useMemo(() => customer?.tags || [], [customer?.tags]);
   const isCustomerLoading = react.useMemo(() => !customer ? true : false, [customer]);
   const dealsType = "";
   const { client, locale } = useShopify();
   const giftProductsCache = react.useRef(null);
+  const effectiveCart = react.useMemo(() => {
+    return cart;
+  }, [lines, cart]);
   const { activeCampaign, subtotal } = react.useMemo(() => {
     for (const campaign of autoFreeGiftConfig) {
       const { rule_conditions = [], rule_result } = campaign;
@@ -341,7 +419,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
       const isPreCheckPassed = preCheck(rule_conditions, tags, []);
       if (isPreCheckPassed && spend_get_reward) {
         const matchedSubtotal = getMatchedMainProductSubTotal(
-          cart,
+          effectiveCart,
           spend_get_reward.main_product?.variant_list?.map((v) => v.variant_id) || [],
           {
             spend_money_type: spend_get_reward.main_product?.spend_money_type || 1,
@@ -355,13 +433,13 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
       }
     }
     return { activeCampaign: null, subtotal: 0 };
-  }, [autoFreeGiftConfig, cart, tags, dealsType]);
+  }, [autoFreeGiftConfig, effectiveCart, tags, dealsType]);
   const { qualifyingGift, nextTierGoal } = react.useMemo(() => {
     if (!activeCampaign || !activeCampaign.rule_result?.spend_get_reward?.gift_product) {
       return { qualifyingGift: null, nextTierGoal: null };
     }
     const giftTiers = activeCampaign.rule_result.spend_get_reward.gift_product;
-    const qualifyingTier = [...giftTiers].reverse().find((tier) => subtotal >= Number(tier.spend_sum_money));
+    const qualifyingTier = [...giftTiers].sort((a, b) => Number(b.spend_sum_money) - Number(a.spend_sum_money)).find((tier) => subtotal >= Number(tier.spend_sum_money));
     const nextGoal = giftTiers.find((tier) => subtotal < Number(tier.spend_sum_money));
     if (!qualifyingTier) {
       return { qualifyingGift: null, nextTierGoal: nextGoal || null };
@@ -438,12 +516,19 @@ var useScriptAutoFreeGift = ({
   campaign,
   _giveaway,
   cart,
-  locale: providedLocale
+  locale: providedLocale,
+  lines
 }) => {
   const { client, locale: contextLocale } = useShopify();
   const locale = providedLocale || contextLocale;
   const [points_subscribe, set_points_subscribe] = react.useState(false);
   const giftProductsCache = react.useRef(null);
+  const effectiveCart = react.useMemo(() => {
+    if (lines && lines.length > 0) {
+      return createMockCartFromLines(lines, cart);
+    }
+    return cart;
+  }, [lines, cart]);
   react.useEffect(() => {
     if (locale === "au") {
       const isPointsSubscribe = Cookies5__default.default.get("points_subscribe");
@@ -465,14 +550,14 @@ var useScriptAutoFreeGift = ({
       upgrade_multiple2 = 1.2;
       upgrade_value2 = 40;
     }
-    cart?.lineItems?.forEach(({ customAttributes }) => {
+    effectiveCart?.lineItems?.forEach(({ customAttributes }) => {
       customAttributes?.forEach(({ key, value }) => {
         if (key === "_amount_upgrade_multiple") upgrade_multiple2 = Number(value) || 1;
         if (key === "_amount_upgrade_value") upgrade_value2 = Number(value) || 0;
       });
     });
     return [upgrade_multiple2, upgrade_value2];
-  }, [cart?.lineItems, points_subscribe]);
+  }, [effectiveCart?.lineItems, points_subscribe]);
   const breakpoints = react.useMemo(() => {
     if (!isActivityAvailable) return [];
     return (campaign?.breakpoints || []).map((item) => ({
@@ -500,7 +585,7 @@ var useScriptAutoFreeGift = ({
   }, [giftHandles]);
   const involvedLines = react.useMemo(() => {
     if (!isActivityAvailable) return [];
-    return (cart?.lineItems || []).filter((line) => {
+    return (effectiveCart?.lineItems || []).filter((line) => {
       const isNotGift = line?.totalAmount && Number(line.totalAmount) > 0 && line.customAttributes?.every(
         (item) => item.key !== _giveaway
       );
@@ -509,7 +594,7 @@ var useScriptAutoFreeGift = ({
       );
       return isNotGift && hasCampaignTag;
     });
-  }, [cart?.lineItems, isActivityAvailable, _giveaway]);
+  }, [effectiveCart?.lineItems, isActivityAvailable, _giveaway]);
   const involvedSubTotal = react.useMemo(() => {
     if (!isActivityAvailable) return new Decimal2__default.default(0);
     return involvedLines.reduce((prev, item) => {
@@ -1092,6 +1177,7 @@ function CartProvider({
       isCodeChanging,
       setIsCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       setLoadingState,
       loadingState,
       // function满赠
@@ -1115,6 +1201,7 @@ function CartProvider({
       locale,
       isCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       loadingState,
       // function满赠
       functionAutoFreeGift,