fix: merge 과정 중 충돌 해결 오류 수정 (#480)

woowacourse-teams · Sep 21, 2023 · e6aba04 · e6aba04
1 parent bc7ba08
commit e6aba04
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/frontend/src/components/Layout/Navbar.tsx b/frontend/src/components/Layout/Navbar.tsx
@@ -64,23 +64,25 @@ const Navbar = ({ $layoutWidth }: NavBarProps) => {
   const { routingHandlers } = useNavigator();
   const { navbarHighlights } = useContext(NavbarHighlightsContext);
   return (
-    <Wrapper
-      $isAddPage={navbarHighlights.addMapOrPin}
-      $layoutWidth={$layoutWidth}
-    >
-      {NAV_ITEMS.map((item) => {
-        return (
-          <NavbarItem
-            key={item.key}
-            label={item.label}
-            icon={item.icon}
-            focusIcon={item.focusIcon}
-            isHighlighted={navbarHighlights[item.key]}
-            onClick={() => routingHandlers[item.key]()}
-            $layoutWidth={$layoutWidth}
-          />
-        );
-      })}
+    <>
+      <Wrapper
+        $isAddPage={navbarHighlights.addMapOrPin}
+        $layoutWidth={$layoutWidth}
+      >
+        {NAV_ITEMS.map((item) => {
+          return (
+            <NavbarItem
+              key={item.key}
+              label={item.label}
+              icon={item.icon}
+              focusIcon={item.focusIcon}
+              isHighlighted={navbarHighlights[item.key]}
+              onClick={() => routingHandlers[item.key]()}
+              $layoutWidth={$layoutWidth}
+            />
+          );
+        })}
+      </Wrapper>
 
       <Modal
         modalKey="addMapOrPin"