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

package/dist/index.js

@@ -181,25 +181,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);
@@ -488,6 +488,14 @@ var useScriptAutoFreeGift = ({
       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;
@@ -504,8 +512,8 @@ var useScriptAutoFreeGift = ({
     return [upgrade_multiple2, upgrade_value2];
   }, [cart?.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 +537,26 @@ var useScriptAutoFreeGift = ({
     return true;
   }, [giftHandles]);
   const involvedLines = react.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 = 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)
     );
@@ -667,8 +676,6 @@ function useAddCartLines(options) {
   );
   return useSWRMutation__default.default("add-cart-lines", addLines, options);
 }
-
-// src/tracking/ga.ts
 var gaTrack = (data) => {
   if (typeof window === "undefined") {
     return;
@@ -686,18 +693,19 @@ var gaTrack = (data) => {
 };
 var trackAddToCartGA = ({
   lineItems = [],
-  gtmParams = {},
-  brand
+  gtmParams = {}
 }) => {
   if (!lineItems.length || !lineItems[0]?.variant) {
     return;
   }
   const { variant } = lineItems[0];
-  const currencyCode = variant?.price?.currencyCode;
-  const totalPrice = lineItems.reduce((sum, item) => {
-    const price = parseFloat(item.variant?.price?.amount || "0");
-    return sum + price;
-  }, 0);
+  const currencyCode = variant.product?.price?.currencyCode;
+  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",
@@ -708,11 +716,11 @@ var trackAddToCartGA = ({
       position: gtmParams?.position || "",
       items: lineItems.map(({ variant: variant2, quantity }) => ({
         item_id: variant2?.sku,
-        item_name: variant2?.product?.title || variant2?.product?.name,
-        item_brand: brand || gtmParams?.brand || "",
+        item_name: variant2?.product?.title || variant2?.product?.title,
+        item_brand: gtmParams?.brand || "",
         item_category: variant2?.product?.productType || "",
-        item_variant: variant2?.title || variant2?.name,
-        price: variant2?.finalPrice?.amount ?? variant2?.price?.amount,
+        item_variant: variant2?.title || variant2?.title,
+        price: variant2?.compareAtPrice?.amount ?? variant2?.price?.amount,
         quantity: quantity || 1
       })),
       ...gtmParams?.ga4Params
@@ -722,13 +730,17 @@ var trackAddToCartGA = ({
 var trackBeginCheckoutGA = ({
   lineItems = [],
   currencyCode,
-  totalPrice,
-  gtmParams = {},
-  brand
+  gtmParams = {}
 }) => {
   if (!lineItems.length) {
     return;
   }
+  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",
@@ -740,10 +752,10 @@ var trackBeginCheckoutGA = ({
       items: lineItems.map((item) => ({
         item_id: item.variant?.sku,
         item_name: item.variant?.product?.title,
-        item_brand: brand || gtmParams?.brand || "",
+        item_brand: gtmParams?.brand || "",
         item_category: item.variant?.product?.productType,
         item_variant: item.variant?.title,
-        price: item.finalPrice?.amount || item.variant?.price?.amount,
+        price: item.variant?.compareAtPrice?.amount ?? item.variant?.price?.amount,
         quantity: item.quantity || 1
       })),
       ...gtmParams?.ga4Params
@@ -752,19 +764,19 @@ var trackBeginCheckoutGA = ({
 };
 var trackBuyNowGA = ({
   lineItems = [],
-  gtmParams = {},
-  brand
+  gtmParams = {}
 }) => {
   if (!lineItems.length || !lineItems[0]?.variant) {
     return;
   }
   const { variant } = lineItems[0];
   const currencyCode = variant.price?.currencyCode;
-  const totalPrice = lineItems.reduce((sum, item) => {
-    const price = parseFloat(item.finalPrice?.amount || item.variant?.price?.amount || "0");
-    const quantity = item.quantity || 1;
-    return sum + price * quantity;
-  }, 0);
+  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",
@@ -776,10 +788,10 @@ var trackBuyNowGA = ({
       items: lineItems.map((item) => ({
         item_id: item.variant?.sku,
         item_name: item.variant?.product?.title || item.variant?.title,
-        item_brand: item.variant?.product?.vendor || brand || gtmParams?.brand || "",
+        item_brand: gtmParams?.brand || "",
         item_category: item.variant?.product?.productType || "",
         item_variant: item.variant?.title,
-        price: item.finalPrice?.amount || item.variant?.price?.amount,
+        price: item.variant?.compareAtPrice?.amount ?? item.variant?.price?.amount,
         quantity: item.quantity || 1
       })),
       ...gtmParams?.ga4Params
@@ -793,10 +805,10 @@ var trackAddToCartFBQ = ({ lineItems = [] }) => {
     return;
   }
   if (lineItems.length && lineItems[0]?.variant) {
-    const { variant, quantity, finalPrice } = lineItems[0];
+    const { variant, quantity } = lineItems[0];
     try {
       window.fbq("track", "AddToCart", {
-        value: finalPrice?.amount || variant?.price?.amount,
+        value: variant?.compareAtPrice?.amount ?? (variant?.price?.amount || variant?.price || 0),
         num_items: quantity,
         currency: variant?.price?.currencyCode,
         content_name: variant?.product?.title,
@@ -883,9 +895,9 @@ function useRemoveCartCodes(options) {
 }
 
 // src/hooks/cart/use-add-to-cart.ts
-function useAddToCart({ withTrack = true, brand } = {}, swrOptions) {
-  const { client, locale, cartCookieAdapter, userAdapter } = useShopify();
-  const { mutateCart, cart, metafieldIdentifiers } = useCartContext();
+function useAddToCart({ withTrack = true } = {}, swrOptions) {
+  const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
+  const { cart } = useCartContext();
   const { trigger: applyCartCodes } = useApplyCartCodes();
   const { trigger: removeInvalidCodes } = useRemoveCartCodes();
   const { trigger: addCartLines2 } = useAddCartLines();
@@ -907,7 +919,8 @@ function useAddToCart({ withTrack = true, brand } = {}, swrOptions) {
       const lines = lineItems.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
-        attributes: item.attributes
+        attributes: item.attributes,
+        sellingPlanId: item.sellingPlanId
       })).filter((item) => item.merchandiseId && item.quantity);
       if (lines.length === 0) {
         return;
@@ -942,34 +955,16 @@ function useAddToCart({ withTrack = true, brand } = {}, swrOptions) {
           discountCodes
         });
       }
-      if (withTrack && resultCart.lineItems) {
-        const trackingLineItems = resultCart.lineItems.map((line) => ({
-          variant: {
-            id: line.variant.id,
-            sku: line.variant.sku || "",
-            title: line.variant.name,
-            price: {
-              amount: String(line.variant.price),
-              currencyCode: resultCart.currency.code
-            },
-            product: line.product ? {
-              title: line.product.title || line.name,
-              productType: line.product.productType,
-              vendor: line.product.vendor
-            } : void 0
-          },
-          quantity: line.quantity
-        }));
+      if (withTrack) {
         trackAddToCartGA({
-          lineItems: trackingLineItems,
-          gtmParams: { ...gtmParams, brand },
-          brand
+          lineItems,
+          gtmParams: { ...gtmParams, brand: config.getBrand() }
         });
-        trackAddToCartFBQ({ lineItems: trackingLineItems });
+        trackAddToCartFBQ({ lineItems });
       }
       return resultCart;
     },
-    [client, locale, cartCookieAdapter, userAdapter, cart, withTrack, brand]
+    [client, locale, cartCookieAdapter, userAdapter, cart, withTrack]
   );
   return useSWRMutation__default.default("add-to-cart", addToCart, swrOptions);
 }
@@ -1050,8 +1045,8 @@ function useUpdateCartAttributes(mutate, metafieldIdentifiers, options) {
   );
   return useSWRMutation__default.default("update-cart-attributes", updateAttributes, options);
 }
-function useBuyNow({ withTrack = true, brand } = {}, swrOptions) {
-  const { client, locale, cartCookieAdapter, userAdapter } = useShopify();
+function useBuyNow({ withTrack = true } = {}, swrOptions) {
+  const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
   const isLoggedIn = userAdapter?.isLoggedIn || false;
   const buyNow = react.useCallback(
     async (_key, { arg }) => {
@@ -1069,9 +1064,10 @@ function useBuyNow({ withTrack = true, brand } = {}, swrOptions) {
         return;
       }
       const lines = lineItems.map((item) => ({
-        merchandiseId: item.variant?.id || item.variantId || "",
+        merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
-        attributes: item.attributes
+        attributes: item.attributes,
+        sellingPlanId: item.sellingPlanId
       })).filter((item) => item.merchandiseId && item.quantity);
       if (lines.length === 0) {
         return;
@@ -1088,27 +1084,9 @@ function useBuyNow({ withTrack = true, brand } = {}, swrOptions) {
         throw new Error("Failed to create cart for buy now");
       }
       if (withTrack && resultCart.lineItems) {
-        const trackingLineItems = resultCart.lineItems.map((line) => ({
-          variant: {
-            id: line.variantId,
-            sku: line.variant.sku || "",
-            title: line.variant.name,
-            price: {
-              amount: String(line.variant.price),
-              currencyCode: resultCart.currency.code
-            },
-            product: line.product ? {
-              title: line.product.title || line.name,
-              productType: line.product.productType,
-              vendor: line.product.vendor
-            } : void 0
-          },
-          quantity: line.quantity
-        }));
         trackBuyNowGA({
-          lineItems: trackingLineItems,
-          gtmParams: { ...gtmParams, brand },
-          brand
+          lineItems,
+          gtmParams: { ...gtmParams, brand: config.getBrand() }
         });
         if (fbqTrackConfig) {
           trackBuyNowFBQ({ trackConfig: fbqTrackConfig });
@@ -1125,7 +1103,7 @@ function useBuyNow({ withTrack = true, brand } = {}, swrOptions) {
       }
       return resultCart;
     },
-    [client, locale, isLoggedIn, cartCookieAdapter, withTrack, brand]
+    [client, locale, isLoggedIn, cartCookieAdapter, withTrack]
   );
   return useSWRMutation__default.default("buy-now", buyNow, swrOptions);
 }
@@ -2634,11 +2612,43 @@ function useAutoRemovePlusMemberInCart({
     removeCartLines2
   ]);
 }
+function useAddPlusMemberProductsToCart({
+  cart,
+  memberSetting,
+  selectedPlusMemberMode,
+  selectedPlusMemberProduct
+}) {
+  const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
+    cart,
+    memberSetting
+  });
+  const plusMemberProduct = react.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,
@@ -2658,14 +2668,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
   });
@@ -2673,25 +2683,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,
@@ -2910,6 +2919,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,
@@ -2940,7 +2952,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 {
@@ -2961,11 +2977,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(
@@ -3147,6 +3164,7 @@ exports.atobID = atobID;
 exports.browserCartCookieAdapter = browserCartCookieAdapter;
 exports.browserCookieAdapter = browserCookieAdapter;
 exports.btoaID = btoaID;
+exports.checkAttributesUpdateNeeded = checkAttributesUpdateNeeded;
 exports.clearGeoLocationCache = clearGeoLocationCache;
 exports.currencyCodeMapping = currencyCodeMapping;
 exports.defaultSWRMutationConfiguration = defaultSWRMutationConfiguration;
@@ -3158,15 +3176,15 @@ exports.getDiscountEnvAttributeValue = getDiscountEnvAttributeValue;
 exports.getMatchedMainProductSubTotal = getMatchedMainProductSubTotal;
 exports.getQuery = getQuery;
 exports.getReferralAttributes = getReferralAttributes;
-exports.isAttributesEqual = isAttributesEqual;
 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;