@anker-in/shopify-react 0.1.1-beta.1 → 0.1.1-beta.3

package/dist/provider/index.mjs

@@ -95,6 +95,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 : "";
@@ -134,25 +209,25 @@ var getMatchedMainProductSubTotal = (cartData, variant_list, main_product) => {
     return acc + (main_product?.spend_money_type === 1 /* ORIGIN_PRICE */ ? Number(line.subtotalAmount) || 0 : Number(line.totalAmount) || 0);
   }, 0) || 0;
 };
-var getDiscountEnvAttributeValue = (attributes = []) => {
-  const attr = attributes.find((attr2) => attr2.key === CUSTOMER_ATTRIBUTE_KEY);
-  return safeParseJson(attr?.value ?? "") ?? {};
-};
-var isAttributesEqual = (attrs1 = [], attrs2 = []) => {
-  if (attrs1.length !== attrs2.length) return false;
-  const sorted1 = [...attrs1].sort((a, b) => a.key.localeCompare(b.key));
-  const sorted2 = [...attrs2].sort((a, b) => a.key.localeCompare(b.key));
-  return sorted1.every(
-    (attr, i) => attr.key === sorted2[i]?.key && attr.value === sorted2[i]?.value
-  );
-};
-var safeParseJson = (str) => {
+var safeParse = (str) => {
   try {
     return JSON.parse(str);
   } catch (err) {
     return {};
   }
 };
+var getDiscountEnvAttributeValue = (attributes = []) => {
+  const attr = attributes.find((attr2) => attr2.key === CUSTOMER_ATTRIBUTE_KEY);
+  return safeParse(attr?.value ?? "") ?? {};
+};
+var checkAttributesUpdateNeeded = (oldAttributes, newAttributes, customAttributesNeedRemove) => {
+  return oldAttributes.some((attr) => {
+    const newAttr = newAttributes.find((newAttr2) => newAttr2.key === attr.key);
+    return newAttr ? newAttr.value !== attr.value : true;
+  }) || newAttributes.some((attr) => !oldAttributes.some((oldAttr) => oldAttr.key === attr.key)) || customAttributesNeedRemove.some(
+    (removeAttr) => oldAttributes.some((oldAttr) => oldAttr.key === removeAttr.key)
+  );
+};
 var containsAll = (source, requiredItems = []) => {
   if (!requiredItems?.length) return true;
   const sourceSet = new Set(source);
@@ -319,12 +394,15 @@ var formatFunctionAutoFreeGift = ({
   };
   return result;
 };
-var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
+var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
   const tags = useMemo(() => customer?.tags || [], [customer?.tags]);
   const isCustomerLoading = useMemo(() => !customer ? true : false, [customer]);
   const dealsType = "";
   const { client, locale } = useShopify();
   const giftProductsCache = useRef(null);
+  const effectiveCart = useMemo(() => {
+    return cart;
+  }, [lines, cart]);
   const { activeCampaign, subtotal } = useMemo(() => {
     for (const campaign of autoFreeGiftConfig) {
       const { rule_conditions = [], rule_result } = campaign;
@@ -332,7 +410,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,
@@ -346,7 +424,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
       }
     }
     return { activeCampaign: null, subtotal: 0 };
-  }, [autoFreeGiftConfig, cart, tags, dealsType]);
+  }, [autoFreeGiftConfig, effectiveCart, tags, dealsType]);
   const { qualifyingGift, nextTierGoal } = useMemo(() => {
     if (!activeCampaign || !activeCampaign.rule_result?.spend_get_reward?.gift_product) {
       return { qualifyingGift: null, nextTierGoal: null };
@@ -429,18 +507,33 @@ 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] = useState(false);
   const giftProductsCache = useRef(null);
+  const effectiveCart = useMemo(() => {
+    if (lines && lines.length > 0) {
+      return createMockCartFromLines(lines, cart);
+    }
+    return cart;
+  }, [lines, cart]);
   useEffect(() => {
     if (locale === "au") {
       const isPointsSubscribe = Cookies5.get("points_subscribe");
       set_points_subscribe(!!isPointsSubscribe);
     }
   }, [locale]);
+  const isActivityAvailable = useMemo(() => {
+    if (!campaign) return false;
+    const query = getQuery();
+    const utmCampaign = Cookies5.get("utm_campaign") || query?.utm_campaign;
+    if (campaign.activityAvailableQuery && !utmCampaign?.includes(campaign.activityAvailableQuery))
+      return false;
+    return true;
+  }, [campaign]);
   const [upgrade_multiple, upgrade_value] = useMemo(() => {
     let upgrade_multiple2 = 1;
     let upgrade_value2 = 0;
@@ -448,17 +541,17 @@ 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 = useMemo(() => {
-    if (!campaign) return [];
-    return (campaign.breakpoints || []).map((item) => ({
+    if (!isActivityAvailable) return [];
+    return (campaign?.breakpoints || []).map((item) => ({
       breakpoint: new Decimal2(item.breakpoint).minus(new Decimal2(upgrade_value)).dividedBy(new Decimal2(upgrade_multiple)).toFixed(2, Decimal2.ROUND_DOWN),
       giveawayProducts: item.giveawayProducts || []
     }));
@@ -482,25 +575,26 @@ var useScriptAutoFreeGift = ({
     return true;
   }, [giftHandles]);
   const involvedLines = useMemo(() => {
-    if (!campaign) return [];
-    return (cart?.lineItems || []).filter((line) => {
+    if (!isActivityAvailable) return [];
+    return (effectiveCart?.lineItems || []).filter((line) => {
       const isNotGift = line?.totalAmount && Number(line.totalAmount) > 0 && line.customAttributes?.every(
         (item) => item.key !== _giveaway
       );
       const hasCampaignTag = line.product?.tags?.some(
-        (tag) => campaign.includeTags?.includes(tag.trim()) && line.variant?.availableForSale
+        (tag) => campaign?.includeTags?.includes(tag.trim()) && line.variant?.availableForSale
       );
       return isNotGift && hasCampaignTag;
     });
-  }, [cart?.lineItems, campaign, _giveaway]);
+  }, [effectiveCart?.lineItems, isActivityAvailable, _giveaway]);
   const involvedSubTotal = useMemo(() => {
-    if (!campaign) return new Decimal2(0);
+    if (!isActivityAvailable) return new Decimal2(0);
     return involvedLines.reduce((prev, item) => {
-      const amount = campaign.useTotalAmount ? item.totalAmount : item.subtotalAmount;
+      const amount = campaign?.useTotalAmount ? item.totalAmount : item.subtotalAmount;
       return new Decimal2(prev).plus(new Decimal2(amount || 0));
     }, new Decimal2(0));
-  }, [involvedLines, campaign]);
+  }, [involvedLines, isActivityAvailable]);
   const [freeGiftLevel, nextFreeGiftLevel] = useMemo(() => {
+    if (!isActivityAvailable) return [null, null];
     const sortedLevels = [...breakpoints].sort(
       (a, b) => Number(b.breakpoint) - Number(a.breakpoint)
     );
@@ -924,6 +1018,9 @@ function CartProvider({
 }) {
   const { client, cartCookieAdapter } = useShopify();
   const [customAttributes, setCustomAttributes] = useState([]);
+  const [customAttributesNeedDelete, setCustomAttributesNeedDelete] = useState(
+    []
+  );
   const [isCodeChanging, setIsCodeChanging] = useState(false);
   const [loadingState, setLoadingState] = useState({
     editLineQuantityLoading: false,
@@ -954,7 +1051,11 @@ function CartProvider({
   useRequest(
     () => {
       const newAttributes = [...attributes, ...customAttributes];
-      const needUpdate = cart && !isAttributesEqual(cart.customAttributes, newAttributes);
+      const needUpdate = cart && !checkAttributesUpdateNeeded(
+        cart.customAttributes,
+        newAttributes,
+        customAttributesNeedDelete
+      );
       if (needUpdate) {
         return updateAttributes({ attributes: newAttributes });
       } else {
@@ -975,11 +1076,12 @@ function CartProvider({
     isCartLoading: isCartLoading || isCodeChanging,
     setLoadingState
   });
-  const removeCustomAttributes = useCallback((attributes2) => {
-    setCustomAttributes(
-      (prev) => prev.filter((attr) => !attributes2.some((a) => a.key === attr.key))
-    );
-  }, []);
+  const removeCustomAttributes = useCallback(
+    (attributes2) => {
+      setCustomAttributesNeedDelete(attributes2);
+    },
+    [setCustomAttributesNeedDelete]
+  );
   const addCustomAttributes = useCallback(
     (attributes2) => {
       const sameAttributes = attributes2.filter(
@@ -1066,6 +1168,7 @@ function CartProvider({
       isCodeChanging,
       setIsCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       setLoadingState,
       loadingState,
       // function满赠
@@ -1089,6 +1192,7 @@ function CartProvider({
       locale,
       isCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       loadingState,
       // function满赠
       functionAutoFreeGift,