diff --git a/components/cart/modal.tsx b/components/cart/modal.tsx index 82c2a310a..bb14abf2a 100644 --- a/components/cart/modal.tsx +++ b/components/cart/modal.tsx @@ -22,10 +22,10 @@ type MerchandiseSearchParams = { export default function CartModal({ cart, cartIdUpdated }: { cart: Cart; cartIdUpdated: boolean }) { const [, setCookie] = useCookies(['cartId']); - const [cartIsOpen, setCartIsOpen] = useState(false); + const [isOpen, setIsOpen] = useState(false); const quantityRef = useRef(cart.totalQuantity); - const openCart = () => setCartIsOpen(true); - const closeCart = () => setCartIsOpen(false); + const openCart = () => setIsOpen(true); + const closeCart = () => setIsOpen(false); useEffect(() => { if (cartIdUpdated) { @@ -42,21 +42,21 @@ export default function CartModal({ cart, cartIdUpdated }: { cart: Cart; cartIdU // Open cart modal when when quantity changes. if (cart.totalQuantity !== quantityRef.current) { // But only if it's not already open (quantity also changes when editing items in cart). - if (!cartIsOpen) { - setCartIsOpen(true); + if (!isOpen) { + setIsOpen(true); } // Always update the quantity reference quantityRef.current = cart.totalQuantity; } - }, [cartIsOpen, cart.totalQuantity, quantityRef]); + }, [isOpen, cart.totalQuantity, quantityRef]); return ( <> - + setIsOpen(true); + const closeMobileMenu = () => setIsOpen(false); useEffect(() => { const handleResize = () => { if (window.innerWidth > 768) { - setMobileMenuIsOpen(false); + setIsOpen(false); } }; window.addEventListener('resize', handleResize); return () => window.removeEventListener('resize', handleResize); - }, [mobileMenuIsOpen]); + }, [isOpen]); useEffect(() => { - setMobileMenuIsOpen(false); + setIsOpen(false); }, [pathname, searchParams]); return ( <> - - {mobileMenuIsOpen && ( - { - setMobileMenuIsOpen(false); - }} - className="relative z-50" + + + - - )} - + {menu.length ? ( +
    + {menu.map((item: Menu) => ( +
  • + + {item.title} + +
  • + ))} +
+ ) : null} + + +
+
+
); } diff --git a/package.json b/package.json index fe831566f..15c72eb5e 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@headlessui/react": "^1.7.15", "@vercel/og": "^0.5.6", "clsx": "^1.2.1", - "framer-motion": "^10.12.16", "is-empty-iterable": "^3.0.0", "next": "13.4.6", "react": "18.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 86b54f709..83b8acec7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,9 +10,6 @@ dependencies: clsx: specifier: ^1.2.1 version: 1.2.1 - framer-motion: - specifier: ^10.12.16 - version: 10.12.16(react-dom@18.2.0)(react@18.2.0) is-empty-iterable: specifier: ^3.0.0 version: 3.0.0 @@ -117,19 +114,6 @@ packages: regenerator-runtime: 0.13.11 dev: true - /@emotion/is-prop-valid@0.8.8: - resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==} - requiresBuild: true - dependencies: - '@emotion/memoize': 0.7.4 - dev: false - optional: true - - /@emotion/memoize@0.7.4: - resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==} - dev: false - optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.42.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1635,24 +1619,6 @@ packages: resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==} dev: true - /framer-motion@10.12.16(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-w/SfWEIWJkYSgRHYBmln7EhcNo31ao8Xexol8lGXf1pR/tlnBtf1HcxoUmEiEh6pacB4/geku5ami53AAQWHMQ==} - peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - dependencies: - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - tslib: 2.5.3 - optionalDependencies: - '@emotion/is-prop-valid': 0.8.8 - dev: false - /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} dev: true