From 7d4b11d2041aa09da2dbe73916ed8f385d8e5d68 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 12:53:49 -0300 Subject: [PATCH 1/8] Changes --- .../core/UserNav/DropdownMenu.module.css | 13 ++---------- components/core/UserNav/DropdownMenu.tsx | 21 ++++++++++++++----- components/core/UserNav/UserNav.tsx | 15 ++----------- components/ui/Modal/Modal.tsx | 8 +------ 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/components/core/UserNav/DropdownMenu.module.css b/components/core/UserNav/DropdownMenu.module.css index 884bab67b..ad0903df5 100644 --- a/components/core/UserNav/DropdownMenu.module.css +++ b/components/core/UserNav/DropdownMenu.module.css @@ -1,17 +1,8 @@ .dropdownMenu { - @apply fixed pt-6 right-0 z-20 w-full h-full; + @apply fixed right-0 mt-7 origin-top-right outline-none bg-primary z-40 w-full h-full; @screen lg { - @apply absolute right-0 w-screen; - max-width: 185px; - } - - & .dropdownMenuContainer { - @apply flex-col py-6 bg-primary h-full justify-around; - - @screen lg { - @apply border border-accents-1 shadow-lg py-2 h-auto; - } + @apply absolute border border-accents-1 shadow-lg w-56 h-auto; } & .link { diff --git a/components/core/UserNav/DropdownMenu.tsx b/components/core/UserNav/DropdownMenu.tsx index c7e247501..e1cdac125 100644 --- a/components/core/UserNav/DropdownMenu.tsx +++ b/components/core/UserNav/DropdownMenu.tsx @@ -4,21 +4,32 @@ import { useTheme } from 'next-themes' import cn from 'classnames' import s from './DropdownMenu.module.css' import { Moon, Sun } from '@components/icon' -import { Menu } from '@headlessui/react' +import { Menu, Transition } from '@headlessui/react' +import { usePreventScroll } from '@react-aria/overlays' interface DropdownMenuProps { onClose: () => void + open: boolean } const DropdownMenu: FC = ({ onClose, children, - + open = false, ...props }) => { const { theme, setTheme } = useTheme() + usePreventScroll() return ( - + ) } diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx index 3d07f0b5a..2f0d4925d 100644 --- a/components/core/UserNav/UserNav.tsx +++ b/components/core/UserNav/UserNav.tsx @@ -2,12 +2,11 @@ import Link from 'next/link' import cn from 'classnames' import s from './UserNav.module.css' import { FC, useRef } from 'react' - import { Avatar } from '@components/core' import { Heart, Bag } from '@components/icon' import { useUI } from '@components/ui/context' import DropdownMenu from './DropdownMenu' -import { Menu, Transition } from '@headlessui/react' +import { Menu } from '@headlessui/react' import useCart from '@lib/bigcommerce/cart/use-cart' interface Props { @@ -59,17 +58,7 @@ const UserNav: FC = ({ className, children, ...props }) => { - - - + )} diff --git a/components/ui/Modal/Modal.tsx b/components/ui/Modal/Modal.tsx index c9a0bc0c3..97f750efd 100644 --- a/components/ui/Modal/Modal.tsx +++ b/components/ui/Modal/Modal.tsx @@ -2,13 +2,7 @@ import cn from 'classnames' import { FC, useRef } from 'react' import s from './Modal.module.css' import { useDialog } from '@react-aria/dialog' -import { - useOverlay, - usePreventScroll, - useModal, - OverlayProvider, - OverlayContainer, -} from '@react-aria/overlays' +import { useOverlay, usePreventScroll, useModal } from '@react-aria/overlays' import { FocusScope } from '@react-aria/focus' interface Props { From 7e73f00860c20552985b25fcc09d21dee5d379e1 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 12:59:47 -0300 Subject: [PATCH 2/8] Changes Scroll --- components/core/Footer/Footer.tsx | 2 +- components/core/UserNav/DropdownMenu.tsx | 6 +++++- public/us-flag.png | Bin 0 -> 762 bytes 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 public/us-flag.png diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx index 55f855429..26f1b010c 100644 --- a/components/core/Footer/Footer.tsx +++ b/components/core/Footer/Footer.tsx @@ -24,7 +24,7 @@ const Footer: FC = ({ className, pages }) => {