@anker-in/shopify-react 0.1.1-beta.14 → 0.1.1-beta.16

package/dist/hooks/index.js

@@ -1351,10 +1351,6 @@ var useCartAttributes = ({
       {
         key: "_is_login",
         value: profile?.token ? "true" : "false"
-      },
-      {
-        key: "_last_url",
-        value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
       }
     ];
     if (profile?.token) {
@@ -1410,18 +1406,29 @@ var useCartAttributes = ({
       }
     ];
   }, [currentUrl]);
+  const commonAttributes = react.useMemo(
+    () => [
+      ...memberAttributes,
+      ...functionAttributes,
+      ...presellAttributes,
+      ...weightAttributes,
+      ...trackingAttributes,
+      ...getReferralAttributes()
+    ].filter((item) => item?.value),
+    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+  );
+  const extraAttributesInCart = react.useMemo(() => {
+    return cart?.customAttributes?.filter(
+      (item) => !commonAttributes.some((attr) => attr.key === item.key)
+    ) || [];
+  }, [cart]);
   return react.useMemo(
     () => ({
-      attributes: [
-        ...memberAttributes,
-        ...functionAttributes,
-        ...presellAttributes,
-        ...weightAttributes,
-        ...trackingAttributes,
-        ...getReferralAttributes()
-      ].filter((item) => item?.value)
+      attributes: [...commonAttributes, ...extraAttributesInCart].filter(
+        (item) => item?.value
+      )
     }),
-    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+    [commonAttributes, extraAttributesInCart]
   );
 };
 var DEFAULT_MIN = 1;
@@ -2590,7 +2597,7 @@ var useUpdatePlusMemberDeliveryOptions = ({
       const { deliveryData } = arg;
       const firstDeliveryGroup = currentCart?.deliveryGroups?.[0];
       const deliveryGroupId = firstDeliveryGroup?.id;
-      const selectedOptionCode = deliveryData?.deliveryCustomData?.selected_delivery_option;
+      const selectedOptionCode = deliveryData?.deliveryCustomData?.selected_delivery_option?.code;
       if (!deliveryGroupId || !selectedOptionCode || selectedOptionCode === firstDeliveryGroup?.selectedDeliveryOption?.code) {
         return null;
       }
@@ -2627,7 +2634,13 @@ var usePlusMemberItemCustomAttributes = ({
 }) => {
   const { deliveryCustomData } = deliveryData || {};
   return react.useMemo(() => {
-    const itemCustomAttributes = [];
+    const itemCustomAttributes = [
+      // _last_url: 付费会员结算完成之后 checkout 有一个继续购买的按钮, 用于跳转到继续购买的页面
+      {
+        key: "_last_url",
+        value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
+      }
+    ];
     if (deliveryCustomData?.is_presale) {
       itemCustomAttributes.push({
         key: "_is_presale",