From e2d98f08c529e09484051e60ef4e13471b95f882 Mon Sep 17 00:00:00 2001
From: marcoskolodny <marcoskolodny@gmail.com>
Date: Tue, 29 Oct 2024 17:20:52 +0100
Subject: [PATCH] cleanup cod

---
 src/navigation-bar.tsx | 129 +++++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 68 deletions(-)

diff --git a/src/navigation-bar.tsx b/src/navigation-bar.tsx
index 6d95f2177..1866ccf09 100644
--- a/src/navigation-bar.tsx
+++ b/src/navigation-bar.tsx
@@ -239,7 +239,6 @@ const MainNavigationBarBurgerMenu = ({
     closeMenu,
     open,
     id,
-    disableFocusTrap,
     setDisableFocusTrap,
 }: {
     sections: ReadonlyArray<MainNavigationBarSection>;
@@ -247,7 +246,6 @@ const MainNavigationBarBurgerMenu = ({
     closeMenu: () => void;
     open: boolean;
     id: string;
-    disableFocusTrap: boolean;
     setDisableFocusTrap: (value: boolean) => void;
 }) => {
     const {texts, t} = useTheme();
@@ -353,66 +351,64 @@ const MainNavigationBarBurgerMenu = ({
                 mountOnEnter
                 unmountOnExit
             >
-                <FocusTrap disabled={disableFocusTrap} group="burger-menu-lock">
-                    <nav
-                        className={styles.burgerMenu}
-                        style={{boxShadow: `6px 0 4px -4px rgba(0, 0, 0, ${shadowAlpha})`}}
-                        id={id}
-                        ref={menuRef}
+                <nav
+                    className={styles.burgerMenu}
+                    style={{boxShadow: `6px 0 4px -4px rgba(0, 0, 0, ${shadowAlpha})`}}
+                    id={id}
+                    ref={menuRef}
+                >
+                    <CSSTransition
+                        timeout={menuAnimationDuration}
+                        in={isSubMenuOpen}
+                        nodeRef={menuContentRef}
                     >
-                        <CSSTransition
-                            timeout={menuAnimationDuration}
-                            in={isSubMenuOpen}
-                            nodeRef={menuContentRef}
-                        >
-                            {(transitionStatus) => (
-                                <div
-                                    ref={menuContentRef}
-                                    style={{
-                                        transition: `transform ${menuAnimationDuration}ms ease-out`,
-                                        transform: `translate(${isSubMenuOpen ? '-100vw' : '0vw'})`,
-                                    }}
-                                >
-                                    {transitionStatus !== 'entered' && (
-                                        <div className={styles.burgerMainMenuContainer}>
-                                            <ResponsiveLayout>
-                                                <ResetResponsiveLayout>
-                                                    <RowList>
-                                                        {sections.map(
-                                                            ({title, menu, ...interactiveProps}, index) => (
-                                                                <Row
-                                                                    key={index}
-                                                                    title={title}
-                                                                    {...(menu
-                                                                        ? {
-                                                                              onPress: () => {
-                                                                                  setIsSubMenuOpen(true);
-                                                                                  setOpenedSection(index);
-                                                                              },
-                                                                          }
-                                                                        : getInteractivePropsWithCloseMenu(
-                                                                              interactiveProps
-                                                                          ))}
-                                                                />
-                                                            )
-                                                        )}
-                                                    </RowList>
-                                                </ResetResponsiveLayout>
-                                                {extra && <Box paddingY={16}>{extra}</Box>}
-                                            </ResponsiveLayout>
-                                        </div>
-                                    )}
-
-                                    {transitionStatus !== 'exited' && openedSection !== -1 && (
-                                        <div className={styles.burgerSubMenuContainer}>
-                                            {renderSection(openedSection)}
-                                        </div>
-                                    )}
-                                </div>
-                            )}
-                        </CSSTransition>
-                    </nav>
-                </FocusTrap>
+                        {(transitionStatus) => (
+                            <div
+                                ref={menuContentRef}
+                                style={{
+                                    transition: `transform ${menuAnimationDuration}ms ease-out`,
+                                    transform: `translate(${isSubMenuOpen ? '-100vw' : '0vw'})`,
+                                }}
+                            >
+                                {transitionStatus !== 'entered' && (
+                                    <div className={styles.burgerMainMenuContainer}>
+                                        <ResponsiveLayout>
+                                            <ResetResponsiveLayout>
+                                                <RowList>
+                                                    {sections.map(
+                                                        ({title, menu, ...interactiveProps}, index) => (
+                                                            <Row
+                                                                key={index}
+                                                                title={title}
+                                                                {...(menu
+                                                                    ? {
+                                                                          onPress: () => {
+                                                                              setIsSubMenuOpen(true);
+                                                                              setOpenedSection(index);
+                                                                          },
+                                                                      }
+                                                                    : getInteractivePropsWithCloseMenu(
+                                                                          interactiveProps
+                                                                      ))}
+                                                            />
+                                                        )
+                                                    )}
+                                                </RowList>
+                                            </ResetResponsiveLayout>
+                                            {extra && <Box paddingY={16}>{extra}</Box>}
+                                        </ResponsiveLayout>
+                                    </div>
+                                )}
+
+                                {transitionStatus !== 'exited' && openedSection !== -1 && (
+                                    <div className={styles.burgerSubMenuContainer}>
+                                        {renderSection(openedSection)}
+                                    </div>
+                                )}
+                            </div>
+                        )}
+                    </CSSTransition>
+                </nav>
             </CSSTransition>
         </Portal>
     );
@@ -867,20 +863,17 @@ export const MainNavigationBar = ({
     }
 
     return (
-        <>
-            <FocusTrap disabled={disableFocusTrap} group="burger-menu-lock">
-                {mainNavBar}
-            </FocusTrap>
+        <FocusTrap disabled={disableFocusTrap}>
+            {mainNavBar}
             <MainNavigationBarBurgerMenu
                 open={isBurgerMenuOpen}
                 id={menuId}
                 sections={sections}
                 extra={burgerMenuExtra}
-                closeMenu={() => setIsBurgerMenuOpen(false)}
-                disableFocusTrap={disableFocusTrap}
+                closeMenu={closeMenu}
                 setDisableFocusTrap={setDisableFocusTrap}
             />
-        </>
+        </FocusTrap>
     );
 };