@anker-in/shopify-react 0.1.1-beta.17 → 0.1.1-beta.19

package/dist/index.js

@@ -527,18 +527,24 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     return true;
   }, [giftHandles]);
-  const { data: giftProductsResult } = useSWR__default.default(shouldFetch ? giftHandles : null, async () => {
-    const res = await shopifySdk.getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR__default.default(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await shopifySdk.getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = react.useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -591,12 +597,14 @@ var useScriptAutoFreeGift = ({
       upgrade_multiple2 = 1.2;
       upgrade_value2 = 40;
     }
-    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;
-      });
-    });
+    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];
   }, [effectiveCart?.lineItems, points_subscribe]);
   const breakpoints = react.useMemo(() => {
@@ -661,18 +669,24 @@ var useScriptAutoFreeGift = ({
     const nextLevel = levelIndex > 0 ? sortedLevels[levelIndex - 1] ?? null : null;
     return [currentLevel, nextLevel];
   }, [breakpoints, involvedSubTotal, involvedLines.length]);
-  const { data: giftProductsResult } = useSWR__default.default(shouldFetch ? giftHandles : null, async () => {
-    const res = await shopifySdk.getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR__default.default(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await shopifySdk.getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = react.useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -935,7 +949,7 @@ function useApplyCartCodes(options) {
       if (!discountCodes?.length) {
         throw new Error("Invalid input used for this operation: Miss discountCode");
       }
-      const cartId = providedCartId ? void 0 : providedCartId || cart?.id;
+      const cartId = providedCartId || cart?.id;
       if (!cartId) {
         return void 0;
       }
@@ -963,7 +977,7 @@ function useRemoveCartCodes(options) {
   const removeCodes = react.useCallback(
     async (_key, { arg }) => {
       const { cartId: providedCartId, discountCodes } = arg;
-      const cartId = providedCartId ? void 0 : providedCartId || cart?.id;
+      const cartId = providedCartId || cart?.id;
       const codes = cart?.discountCodes?.filter((code) => !!code.applicable) || [];
       const leftCodes = codes.filter((code) => discountCodes?.length ? !discountCodes.includes(code.code) : code.code).map((code) => code.code);
       const updatedCart = await shopifySdk.updateCartCodes(client, {
@@ -1514,8 +1528,29 @@ var useCartAttributes = ({
     [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
   );
   const extraAttributesInCart = react.useMemo(() => {
+    const commonAttributeKeys = [
+      // member attributes
+      "_token",
+      "_member_type",
+      "_user_type",
+      "_is_login",
+      "_login_user",
+      // function attributes
+      "_discounts_function_env",
+      // presell attributes
+      "_presale",
+      // weight attributes
+      "_weight",
+      "_app_source_name",
+      // tracking attributes
+      "utm_params",
+      // referral attributes
+      "_invite_code",
+      "_play_mode_id",
+      "_popup"
+    ];
     return cart?.customAttributes?.filter(
-      (item) => !commonAttributes.some((attr) => attr.key === item.key)
+      (item) => !commonAttributeKeys.includes(item.key)
     ) || [];
   }, [cart]);
   return react.useMemo(
@@ -1741,8 +1776,9 @@ function useProductsByHandles(options = {}) {
         metafieldIdentifiers
       });
     },
-    swrOptions || {
-      revalidateOnFocus: false
+    {
+      revalidateOnFocus: false,
+      ...swrOptions
     }
   );
 }
@@ -3143,7 +3179,12 @@ function CartProvider({
   const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
   ahooks.useRequest(
     () => {
-      const newAttributes = [...attributes, ...customAttributes];
+      const newAttributes = [...attributes];
+      customAttributes.forEach((item) => {
+        if (item.value && !newAttributes.some((attr) => attr.key === item.key)) {
+          newAttributes.push(item);
+        }
+      });
       const needUpdate = cart && checkAttributesUpdateNeeded(
         cart.customAttributes,
         newAttributes,