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

package/dist/index.js

@@ -142,6 +142,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 : "";
@@ -181,25 +256,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);
@@ -366,12 +441,18 @@ 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(() => {
+    if (lines && lines.length > 0) {
+      return createMockCartFromLines(lines, cart);
+    }
+    return cart;
+  }, [lines, cart]);
   const { activeCampaign, subtotal } = react.useMemo(() => {
     for (const campaign of autoFreeGiftConfig) {
       const { rule_conditions = [], rule_result } = campaign;
@@ -379,7 +460,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,
@@ -393,13 +474,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 };
@@ -476,18 +557,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] = 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");
       set_points_subscribe(!!isPointsSubscribe);
     }
   }, [locale]);
+  const isActivityAvailable = react.useMemo(() => {
+    if (!campaign) return false;
+    const query = getQuery();
+    const utmCampaign = Cookies5__default.default.get("utm_campaign") || query?.utm_campaign;
+    if (campaign.activityAvailableQuery && !utmCampaign?.includes(campaign.activityAvailableQuery))
+      return false;
+    return true;
+  }, [campaign]);
   const [upgrade_multiple, upgrade_value] = react.useMemo(() => {
     let upgrade_multiple2 = 1;
     let upgrade_value2 = 0;
@@ -495,17 +591,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 = react.useMemo(() => {
-    if (!campaign) return [];
-    return (campaign.breakpoints || []).map((item) => ({
+    if (!isActivityAvailable) return [];
+    return (campaign?.breakpoints || []).map((item) => ({
       breakpoint: new Decimal2__default.default(item.breakpoint).minus(new Decimal2__default.default(upgrade_value)).dividedBy(new Decimal2__default.default(upgrade_multiple)).toFixed(2, Decimal2__default.default.ROUND_DOWN),
       giveawayProducts: item.giveawayProducts || []
     }));
@@ -529,25 +625,26 @@ var useScriptAutoFreeGift = ({
     return true;
   }, [giftHandles]);
   const involvedLines = react.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 = react.useMemo(() => {
-    if (!campaign) return new Decimal2__default.default(0);
+    if (!isActivityAvailable) return new Decimal2__default.default(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__default.default(prev).plus(new Decimal2__default.default(amount || 0));
     }, new Decimal2__default.default(0));
-  }, [involvedLines, campaign]);
+  }, [involvedLines, isActivityAvailable]);
   const [freeGiftLevel, nextFreeGiftLevel] = react.useMemo(() => {
+    if (!isActivityAvailable) return [null, null];
     const sortedLevels = [...breakpoints].sort(
       (a, b) => Number(b.breakpoint) - Number(a.breakpoint)
     );
@@ -691,8 +788,12 @@ var trackAddToCartGA = ({
   }
   const { variant } = lineItems[0];
   const currencyCode = variant.product?.price?.currencyCode;
-  const price = variant.compareAtPrice?.amount ?? (variant.price?.amount || 0);
-  const totalPrice = lineItems?.reduce((prev, { variant: variant2 }) => prev.plus(variant2?.finalPrice?.amount ?? price), new Decimal2__default.default(0)).toNumber();
+  const totalPrice = lineItems?.reduce(
+    (prev, { variant: variant2 }) => prev.plus(
+      variant2?.finalPrice?.amount ?? variant2?.compareAtPrice?.amount ?? variant2?.price?.amount ?? 0
+    ),
+    new Decimal2__default.default(0)
+  ).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "add_to_cart",
@@ -707,7 +808,7 @@ var trackAddToCartGA = ({
         item_brand: gtmParams?.brand || "",
         item_category: variant2?.product?.productType || "",
         item_variant: variant2?.title || variant2?.title,
-        price,
+        price: variant2?.compareAtPrice?.amount ?? variant2?.price?.amount,
         quantity: quantity || 1
       })),
       ...gtmParams?.ga4Params
@@ -722,9 +823,12 @@ var trackBeginCheckoutGA = ({
   if (!lineItems.length) {
     return;
   }
-  const { variant } = lineItems[0] || {};
-  const price = variant?.compareAtPrice?.amount ?? (variant?.price?.amount || 0);
-  const totalPrice = lineItems?.reduce((prev, { variant: variant2 }) => prev.plus(variant2?.finalPrice?.amount ?? price), new Decimal2__default.default(0)).toNumber();
+  const totalPrice = lineItems?.reduce(
+    (prev, { variant }) => prev.plus(
+      variant?.finalPrice?.amount ?? variant?.compareAtPrice?.amount ?? variant?.price?.amount ?? 0
+    ),
+    new Decimal2__default.default(0)
+  ).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "begin_checkout",
@@ -739,7 +843,7 @@ var trackBeginCheckoutGA = ({
         item_brand: gtmParams?.brand || "",
         item_category: item.variant?.product?.productType,
         item_variant: item.variant?.title,
-        price,
+        price: item.variant?.compareAtPrice?.amount ?? item.variant?.price?.amount,
         quantity: item.quantity || 1
       })),
       ...gtmParams?.ga4Params
@@ -755,8 +859,12 @@ var trackBuyNowGA = ({
   }
   const { variant } = lineItems[0];
   const currencyCode = variant.price?.currencyCode;
-  const price = variant.compareAtPrice?.amount ?? (variant.price?.amount || 0);
-  const totalPrice = lineItems?.reduce((prev, { variant: variant2 }) => prev.plus(variant2?.finalPrice?.amount ?? price), new Decimal2__default.default(0)).toNumber();
+  const totalPrice = lineItems?.reduce(
+    (prev, { variant: variant2 }) => prev.plus(
+      variant2?.finalPrice?.amount ?? variant2?.compareAtPrice?.amount ?? (variant2?.price?.amount || 0)
+    ),
+    new Decimal2__default.default(0)
+  ).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "begin_checkout",
@@ -771,7 +879,7 @@ var trackBuyNowGA = ({
         item_brand: gtmParams?.brand || "",
         item_category: item.variant?.product?.productType || "",
         item_variant: item.variant?.title,
-        price,
+        price: item.variant?.compareAtPrice?.amount ?? item.variant?.price?.amount,
         quantity: item.quantity || 1
       })),
       ...gtmParams?.ga4Params
@@ -914,6 +1022,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       if (!resultCart) {
         return void 0;
       }
+      console.log("npm addCartLines resultCart", resultCart);
       if (resultCart.discountCodes && resultCart.discountCodes.length > 0) {
         const unapplicableCodes = resultCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
         if (unapplicableCodes.length > 0) {
@@ -1087,6 +1196,60 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
   );
   return useSWRMutation__default.default("buy-now", buyNow, swrOptions);
 }
+function useCalcGiftsFromLines({
+  lines,
+  customer,
+  scriptGiveawayKey = CUSTOMER_SCRIPT_GIFT_KEY
+}) {
+  const { locale } = useShopify();
+  const { cart, autoFreeGiftConfig, gradientGiftsConfig } = useCartContext();
+  const functionGift = useCalcAutoFreeGift(cart, autoFreeGiftConfig || [], customer, lines);
+  const scriptGift = useScriptAutoFreeGift({
+    campaign: gradientGiftsConfig || null,
+    _giveaway: scriptGiveawayKey,
+    cart,
+    locale,
+    lines
+  });
+  const allGiftLines = react.useMemo(() => {
+    const functionGiftLines = functionGift.qualifyingGift?.itemsToAdd || [];
+    const scriptGiftLines = scriptGift.freeGiftLevel ? scriptGift.freeGiftLevel.giveawayProducts.map((product) => {
+      const giftProduct = scriptGift.giftProductsResult?.find(
+        (p) => p.handle === product.handle
+      );
+      const variant = giftProduct?.variants?.[0];
+      return {
+        variant: {
+          id: variant?.id || "",
+          handle: product.handle,
+          sku: product.sku
+        },
+        quantity: 1,
+        attributes: [
+          {
+            key: scriptGiveawayKey,
+            value: "true"
+          }
+        ]
+      };
+    }).filter((item) => item.variant.id) : [];
+    return [...functionGiftLines, ...scriptGiftLines];
+  }, [
+    functionGift.qualifyingGift,
+    scriptGift.freeGiftLevel,
+    scriptGift.giftProductsResult,
+    scriptGiveawayKey
+  ]);
+  const hasGifts = react.useMemo(() => {
+    return allGiftLines.length > 0;
+  }, [allGiftLines]);
+  return {
+    functionGift,
+    scriptGift,
+    allGiftLines,
+    hasGifts
+  };
+}
 
 // src/hooks/cart/types/order-discount.ts
 var OrderDiscountType = /* @__PURE__ */ ((OrderDiscountType2) => {
@@ -1236,8 +1399,6 @@ var useCartAttributes = ({
     memberSetting,
     cart
   });
-  console.log("memberSetting", memberSetting);
-  console.log("hasPlusMember", hasPlusMember);
   react.useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
@@ -1286,15 +1447,19 @@ var useCartAttributes = ({
     ];
   }, [profile?.memberType, profile?.token, userType, hasPlusMember]);
   const functionAttributes = react.useMemo(() => {
-    return [
-      cart?.discountCodes && {
+    const hasFunctionEnvAttribute = cart?.lineItems.some(
+      (item) => item.customAttributes?.some((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY)
+    );
+    const discountCodes = cart?.discountCodes.map((item) => item.code).filter((code) => code) || [];
+    return hasFunctionEnvAttribute ? [
+      {
         key: "_discounts_function_env",
         value: JSON.stringify({
-          discount_code: cart?.discountCodes.map((item) => item.code),
+          discount_code: discountCodes,
           user_tags: customer?.tags || []
         })
       }
-    ];
+    ] : [];
   }, [cart]);
   const presellAttributes = react.useMemo(() => {
     return [
@@ -2471,6 +2636,69 @@ var usePlusMemberDeliveryCodes = ({
     [deliveryData]
   );
 };
+function useUpdateCartDeliveryOptions(mutate, metafieldIdentifiers, options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const updateDeliveryOptions = react.useCallback(
+    async (_key, { arg }) => {
+      const updatedCart = await shopifySdk.updateCartDeliveryOptions(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      console.log("useUpdateCartDeliveryOptions updatedCart", updatedCart);
+      if (updatedCart) {
+        mutate(updatedCart);
+      }
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutate]
+  );
+  return useSWRMutation__default.default("update-cart-delivery-options", updateDeliveryOptions, options);
+}
+
+// src/hooks/member/plus/use-update-plus-member-delivery-options.ts
+var useUpdatePlusMemberDeliveryOptions = ({
+  options
+}) => {
+  const { cart, mutateCart: mutate, metafieldIdentifiers } = useCartContext();
+  const { trigger: updateCartDeliveryOptions2, isMutating } = useUpdateCartDeliveryOptions(
+    mutate,
+    metafieldIdentifiers
+  );
+  const handler = react.useCallback(
+    async (_, { arg }) => {
+      const { deliveryData } = arg;
+      const firstDeliveryGroup = cart?.deliveryGroups?.[0];
+      const deliveryGroupId = firstDeliveryGroup?.id;
+      const selectedOptionCode = deliveryData?.deliveryCustomData?.selected_delivery_option?.code;
+      if (!deliveryGroupId || !selectedOptionCode || selectedOptionCode === firstDeliveryGroup?.selectedDeliveryOption?.code) {
+        return null;
+      }
+      const deliveryGroup = cart?.deliveryGroups?.find((group) => group?.id === deliveryGroupId);
+      const matchedOption = deliveryGroup?.deliveryOptions?.find(
+        (option) => option?.code === selectedOptionCode
+      );
+      if (!matchedOption?.handle) {
+        return null;
+      }
+      const deliveryOptions = [
+        {
+          deliveryGroupId,
+          deliveryOptionHandle: matchedOption.handle
+        }
+      ];
+      const updatedCart = await updateCartDeliveryOptions2({
+        selectedDeliveryOptions: deliveryOptions
+      });
+      if (updatedCart && mutate) {
+        mutate(updatedCart);
+      }
+      return updatedCart;
+    },
+    [cart, updateCartDeliveryOptions2, mutate]
+  );
+  return useSWRMutation__default.default("update-cart-delivery-options", handler, options);
+};
 var usePlusMemberItemCustomAttributes = ({
   deliveryData
 }) => {
@@ -2557,15 +2785,14 @@ var usePlusMemberCheckoutCustomAttributes = ({
   }, [deliveryCustomData, product, profile, userType, variant, isShowShippingBenefits]);
 };
 function useAutoRemovePlusMemberInCart({
-  metafields,
-  isMonthlyPlus,
-  isAnnualPlus
+  cart,
+  profile,
+  memberSetting
 }) {
-  const { plus_monthly_product, plus_annual_product } = metafields || {};
-  const { cart } = useCartContext();
+  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   react.useEffect(() => {
-    if (!cart) return;
+    if (!cart || !plus_monthly_product || !plus_annual_product) return;
     const removePlusProduct = async (productType) => {
       if (!productType) return;
       const product = cart.lineItems?.find(
@@ -2577,26 +2804,53 @@ function useAutoRemovePlusMemberInCart({
         });
       }
     };
-    if (isMonthlyPlus) {
+    if (profile?.isMonthlyPlus) {
       removePlusProduct(plus_monthly_product);
     }
-    if (isAnnualPlus) {
+    if (profile?.isAnnualPlus) {
       removePlusProduct(plus_annual_product);
     }
+  }, [cart, plus_annual_product, plus_monthly_product, profile, removeCartLines2]);
+}
+function useAddPlusMemberProductsToCart({
+  cart,
+  profile
+}) {
+  const { selectedPlusMemberMode, selectedPlusMemberProduct, plusMemberMetafields } = usePlusMemberContext();
+  const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
+    memberSetting: plusMemberMetafields,
+    cart
+  });
+  const plusMemberProduct = react.useMemo(() => {
+    if (!selectedPlusMemberProduct || selectedPlusMemberMode === "free" /* FREE */) {
+      return void 0;
+    }
+    if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
+      return void 0;
+    }
+    if (selectedPlusMemberMode === "annual" /* ANNUAL */ && hasAnnualPlus) {
+      return void 0;
+    }
+    if (profile?.isMonthlyPlus && selectedPlusMemberMode === "monthly" /* MONTHLY */) {
+      return void 0;
+    }
+    if (!profile?.isAnnualPlus && selectedPlusMemberMode === "annual" /* ANNUAL */) {
+      return void 0;
+    }
+    return selectedPlusMemberProduct;
   }, [
-    cart,
-    plus_annual_product,
-    plus_monthly_product,
-    isAnnualPlus,
-    isMonthlyPlus,
-    removeCartLines2
+    selectedPlusMemberMode,
+    selectedPlusMemberProduct?.variant,
+    selectedPlusMemberProduct?.product,
+    hasMonthlyPlus,
+    hasAnnualPlus
   ]);
+  return plusMemberProduct;
 }
 var PlusMemberProvider = ({
   variant,
   product,
-  shopCommon,
-  metafields,
+  memberSetting,
   initialSelectedPlusMemberMode = "free",
   profile,
   locale,
@@ -2616,14 +2870,14 @@ var PlusMemberProvider = ({
   const [deleteMarginBottom, setDeleteMarginBottom] = react.useState(false);
   const shippingMethodsContext = useShippingMethods({
     variant,
-    plusMemberMetafields: metafields,
+    plusMemberMetafields: memberSetting,
     selectedPlusMemberMode});
   const plusMemberHandles = react.useMemo(() => {
     return [
-      metafields?.plus_monthly_product?.handle,
-      metafields?.plus_annual_product?.handle
+      memberSetting?.plus_monthly_product?.handle,
+      memberSetting?.plus_annual_product?.handle
     ].filter(Boolean);
-  }, [metafields]);
+  }, [memberSetting]);
   const { data: plusMemberProducts = [] } = useProductsByHandles({
     handles: plusMemberHandles
   });
@@ -2631,25 +2885,24 @@ var PlusMemberProvider = ({
     if (selectedPlusMemberMode === "free" /* FREE */) {
       return null;
     }
-    const handle = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? metafields?.plus_monthly_product?.handle : metafields?.plus_annual_product?.handle;
-    const sku = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? metafields?.plus_monthly_product?.sku : metafields?.plus_annual_product?.sku;
+    const handle = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? memberSetting?.plus_monthly_product?.handle : memberSetting?.plus_annual_product?.handle;
+    const sku = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? memberSetting?.plus_monthly_product?.sku : memberSetting?.plus_annual_product?.sku;
     const product2 = plusMemberProducts?.find((p) => p.handle === handle);
     const variant2 = product2?.variants?.find((v) => v.sku === sku);
     return product2 && variant2 ? { product: product2, variant: variant2 } : null;
-  }, [plusMemberProducts, metafields, selectedPlusMemberMode]);
+  }, [plusMemberProducts, memberSetting, selectedPlusMemberMode]);
   return /* @__PURE__ */ jsxRuntime.jsx(
     PlusMemberContext.Provider,
     {
       value: {
         variant,
-        shopCommon,
         zipCode,
         setZipCode,
         allowNextDayDelivery,
         setAllowNextDayDelivery,
         allowThirdDayDelivery,
         setAllowThirdDayDelivery,
-        plusMemberMetafields: metafields,
+        plusMemberMetafields: memberSetting,
         selectedPlusMemberMode,
         setSelectedPlusMemberMode,
         showAreaCheckModal,
@@ -2868,6 +3121,9 @@ function CartProvider({
 }) {
   const { client, cartCookieAdapter } = useShopify();
   const [customAttributes, setCustomAttributes] = react.useState([]);
+  const [customAttributesNeedDelete, setCustomAttributesNeedDelete] = react.useState(
+    []
+  );
   const [isCodeChanging, setIsCodeChanging] = react.useState(false);
   const [loadingState, setLoadingState] = react.useState({
     editLineQuantityLoading: false,
@@ -2898,7 +3154,11 @@ function CartProvider({
   ahooks.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 {
@@ -2919,11 +3179,12 @@ function CartProvider({
     isCartLoading: isCartLoading || isCodeChanging,
     setLoadingState
   });
-  const removeCustomAttributes = react.useCallback((attributes2) => {
-    setCustomAttributes(
-      (prev) => prev.filter((attr) => !attributes2.some((a) => a.key === attr.key))
-    );
-  }, []);
+  const removeCustomAttributes = react.useCallback(
+    (attributes2) => {
+      setCustomAttributesNeedDelete(attributes2);
+    },
+    [setCustomAttributesNeedDelete]
+  );
   const addCustomAttributes = react.useCallback(
     (attributes2) => {
       const sameAttributes = attributes2.filter(
@@ -3010,6 +3271,7 @@ function CartProvider({
       isCodeChanging,
       setIsCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       setLoadingState,
       loadingState,
       // function满赠
@@ -3033,6 +3295,7 @@ function CartProvider({
       locale,
       isCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       loadingState,
       // function满赠
       functionAutoFreeGift,
@@ -3105,7 +3368,9 @@ exports.atobID = atobID;
 exports.browserCartCookieAdapter = browserCartCookieAdapter;
 exports.browserCookieAdapter = browserCookieAdapter;
 exports.btoaID = btoaID;
+exports.checkAttributesUpdateNeeded = checkAttributesUpdateNeeded;
 exports.clearGeoLocationCache = clearGeoLocationCache;
+exports.createMockCartFromLines = createMockCartFromLines;
 exports.currencyCodeMapping = currencyCodeMapping;
 exports.defaultSWRMutationConfiguration = defaultSWRMutationConfiguration;
 exports.formatFunctionAutoFreeGift = formatFunctionAutoFreeGift;
@@ -3116,15 +3381,16 @@ exports.getDiscountEnvAttributeValue = getDiscountEnvAttributeValue;
 exports.getMatchedMainProductSubTotal = getMatchedMainProductSubTotal;
 exports.getQuery = getQuery;
 exports.getReferralAttributes = getReferralAttributes;
-exports.isAttributesEqual = isAttributesEqual;
+exports.normalizeAddToCartLines = normalizeAddToCartLines;
 exports.preCheck = preCheck;
-exports.safeParseJson = safeParseJson;
+exports.safeParse = safeParse;
 exports.trackAddToCartFBQ = trackAddToCartFBQ;
 exports.trackAddToCartGA = trackAddToCartGA;
 exports.trackBeginCheckoutGA = trackBeginCheckoutGA;
 exports.trackBuyNowFBQ = trackBuyNowFBQ;
 exports.trackBuyNowGA = trackBuyNowGA;
 exports.useAddCartLines = useAddCartLines;
+exports.useAddPlusMemberProductsToCart = useAddPlusMemberProductsToCart;
 exports.useAddToCart = useAddToCart;
 exports.useAllBlogs = useAllBlogs;
 exports.useAllCollections = useAllCollections;
@@ -3137,6 +3403,7 @@ exports.useAutoRemovePlusMemberInCart = useAutoRemovePlusMemberInCart;
 exports.useBlog = useBlog;
 exports.useBuyNow = useBuyNow;
 exports.useCalcAutoFreeGift = useCalcAutoFreeGift;
+exports.useCalcGiftsFromLines = useCalcGiftsFromLines;
 exports.useCalcOrderDiscount = useCalcOrderDiscount;
 exports.useCartAttributes = useCartAttributes;
 exports.useCartContext = useCartContext;
@@ -3171,6 +3438,7 @@ exports.useSite = useSite;
 exports.useUpdateCartAttributes = useUpdateCartAttributes;
 exports.useUpdateCartLines = useUpdateCartLines;
 exports.useUpdateLineCodeAmountAttributes = useUpdateLineCodeAmountAttributes;
+exports.useUpdatePlusMemberDeliveryOptions = useUpdatePlusMemberDeliveryOptions;
 exports.useUpdateVariantQuery = useUpdateVariantQuery;
 exports.useVariant = useVariant;
 exports.useVariantMedia = useVariantMedia;