@anker-in/shopify-react 0.1.1-beta.41 → 0.1.1-beta.42

package/dist/index.mjs

@@ -1303,24 +1303,31 @@ function useRemoveCartLines(options) {
   );
   return useSWRMutation("remove-cart-lines", removeLines, options);
 }
-function useUpdateCartAttributes(mutate, metafieldIdentifiers, options) {
+function useUpdateCartAttributes({
+  mutate,
+  metafieldIdentifiers,
+  disabled = false,
+  swrOptions
+}) {
   const { client, locale, cartCookieAdapter } = useShopify();
   const updateAttributes = useCallback(
     async (_key, { arg }) => {
+      if (disabled || !cartCookieAdapter?.getCartId(locale)) {
+        return void 0;
+      }
       const updatedCart = await updateCartAttributes(client, {
         ...arg,
         metafieldIdentifiers,
         cookieAdapter: cartCookieAdapter
       });
-      console.log("useUpdateCartAttributes updatedCart", updatedCart);
       if (updatedCart) {
         mutate(updatedCart);
       }
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers]
+    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers, disabled]
   );
-  return useSWRMutation("update-cart-attributes", updateAttributes, options);
+  return useSWRMutation("update-cart-attributes", updateAttributes, swrOptions);
 }
 function useBuyNow({ withTrack = true } = {}, swrOptions) {
   const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
@@ -1684,7 +1691,7 @@ var useCartAttributes = ({
         })
       }
     ] : [];
