crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-06-18 13:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Belen Curcio 2021-01-06 20:15:11 -03:00
commit b40681e01e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/common/Layout/Layout.tsx
View File

@ -8,15 +8,11 @@ import { Navbar, Footer } from '@components/common'
import { useAcceptCookies } from '@lib/hooks/useAcceptCookies' import { useAcceptCookies } from '@lib/hooks/useAcceptCookies'
import { Sidebar, Button, Modal, LoadingDots } from '@components/ui' import { Sidebar, Button, Modal, LoadingDots } from '@components/ui'
import { CartSidebarView } from '@components/cart' import { CartSidebarView } from '@components/cart'
<<<<<<< HEAD
import LoginView from '@components/auth/LoginView'
import { CommerceProvider } from '@bigcommerce/storefront-data-hooks'
import type { Page } from '@bigcommerce/storefront-data-hooks/api/operations/get-all-pages'
=======
import LoginView from '@components/auth/LoginView'
import { CommerceProvider } from '@framework' import { CommerceProvider } from '@framework'
import type { Page } from '@framework/api/operations/get-all-pages' import type { Page } from '@framework/api/operations/get-all-pages'
>>>>>>> 79269edbd3b96eecdc3b96b7c671670ddb74bb3b
const Loading = () => ( const Loading = () => (
<div className="w-80 h-80 flex items-center text-center justify-center p-3"> <div className="w-80 h-80 flex items-center text-center justify-center p-3">

2
components/ui/Modal/Modal.tsx
View File

@ -39,7 +39,7 @@ const Modal: FC<Props> = ({ children, open, onClose, onEnter = null }) => {
window.removeEventListener('keydown', handleKey) window.removeEventListener('keydown', handleKey)
clearAllBodyScrollLocks() clearAllBodyScrollLocks()
} }
}, [open]) }, [open, handleKey])
return ( return (
<Portal> <Portal>