@weareconceptstudio/account 2.0.7 → 2.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AccountProvider.d.ts.map +1 -1
- package/dist/AccountProvider.js +2 -0
- package/dist/AccountProvider.js.map +1 -1
- package/dist/components/CartPageDetector.d.ts +2 -0
- package/dist/components/CartPageDetector.d.ts.map +1 -0
- package/dist/components/CartPageDetector.js +29 -0
- package/dist/components/CartPageDetector.js.map +1 -0
- package/dist/components/TotalCheckout/BalanceComp/index.d.ts.map +1 -1
- package/dist/components/TotalCheckout/BalanceComp/index.js +10 -2
- package/dist/components/TotalCheckout/BalanceComp/index.js.map +1 -1
- package/dist/components/TotalCheckout/CommentComp/index.d.ts.map +1 -1
- package/dist/components/TotalCheckout/CommentComp/index.js +21 -2
- package/dist/components/TotalCheckout/CommentComp/index.js.map +1 -1
- package/dist/components/TotalCheckout/PromoCodeComp/index.d.ts.map +1 -1
- package/dist/components/TotalCheckout/PromoCodeComp/index.js +9 -2
- package/dist/components/TotalCheckout/PromoCodeComp/index.js.map +1 -1
- package/dist/components/TotalCheckout/index.d.ts.map +1 -1
- package/dist/components/TotalCheckout/index.js +1 -3
- package/dist/components/TotalCheckout/index.js.map +1 -1
- package/dist/modules/order/OrderDetails/index.js +4 -6
- package/dist/modules/order/OrderDetails/index.js.map +1 -1
- package/dist/utils/useCartSticky.d.ts +1 -6
- package/dist/utils/useCartSticky.d.ts.map +1 -1
- package/dist/utils/useCartSticky.js +34 -85
- package/dist/utils/useCartSticky.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountProvider.d.ts","sourceRoot":"","sources":["../src/AccountProvider.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AccountProvider.d.ts","sourceRoot":"","sources":["../src/AccountProvider.js"],"names":[],"mappings":"AAqBO,yCAIN;AAEM;;;sBA4FN;kBAvHwE,OAAO"}
|
package/dist/AccountProvider.js
CHANGED
|
@@ -3,6 +3,7 @@ import { deepMerge, useTranslation, useUi } from '@weareconceptstudio/core';
|
|
|
3
3
|
import { ThemeProvider } from 'styled-components';
|
|
4
4
|
import { AddressProvider } from './modules/address/AddressProvider';
|
|
5
5
|
import { initCartStore } from '@weareconceptstudio/cart';
|
|
6
|
+
import { CartPageDetector } from './components/CartPageDetector';
|
|
6
7
|
//* Translations
|
|
7
8
|
import translations from './translations';
|
|
8
9
|
//* Config
|
|
@@ -70,6 +71,7 @@ export const AccountProvider = ({ children, ...props }) => {
|
|
|
70
71
|
}
|
|
71
72
|
}, [contextValue.productUrlPrefix, contextValue.productPopup, openPopup]);
|
|
72
73
|
return (React.createElement(AccountContext.Provider, { value: { ...contextValue, handleProductClick } },
|
|
74
|
+
React.createElement(CartPageDetector, null),
|
|
73
75
|
React.createElement(AddressProvider, { useUser: contextValue.useUser, addressType: contextValue.globalSettings.hasAddressType, addressFormFields: contextValue.addressFormFields },
|
|
74
76
|
React.createElement(ThemeProvider, { theme: theme },
|
|
75
77
|
React.createElement(AccountVariables, { fontFamily: contextValue.fontFamily }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountProvider.js","sourceRoot":"","sources":["../src/AccountProvider.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"AccountProvider.js","sourceRoot":"","sources":["../src/AccountProvider.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,gBAAgB;AAChB,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,UAAU;AACV,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,UAAU;AACV,OAAO,KAAK,MAAM,gBAAgB,CAAC;AACnC,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AAE3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACrC,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE3C,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACzD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CAAC;IAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,EAAE,CAAC;IAE9B,MAAM,YAAY,GAAG,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IACrD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,wBAAwB;IAE7E,4CAA4C;IAC5C,SAAS,CAAC,GAAG,EAAE;QACd,MAAM,EACL,WAAW,EACX,iBAAiB,EACjB,aAAa,EAAE,QAAQ,EACvB,iBAAiB,EAAE,WAAW,GAC9B,GAAG,YAAY,CAAC,cAAc,CAAC;QAEhC,sCAAsC;QACtC,aAAa,CACZ;YACC,WAAW,EAAE,WAAW,IAAI,KAAK;YACjC,iBAAiB;YACjB,QAAQ;YACR,WAAW;SACX,EACD,UAAU,EACV,YAAY,EACZ,IAAI,CACJ,CAAC;QAEF,MAAM,oBAAoB,GACzB,OAAO,MAAM,KAAK,WAAW;YAC7B,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAEtF,0CAA0C;QAC1C,MAAM,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;YAEtC,oBAAoB;YACpB,IAAI,IAAI,EAAE,CAAC;gBACV,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;YAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC3B,kBAAkB;gBAClB,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;gBAElB,+BAA+B;gBAC/B,IAAI,UAAU,EAAE,CAAC;oBAChB,UAAU,CAAC,GAAG,EAAE;wBACf,IAAI,WAAW,EAAE,CAAC;4BACjB,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;wBACpB,CAAC;6BAAM,CAAC;4BACP,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;wBACrB,CAAC;oBACF,CAAC,EAAE,GAAG,CAAC,CAAC;gBACT,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAE9E,SAAS,CAAC,GAAG,EAAE;QACd,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,WAAW,CACrC,CAAC,OAAO,EAAE,EAAE;QACX,IAAI,YAAY,CAAC,gBAAgB,EAAE,CAAC;YACnC,0EAA0E;QAC3E,CAAC;aAAM,CAAC;YACP,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACxF,CAAC;IACF,CAAC,EACD,CAAC,YAAY,CAAC,gBAAgB,EAAE,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,CACrE,CAAC;IAEF,OAAO,CACN,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,kBAAkB,EAAE;QACtE,oBAAC,gBAAgB,OAAG;QACpB,oBAAC,eAAe,IACf,OAAO,EAAE,YAAY,CAAC,OAAO,EAC7B,WAAW,EAAE,YAAY,CAAC,cAAc,CAAC,cAAc,EACvD,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;YACjD,oBAAC,aAAa,IAAC,KAAK,EAAE,KAAK;gBAC1B,oBAAC,gBAAgB,IAAC,UAAU,EAAE,YAAY,CAAC,UAAU,GAAI;gBACzD,oBAAC,kBAAkB,OAAG;gBACtB,oBAAC,iBAAiB,OAAG;gBAEpB,QAAQ,CACM,CACC,CACO,CAC1B,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CartPageDetector.d.ts","sourceRoot":"","sources":["../../src/components/CartPageDetector.js"],"names":[],"mappings":"AAQO,wCAsBN"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
import { useEffect, useMemo } from 'react';
|
|
3
|
+
/**
|
|
4
|
+
* Internal component that detects cart/checkout pages and updates the cart store
|
|
5
|
+
* This runs inside AccountProvider, so no need to add it manually to layouts
|
|
6
|
+
*/
|
|
7
|
+
export const CartPageDetector = () => {
|
|
8
|
+
const isCheckoutPage = useMemo(() => {
|
|
9
|
+
if (typeof window === 'undefined')
|
|
10
|
+
return false;
|
|
11
|
+
return window.location.href.includes('checkout');
|
|
12
|
+
}, [window.location.href]);
|
|
13
|
+
const isCartPage = useMemo(() => {
|
|
14
|
+
if (typeof window === 'undefined')
|
|
15
|
+
return false;
|
|
16
|
+
return window.location.href.includes('cart');
|
|
17
|
+
}, [window.location.href]);
|
|
18
|
+
// Update cart store when page type changes
|
|
19
|
+
useEffect(() => {
|
|
20
|
+
import('@weareconceptstudio/cart').then(({ useCartStore }) => {
|
|
21
|
+
const store = useCartStore.getState();
|
|
22
|
+
if (store.updatePageType) {
|
|
23
|
+
store.updatePageType();
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}, [window.location.href, isCheckoutPage, isCartPage]);
|
|
27
|
+
return null; // This component doesn't render anything
|
|
28
|
+
};
|
|
29
|
+
//# sourceMappingURL=CartPageDetector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CartPageDetector.js","sourceRoot":"","sources":["../../src/components/CartPageDetector.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE3C;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACpC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO,KAAK,CAAC;QAChD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO,KAAK,CAAC;QAChD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3B,2CAA2C;IAC3C,SAAS,CAAC,GAAG,EAAE;QACd,MAAM,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;YACtC,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC1B,KAAK,CAAC,cAAc,EAAE,CAAC;YACxB,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAEvD,OAAO,IAAI,CAAC,CAAC,yCAAyC;AACvD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/BalanceComp/index.js"],"names":[],"mappings":";AAYA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/BalanceComp/index.js"],"names":[],"mappings":";AAYA,kDA+FC;kBA3G0C,OAAO"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { useEffect, useState } from 'react';
|
|
2
2
|
import { Text, CollapseItem, useTranslation } from '@weareconceptstudio/core';
|
|
3
3
|
import { ErrorMessage, FormBuilder } from '@weareconceptstudio/form';
|
|
4
4
|
import { useAccountContext } from '../../../AccountProvider';
|
|
@@ -14,16 +14,24 @@ const BalanceComp = () => {
|
|
|
14
14
|
const { user } = useUser();
|
|
15
15
|
const balance = user?.balance || 0;
|
|
16
16
|
const userFormattedBalance = user?.formatted_balance || 0;
|
|
17
|
+
const [isOpen, setIsOpen] = useState(false);
|
|
18
|
+
useEffect(() => {
|
|
19
|
+
if (useBalance) {
|
|
20
|
+
setIsOpen(true);
|
|
21
|
+
}
|
|
22
|
+
}, [useBalance]);
|
|
17
23
|
const handleBalance = (amount) => {
|
|
18
24
|
fillCart('useBalance', amount);
|
|
25
|
+
setIsOpen(true);
|
|
19
26
|
};
|
|
20
27
|
const onFinish = (values) => {
|
|
21
28
|
if (!user || !user?.balance)
|
|
22
29
|
return;
|
|
23
30
|
handleBalance(values.balance);
|
|
31
|
+
setIsOpen(true);
|
|
24
32
|
};
|
|
25
33
|
return (React.createElement(BalanceCompStyle, { className: `collapse-distance ${itemsCount && balance ? '' : 'disable'}` },
|
|
26
|
-
React.createElement(CollapseItem, { status:
|
|
34
|
+
React.createElement(CollapseItem, { status: isOpen ? 'open' : 'close', title: React.createElement(React.Fragment, null,
|
|
27
35
|
React.createElement("div", { className: 'inner-wrapper-icon' },
|
|
28
36
|
React.createElement("svg", { width: '12', height: '12', fill: 'none', viewBox: '0 0 12 12', xmlns: 'http://www.w3.org/2000/svg' },
|
|
29
37
|
React.createElement("path", { d: 'M0 6H12', stroke: 'black', strokeWidth: '2' }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/BalanceComp/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/BalanceComp/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/CommentComp/index.js"],"names":[],"mappings":";AAMA;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/CommentComp/index.js"],"names":[],"mappings":";AAMA;;sBAqEC;kBA3EkD,OAAO"}
|
|
@@ -1,17 +1,36 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { useState, useRef, useEffect } from 'react';
|
|
2
2
|
import { CollapseItem, Text } from '@weareconceptstudio/core';
|
|
3
3
|
import { Input } from '@weareconceptstudio/form';
|
|
4
4
|
import { useCart } from '@weareconceptstudio/cart';
|
|
5
5
|
import CommentCompStyle from './style';
|
|
6
6
|
const CommentComp = ({ isShipping }) => {
|
|
7
7
|
const { fillCheckoutData, isCheckoutPage } = useCart();
|
|
8
|
+
const [localComment, setLocalComment] = useState('');
|
|
9
|
+
const debounceTimerRef = useRef(null);
|
|
10
|
+
// Debounced update to cart store
|
|
11
|
+
useEffect(() => {
|
|
12
|
+
if (debounceTimerRef.current) {
|
|
13
|
+
clearTimeout(debounceTimerRef.current);
|
|
14
|
+
}
|
|
15
|
+
debounceTimerRef.current = setTimeout(() => {
|
|
16
|
+
fillCheckoutData('note', localComment);
|
|
17
|
+
}, 500);
|
|
18
|
+
return () => {
|
|
19
|
+
if (debounceTimerRef.current) {
|
|
20
|
+
clearTimeout(debounceTimerRef.current);
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
}, [localComment, fillCheckoutData]);
|
|
24
|
+
const handleCommentChange = (e) => {
|
|
25
|
+
setLocalComment(e.target.value);
|
|
26
|
+
};
|
|
8
27
|
return isCheckoutPage && typeof isShipping === 'boolean' && !isShipping ? (React.createElement(CommentCompStyle, { className: 'collapse-distance' },
|
|
9
28
|
React.createElement(CollapseItem, { status: 'open', title: React.createElement(React.Fragment, null,
|
|
10
29
|
React.createElement("div", { className: 'inner-wrapper-icon' },
|
|
11
30
|
React.createElement("svg", { width: '12', height: '12', fill: 'none', viewBox: '0 0 12 12', xmlns: 'http://www.w3.org/2000/svg' },
|
|
12
31
|
React.createElement("path", { d: 'M0 6H12', stroke: 'black', strokeWidth: '2' }),
|
|
13
32
|
React.createElement("path", { d: 'M6 12L6 0', stroke: 'black', strokeWidth: '2' }))),
|
|
14
|
-
React.createElement(Text, { className: 'account-p account-p4 account-primary-color1 account-font-medium comment-text', text: 'account.order_balance.comment' })), description: React.createElement(Input.TextArea, { containerClassName: `comment-field`, placeholder: 'account.cart_checkout.checkoutCommentPlaceholder',
|
|
33
|
+
React.createElement(Text, { className: 'account-p account-p4 account-primary-color1 account-font-medium comment-text', text: 'account.order_balance.comment' })), description: React.createElement(Input.TextArea, { containerClassName: `comment-field`, placeholder: 'account.cart_checkout.checkoutCommentPlaceholder', value: localComment, onChange: handleCommentChange, className: `account-p account-p3 account-font-regular account-primary-color1` }) }))) : null;
|
|
15
34
|
};
|
|
16
35
|
export default CommentComp;
|
|
17
36
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/CommentComp/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/CommentComp/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,gBAAgB,MAAM,SAAS,CAAC;AAEvC,MAAM,WAAW,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IACtC,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;IACvD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEtC,iCAAiC;IACjC,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC9B,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;QAED,gBAAgB,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1C,gBAAgB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACxC,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,OAAO,GAAG,EAAE;YACX,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAC9B,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC;QACF,CAAC,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAErC,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,EAAE;QACjC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC;IAEF,OAAO,cAAc,IAAI,OAAO,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CACzE,oBAAC,gBAAgB,IAAC,SAAS,EAAC,mBAAmB;QAC9C,oBAAC,YAAY,IACZ,MAAM,EAAE,MAAM,EACd,KAAK,EACJ;gBACC,6BAAK,SAAS,EAAC,oBAAoB;oBAClC,6BACC,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,WAAW,EACnB,KAAK,EAAC,4BAA4B;wBAClC,8BACC,CAAC,EAAC,SAAS,EACX,MAAM,EAAC,OAAO,EACd,WAAW,EAAC,GAAG,GACd;wBACF,8BACC,CAAC,EAAC,WAAW,EACb,MAAM,EAAC,OAAO,EACd,WAAW,EAAC,GAAG,GACd,CACG,CACD;gBAEN,oBAAC,IAAI,IACJ,SAAS,EAAC,8EAA8E,EACxF,IAAI,EAAE,+BAA+B,GACpC,CACA,EAEJ,WAAW,EACV,oBAAC,KAAK,CAAC,QAAQ,IACd,kBAAkB,EAAE,eAAe,EACnC,WAAW,EAAE,kDAAkD,EAC/D,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,mBAAmB,EAC7B,SAAS,EAAE,kEAAkE,GAC5E,GACc,CACA,CACnB,CAAC,CAAC,CAAC,IAAI,CAAC;AACV,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/PromoCodeComp/index.js"],"names":[],"mappings":";AAWA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/PromoCodeComp/index.js"],"names":[],"mappings":";AAWA,oDA4GC;kBAvHyC,OAAO"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useMemo } from 'react';
|
|
1
|
+
import React, { useMemo, useEffect } from 'react';
|
|
2
2
|
import { Text, CollapseItem } from '@weareconceptstudio/core';
|
|
3
3
|
import { ErrorMessage, FormBuilder } from '@weareconceptstudio/form';
|
|
4
4
|
import { useCart } from '@weareconceptstudio/cart';
|
|
@@ -10,8 +10,15 @@ import PromoCodeCompStyle from './style';
|
|
|
10
10
|
const PromoCodeComp = () => {
|
|
11
11
|
const { itemsCount, appliedPromotions, fillCart, fillCheckoutData, togglePromotion, checkoutData, actionLoading } = useCart();
|
|
12
12
|
const [formKey, setFormKey] = React.useState(0);
|
|
13
|
+
const [isOpen, setIsOpen] = React.useState(false);
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
if (appliedPromotions?.length) {
|
|
16
|
+
setIsOpen(true);
|
|
17
|
+
}
|
|
18
|
+
}, [appliedPromotions]);
|
|
13
19
|
const onFinish = (values) => {
|
|
14
20
|
fillCart('promotion_code', values?.promo_code || null);
|
|
21
|
+
setIsOpen(true);
|
|
15
22
|
};
|
|
16
23
|
// Reset form when promotion_code changes or when there's an error
|
|
17
24
|
React.useEffect(() => {
|
|
@@ -29,7 +36,7 @@ const PromoCodeComp = () => {
|
|
|
29
36
|
return appliedPromotions?.map((promotion) => (React.createElement(AppliedPromotion, { key: promotion.id, ...promotion, isExcluded: checkoutData?.excludedPromotions?.includes(promotion.id), onClick: () => (promotion.is_manual ? onFinish(null) : togglePromotion({ promotionId: promotion.id })) })));
|
|
30
37
|
}, [appliedPromotions, checkoutData.excludedPromotions]);
|
|
31
38
|
return (React.createElement(PromoCodeCompStyle, { className: `collapse-distance ${itemsCount ? '' : 'disable'}` },
|
|
32
|
-
React.createElement(CollapseItem, { status:
|
|
39
|
+
React.createElement(CollapseItem, { status: isOpen ? 'open' : 'close', title: React.createElement(React.Fragment, null,
|
|
33
40
|
React.createElement("div", { className: 'inner-wrapper-icon' },
|
|
34
41
|
React.createElement("svg", { xmlns: 'http://www.w3.org/2000/svg', width: '12', height: '12', viewBox: '0 0 12 12', fill: 'none' },
|
|
35
42
|
React.createElement("path", { d: 'M0 6H12', stroke: 'black', strokeWidth: '2' }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/PromoCodeComp/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/TotalCheckout/PromoCodeComp/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,SAAS;AACT,OAAO,kBAAkB,MAAM,SAAS,CAAC;AAEzC,MAAM,aAAa,GAAG,GAAG,EAAE;IAC1B,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,GAChH,OAAO,EAAE,CAAC;IACX,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElD,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,iBAAiB,EAAE,MAAM,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;IACF,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,EAAE;QAC3B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;QACvD,SAAS,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,kEAAkE;IAClE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,IAAI,YAAY,CAAC,cAAc,IAAI,YAAY,CAAC,eAAe,EAAE,CAAC;YACjE,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAChC,CAAC;IACF,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAEhE,MAAM,mBAAmB,GAAG,GAAG,EAAE;QAChC,IAAI,YAAY,CAAC,eAAe,EAAE,CAAC;YAClC,gBAAgB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,aAAa,EAAE,SAAS,IAAI,KAAK,CAAC;IAE7D,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,OAAO,iBAAiB,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAC5C,oBAAC,gBAAgB,IAChB,GAAG,EAAE,SAAS,CAAC,EAAE,KACb,SAAS,EACb,UAAU,EAAE,YAAY,EAAE,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,EACpE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,GACrG,CACF,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,iBAAiB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzD,OAAO,CACN,oBAAC,kBAAkB,IAAC,SAAS,EAAE,qBAAqB,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE;QAChF,oBAAC,YAAY,IACZ,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EACjC,KAAK,EACJ;gBACC,6BAAK,SAAS,EAAC,oBAAoB;oBAClC,6BACC,KAAK,EAAC,4BAA4B,EAClC,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM;wBACX,8BACC,CAAC,EAAC,SAAS,EACX,MAAM,EAAC,OAAO,EACd,WAAW,EAAC,GAAG,GACd;wBACF,8BACC,CAAC,EAAC,WAAW,EACb,MAAM,EAAC,OAAO,EACd,WAAW,EAAC,GAAG,GACd,CACG,CACD;gBAEN,oBAAC,IAAI,IACJ,SAAS,EAAC,iFAAiF,EAC3F,IAAI,EAAE,6CAA6C,GAClD,CACA,EAEJ,WAAW,EACV;gBACE,UAAU;gBAEV,CAAC,YAAY,CAAC,cAAc,IAAI,YAAY,CAAC,eAAe,IAAI,kBAAkB,CAAC,CAAC,CAAC,CACrF,oBAAC,WAAW,IACX,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,WAAW,EAAE;wBACZ,SAAS,EAAE,sBAAsB;wBACjC,IAAI,EAAE,UAAU;qBAChB;oBACD,oBAAC,aAAa,IACb,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,oBAAoB,EAC7B,IAAI,EAAE,6BAA6B,EACnC,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,kBAAkB,GAC3B;oBAEF,oBAAC,YAAY,IACZ,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,6BAAK,SAAS,EAAC,eAAe,GAAG,EACrC,OAAO,EAAE,YAAY,CAAC,eAAe,GACpC,CACW,CACd,CAAC,CAAC,CAAC,IAAI,CACN,GACa,CACE,CACrB,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/TotalCheckout/index.js"],"names":[],"mappings":";AAiBA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/TotalCheckout/index.js"],"names":[],"mappings":";AAiBA,gEAiKG;kBAlLyB,OAAO"}
|
|
@@ -35,9 +35,7 @@ const TotalCheckout = memo(({ isShipping, children, confirmation, buttonProps })
|
|
|
35
35
|
React.createElement(Text, { className: `account-p account-p2 account-font-regular account-primary-color1 balance-text-block`, text: `-${formatted_discount} ` }))) : null,
|
|
36
36
|
globalSettings.hasPromoCodeSystem && cashback ? (React.createElement("div", { className: `od-item-wrap` },
|
|
37
37
|
React.createElement(Text, { className: `account-p account-p2 account-font-regular account-primary-color1`, text: `account.balance_promotions.muramoney` }),
|
|
38
|
-
React.createElement(Text, { className: `account-p account-p2 account-font-regular account-primary-color1 balance-text-block`, text:
|
|
39
|
-
percentage: formatted_cashback,
|
|
40
|
-
}) }))) : null,
|
|
38
|
+
React.createElement(Text, { className: `account-p account-p2 account-font-regular account-primary-color1 balance-text-block`, text: formatted_cashback }))) : null,
|
|
41
39
|
globalSettings.hasBalanceSystem && useBalance ? (React.createElement("div", { className: `od-item-wrap` },
|
|
42
40
|
React.createElement(Text, { className: `account-p account-p2 account-font-regular account-primary-color1`, text: `account.balance_promotions.muramoney` }),
|
|
43
41
|
React.createElement(Text, { className: `account-p account-p2 account-font-regular account-primary-color1 balance-text-block`, text: `-${formatted_useBalance}` }))) : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/TotalCheckout/index.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/TotalCheckout/index.js"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Text, useTranslation } from '@weareconceptstudio/core';
|
|
|
3
3
|
import { useAccountContext } from '../../../AccountProvider';
|
|
4
4
|
import OrderStatus from '../OrderStatus';
|
|
5
5
|
import OrderDetailsStyle from './style';
|
|
6
|
-
const OrderDetails = memo(({ className, status, date, orderNumber, itemsCount, formatted_subtotal, formatted_total, shippingCost, formatted_shippingCost, usedBalance, formatted_usedBalance, discounts = [],
|
|
6
|
+
const OrderDetails = memo(({ className, status, date, orderNumber, itemsCount, formatted_subtotal, formatted_total, shippingCost, formatted_shippingCost, usedBalance, formatted_usedBalance, discounts = [], cashback, formatted_cashback, }) => {
|
|
7
7
|
const { translate } = useTranslation();
|
|
8
8
|
const { order } = useAccountContext();
|
|
9
9
|
return (React.createElement(OrderDetailsStyle, { className: `${className || ''}` },
|
|
@@ -36,7 +36,7 @@ const OrderDetails = memo(({ className, status, date, orderNumber, itemsCount, f
|
|
|
36
36
|
React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1 value` }, formatted_subtotal))) : null,
|
|
37
37
|
order?.hasDiscounts ? (React.createElement(React.Fragment, null, discounts?.length > 0
|
|
38
38
|
? discounts.map((item, index) => {
|
|
39
|
-
if (item.discount != 0) {
|
|
39
|
+
if (item.discount != 0 && item.type !== 'balance_cashback') {
|
|
40
40
|
return (React.createElement("div", { key: index, className: `order-detail-item-wrap` },
|
|
41
41
|
React.createElement(Text, { className: `account-p account-p3 account-font-bold discount-color` },
|
|
42
42
|
translate('account.order_balance.discount'),
|
|
@@ -49,13 +49,11 @@ const OrderDetails = memo(({ className, status, date, orderNumber, itemsCount, f
|
|
|
49
49
|
}
|
|
50
50
|
})
|
|
51
51
|
: null)) : null,
|
|
52
|
-
|
|
52
|
+
cashback ? (React.createElement("div", { className: `order-detail-item-wrap` },
|
|
53
53
|
React.createElement(Text, { className: `account-p account-p3 account-font-bold cashback-color first-letter` },
|
|
54
54
|
translate('account.balance_promotions.muramoney'),
|
|
55
55
|
":"),
|
|
56
|
-
React.createElement(Text, { className: `account-p account-p3 account-font-regular cashback-color value` },
|
|
57
|
-
"+",
|
|
58
|
-
formatted_cashbackTotal))) : null,
|
|
56
|
+
React.createElement(Text, { className: `account-p account-p3 account-font-regular cashback-color value` }, formatted_cashback))) : null,
|
|
59
57
|
order?.hasUsedBalance ? (React.createElement(React.Fragment, null, usedBalance ? (React.createElement("div", { className: `order-detail-item-wrap` },
|
|
60
58
|
React.createElement(Text, { className: `account-p account-p3 account-font-bold balance-color` },
|
|
61
59
|
translate('account.balance_promotions.usedBalance'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/order/OrderDetails/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,iBAAiB,MAAM,SAAS,CAAC;AAExC,MAAM,YAAY,GAAG,IAAI,CACxB,CAAC,EACA,SAAS,EACT,MAAM,EACN,IAAI,EACJ,WAAW,EACX,UAAU,EAEV,kBAAkB,EAClB,eAAe,EACf,YAAY,EACZ,sBAAsB,EACtB,WAAW,EACX,qBAAqB,EACrB,SAAS,GAAG,EAAE,EAEd,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/order/OrderDetails/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCartSticky.d.ts","sourceRoot":"","sources":["../../src/utils/useCartSticky.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useCartSticky.d.ts","sourceRoot":"","sources":["../../src/utils/useCartSticky.js"],"names":[],"mappings":"AAEO;;EAiEN"}
|
|
@@ -1,112 +1,61 @@
|
|
|
1
1
|
import { useEffect, useRef, useCallback } from 'react';
|
|
2
|
-
/**
|
|
3
|
-
* Custom hook to handle cart sticky sidebar with GSAP ScrollTrigger
|
|
4
|
-
* @param {Object} options - Configuration options
|
|
5
|
-
* @param {boolean} options.enabled - Enable/disable sticky behavior (default: true)
|
|
6
|
-
* @param {number} options.breakpoint - Minimum width for sticky (default: 1024)
|
|
7
|
-
* @param {boolean} options.loading - Loading state to wait before initializing
|
|
8
|
-
* @param {Array} options.dependencies - Dependencies to trigger re-calculation
|
|
9
|
-
*/
|
|
10
2
|
export const useCartSticky = (options = {}) => {
|
|
11
|
-
const { enabled = true, breakpoint = 1024, loading, dependencies = [] } = options;
|
|
3
|
+
const { enabled = true, breakpoint = 1024, loading = false, dependencies = [] } = options;
|
|
12
4
|
const scrollTriggerRef = useRef(null);
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
const recreateScrollTrigger = useCallback(async () => {
|
|
17
|
-
if (typeof window === 'undefined')
|
|
5
|
+
const mmRef = useRef(null);
|
|
6
|
+
const setup = useCallback(async () => {
|
|
7
|
+
if (!enabled || typeof window === 'undefined')
|
|
18
8
|
return;
|
|
9
|
+
// Wait until page is rendered
|
|
10
|
+
await new Promise((r) => requestAnimationFrame(r));
|
|
19
11
|
const { default: gsap } = await import('gsap');
|
|
20
12
|
const { ScrollTrigger } = await import('gsap/ScrollTrigger');
|
|
21
13
|
gsap.registerPlugin(ScrollTrigger);
|
|
22
|
-
// Get elements
|
|
23
14
|
const leftPanel = document.querySelector('.left-panel-wrap');
|
|
24
15
|
const pinElement = document.querySelector('.sticky-wrap');
|
|
25
16
|
const header = document.querySelector('header');
|
|
26
17
|
const container = document.querySelector('.cart-main-wrap');
|
|
27
|
-
if (!leftPanel || !pinElement || !header || !container)
|
|
18
|
+
if (!leftPanel || !pinElement || !header || !container)
|
|
28
19
|
return;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
matchMediaRef.current = gsap.matchMedia();
|
|
44
|
-
matchMediaRef.current.add(`(min-width: ${breakpoint}px)`, () => {
|
|
45
|
-
const pinHeight = pinElement.clientHeight;
|
|
46
|
-
const leftPanelHeight = leftPanel.clientHeight;
|
|
47
|
-
// Only pin if content is taller than sidebar
|
|
48
|
-
if (leftPanelHeight > pinHeight) {
|
|
20
|
+
const headerH = header.clientHeight;
|
|
21
|
+
const pad = parseInt(getComputedStyle(container).paddingBlockStart) || 0;
|
|
22
|
+
const startOffset = headerH + pad;
|
|
23
|
+
// Remove old setup
|
|
24
|
+
if (scrollTriggerRef.current)
|
|
25
|
+
scrollTriggerRef.current.kill();
|
|
26
|
+
if (mmRef.current)
|
|
27
|
+
mmRef.current.revert();
|
|
28
|
+
// Setup matchMedia
|
|
29
|
+
mmRef.current = gsap.matchMedia();
|
|
30
|
+
mmRef.current.add(`(min-width: ${breakpoint}px)`, () => {
|
|
31
|
+
const pinH = pinElement.clientHeight;
|
|
32
|
+
const leftH = leftPanel.clientHeight;
|
|
33
|
+
if (leftH > pinH) {
|
|
49
34
|
scrollTriggerRef.current = ScrollTrigger.create({
|
|
50
35
|
trigger: leftPanel,
|
|
51
36
|
start: `top ${startOffset}px`,
|
|
52
|
-
end: `bottom ${startOffset +
|
|
37
|
+
end: `bottom ${startOffset + pinH}px`,
|
|
53
38
|
pin: pinElement,
|
|
54
39
|
pinSpacing: false,
|
|
55
40
|
});
|
|
56
41
|
}
|
|
57
42
|
});
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
// Initial setup effect
|
|
43
|
+
}, [enabled, breakpoint]);
|
|
44
|
+
// Run when loading state finished or dependencies change
|
|
61
45
|
useEffect(() => {
|
|
62
|
-
if (
|
|
46
|
+
if (loading)
|
|
63
47
|
return;
|
|
64
|
-
|
|
65
|
-
let mounted = true;
|
|
66
|
-
let initTimeout;
|
|
67
|
-
const init = async () => {
|
|
68
|
-
// Wait for DOM and any animations on first load
|
|
69
|
-
if (!isInitializedRef.current) {
|
|
70
|
-
await new Promise((resolve) => setTimeout(resolve, 400));
|
|
71
|
-
}
|
|
72
|
-
if (!mounted)
|
|
73
|
-
return;
|
|
74
|
-
await recreateScrollTrigger();
|
|
75
|
-
};
|
|
76
|
-
initTimeout = setTimeout(init, 0);
|
|
77
|
-
return () => {
|
|
78
|
-
mounted = false;
|
|
79
|
-
clearTimeout(initTimeout);
|
|
80
|
-
if (scrollTriggerRef.current) {
|
|
81
|
-
scrollTriggerRef.current.kill(true);
|
|
82
|
-
}
|
|
83
|
-
if (matchMediaRef.current) {
|
|
84
|
-
matchMediaRef.current.revert();
|
|
85
|
-
}
|
|
86
|
-
};
|
|
87
|
-
}, [enabled, loading, breakpoint, recreateScrollTrigger]);
|
|
88
|
-
// Dependency change effect - only recreate, no re-render
|
|
89
|
-
useEffect(() => {
|
|
90
|
-
if (!enabled || !isInitializedRef.current || loading === true) {
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
let mounted = true;
|
|
94
|
-
let updateTimeout;
|
|
95
|
-
const update = async () => {
|
|
96
|
-
// Wait for DOM updates (item deletion animations, etc.)
|
|
97
|
-
await new Promise((resolve) => setTimeout(resolve, 400));
|
|
98
|
-
if (!mounted)
|
|
99
|
-
return;
|
|
100
|
-
await recreateScrollTrigger();
|
|
101
|
-
};
|
|
102
|
-
updateTimeout = setTimeout(update, 0);
|
|
48
|
+
setup();
|
|
103
49
|
return () => {
|
|
104
|
-
|
|
105
|
-
|
|
50
|
+
if (scrollTriggerRef.current)
|
|
51
|
+
scrollTriggerRef.current.kill();
|
|
52
|
+
if (mmRef.current)
|
|
53
|
+
mmRef.current.revert();
|
|
106
54
|
};
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
55
|
+
}, [loading, setup, ...dependencies]);
|
|
56
|
+
return {
|
|
57
|
+
isSetup: !!scrollTriggerRef.current,
|
|
58
|
+
};
|
|
110
59
|
};
|
|
111
60
|
export default useCartSticky;
|
|
112
61
|
//# sourceMappingURL=useCartSticky.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCartSticky.js","sourceRoot":"","sources":["../../src/utils/useCartSticky.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEvD
|
|
1
|
+
{"version":3,"file":"useCartSticky.js","sourceRoot":"","sources":["../../src/utils/useCartSticky.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@weareconceptstudio/account",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.8",
|
|
4
4
|
"description": "Concept Studio Account",
|
|
5
5
|
"author": "Concept Studio",
|
|
6
6
|
"license": "ISC",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"watch": "tsc -m es6 --watch"
|
|
22
22
|
},
|
|
23
23
|
"peerDependencies": {
|
|
24
|
-
"@weareconceptstudio/cart": "^0.0.
|
|
24
|
+
"@weareconceptstudio/cart": "^0.0.7",
|
|
25
25
|
"@weareconceptstudio/core": "^0.4.7",
|
|
26
26
|
"@weareconceptstudio/form": "^0.5.3",
|
|
27
27
|
"classnames": "2.5.1",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"swiper": "11.1.14"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@weareconceptstudio/cart": "^0.0.
|
|
38
|
+
"@weareconceptstudio/cart": "^0.0.7",
|
|
39
39
|
"@weareconceptstudio/core": "^0.4.7",
|
|
40
40
|
"@weareconceptstudio/form": "^0.5.3",
|
|
41
41
|
"rimraf": "6.0.1",
|