@anker-in/shopify-react 0.1.1-beta.1 → 0.1.1-beta.2

package/dist/provider/index.mjs

@@ -134,25 +134,25 @@ var getMatchedMainProductSubTotal = (cartData, variant_list, main_product) => {
     return acc + (main_product?.spend_money_type === 1 /* ORIGIN_PRICE */ ? Number(line.subtotalAmount) || 0 : Number(line.totalAmount) || 0);
   }, 0) || 0;
 };
-var getDiscountEnvAttributeValue = (attributes = []) => {
-  const attr = attributes.find((attr2) => attr2.key === CUSTOMER_ATTRIBUTE_KEY);
-  return safeParseJson(attr?.value ?? "") ?? {};
-};
-var isAttributesEqual = (attrs1 = [], attrs2 = []) => {
-  if (attrs1.length !== attrs2.length) return false;
-  const sorted1 = [...attrs1].sort((a, b) => a.key.localeCompare(b.key));
-  const sorted2 = [...attrs2].sort((a, b) => a.key.localeCompare(b.key));
-  return sorted1.every(
-    (attr, i) => attr.key === sorted2[i]?.key && attr.value === sorted2[i]?.value
-  );
-};
-var safeParseJson = (str) => {
+var safeParse = (str) => {
   try {
     return JSON.parse(str);
   } catch (err) {
     return {};
   }
 };
+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);
@@ -441,6 +441,14 @@ var useScriptAutoFreeGift = ({
       set_points_subscribe(!!isPointsSubscribe);
     }
   }, [locale]);
+  const isActivityAvailable = useMemo(() => {
+    if (!campaign) return false;
+    const query = getQuery();
+    const utmCampaign = Cookies5.get("utm_campaign") || query?.utm_campaign;
+    if (campaign.activityAvailableQuery && !utmCampaign?.includes(campaign.activityAvailableQuery))
+      return false;
+    return true;
+  }, [campaign]);
   const [upgrade_multiple, upgrade_value] = useMemo(() => {
     let upgrade_multiple2 = 1;
     let upgrade_value2 = 0;
@@ -457,8 +465,8 @@ var useScriptAutoFreeGift = ({
     return [upgrade_multiple2, upgrade_value2];
   }, [cart?.lineItems, points_subscribe]);
   const breakpoints = useMemo(() => {
-    if (!campaign) return [];
-    return (campaign.breakpoints || []).map((item) => ({
+    if (!isActivityAvailable) return [];
+    return (campaign?.breakpoints || []).map((item) => ({
       breakpoint: new Decimal2(item.breakpoint).minus(new Decimal2(upgrade_value)).dividedBy(new Decimal2(upgrade_multiple)).toFixed(2, Decimal2.ROUND_DOWN),
       giveawayProducts: item.giveawayProducts || []
     }));
@@ -482,25 +490,26 @@ var useScriptAutoFreeGift = ({
     return true;
   }, [giftHandles]);
   const involvedLines = useMemo(() => {
-    if (!campaign) return [];
+    if (!isActivityAvailable) return [];
     return (cart?.lineItems || []).filter((line) => {
       const isNotGift = line?.totalAmount && Number(line.totalAmount) > 0 && line.customAttributes?.every(
         (item) => item.key !== _giveaway
       );
       const hasCampaignTag = line.product?.tags?.some(
-        (tag) => campaign.includeTags?.includes(tag.trim()) && line.variant?.availableForSale
+        (tag) => campaign?.includeTags?.includes(tag.trim()) && line.variant?.availableForSale
       );
       return isNotGift && hasCampaignTag;
     });
-  }, [cart?.lineItems, campaign, _giveaway]);
+  }, [cart?.lineItems, isActivityAvailable, _giveaway]);
   const involvedSubTotal = useMemo(() => {
-    if (!campaign) return new Decimal2(0);
+    if (!isActivityAvailable) return new Decimal2(0);
     return involvedLines.reduce((prev, item) => {
-      const amount = campaign.useTotalAmount ? item.totalAmount : item.subtotalAmount;
+      const amount = campaign?.useTotalAmount ? item.totalAmount : item.subtotalAmount;
       return new Decimal2(prev).plus(new Decimal2(amount || 0));
     }, new Decimal2(0));
-  }, [involvedLines, campaign]);
+  }, [involvedLines, isActivityAvailable]);
   const [freeGiftLevel, nextFreeGiftLevel] = useMemo(() => {
+    if (!isActivityAvailable) return [null, null];
     const sortedLevels = [...breakpoints].sort(
       (a, b) => Number(b.breakpoint) - Number(a.breakpoint)
     );
@@ -924,6 +933,9 @@ function CartProvider({
 }) {
   const { client, cartCookieAdapter } = useShopify();
   const [customAttributes, setCustomAttributes] = useState([]);
+  const [customAttributesNeedDelete, setCustomAttributesNeedDelete] = useState(
+    []
+  );
   const [isCodeChanging, setIsCodeChanging] = useState(false);
   const [loadingState, setLoadingState] = useState({
     editLineQuantityLoading: false,
@@ -954,7 +966,11 @@ function CartProvider({
   useRequest(
     () => {
       const newAttributes = [...attributes, ...customAttributes];
-      const needUpdate = cart && !isAttributesEqual(cart.customAttributes, newAttributes);
+      const needUpdate = cart && !checkAttributesUpdateNeeded(
+        cart.customAttributes,
+        newAttributes,
+        customAttributesNeedDelete
+      );
       if (needUpdate) {
         return updateAttributes({ attributes: newAttributes });
       } else {
@@ -975,11 +991,12 @@ function CartProvider({
     isCartLoading: isCartLoading || isCodeChanging,
     setLoadingState
   });
-  const removeCustomAttributes = useCallback((attributes2) => {
-    setCustomAttributes(
-      (prev) => prev.filter((attr) => !attributes2.some((a) => a.key === attr.key))
-    );
-  }, []);
+  const removeCustomAttributes = useCallback(
+    (attributes2) => {
+      setCustomAttributesNeedDelete(attributes2);
+    },
+    [setCustomAttributesNeedDelete]
+  );
   const addCustomAttributes = useCallback(
     (attributes2) => {
       const sameAttributes = attributes2.filter(