@anker-in/shopify-react 0.1.1-beta.48 → 0.1.1-beta.49

package/dist/provider/index.mjs

@@ -216,14 +216,6 @@ var getDiscountEnvAttributeValue = (attributes = []) => {
   const attr = attributes.find((attr2) => attr2.key === CUSTOMER_ATTRIBUTE_KEY);
   return safeParse(attr?.value ?? "") ?? {};
 };
-var checkAttributesUpdateNeeded = (oldAttributes, newAttributes, customAttributesNeedRemove) => {
-  return oldAttributes.some((attr) => {
-    const newAttr = newAttributes.find((newAttr2) => newAttr2.key === attr.key);
-    return newAttr ? newAttr.value !== attr.value : true;
-  }) || newAttributes.some((attr) => !oldAttributes.some((oldAttr) => oldAttr.key === attr.key)) || customAttributesNeedRemove.some(
-    (removeAttr) => oldAttributes.some((oldAttr) => oldAttr.key === removeAttr.key)
-  );
-};
 var containsAll = (source, requiredItems = []) => {
   if (!requiredItems?.length) return true;
   const sourceSet = new Set(source);
@@ -704,6 +696,16 @@ var useScriptAutoFreeGift = ({
     giftProductsResult: finalGiftProductsResult
   };
 };
+
+// src/hooks/cart/utils/cart-attributes.ts
+var checkAttributesUpdateNeeded = (oldAttributes, newAttributes, customAttributesNeedRemove) => {
+  return newAttributes.some((attr) => !oldAttributes.some((oldAttr) => oldAttr.key === attr.key)) || oldAttributes.some((attr) => {
+    const newAttr = newAttributes.find((newAttr2) => newAttr2.key === attr.key);
+    return newAttr ? newAttr.value !== attr.value : true;
+  }) || customAttributesNeedRemove.some(
+    (removeAttr) => oldAttributes.some((oldAttr) => oldAttr.key === removeAttr.key)
+  );
+};
 var getReferralAttributes = () => {
   const inviteCode = getLocalStorage("inviteCode") || Cookies5.get("inviteCode");
   const playModeId = getLocalStorage("playModeId") || Cookies5.get("playModeId");
@@ -1070,7 +1072,7 @@ function CartProvider({
 }) {
   const { client, cartCookieAdapter } = useShopify();
   const [customAttributes, setCustomAttributes] = useState([]);
-  const [customAttributesNeedDelete, setCustomAttributesNeedDelete] = useState(
+  const [customAttributesNeedRemove, setCustomAttributesNeedRemove] = useState(
     []
   );
   const [isCodeChanging, setIsCodeChanging] = useState(false);
@@ -1103,12 +1105,11 @@ function CartProvider({
     metafieldIdentifiers,
     disabled: isCartLoading
   });
-  console.log("isCartLoading", isCartLoading);
   const { hasPlusMember } = useHasPlusMemberInCart({
     memberSetting,
     cart
   });
-  const { attributes } = useCartAttributes({
+  const { attributes: commonAttributes } = useCartAttributes({
     profile,
     customer,
     cart,
@@ -1116,16 +1117,17 @@ function CartProvider({
   });
   useRequest(
     () => {
-      const newAttributes = [...attributes];
-      customAttributes.forEach((item) => {
-        if (item.value && !newAttributes.some((attr) => attr.key === item.key)) {
-          newAttributes.push(item);
-        }
-      });
+      const filteredSameCommonAttributes = commonAttributes.filter(
+        (attr) => !customAttributes.some((a) => a.key === attr.key)
+      );
+      const newAttributes = [
+        ...filteredSameCommonAttributes,
+        ...customAttributes
+      ];
       const needUpdate = cart && checkAttributesUpdateNeeded(
         cart.customAttributes,
         newAttributes,
-        customAttributesNeedDelete
+        customAttributesNeedRemove
       );
       if (needUpdate) {
         return updateAttributes({ attributes: newAttributes });
@@ -1138,7 +1140,7 @@ function CartProvider({
       // 1 秒内只触发最后一次更新
       throttleTrailing: true,
       throttleLeading: false,
-      refreshDeps: [attributes, customAttributes]
+      refreshDeps: [commonAttributes, customAttributes, customAttributesNeedRemove]
     }
   );
   useUpdateLineCodeAmountAttributes({
@@ -1149,28 +1151,21 @@ function CartProvider({
     metafieldIdentifiers
   });
   const removeCustomAttributes = useCallback(
-    (attributes2) => {
-      setCustomAttributesNeedDelete(attributes2);
+    (attributes) => {
+      setCustomAttributesNeedRemove(attributes);
     },
-    [setCustomAttributesNeedDelete]
+    [setCustomAttributesNeedRemove]
   );
   const addCustomAttributes = useCallback(
-    (attributes2) => {
-      const sameAttributes = attributes2.filter(
-        (attr) => customAttributes.some((a) => a.key === attr.key)
-      );
-      if (sameAttributes.length) {
-        setCustomAttributes((prev) => {
-          const removedAttributes = prev.filter(
-            (attr) => !sameAttributes.some((a) => a.key === attr.key)
-          );
-          return [...removedAttributes, ...attributes2];
-        });
-      } else {
-        setCustomAttributes((prev) => [...prev, ...attributes2]);
-      }
+    (attributes) => {
+      setCustomAttributes((oldCustomAttributes) => {
+        const filteredSameAttributes = oldCustomAttributes.filter(
+          (attr) => !attributes.some((a) => a.key === attr.key)
+        );
+        return [...filteredSameAttributes, ...attributes];
+      });
     },
-    [customAttributes]
+    [setCustomAttributes]
   );
   const functionAutoFreeGiftResult = useCalcAutoFreeGift(cart, autoFreeGiftConfig || [], customer);
   const scriptAutoFreeGiftResult = useScriptAutoFreeGift({
@@ -1242,7 +1237,6 @@ function CartProvider({
       mutateCart,
       addCustomAttributes,
       removeCustomAttributes,
-      setCustomAttributes,
       locale,
       profile,
       customer,