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

package/dist/index.mjs

@@ -173,25 +173,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);
@@ -480,6 +480,14 @@ var useScriptAutoFreeGift = ({
       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;
@@ -496,8 +504,8 @@ var useScriptAutoFreeGift = ({
     return [upgrade_multiple2, upgrade_value2];
   }, [cart?.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 || []
     }));
@@ -521,25 +529,26 @@ var useScriptAutoFreeGift = ({
     return true;
   }, [giftHandles]);
   const involvedLines = useMemo(() => {
-    if (!campaign) return [];
+    if (!isActivityAvailable) return [];
     return (cart?.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]);
+  }, [cart?.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)
     );
@@ -683,8 +692,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(0)).toNumber();
+  const totalPrice = lineItems?.reduce(
+    (prev, { variant: variant2 }) => prev.plus(
+      variant2?.finalPrice?.amount ?? variant2?.compareAtPrice?.amount ?? variant2?.price?.amount ?? 0
+    ),
+    new Decimal2(0)
+  ).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "add_to_cart",
@@ -699,7 +712,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
@@ -714,9 +727,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(0)).toNumber();
+  const totalPrice = lineItems?.reduce(
+    (prev, { variant }) => prev.plus(
+      variant?.finalPrice?.amount ?? variant?.compareAtPrice?.amount ?? variant?.price?.amount ?? 0
+    ),
+    new Decimal2(0)
+  ).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "begin_checkout",
@@ -731,7 +747,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
@@ -747,8 +763,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(0)).toNumber();
+  const totalPrice = lineItems?.reduce(
+    (prev, { variant: variant2 }) => prev.plus(
+      variant2?.finalPrice?.amount ?? variant2?.compareAtPrice?.amount ?? (variant2?.price?.amount || 0)
+    ),
+    new Decimal2(0)
+  ).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "begin_checkout",
@@ -763,7 +783,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
@@ -2584,11 +2604,43 @@ function useAutoRemovePlusMemberInCart({
     removeCartLines2
   ]);
 }
+function useAddPlusMemberProductsToCart({
+  cart,
+  memberSetting,
+  selectedPlusMemberMode,
+  selectedPlusMemberProduct
+}) {
+  const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
+    cart,
+    memberSetting
+  });
+  const plusMemberProduct = useMemo(() => {
+    if (selectedPlusMemberMode === "free" /* FREE */) {
+      return void 0;
+    }
+    if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
+      return void 0;
+    }
+    if (selectedPlusMemberMode === "annual" /* ANNUAL */ && hasAnnualPlus) {
+      return void 0;
+    }
+    if (!selectedPlusMemberProduct) {
+      return void 0;
+    }
+    return selectedPlusMemberProduct;
+  }, [
+    selectedPlusMemberMode,
+    selectedPlusMemberProduct?.variant,
+    selectedPlusMemberProduct?.product,
+    hasMonthlyPlus,
+    hasAnnualPlus
+  ]);
+  return plusMemberProduct;
+}
 var PlusMemberProvider = ({
   variant,
   product,
-  shopCommon,
-  metafields,
+  memberSetting,
   initialSelectedPlusMemberMode = "free",
   profile,
   locale,
@@ -2608,14 +2660,14 @@ var PlusMemberProvider = ({
   const [deleteMarginBottom, setDeleteMarginBottom] = useState(false);
   const shippingMethodsContext = useShippingMethods({
     variant,
-    plusMemberMetafields: metafields,
+    plusMemberMetafields: memberSetting,
     selectedPlusMemberMode});
   const plusMemberHandles = 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
   });
@@ -2623,25 +2675,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__ */ jsx(
     PlusMemberContext.Provider,
     {
       value: {
         variant,
-        shopCommon,
         zipCode,
         setZipCode,
         allowNextDayDelivery,
         setAllowNextDayDelivery,
         allowThirdDayDelivery,
         setAllowThirdDayDelivery,
-        plusMemberMetafields: metafields,
+        plusMemberMetafields: memberSetting,
         selectedPlusMemberMode,
         setSelectedPlusMemberMode,
         showAreaCheckModal,
@@ -2860,6 +2911,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,
@@ -2890,7 +2944,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 {
@@ -2911,11 +2969,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(
@@ -3048,6 +3107,6 @@ function useCartContext() {
   return context;
 }
 
-export { BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, OrderBasePriceType, OrderDiscountType, PLUS_MEMBER_TYPE, PlusMemberContext, PlusMemberMode, PlusMemberProvider, PriceBasePriceType, PriceDiscountType, RuleType, SCRIPT_CODE_AMOUNT_KEY, ShippingMethodMode, ShopifyContext, ShopifyProvider, SpendMoneyType, atobID, browserCartCookieAdapter, browserCookieAdapter, btoaID, clearGeoLocationCache, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, gaTrack, getCachedGeoLocation, getDiscountEnvAttributeValue, getMatchedMainProductSubTotal, getQuery, getReferralAttributes, isAttributesEqual, preCheck, safeParseJson, trackAddToCartFBQ, trackAddToCartGA, trackBeginCheckoutGA, trackBuyNowFBQ, trackBuyNowGA, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcOrderDiscount, useCartAttributes, useCartContext, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useIntersection, usePlusAnnualProductVariant, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberDeliveryCodes, usePlusMemberItemCustomAttributes, usePlusMonthlyProductVariant, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useScriptAutoFreeGift, useSearch, useSelectedOptions, useShippingMethodAvailableCheck, useShippingMethods, useShopify, useSite, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia };
+export { BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, OrderBasePriceType, OrderDiscountType, PLUS_MEMBER_TYPE, PlusMemberContext, PlusMemberMode, PlusMemberProvider, PriceBasePriceType, PriceDiscountType, RuleType, SCRIPT_CODE_AMOUNT_KEY, ShippingMethodMode, ShopifyContext, ShopifyProvider, SpendMoneyType, atobID, browserCartCookieAdapter, browserCookieAdapter, btoaID, checkAttributesUpdateNeeded, clearGeoLocationCache, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, gaTrack, getCachedGeoLocation, getDiscountEnvAttributeValue, getMatchedMainProductSubTotal, getQuery, getReferralAttributes, preCheck, safeParse, trackAddToCartFBQ, trackAddToCartGA, trackBeginCheckoutGA, trackBuyNowFBQ, trackBuyNowGA, useAddCartLines, useAddPlusMemberProductsToCart, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcOrderDiscount, useCartAttributes, useCartContext, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useIntersection, usePlusAnnualProductVariant, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberDeliveryCodes, usePlusMemberItemCustomAttributes, usePlusMonthlyProductVariant, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useScriptAutoFreeGift, useSearch, useSelectedOptions, useShippingMethodAvailableCheck, useShippingMethods, useShopify, useSite, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map