@anker-in/shopify-react 1.2.2-beta.3 → 1.2.2-beta.5

package/dist/index.mjs

@@ -858,17 +858,11 @@ var trackAddToCartGA = ({
   lineItems = [],
   gtmParams = {}
 }) => {
-  if (!lineItems.length || !lineItems[0]?.variant) {
+  if (!lineItems.length) {
     return;
   }
-  const { variant } = lineItems[0];
-  const currencyCode = variant.product?.price?.currencyCode;
-  const totalPrice = lineItems?.reduce(
-    (prev, { variant: variant2 }) => prev.plus(
-      variant2?.finalPrice?.amount === void 0 ? Number(variant2?.price?.amount) || 0 : Number(variant2?.finalPrice?.amount) || 0
-    ),
-    new Decimal2(0)
-  ).toNumber();
+  const currencyCode = lineItems[0].product?.price?.currencyCode;
+  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.variant.price || 0), new Decimal2(0)).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "add_to_cart",
@@ -878,19 +872,19 @@ var trackAddToCartGA = ({
       value: totalPrice,
       position: gtmParams?.position || "",
       items: lineItems.map((item) => {
-        const imageUrl = item.variant?.image?.url || item.variant?.product?.images?.[0]?.url;
+        const imageUrl = item.variant.image?.url || item.product?.images?.[0]?.url;
         const itemCategoryId = item.gtmParams?.item_category_id;
-        const itemVariantId = item.variant?.id ? atobID(item.variant.id) : void 0;
+        const itemVariantId = item.variant.id ? atobID(item.variant.id) : void 0;
         return {
-          item_id: item.variant?.sku,
-          item_name: item.variant?.product?.title || item.variant?.product?.title,
+          item_id: item.variant.sku,
+          item_name: item.product?.title,
           item_brand: gtmParams?.brand || "",
-          item_category: item.variant?.product?.productType || "",
-          item_variant: item.variant?.title || item.variant?.title,
-          price: item.variant?.compareAtPrice?.amount ?? item.variant?.price?.amount,
+          item_category: item.product?.productType || "",
+          item_variant: item.variant.name,
+          price: item.variant.listPrice ?? item.variant.price,
           quantity: item.quantity || 1,
           ...imageUrl && { image_url: imageUrl },
-          ...itemCategoryId && { item_category_id: itemCategoryId },
+          ...itemCategoryId !== void 0 && { item_category_id: itemCategoryId },
           ...itemVariantId && { item_variant_id: itemVariantId }
         };
       }),
@@ -1071,21 +1065,24 @@ var getGA4Data = async (measurementId = "G-R0BRMRK4CY") => {
 };
 
 // src/tracking/fbq.ts
-var trackAddToCartFBQ = ({ lineItems = [] }) => {
+var trackAddToCartFBQ = ({
+  lineItems = []
+}) => {
   if (typeof window === "undefined" || !window.fbq) {
     return;
   }
-  if (lineItems.length && lineItems[0]?.variant) {
-    const { variant, quantity } = lineItems[0];
+  if (lineItems.length) {
+    const item = lineItems[0];
+    const { variant, quantity, product } = item;
     try {
       window.fbq("track", "AddToCart", {
-        value: variant?.compareAtPrice?.amount ?? (variant?.price?.amount || variant?.price || 0),
+        value: variant.listPrice || variant.price,
         num_items: quantity,
-        currency: variant?.price?.currencyCode,
-        content_name: variant?.product?.title,
+        currency: product?.price?.currencyCode,
+        content_name: product?.title,
         content_type: "product_group",
-        content_ids: String(variant?.id),
-        content_category: variant?.product?.metafields?.global?.trafficType || "public"
+        content_ids: String(variant.id),
+        content_category: product?.metafields?.global?.trafficType || "public"
       });
     } catch (error) {
       console.error("FBQ tracking error:", error);
@@ -1170,7 +1167,7 @@ var initSameLinesAttributes = ({
   line
 }) => {
   const sameLineInCart = cart?.lineItems.find(
-    (lineInCart) => lineInCart.variant.sku === line.variant?.sku && lineInCart.product?.handle === line.variant?.product?.handle
+    (lineInCart) => lineInCart.variant.id === line.variant?.id
   );
   const codeAmountAttribute = sameLineInCart?.customAttributes?.find(
     (attr) => attr.key === CODE_AMOUNT_KEY
@@ -1201,13 +1198,14 @@ var initSameLinesAttributes = ({
 var initDiscountAttributes = ({ line }) => {
   let itemAttributes = line.attributes || [];
   const functionEnvAttribute = itemAttributes.find((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY);
-  if (!functionEnvAttribute) {
+  const priceAmount = line.variant?.finalPrice?.amount ?? line.variant?.price?.amount;
+  if (!functionEnvAttribute && priceAmount !== void 0 && priceAmount !== null) {
     itemAttributes = itemAttributes.concat([
       {
         key: CUSTOMER_ATTRIBUTE_KEY,
         value: JSON.stringify({
           is_gift: false,
-          discounted_amount: line.variant?.finalPrice?.amount === void 0 ? Number(line.variant?.price?.amount) * (line.quantity || 1) : Number(line.variant?.finalPrice?.amount) * (line.quantity || 1)
+          discounted_amount: new Decimal2(priceAmount).times(line.quantity || 1).toNumber()
         })
       }
     ]);
@@ -2546,12 +2544,25 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
           addCustomAttributes(customAttributes);
         }
       }
-      if (withTrack) {
+      if (withTrack && resultCart) {
+        const trackingLineItems = lineItems.map((inputLine) => {
+          const cartLine = resultCart.lineItems.find(
+            (line) => line.variant.id === inputLine.variant?.id
+          );
+          if (!cartLine) {
+            return null;
+          }
+          return {
+            ...cartLine,
+            quantity: inputLine.quantity,
+            gtmParams: inputLine.gtmParams
+          };
+        }).filter(Boolean);
         trackAddToCartGA({
-          lineItems,
+          lineItems: trackingLineItems,
           gtmParams: { ...gtmParams, brand: config.getBrand() }
         });
-        trackAddToCartFBQ({ lineItems });
+        trackAddToCartFBQ({ lineItems: trackingLineItems });
       }
       performanceAdapter?.addToCartEnd();
       return resultCart;