fix: close function

bigcommerce · Jul 20, 2022 · 06aab7b · 06aab7b
1 parent 47c60fe
commit 06aab7b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/apps/storefront/src/App.tsx b/apps/storefront/src/App.tsx
@@ -17,7 +17,8 @@ body {
 const HeaderContainer = styled('div')(() => ({
   display: 'flex',
   alignItems: 'center',
-  justifyContent: 'space-between',
+  justifyContent: 'flex-end',
+  marginBottom: '1rem',
 }))
 
 export default function App() {
@@ -35,8 +36,7 @@ export default function App() {
             {isOpen ? (
               <Layout close={() => setIsOpen(false)}>
                 <HeaderContainer>
-                  <p>bundle b2b</p>
-                  <RegisteredCloseButton />
+                  <RegisteredCloseButton setIsOpen={setIsOpen} />
                 </HeaderContainer>
                 <Routes>
                   <Route
@@ -49,7 +49,7 @@ export default function App() {
                   />
                   <Route
                     path="/registered"
-                    element={<Registered />}
+                    element={<Registered setIsOpen={setIsOpen} />}
                   />
                 </Routes>
               </Layout>

diff --git a/apps/storefront/src/components/RegisteredCloseButton.tsx b/apps/storefront/src/components/RegisteredCloseButton.tsx
@@ -1,12 +1,13 @@
 import { useNavigate } from 'react-router-dom'
 import { Close } from '@mui/icons-material'
 
-export function RegisteredCloseButton() {
+export function RegisteredCloseButton(props: any) {
+  const { setIsOpen } = props
   const navigate = useNavigate()
 
   const handleCloseForm = () => {
     const isHasFrontPage = window?.history?.length > 2
-
+    setIsOpen(false)
     if (isHasFrontPage) {
       navigate(-1)
     } else {

diff --git a/apps/storefront/src/pages/registered/Registered.tsx b/apps/storefront/src/pages/registered/Registered.tsx
@@ -1,5 +1,5 @@
 import {
-  useEffect, useState, useContext,
+  useEffect, useState, useContext, Dispatch, SetStateAction,
 } from 'react'
 import { useNavigate } from 'react-router-dom'
 
@@ -32,7 +32,12 @@ import {
 
 import { RegisteredContainer, RegisteredImage } from './styled'
 
-export default function Registered() {
+interface RegisteredProps {
+  setIsOpen: Dispatch<SetStateAction<boolean>>,
+}
+
+export default function Registered(props: RegisteredProps) {
+  const { setIsOpen } = props
   const [activeStep, setActiveStep] = useState(0)
   const navigate = useNavigate()
 
@@ -135,6 +140,7 @@ export default function Registered() {
       })
     }
 
+    setIsOpen(false)
     if (isHasFrontPage) {
       navigate(-1)
     } else {