fix layout component structure

packages/app/src/components/Layout/AdminLayout.tsx

@@ -29,32 +29,30 @@ const AdminLayout = ({
   const SystemVersion = dynamic(() => import('../SystemVersion'), { ssr: false });
 
   return (
-    <>
-      <RawLayout title={title}>
-        <GrowiNavbar />
-
-        <header className="py-0">
-          <h1 className="title">{title}</h1>
-        </header>
-        <div id="main" className="main">
-          <div className="container-fluid">
-            <div className="row">
-              <div className="col-lg-3">
-                <AdminNavigation selected={selectedNavOpt} />
-              </div>
-              <div className="col-lg-9">
-                {/* TODO: inject Admincontainer (injectableContainers & adminSecurityContainers) by https://redmine.weseek.co.jp/issues/100072 */}
-                <Provider>
-                  {children}
-                </Provider>
-              </div>
+    <RawLayout title={title}>
+      <GrowiNavbar />
+
+      <header className="py-0">
+        <h1 className="title">{title}</h1>
+      </header>
+      <div id="main" className="main">
+        <div className="container-fluid">
+          <div className="row">
+            <div className="col-lg-3">
+              <AdminNavigation selected={selectedNavOpt} />
+            </div>
+            <div className="col-lg-9">
+              {/* TODO: inject Admincontainer (injectableContainers & adminSecurityContainers) by https://redmine.weseek.co.jp/issues/100072 */}
+              <Provider>
+                {children}
+              </Provider>
             </div>
           </div>
         </div>
-      </RawLayout>
+      </div>
 
       <SystemVersion />
-    </>
+    </RawLayout>
   );
 };
 

packages/app/src/components/Layout/BasicLayout.tsx

@@ -23,28 +23,26 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
   const SystemVersion = dynamic(() => import('../SystemVersion'), { ssr: false });
 
   return (
-    <>
-      <RawLayout title={title} className={className}>
-        <GrowiNavbar />
-
-        <div className="page-wrapper d-flex d-print-block">
-          <div className="grw-sidebar-wrapper">
-            <Sidebar />
-          </div>
-
-          <div className="flex-fill mw-0">
-            {children}
-          </div>
+    <RawLayout title={title} className={className}>
+      <GrowiNavbar />
+
+      <div className="page-wrapper d-flex d-print-block">
+        <div className="grw-sidebar-wrapper">
+          <Sidebar />
+        </div>
+
+        <div className="flex-fill mw-0">
+          {children}
         </div>
+      </div>
 
-        <GrowiNavbarBottom />
-      </RawLayout>
+      <GrowiNavbarBottom />
 
       {/* <PageCreateModal /> */}
       {/* <HotkeysManager /> */}
 
       <ShortcutsModal />
       <SystemVersion showShortcutsButton />
-    </>
+    </RawLayout>
   );
 };