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

package/dist/index.mjs

@@ -519,18 +519,24 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     return true;
   }, [giftHandles]);
-  const { data: giftProductsResult } = useSWR(shouldFetch ? giftHandles : null, async () => {
-    const res = await getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -583,12 +589,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 = useMemo(() => {
@@ -653,18 +661,24 @@ var useScriptAutoFreeGift = ({
     const nextLevel = levelIndex > 0 ? sortedLevels[levelIndex - 1] ?? null : null;
     return [currentLevel, nextLevel];
   }, [breakpoints, involvedSubTotal, involvedLines.length]);
-  const { data: giftProductsResult } = useSWR(shouldFetch ? giftHandles : null, async () => {
-    const res = await getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -927,7 +941,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;
       }
@@ -955,7 +969,7 @@ function useRemoveCartCodes(options) {
   const removeCodes = 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 updateCartCodes(client, {
@@ -1754,8 +1768,9 @@ function useProductsByHandles(options = {}) {
         metafieldIdentifiers
       });
     },
-    swrOptions || {
-      revalidateOnFocus: false
+    {
+      revalidateOnFocus: false,
+      ...swrOptions
     }
   );
 }
@@ -3156,7 +3171,12 @@ function CartProvider({
   const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
   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,