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

package/dist/provider/index.d.mts

@@ -4,7 +4,7 @@ import { ShopifyClient, ShopifyConfig, CartCookieAdapter as CartCookieAdapter$1,
 import { C as CookieAdapter, b as CartCookieAdapter, R as RouterAdapter, U as UserContextAdapter } from '../types-BLMoxbOk.mjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { SWRConfiguration } from 'swr';
-import { e as PlusMemberSettingsMetafields } from '../types-DpxtE_nv.mjs';
+import { e as PlusMemberSettingsMetafields } from '../types-DX-2ABDs.mjs';
 import 'swr/mutation';
 
 interface ShopifyContextValue {

package/dist/provider/index.d.ts

@@ -4,7 +4,7 @@ import { ShopifyClient, ShopifyConfig, CartCookieAdapter as CartCookieAdapter$1,
 import { C as CookieAdapter, b as CartCookieAdapter, R as RouterAdapter, U as UserContextAdapter } from '../types-BLMoxbOk.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { SWRConfiguration } from 'swr';
-import { e as PlusMemberSettingsMetafields } from '../types-DpxtE_nv.js';
+import { e as PlusMemberSettingsMetafields } from '../types-DX-2ABDs.js';
 import 'swr/mutation';
 
 interface ShopifyContextValue {

package/dist/provider/index.js

@@ -786,10 +786,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) {
@@ -845,18 +841,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 useUpdateLineCodeAmountAttributes = ({