@tapcart/mobile-components 0.8.58 → 0.8.59

package/dist/components/hooks/use-scroll-direction.js

@@ -1,5 +1,5 @@
 "use client";
-import { useState, useEffect, useRef, useTransition } from "react";
+import React, { useState, useEffect, useRef, useTransition } from "react";
 function useScrollDirection(threshold = 100) {
     const [scrollData, setScrollData] = useState({
         direction: null,
@@ -12,7 +12,7 @@ function useScrollDirection(threshold = 100) {
     const isBouncing = useRef(false);
     useEffect(() => {
         var _a;
-        if (typeof window === "undefined") {
+        if (typeof window === "undefined" || React.version === "17.0.2") {
             return;
         }
         const updateScrollDirection = () => {

package/dist/components/ui/virtual-grid.d.ts

@@ -4,7 +4,8 @@ interface GridType {
     children: React.ReactNode;
     isLoadingMore: boolean;
     isReachingEnd: boolean;
-    LoaderItem: React.FunctionComponent;
+    LoaderItem: React.ComponentType;
+    loaderItemProps?: Record<string, any>;
     overscan?: number;
     estimatedHeight?: number;
     spacing?: {
@@ -18,6 +19,6 @@ declare const virtualGridVariants: (props?: ({
 } & import("class-variance-authority/dist/types").ClassProp) | undefined) => string;
 export interface VirtualGridProps extends GridType, VariantProps<typeof virtualGridVariants> {
 }
-declare function VirtualGrid({ columns, children, overscan, estimatedHeight, isReachingEnd, LoaderItem, spacing, style, }: VirtualGridProps): import("react/jsx-runtime").JSX.Element;
+declare function VirtualGrid({ columns, children, overscan, estimatedHeight, isReachingEnd, LoaderItem, spacing, loaderItemProps, style, }: VirtualGridProps): import("react/jsx-runtime").JSX.Element;
 export { VirtualGrid, virtualGridVariants };
 //# sourceMappingURL=virtual-grid.d.ts.map

package/dist/components/ui/virtual-grid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-grid.d.ts","sourceRoot":"","sources":["../../../components/ui/virtual-grid.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAO,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAMjE,UAAU,QAAQ;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,aAAa,EAAE,OAAO,CAAA;IACtB,aAAa,EAAE,OAAO,CAAA;IACtB,UAAU,EAAE,KAAK,CAAC,iBAAiB,CAAA;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE;QACR,aAAa,EAAE,MAAM,CAAA;QACrB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B;AAED,QAAA,MAAM,mBAAmB;;mFAYvB,CAAA;AAEF,MAAM,WAAW,gBACf,SAAQ,QAAQ,EACd,YAAY,CAAC,OAAO,mBAAmB,CAAC;CAAG;AAE/C,iBAAS,WAAW,CAAC,EACnB,OAAO,EACP,QAAQ,EACR,QAAY,EACZ,eAAqB,EACrB,aAAa,EACb,UAAU,EACV,OAGC,EACD,KAAK,GACN,EAAE,gBAAgB,2CAoElB;AAED,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"virtual-grid.d.ts","sourceRoot":"","sources":["../../../components/ui/virtual-grid.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAO,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAMjE,UAAU,QAAQ;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,aAAa,EAAE,OAAO,CAAA;IACtB,aAAa,EAAE,OAAO,CAAA;IACtB,UAAU,EAAE,KAAK,CAAC,aAAa,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE;QACR,aAAa,EAAE,MAAM,CAAA;QACrB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B;AAED,QAAA,MAAM,mBAAmB;;mFAYvB,CAAA;AAEF,MAAM,WAAW,gBACf,SAAQ,QAAQ,EACd,YAAY,CAAC,OAAO,mBAAmB,CAAC;CAAG;AAE/C,iBAAS,WAAW,CAAC,EACnB,OAAO,EACP,QAAQ,EACR,QAAY,EACZ,eAAqB,EACrB,aAAa,EACb,UAAU,EACV,OAGC,EACD,eAAoB,EACpB,KAAK,GACN,EAAE,gBAAgB,2CAoElB;AAED,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAA"}

package/dist/components/ui/virtual-grid.js

@@ -21,7 +21,7 @@ const virtualGridVariants = cva("grid", {
 function VirtualGrid({ columns, children, overscan = 4, estimatedHeight = 375, isReachingEnd, LoaderItem, spacing = {
     horizontalGap: 7,
     verticalGap: 16,
-}, style, }) {
+}, loaderItemProps = {}, style, }) {
     const col = columns || 2;
     const parentRef = React.useRef(document.getElementById("tc-vgsl"));
     const childrenArray = React.Children.toArray(children);
@@ -51,7 +51,7 @@ function VirtualGrid({ columns, children, overscan = 4, estimatedHeight = 375, i
                     } }, { children: Array.from({ length: col }).map((_, colIndex) => {
                         const index = rowStartIndex + colIndex;
                         if (index >= childrenArray.length && !isReachingEnd)
-                            return (_jsx("div", { children: _jsx(LoaderItem, {}) }, index));
+                            return (_jsx("div", { children: _jsx(LoaderItem, Object.assign({}, loaderItemProps)) }, index));
                         if (!childrenArray[index])
                             return null;
                         return (_jsx("div", Object.assign({ style: { height: "100%" } }, { children: childrenArray[index] }), index));

package/dist/lib/utils.js

@@ -575,9 +575,9 @@ const evaluateSingleCondition = (condition, context) => {
     // For regular values (like collection names, customer auth, etc)
     switch (operator) {
         case "equals":
-            return contextValues.some((contextValue) => (contextValue === null || contextValue === void 0 ? void 0 : contextValue.value.toLowerCase()) === value.toLowerCase());
+            return contextValues.some((contextValue) => { var _a; return ((_a = contextValue === null || contextValue === void 0 ? void 0 : contextValue.value) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === (value === null || value === void 0 ? void 0 : value.toLowerCase()); });
         case "does not equal":
-            return !contextValues.some((contextValue) => (contextValue === null || contextValue === void 0 ? void 0 : contextValue.value.toLowerCase()) === value.toLowerCase());
+            return !contextValues.some((contextValue) => { var _a; return ((_a = contextValue === null || contextValue === void 0 ? void 0 : contextValue.value) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === (value === null || value === void 0 ? void 0 : value.toLowerCase()); });
         case "contains":
             return contextValues.some((contextValue) => { var _a; return (_a = contextValue === null || contextValue === void 0 ? void 0 : contextValue.value) === null || _a === void 0 ? void 0 : _a.includes(value); });
         default:

package/dist/lib/variablesCart.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variablesCart.util.d.ts","sourceRoot":"","sources":["../../lib/variablesCart.util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,6BAA6B,EAO9B,MAAM,kBAAkB,CAAA;AAEzB,eAAO,MAAM,2BAA2B;;cAM5B,MAAM;;0BAEI;YAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;YACzB,KAAK,EAAE,MAAM,CAAA;YACb,cAAc,CAAC,EAAE,MAAM,CAAA;SACxB,EAAE;;;;;;CAyBN,CAAA;AAyED,eAAO,MAAM,6BAA6B,SAClC,MAAM,QACN,SAAS,GAAG,IAAI,YAUvB,CAAA;AAED,eAAO,MAAM,2BAA2B,SAChC,MAAM,QACN,SAAS,GAAG,IAAI,YAUvB,CAAA;AAkLD,MAAM,MAAM,uBAAuB,GAAG;IACpC,yBAAyB,EAAE,sBAAsB,EAAE,CAAA;IACnD,gBAAgB,EAAE,6BAA6B,EAAE,CAAA;IACjD,cAAc,EAAE,OAAO,CAAA;IACvB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,gBAAgB,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iCAAiC,EAAE,uBAU/C,CAAA;AAED,eAAO,MAAM,8BAA8B,SACnC,SAAS,GAAG,IAAI,KACrB,uBAmCF,CAAA"}
+{"version":3,"file":"variablesCart.util.d.ts","sourceRoot":"","sources":["../../lib/variablesCart.util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,6BAA6B,EAO9B,MAAM,kBAAkB,CAAA;AAEzB,eAAO,MAAM,2BAA2B;;cAM5B,MAAM;;0BAEI;YAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;YACzB,KAAK,EAAE,MAAM,CAAA;YACb,cAAc,CAAC,EAAE,MAAM,CAAA;SACxB,EAAE;;;;;;CAyBN,CAAA;AAyED,eAAO,MAAM,6BAA6B,SAClC,MAAM,QACN,SAAS,GAAG,IAAI,YAUvB,CAAA;AAED,eAAO,MAAM,2BAA2B,SAChC,MAAM,QACN,SAAS,GAAG,IAAI,YAUvB,CAAA;AAoLD,MAAM,MAAM,uBAAuB,GAAG;IACpC,yBAAyB,EAAE,sBAAsB,EAAE,CAAA;IACnD,gBAAgB,EAAE,6BAA6B,EAAE,CAAA;IACjD,cAAc,EAAE,OAAO,CAAA;IACvB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,gBAAgB,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iCAAiC,EAAE,uBAU/C,CAAA;AAED,eAAO,MAAM,8BAA8B,SACnC,SAAS,GAAG,IAAI,KACrB,uBAmCF,CAAA"}

package/dist/lib/variablesCart.util.js

@@ -159,25 +159,26 @@ const getLineItemDiscounts = (cart) => {
     const discountMap = ((cart === null || cart === void 0 ? void 0 : cart.items) || []).reduce((acc, item) => {
         var _a;
         (_a = item === null || item === void 0 ? void 0 : item.discounts) === null || _a === void 0 ? void 0 : _a.forEach((discount) => {
-            const code = discount === null || discount === void 0 ? void 0 : discount.code;
-            if (!code)
+            // Use code if available, otherwise fall back to title, otherwise use a default identifier
+            const identifier = (discount === null || discount === void 0 ? void 0 : discount.code) || (discount === null || discount === void 0 ? void 0 : discount.title) || "unknown-discount";
+            if (!identifier)
                 return;
-            if (!acc[code]) {
-                acc[code] = {
+            if (!acc[identifier]) {
+                acc[identifier] = {
                     amount: 0,
                     type: discount.type,
                     readOnly: discount.readOnly,
                 };
             }
-            acc[code].amount += discount.amount;
+            acc[identifier].amount += discount.amount;
         });
         return acc;
     }, {});
     if (!discountMap)
         return [];
-    return (_a = Object.entries(discountMap)) === null || _a === void 0 ? void 0 : _a.map(([code, { amount, type, readOnly }]) => ({
-        id: code,
-        name: `Discount - ${code}`,
+    return (_a = Object.entries(discountMap)) === null || _a === void 0 ? void 0 : _a.map(([identifier, { amount, type, readOnly }]) => ({
+        id: identifier,
+        name: `Discount - ${identifier}`,
         amount,
         type,
         readOnly,

package/dist/lib/variablesCart.util.test.js

@@ -1,3 +1,4 @@
+/* eslint-env jest */
 import { getVariablesCalculatedCartData } from "./variablesCart.util";
 import { DiscountApplicationTargetType, } from "app-studio-types";
 const baseCartData = {
@@ -294,94 +295,345 @@ describe("cart-provider.util", () => {
                         attributes: [],
                         featuredImage: "https://cdn.shopify.com/s/files/1/0656/7939/2959/files/Screenshot2024-08-22at9.44.04AM.png?v=1726022527",
                         compareAtPrice: 0,
-                        quantity: 1,
-                        totalAmount: 220,
                         currencyCode: "USD",
+                        totalAmount: 220,
                         price: 220,
-                        quantityAvailable: 99,
-                        variantSku: "",
-                    },
-                    {
-                        featuredImage: "https://cdn.shopify.com/s/files/1/0656/7939/2959/files/Screenshot2024-08-22at9.44.04AM.png?v=1726022527",
-                        quantityAvailable: 99,
-                        variantSku: "",
-                        title: "Fall Fancy Rug",
-                        productId: "7954296832191",
-                        compareAtPrice: 0,
-                        discounts: [
-                            {
-                                type: "manual",
-                                code: "FALLRUG10",
-                                amount: 22,
-                            },
-                        ],
-                        id: "gid://shopify/CartLine/b642de72-78c4-4998-92da-5d4c4146057b?cart=Z2NwLXVzLXdlc3QxOjAxSlJYUDZRUk1CS1pSRllDSlNTNUgxWFQz",
-                        attributes: [],
-                        productVendor: "Emmys Tapcart Boutique",
-                        image: "https://cdn.shopify.com/s/files/1/0656/7939/2959/files/Screenshot2024-08-22at9.43.44AM_x500.png?v=1726022527",
                         quantity: 1,
-                        totalAmount: 198,
-                        currencyCode: "USD",
-                        selectedOptions: [
-                            {
-                                name: "Rug Padding",
-                                value: "With Padding",
-                            },
-                            {
-                                value: "2 x 3",
-                                name: "Size",
-                            },
-                        ],
-                        price: 220,
-                        variantId: "43668884029631",
-                        cost: {
-                            totalAmount: {
-                                amount: "198",
-                                currencyCode: "USD",
-                            },
-                        },
                     },
                 ],
-                subtotal: 679.96,
-                discounts: ["Order10", "Fallrug10"],
-                // Added discountAllocations for testing
                 discountAllocations: [
                     {
                         targetType: DiscountApplicationTargetType.LineItem,
-                        discountedAmount: { amount: "10.00", currencyCode: "USD" },
-                        code: "ORDER10",
-                    },
-                ],
-                // Added appliedGiftCards using the provided format
-                appliedGiftCards: [
-                    {
-                        id: "gid://shopify/AppliedGiftCard/3c208423-e985-46c7-bb34-656c59dc29b1",
-                        lastCharacters: "oney",
-                        amountUsed: { amount: "10.00", currencyCode: "USD" },
-                        presentmentAmountUsed: { amount: "10.00", currencyCode: "USD" },
+                        discountedAmount: { amount: "22.00", currencyCode: "USD" },
+                        code: "FALLRUG10",
                     },
                 ],
             };
             const result = getVariablesCalculatedCartData(realWorldCart);
-            console.log(result);
-            // Test that the calculated data is correct
-            expect(result.orderAndLineItemDiscounts).toHaveLength(2);
-            expect(result.orderAndLineItemDiscounts[0].id).toBe("ORDER10");
-            expect(result.orderAndLineItemDiscounts[0].amount).toBe(10);
-            // Test applied gift cards
-            expect(result.appliedGiftCards).toHaveLength(1);
-            expect(result.appliedGiftCards[0].id).toBe("gid://shopify/AppliedGiftCard/3c208423-e985-46c7-bb34-656c59dc29b1");
-            expect(result.appliedGiftCards[0].amount).toBe(10);
-            expect(result.appliedGiftCards[0].name).toBe("Gift Card - oney");
-            // Test other calculated values
-            expect(result.discountsTotalAmount).toBe(32); // 22 + 10
-            expect(result.giftCardsTotalAmount).toBe(10);
-            // Test sales amount calculation - should be 4 * (99.99 - 59.99) = 4 * 40 = 160
-            expect(result.salesAmount).toBe(160);
-            // Total compare at price should include all items pricing
+            expect(result).toBeDefined();
             expect(result.totalCompareAtPrice).toBeGreaterThan(0);
-            // Free shipping isn't in the test data
-            expect(result.isFreeShipping).toBe(false);
+            expect(isNaN(result.totalDiscountedPrice)).toBe(false);
+        });
+        it("should handle null cart gracefully", () => {
+            const result = getVariablesCalculatedCartData(null);
+            expect(result).toEqual({
+                orderAndLineItemDiscounts: [],
+                appliedGiftCards: [],
+                isFreeShipping: false,
+                discountsTotalAmount: 0,
+                salesAmount: 0,
+                giftCardsTotalAmount: 0,
+                totalCompareAtPrice: 0,
+                totalDiscountedPrice: 0,
+                totalSavedAmount: 0,
+            });
+        });
+        it("should handle empty cart", () => {
+            const emptyCart = Object.assign(Object.assign({}, baseCartData), { items: [] });
+            const result = getVariablesCalculatedCartData(emptyCart);
+            expect(result.orderAndLineItemDiscounts).toHaveLength(0);
+            expect(result.totalCompareAtPrice).toBe(0);
+            expect(result.totalDiscountedPrice).toBe(0);
+        });
+        // BOGO Discount Tests - Testing the main fix
+        describe("BOGO Discount Functionality", () => {
+            it("should handle BOGO discounts with only title (no code)", () => {
+                // This is the exact scenario from the user's cart data
+                const bogoCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "8675202302202",
+                            variantId: "46921128968442",
+                            price: 699.95,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            totalAmount: 699.95,
+                            title: "The Complete Snowboard",
+                            discounts: [
+                                {
+                                    amount: 0,
+                                    title: "Buy 1 get 1 of same",
+                                    type: "automatic",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "699.95", currencyCode: "USD" } },
+                        },
+                        {
+                            id: "line2",
+                            quantity: 1,
+                            productId: "8675202302202",
+                            variantId: "46921128968442",
+                            price: 699.95,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            totalAmount: 0,
+                            title: "The Complete Snowboard",
+                            discounts: [
+                                {
+                                    amount: 699.95,
+                                    title: "Buy 1 get 1 of same",
+                                    type: "automatic",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "0", currencyCode: "USD" } },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(bogoCart);
+                // Should find the BOGO discount using title as identifier
+                expect(result.orderAndLineItemDiscounts).toHaveLength(1);
+                expect(result.orderAndLineItemDiscounts[0]).toEqual({
+                    id: "Buy 1 get 1 of same",
+                    amount: 699.95,
+                    name: "Discount - Buy 1 get 1 of same",
+                    type: "automatic",
+                    readOnly: undefined,
+                });
+                // Should include BOGO discount in total calculations
+                expect(result.discountsTotalAmount).toBe(699.95);
+                expect(result.totalCompareAtPrice).toBe(1399.9); // 699.95 * 2
+                expect(result.totalDiscountedPrice).toBe(699.95); // 1399.9 - 699.95
+            });
+            it("should handle discounts with code but no title", () => {
+                const codeOnlyCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "prod1",
+                            variantId: "var1",
+                            price: 100,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 20,
+                                    code: "SAVE20",
+                                    type: "manual",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "80", currencyCode: "USD" } },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(codeOnlyCart);
+                expect(result.orderAndLineItemDiscounts).toHaveLength(1);
+                expect(result.orderAndLineItemDiscounts[0].id).toBe("SAVE20");
+                expect(result.discountsTotalAmount).toBe(20);
+            });
+            it("should prefer code over title when both exist", () => {
+                const bothCodeAndTitleCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "prod1",
+                            variantId: "var1",
+                            price: 100,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 15,
+                                    code: "PROMO15",
+                                    title: "15% Off Promo",
+                                    type: "manual",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "85", currencyCode: "USD" } },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(bothCodeAndTitleCart);
+                expect(result.orderAndLineItemDiscounts).toHaveLength(1);
+                expect(result.orderAndLineItemDiscounts[0].id).toBe("PROMO15"); // Should use code
+                expect(result.orderAndLineItemDiscounts[0].name).toBe("Discount - PROMO15");
+            });
+            it("should use fallback identifier when neither code nor title exist", () => {
+                const noIdentifierCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "prod1",
+                            variantId: "var1",
+                            price: 100,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 10,
+                                    type: "automatic",
+                                    // No code or title
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "90", currencyCode: "USD" } },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(noIdentifierCart);
+                expect(result.orderAndLineItemDiscounts).toHaveLength(1);
+                expect(result.orderAndLineItemDiscounts[0].id).toBe("unknown-discount");
+            });
+            it("should aggregate multiple line items with same discount identifier", () => {
+                const multipleItemsSameDiscountCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "prod1",
+                            variantId: "var1",
+                            price: 50,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 5,
+                                    title: "10% Off Sale",
+                                    type: "automatic",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "45", currencyCode: "USD" } },
+                        },
+                        {
+                            id: "line2",
+                            quantity: 1,
+                            productId: "prod2",
+                            variantId: "var2",
+                            price: 30,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 3,
+                                    title: "10% Off Sale",
+                                    type: "automatic",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "27", currencyCode: "USD" } },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(multipleItemsSameDiscountCart);
+                expect(result.orderAndLineItemDiscounts).toHaveLength(1);
+                expect(result.orderAndLineItemDiscounts[0]).toEqual({
+                    id: "10% Off Sale",
+                    amount: 8,
+                    name: "Discount - 10% Off Sale",
+                    type: "automatic",
+                    readOnly: undefined,
+                });
+            });
+        });
+        // Edge Case Tests
+        describe("Edge Cases", () => {
+            it("should handle subscription pricing", () => {
+                const subscriptionCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            attributes: {},
+                            compareAtPrice: 15,
+                            cost: {
+                                totalAmount: {
+                                    amount: 8.5,
+                                    currencyCode: "USD",
+                                },
+                            },
+                            currencyCode: "USD",
+                            discounts: [],
+                            featuredImage: "https://cdn.shopify.com/s/files/1/0733/5179/0842/files/snowboard_wax.png?v=1733258904",
+                            id: "gid://shopify/CartLine/5e1a02e3-5aa0-4244-8653-8adb8205f590?cart=Z2NwLXVzLWVhc3QxOjAxSllFTjRXTTJHQzVYVENBWUVOQjExS0pC",
+                            price: 10,
+                            productId: "8746326294778",
+                            productVendor: "Eric Dixon's Tapcart Boutique",
+                            quantity: 1,
+                            quantityAvailable: 13,
+                            selectedOptions: [
+                                {
+                                    name: "Color",
+                                    value: "Yellow",
+                                },
+                            ],
+                            sellingPlanAllocation: {
+                                id: "4139745530",
+                                name: "Ski wax subscription, billed and delivered weekly",
+                                priceAdjustments: [
+                                    {
+                                        compareAtPrice: 10,
+                                        perDeliveryPrice: 8.5,
+                                        price: 8.5,
+                                    },
+                                ],
+                            },
+                            sellingPlanId: "4139745530",
+                            title: "Subscription Wax",
+                            totalAmount: 8.5,
+                            variantId: "47197277683962",
+                            variantSku: "",
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(subscriptionCart);
+                expect(result.totalCompareAtPrice).toBe(10); // Using actual item price * quantity since subscription logic uses price as compareAtPrice when no compareAtPrice exists
+                expect(result.salesAmount).toBe(1.5); // (10-8.5) * 1 = 1.5 for subscription pricing
+            });
+            it("should handle mixed discounts and gift cards", () => {
+                const mixedCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "prod1",
+                            variantId: "var1",
+                            price: 100,
+                            compareAtPrice: 120,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 15,
+                                    title: "Flash Sale",
+                                    type: "automatic",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "85", currencyCode: "USD" } },
+                        },
+                    ], discountAllocations: [
+                        {
+                            targetType: DiscountApplicationTargetType.LineItem,
+                            discountedAmount: { amount: "10.00", currencyCode: "USD" },
+                            code: "EXTRA10",
+                        },
+                    ], appliedGiftCards: [
+                        {
+                            id: "gift1",
+                            lastCharacters: "5678",
+                            amountUsed: { amount: "20.00", currencyCode: "USD" },
+                            presentmentAmountUsed: { amount: "20.00", currencyCode: "USD" },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(mixedCart);
+                expect(result.orderAndLineItemDiscounts).toHaveLength(2); // Line item + order level
+                expect(result.appliedGiftCards).toHaveLength(1);
+                expect(result.discountsTotalAmount).toBe(25); // 15 + 10
+                expect(result.giftCardsTotalAmount).toBe(20);
+                expect(result.salesAmount).toBe(20); // (120-100) * 1
+                expect(result.totalDiscountedPrice).toBe(55); // 120 - 25 - 20 - 20
+            });
+            it("should handle zero amounts and negative scenarios", () => {
+                const zeroAmountCart = Object.assign(Object.assign({}, baseCartData), { items: [
+                        {
+                            id: "line1",
+                            quantity: 1,
+                            productId: "prod1",
+                            variantId: "var1",
+                            price: 0,
+                            compareAtPrice: 0,
+                            currencyCode: "USD",
+                            discounts: [
+                                {
+                                    amount: 0,
+                                    title: "Zero Discount",
+                                    type: "automatic",
+                                },
+                            ],
+                            cost: { totalAmount: { amount: "0", currencyCode: "USD" } },
+                        },
+                    ] });
+                const result = getVariablesCalculatedCartData(zeroAmountCart);
+                expect(result.totalCompareAtPrice).toBe(0);
+                expect(result.discountsTotalAmount).toBe(0);
+                expect(result.totalDiscountedPrice).toBe(0);
+                expect(result.totalDiscountedPrice).not.toBeLessThan(0);
+            });
         });
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapcart/mobile-components",
-  "version": "0.8.58",
+  "version": "0.8.59",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "style": "dist/styles.css",