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

package/dist/index.d.mts

@@ -2,7 +2,7 @@ export { AppContext, CartContextValue, CartProvider, CartProviderProps, LoadingS
 export { C as CookieAdapter, a as CookieOptions, P as PerformanceAdapter, R as RouterAdapter, U as UserContextAdapter } from './types-SKDHauqk.mjs';
 export { BrowserPerformanceAdapter, browserCartCookieAdapter, browserCookieAdapter } from './adapters/index.mjs';
 export { AddCartLinesInput, ApplyCartCodesInput, AutoFreeGift, AutoFreeGiftCartLineInput, AutoFreeGiftConfig, AutoFreeGiftItem, AutoFreeGiftList, AutoFreeGiftMainProduct, BuyNowInput, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, Config, CreateCartInput, DiscountLabel, FormattedGift, FunctionGiftResult, GeoLocationData, GetCartAttributesProps, GiftProduct, GiftProductItem, GiftTier, HasPlusMemberInCartProps, HasPlusMemberInCartResult, HasPlusMemberInLinesResult, ImageMedia, LocaleMapping, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, MainProductInfo, NormalizedSearchResultItem, Options, OrderBasePriceType, OrderDiscountConfig, OrderDiscountResult, OrderDiscountType, PlusMemberContext, PlusMemberContextValue, PlusMemberProvider, PlusMemberProviderProps, PriceBasePriceType, PriceDiscountConfig, PriceDiscountType, RemoveCartCodesInput, RemoveCartLinesInput, RewardItem, RuleCondition, RuleType, SCRIPT_CODE_AMOUNT_KEY, SearchResult, SearchResultType, SelectedOptionsResult, ShippingMethodsContext, SiteInfo, SpendMoneyType, TieredDiscount, UpdateBuyerIdentityInput, UpdateCartAttributesInput, UseAllBlogsOptions, UseAllCollectionsOptions, UseAllProductsOptions, UseArticleOptions, UseArticlesInBlogOptions, UseArticlesOptions, UseAutoRemovePlusMemberInCartProps, UseAvailableDeliveryCouponResult, UseBlogOptions, UseBuyNowOptions, UseCalcGiftsFromLinesOptions, UseCalcGiftsFromLinesResult, UseCollectionOptions, UseCollectionsOptions, UseExposureOptions, UseGeoLocationOptions, UseHasPlusMemberInLinesProps, UseIntersectionOptions, UsePlusMemberVariantsOptions, UsePlusMemberVariantsResult, UsePriceOptions, UsePriceResult, UseProductOptions, UseProductsByHandlesOptions, UseSearchOptions, UseShippingMethodsOptions, UseShippingMethodsResult, UseSiteOptions, UseUpdateBuyerIdentityOptions, UseUpdateCartAttributesOptions, VariantItem, VariantMedia, VideoMedia, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, getCachedGeoLocation, getCartBasicAttributes, getDiscountEnvAttributeValue, getGA4Attributes, getGA4AttributesAsync, getMatchedMainProductSubTotal, getOperatingSystem, getQuery, getReferralAttributes, getUserType, hasPlusMemberInCart, hasPlusMemberInLines, normalizeAddToCartLines, preCheck, safeParse, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useHasPlusMemberInLines, useIntersection, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberNeedAddToCart, usePlusMemberVariants, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useSearch, useSelectedOptions, useShippingMethods, useSite, useUpdateBuyerIdentity, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia } from './hooks/index.mjs';
-export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-DfR13pDe.mjs';
+export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-C0UyuPrG.mjs';
 export * from '@anker-in/shopify-sdk';
 import 'react';
 import 'react/jsx-runtime';

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { AppContext, CartContextValue, CartProvider, CartProviderProps, LoadingS
 export { C as CookieAdapter, a as CookieOptions, P as PerformanceAdapter, R as RouterAdapter, U as UserContextAdapter } from './types-SKDHauqk.js';
 export { BrowserPerformanceAdapter, browserCartCookieAdapter, browserCookieAdapter } from './adapters/index.js';
 export { AddCartLinesInput, ApplyCartCodesInput, AutoFreeGift, AutoFreeGiftCartLineInput, AutoFreeGiftConfig, AutoFreeGiftItem, AutoFreeGiftList, AutoFreeGiftMainProduct, BuyNowInput, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, Config, CreateCartInput, DiscountLabel, FormattedGift, FunctionGiftResult, GeoLocationData, GetCartAttributesProps, GiftProduct, GiftProductItem, GiftTier, HasPlusMemberInCartProps, HasPlusMemberInCartResult, HasPlusMemberInLinesResult, ImageMedia, LocaleMapping, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, MainProductInfo, NormalizedSearchResultItem, Options, OrderBasePriceType, OrderDiscountConfig, OrderDiscountResult, OrderDiscountType, PlusMemberContext, PlusMemberContextValue, PlusMemberProvider, PlusMemberProviderProps, PriceBasePriceType, PriceDiscountConfig, PriceDiscountType, RemoveCartCodesInput, RemoveCartLinesInput, RewardItem, RuleCondition, RuleType, SCRIPT_CODE_AMOUNT_KEY, SearchResult, SearchResultType, SelectedOptionsResult, ShippingMethodsContext, SiteInfo, SpendMoneyType, TieredDiscount, UpdateBuyerIdentityInput, UpdateCartAttributesInput, UseAllBlogsOptions, UseAllCollectionsOptions, UseAllProductsOptions, UseArticleOptions, UseArticlesInBlogOptions, UseArticlesOptions, UseAutoRemovePlusMemberInCartProps, UseAvailableDeliveryCouponResult, UseBlogOptions, UseBuyNowOptions, UseCalcGiftsFromLinesOptions, UseCalcGiftsFromLinesResult, UseCollectionOptions, UseCollectionsOptions, UseExposureOptions, UseGeoLocationOptions, UseHasPlusMemberInLinesProps, UseIntersectionOptions, UsePlusMemberVariantsOptions, UsePlusMemberVariantsResult, UsePriceOptions, UsePriceResult, UseProductOptions, UseProductsByHandlesOptions, UseSearchOptions, UseShippingMethodsOptions, UseShippingMethodsResult, UseSiteOptions, UseUpdateBuyerIdentityOptions, UseUpdateCartAttributesOptions, VariantItem, VariantMedia, VideoMedia, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, getCachedGeoLocation, getCartBasicAttributes, getDiscountEnvAttributeValue, getGA4Attributes, getGA4AttributesAsync, getMatchedMainProductSubTotal, getOperatingSystem, getQuery, getReferralAttributes, getUserType, hasPlusMemberInCart, hasPlusMemberInLines, normalizeAddToCartLines, preCheck, safeParse, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useHasPlusMemberInLines, useIntersection, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberNeedAddToCart, usePlusMemberVariants, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useSearch, useSelectedOptions, useShippingMethods, useSite, useUpdateBuyerIdentity, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia } from './hooks/index.js';
-export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-DfR13pDe.js';
+export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-C0UyuPrG.js';
 export * from '@anker-in/shopify-sdk';
 import 'react';
 import 'react/jsx-runtime';

package/dist/index.js

@@ -1315,9 +1315,13 @@ function useAutoRemoveFreeGifts(options = {}) {
   const {
     removeFunctionGifts = true,
     removeScriptGifts = true,
-    isGiftLineItem
+    isGiftLineItem,
+    runOnlyOnceAfterInit = false,
+    initDelay = 500
   } = options;
   const [isRemoving, setIsRemoving] = react.useState(false);
+  const [isInitialized, setIsInitialized] = react.useState(!runOnlyOnceAfterInit);
+  const [isFinished, setIsFinished] = react.useState(false);
   const { cart } = useCartContext();
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   const giftsToRemove = react.useMemo(() => {
@@ -1354,7 +1358,29 @@ function useAutoRemoveFreeGifts(options = {}) {
       return false;
     });
   }, [cart, removeFunctionGifts, removeScriptGifts, isGiftLineItem]);
+  ahooks.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
+    }
+  );
   react.useEffect(() => {
+    if (runOnlyOnceAfterInit && (!isInitialized || isFinished)) {
+      return;
+    }
     if (isRemoving || giftsToRemove.length === 0) {
       return;
     }
@@ -1368,10 +1394,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
@@ -1705,7 +1737,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 = [
@@ -1744,6 +1786,7 @@ function getCartBasicAttributes({
     ...functionAttributes,
     ...presellAttributes,
     ...weightAttributes,
+    ...hideShippingAttributes,
     ...trackingAttributes,
     ...getReferralAttributes()
   ].filter((item) => item?.value !== void 0 && item?.value !== null);
@@ -2740,7 +2783,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");
@@ -2748,7 +2797,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;
             }
@@ -3577,6 +3628,16 @@ function clearGeoLocationCache(cacheKey = "geoLocation") {
   }
 }
 var CartContext = react.createContext(null);
+function AutoRemoveGiftsHandler({
+  options,
+  onRemovingChange
+}) {
+  const { isRemoving } = useAutoRemoveFreeGifts(options);
+  react.useEffect(() => {
+    onRemovingChange(isRemoving);
+  }, [isRemoving, onRemovingChange]);
+  return null;
+}
 function CartProvider({
   children,
   // swrOptions,
@@ -3604,6 +3665,7 @@ function CartProvider({
   });
   const [scriptAutoFreeGift, setScriptAutoFreeGift] = react.useState([]);
   const [functionAutoFreeGift, setFunctionAutoFreeGift] = react.useState([]);
+  const [isAutoRemovingFreeGifts, setIsAutoRemovingFreeGifts] = react.useState(false);
   const {
     run: fetchCart,
     data: cart,
@@ -3763,7 +3825,9 @@ function CartProvider({
   const autoRemoveFreeGiftsOptions = react.useMemo(() => {
     return {
       removeFunctionGifts: !!functionAutoFreeGiftConfig,
-      removeScriptGifts: !!scriptAutoFreeGiftConfig
+      removeScriptGifts: !!scriptAutoFreeGiftConfig,
+      runOnlyOnceAfterInit: true,
+      initDelay: 500
     };
   }, [functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig]);
   const value = react.useMemo(
@@ -3796,7 +3860,8 @@ function CartProvider({
       metafieldIdentifiers,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     }),
     [
       cart,
@@ -3825,10 +3890,20 @@ function CartProvider({
       profile,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     ]
   );
-  return /* @__PURE__ */ jsxRuntime.jsx(CartContext.Provider, { value, children });
+  return /* @__PURE__ */ jsxRuntime.jsxs(CartContext.Provider, { value, children: [
+    (functionAutoFreeGiftConfig || scriptAutoFreeGiftConfig) && /* @__PURE__ */ jsxRuntime.jsx(
+      AutoRemoveGiftsHandler,
+      {
+        options: autoRemoveFreeGiftsOptions,
+        onRemovingChange: setIsAutoRemovingFreeGifts
+      }
+    ),
+    children
+  ] });
 }
 function useCartContext(options) {
   const context = react.useContext(CartContext);