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

package/dist/index.mjs

@@ -2,12 +2,12 @@ import { createContext, useMemo, useContext, useRef, useState, useEffect, useCal
 import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes, addCartLines, updateCartLines, removeCartLines, getLocalStorage, updateCartAttributes, updateBuyerIdentity, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getCart, setLocalStorage } from '@anker-in/shopify-sdk';
 export * from '@anker-in/shopify-sdk';
 import Cookies5 from 'js-cookie';
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import Decimal3 from 'decimal.js';
 import { atobID, btoaID } from '@anker-in/shopify-core';
 import useSWR from 'swr';
 import useSWRMutation from 'swr/mutation';
-import { useRequest } from 'ahooks';
+import { useDebounceEffect, useRequest } from 'ahooks';
 
 // src/provider/context.ts
 var ShopifyContext = createContext(null);
@@ -1307,9 +1307,13 @@ function useAutoRemoveFreeGifts(options = {}) {
   const {
     removeFunctionGifts = true,
     removeScriptGifts = true,
-    isGiftLineItem
+    isGiftLineItem,
+    runOnlyOnceAfterInit = false,
+    initDelay = 500
   } = options;
   const [isRemoving, setIsRemoving] = useState(false);
+  const [isInitialized, setIsInitialized] = useState(!runOnlyOnceAfterInit);
+  const [isFinished, setIsFinished] = useState(false);
   const { cart } = useCartContext();
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   const giftsToRemove = useMemo(() => {
@@ -1346,7 +1350,29 @@ function useAutoRemoveFreeGifts(options = {}) {
       return false;
     });
   }, [cart, removeFunctionGifts, removeScriptGifts, isGiftLineItem]);
+  useDebounceEffect(
+    () => {
+      if (!runOnlyOnceAfterInit || isInitialized || isFinished) {
+        return;
+      }
+      if (!cart?.lineItems?.length) {
+        return;
+      }
+      setIsInitialized(true);
+      if (giftsToRemove.length === 0) {
+        setIsFinished(true);
+      }
+    },
+    [runOnlyOnceAfterInit, isInitialized, isFinished, cart?.lineItems, giftsToRemove.length],
+    {
+      trailing: true,
+      wait: initDelay
+    }
+  );
   useEffect(() => {
+    if (runOnlyOnceAfterInit && (!isInitialized || isFinished)) {
+      return;
+    }
     if (isRemoving || giftsToRemove.length === 0) {
       return;
     }
@@ -1360,10 +1386,16 @@ function useAutoRemoveFreeGifts(options = {}) {
         console.error("Failed to remove free gifts:", error);
       } finally {
         setIsRemoving(false);
+        if (runOnlyOnceAfterInit) {
+          setIsFinished(true);
+        }
       }
     };
     performRemoval();
   }, [
+    runOnlyOnceAfterInit,
+    isInitialized,
+    isFinished,
     isRemoving,
     giftsToRemove,
     removeCartLines2
@@ -1697,7 +1729,17 @@ function getCartBasicAttributes({
   const presellAttributes = [
     {
       key: "_presale",
-      value: cart?.lineItems?.some((item) => item?.variant?.metafields?.presell === "presell") ? "true" : "false"
+      value: cart?.lineItems?.some(
+        (item) => item?.variant?.metafields?.global?.presell === "presell"
+      ) ? "true" : "false"
+    }
+  ];
+  const hideShippingAttributes = [
+    {
+      key: "_hide_shipping",
+      value: cart?.lineItems?.some(
+        (item) => item?.variant?.metafields?.global?.hideShipping === "true"
+      ) ? "true" : "false"
     }
   ];
   const weightAttributes = [
@@ -1736,6 +1778,7 @@ function getCartBasicAttributes({
     ...functionAttributes,
     ...presellAttributes,
     ...weightAttributes,
+    ...hideShippingAttributes,
     ...trackingAttributes,
     ...getReferralAttributes()
   ].filter((item) => item?.value !== void 0 && item?.value !== null);
@@ -2732,7 +2775,13 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
         cookieAdapter: cartCookieAdapter,
         buyerIdentity,
         discountCodes,
-        customAttributes: [...basicCartAttributes, ...ga4Attributes, ...customAttributes || []]
+        customAttributes: [
+          ...basicCartAttributes.filter(
+            (a) => !(customAttributes || []).some((c) => c.key === a.key)
+          ),
+          ...ga4Attributes.filter((a) => !(customAttributes || []).some((c) => c.key === a.key)),
+          ...customAttributes || []
+        ]
       });
       if (!resultCart) {
         throw new Error("Failed to create cart for buy now");
@@ -2740,7 +2789,9 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       if (withTrack && resultCart.lineItems) {
         trackBuyNowGA({
           lineItems: lineItems.map((item) => {
-            const cartLine = resultCart.lineItems.find((line) => line.variant.id === item.variant?.id);
+            const cartLine = resultCart.lineItems.find(
+              (line) => line.variant.id === item.variant?.id
+            );
             if (!cartLine) {
               return null;
             }
@@ -3569,6 +3620,16 @@ function clearGeoLocationCache(cacheKey = "geoLocation") {
   }
 }
 var CartContext = createContext(null);
+function AutoRemoveGiftsHandler({
+  options,
+  onRemovingChange
+}) {
+  const { isRemoving } = useAutoRemoveFreeGifts(options);
+  useEffect(() => {
+    onRemovingChange(isRemoving);
+  }, [isRemoving, onRemovingChange]);
+  return null;
+}
 function CartProvider({
   children,
   // swrOptions,
@@ -3596,6 +3657,7 @@ function CartProvider({
   });
   const [scriptAutoFreeGift, setScriptAutoFreeGift] = useState([]);
   const [functionAutoFreeGift, setFunctionAutoFreeGift] = useState([]);
+  const [isAutoRemovingFreeGifts, setIsAutoRemovingFreeGifts] = useState(false);
   const {
     run: fetchCart,
     data: cart,
@@ -3755,7 +3817,9 @@ function CartProvider({
   const autoRemoveFreeGiftsOptions = useMemo(() => {
     return {
       removeFunctionGifts: !!functionAutoFreeGiftConfig,
-      removeScriptGifts: !!scriptAutoFreeGiftConfig
+      removeScriptGifts: !!scriptAutoFreeGiftConfig,
+      runOnlyOnceAfterInit: true,
+      initDelay: 500
     };
   }, [functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig]);
   const value = useMemo(
@@ -3788,7 +3852,8 @@ function CartProvider({
       metafieldIdentifiers,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     }),
     [
       cart,
@@ -3817,10 +3882,20 @@ function CartProvider({
       profile,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     ]
   );
-  return /* @__PURE__ */ jsx(CartContext.Provider, { value, children });
+  return /* @__PURE__ */ jsxs(CartContext.Provider, { value, children: [
+    (functionAutoFreeGiftConfig || scriptAutoFreeGiftConfig) && /* @__PURE__ */ jsx(
+      AutoRemoveGiftsHandler,
+      {
+        options: autoRemoveFreeGiftsOptions,
+        onRemovingChange: setIsAutoRemovingFreeGifts
+      }
+    ),
+    children
+  ] });
 }
 function useCartContext(options) {
   const context = useContext(CartContext);