-  }, [cart]);
+  }, [cart, customer]);
   const presellAttributes = useMemo(() => {
     return [
       {
@@ -1748,9 +1755,7 @@ var useCartAttributes = ({
       "_play_mode_id",
       "_popup"
     ];
-    return cart?.customAttributes?.filter(
-      (item) => !commonAttributeKeys.includes(item.key)
-    ) || [];
+    return cart?.customAttributes?.filter((item) => !commonAttributeKeys.includes(item.key)) || [];
   }, [cart]);
   return useMemo(
     () => ({
@@ -2604,8 +2609,9 @@ var createInitialValue = () => ({
     tddCoupon: void 0,
     isLoadingCoupon: false
   },
-  selectedPlusMemberProduct: null,
-  plusMemberProducts: [],
+  selectedPlusMemberVariant: void 0,
+  monthlyVariant: void 0,
+  annualVariant: void 0,
   showPlusMemberBenefit: false,
   setShowPlusMemberBenefit: () => {
   },
@@ -2619,33 +2625,39 @@ var PlusMemberContext = createContext(createInitialValue());
 function usePlusMemberContext() {
   return useContext(PlusMemberContext);
 }
-function usePlusMonthlyProductVariant() {
-  const { plusMemberProducts, plusMemberMetafields } = usePlusMemberContext();
-  const plusMonthly = plusMemberMetafields?.plus_monthly_product;
-  const plusMonthlyProductVariant = useMemo(() => {
-    const product = plusMemberProducts?.find(
-      (item) => item?.handle === plusMonthly?.handle
-    );
-    const productVariant = product?.variants?.find(
-      (item) => item.sku === plusMonthly?.sku
-    );
-    return productVariant;
+function usePlusMemberVariants({
+  memberSetting
+}) {
+  const plusMonthly = memberSetting?.plus_monthly_product;
+  const plusAnnual = memberSetting?.plus_annual_product;
+  const plusMemberHandles = useMemo(() => {
+    return [plusMonthly?.handle, plusAnnual?.handle].filter(Boolean);
+  }, [plusMonthly?.handle, plusAnnual?.handle]);
+  const { data: plusMemberProducts = [] } = useProductsByHandles({
+    handles: plusMemberHandles
+  });
+  const monthlyProduct = useMemo(() => {
+    return plusMemberProducts?.find((item) => item?.handle === plusMonthly?.handle);
   }, [plusMemberProducts, plusMonthly]);
-  return plusMonthlyProductVariant;
-}
-function usePlusAnnualProductVariant() {
-  const { plusMemberProducts, plusMemberMetafields } = usePlusMemberContext();
-  const plusAnnual = plusMemberMetafields?.plus_annual_product;
-  const plusAnnualProductVariant = useMemo(() => {
-    const product = plusMemberProducts?.find(
-      (item) => item?.handle === plusAnnual?.handle
-    );
-    const productVariant = product?.variants?.find(
-      (item) => item.sku === plusAnnual?.sku
-    );
-    return productVariant;
+  const annualProduct = useMemo(() => {
+    return plusMemberProducts?.find((item) => item?.handle === plusAnnual?.handle);
   }, [plusMemberProducts, plusAnnual]);
-  return plusAnnualProductVariant;
+  const monthlyVariant = useMemo(() => {
+    return monthlyProduct?.variants?.find((item) => item.sku === plusMonthly?.sku);
+  }, [monthlyProduct, plusMonthly]);
+  const annualVariant = useMemo(() => {
+    return annualProduct?.variants?.find((item) => item.sku === plusAnnual?.sku);
+  }, [annualProduct, plusAnnual]);
+  return {
+    monthlyVariant: monthlyVariant ? {
+      ...monthlyVariant,
+      product: monthlyProduct
+    } : void 0,
+    annualVariant: annualVariant ? {
+      ...annualVariant,
+      product: annualProduct
+    } : void 0
+  };
 }
 var useAvailableDeliveryCoupon = ({
   profile
@@ -3046,13 +3058,13 @@ function usePlusMemberNeedAddToCart({
   cart,
   profile
 }) {
-  const { selectedPlusMemberMode, selectedPlusMemberProduct, plusMemberMetafields } = usePlusMemberContext();
+  const { selectedPlusMemberMode, selectedPlusMemberVariant, plusMemberMetafields } = usePlusMemberContext();
   const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
     memberSetting: plusMemberMetafields,
     cart
   });
-  const plusMemberProduct = useMemo(() => {
-    if (!selectedPlusMemberProduct || selectedPlusMemberMode === "free" /* FREE */) {
+  const plusMemberVariant = useMemo(() => {
+    if (!selectedPlusMemberVariant || selectedPlusMemberMode === "free" /* FREE */) {
       return void 0;
     }
     if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
@@ -3067,15 +3079,9 @@ function usePlusMemberNeedAddToCart({
     if (profile?.isAnnualPlus && selectedPlusMemberMode === "annual" /* ANNUAL */) {
       return void 0;
     }
-    return selectedPlusMemberProduct;
-  }, [
-    selectedPlusMemberMode,
-    selectedPlusMemberProduct?.variant,
-    selectedPlusMemberProduct?.product,
-    hasMonthlyPlus,
-    hasAnnualPlus
-  ]);
-  return plusMemberProduct;
+    return selectedPlusMemberVariant;
+  }, [selectedPlusMemberMode, selectedPlusMemberVariant, hasMonthlyPlus, hasAnnualPlus]);
+  return plusMemberVariant;
 }
 var PlusMemberProvider = ({
   variant,
@@ -3105,26 +3111,15 @@ var PlusMemberProvider = ({
     profile,
     isPlus: profile?.isPlus || false
   });
-  console.log("shippingMethodsContext", shippingMethodsContext);
-  const plusMemberHandles = useMemo(() => {
-    return [
-      memberSetting?.plus_monthly_product?.handle,
-      memberSetting?.plus_annual_product?.handle
-    ].filter(Boolean);
-  }, [memberSetting]);
-  const { data: plusMemberProducts = [] } = useProductsByHandles({
-    handles: plusMemberHandles
+  const { monthlyVariant, annualVariant } = usePlusMemberVariants({
+    memberSetting
   });
-  const selectedPlusMemberProduct = useMemo(() => {
+  const selectedPlusMemberVariant = useMemo(() => {
     if (selectedPlusMemberMode === "free" /* FREE */) {
-      return null;
+      return void 0;
     }
-    const handle = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? memberSetting?.plus_monthly_product?.handle : memberSetting?.plus_annual_product?.handle;
-    const sku = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? memberSetting?.plus_monthly_product?.sku : memberSetting?.plus_annual_product?.sku;
-    const product2 = plusMemberProducts?.find((p) => p.handle === handle);
-    const variant2 = product2?.variants?.find((v) => v.sku === sku);
-    return product2 && variant2 ? { product: product2, variant: variant2 } : null;
-  }, [plusMemberProducts, memberSetting, selectedPlusMemberMode]);
+    return selectedPlusMemberMode === "monthly" /* MONTHLY */ ? monthlyVariant : annualVariant;
+  }, [monthlyVariant, annualVariant, selectedPlusMemberMode]);
   return /* @__PURE__ */ jsx(
     PlusMemberContext.Provider,
     {
@@ -3148,8 +3143,9 @@ var PlusMemberProvider = ({
         setShowTip,
         showMoreShippingMethod,
         setShowMoreShippingMethod,
-        selectedPlusMemberProduct,
-        plusMemberProducts,
+        selectedPlusMemberVariant,
+        monthlyVariant,
+        annualVariant,
         product,
         showPlusMemberBenefit,
         setShowPlusMemberBenefit,
@@ -3383,7 +3379,11 @@ function CartProvider({
       refreshDeps: [locale]
     }
   );
-  const { trigger: updateAttributes } = useUpdateCartAttributes(mutateCart, metafieldIdentifiers);
+  const { trigger: updateAttributes } = useUpdateCartAttributes({
+    mutate: mutateCart,
+    metafieldIdentifiers,
+    disabled: isCartLoading
+  });
   const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
   useRequest(
     () => {
@@ -3566,6 +3566,6 @@ function useCartContext(options) {
   return context;
 }
 
-export { BrowserPerformanceAdapter, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, OrderBasePriceType, OrderDiscountType, PLUS_MEMBER_TYPE, PlusMemberContext, PlusMemberMode, PlusMemberProvider, PriceBasePriceType, PriceDiscountType, RuleType, SCRIPT_CODE_AMOUNT_KEY, ShippingMethodMode, ShopifyContext, ShopifyProvider, SpendMoneyType, browserCartCookieAdapter, browserCookieAdapter, checkAttributesUpdateNeeded, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, gaTrack, getCachedGeoLocation, getDiscountEnvAttributeValue, getMatchedMainProductSubTotal, getQuery, getReferralAttributes, normalizeAddToCartLines, preCheck, safeParse, trackAddToCartFBQ, trackAddToCartGA, trackBeginCheckoutGA, trackBuyNowFBQ, trackBuyNowGA, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartContext, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useIntersection, usePlusAnnualProductVariant, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberDeliveryCodes, usePlusMemberItemCustomAttributes, usePlusMemberNeedAddToCart, usePlusMonthlyProductVariant, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useScriptAutoFreeGift, useSearch, useSelectedOptions, useShippingMethodAvailableCheck, useShippingMethods, useShopify, useSite, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdatePlusMemberDeliveryOptions, useUpdateVariantQuery, useVariant, useVariantMedia };
+export { BrowserPerformanceAdapter, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, OrderBasePriceType, OrderDiscountType, PLUS_MEMBER_TYPE, PlusMemberContext, PlusMemberMode, PlusMemberProvider, PriceBasePriceType, PriceDiscountType, RuleType, SCRIPT_CODE_AMOUNT_KEY, ShippingMethodMode, ShopifyContext, ShopifyProvider, SpendMoneyType, browserCartCookieAdapter, browserCookieAdapter, checkAttributesUpdateNeeded, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, gaTrack, getCachedGeoLocation, getDiscountEnvAttributeValue, getMatchedMainProductSubTotal, getQuery, getReferralAttributes, normalizeAddToCartLines, preCheck, safeParse, trackAddToCartFBQ, trackAddToCartGA, trackBeginCheckoutGA, trackBuyNowFBQ, trackBuyNowGA, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartContext, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useIntersection, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberDeliveryCodes, usePlusMemberItemCustomAttributes, usePlusMemberNeedAddToCart, usePlusMemberVariants, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useScriptAutoFreeGift, useSearch, useSelectedOptions, useShippingMethodAvailableCheck, useShippingMethods, useShopify, useSite, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdatePlusMemberDeliveryOptions, useUpdateVariantQuery, useVariant, useVariantMedia };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map