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

package/dist/provider/index.mjs

@@ -477,18 +477,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;
@@ -541,12 +547,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(() => {
@@ -611,18 +619,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;
@@ -1091,7 +1105,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,