WIP on feat/renewal-design

portone-io · Oct 7, 2024 · 9419ef5 · 9419ef5
1 parent cc80867
commit 9419ef5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/routes/(root).tsx b/src/routes/(root).tsx
@@ -9,6 +9,7 @@ import * as prose from "~/components/prose";
 import type { DocsEntry } from "~/content/config";
 import Gnb from "~/layouts/gnb/Gnb";
 import SidebarProvider from "~/layouts/sidebar/context";
+import { SearchProvider } from "~/layouts/sidebar/search";
 import SidebarBackground from "~/layouts/sidebar/SidebarBackground";
 import { getOpiFullSlug, loadDoc } from "~/misc/opi";
 import { SystemVersionProvider } from "~/state/system-version";
@@ -46,19 +47,21 @@ export default function Layout(props: Props) {
  />
  <SidebarProvider>
  <MDXProvider components={prose}>
- <div class="h-full flex flex-col">
- <Gnb
- lang={lang()}
- navAsMenu={navAsMenuPaths.some((path) =>
- location.pathname.startsWith(path),
- )}
- docData={docData()?.frontmatter as DocsEntry}
- />
- <SidebarBackground />
- <main class="mx-auto max-w-8xl min-h-0 w-full flex-1 px-10">
- {props.children}
- </main>
- </div>
+ <SearchProvider>
+ <div class="h-full flex flex-col">
+ <Gnb
+ lang={lang()}
+ navAsMenu={navAsMenuPaths.some((path) =>
+ location.pathname.startsWith(path),
+ )}
+ docData={docData()?.frontmatter as DocsEntry}
+ />
+ <SidebarBackground />
+ <main class="mx-auto max-w-8xl min-h-0 w-full flex-1 px-10">
+ {props.children}
+ </main>
+ </div>
+ </SearchProvider>
  </MDXProvider>
  </SidebarProvider>
  </SystemVersionProvider>

diff --git a/src/routes/(root)/opi.tsx b/src/routes/(root)/opi.tsx
@@ -12,7 +12,7 @@ import * as prose from "~/components/prose";
 import type { DocsEntry } from "~/content/config";
 import DocsNavMenu from "~/layouts/sidebar/DocsNavMenu";
 import RightSidebar from "~/layouts/sidebar/RightSidebar";
-import { SearchProvider, SearchScreen } from "~/layouts/sidebar/search";
+import { SearchScreen } from "~/layouts/sidebar/search";
 import { getOpiFullSlug, loadDoc } from "~/misc/opi";
 import { calcNavMenuSystemVersions } from "~/state/nav";
 import { Lang } from "~/type";
@@ -57,7 +57,7 @@ export default function Docs(props: { children: JSXElement }) {
  );
 
  return (
- <SearchProvider>
+ <>
  <div class="flex gap-5">
  <DocsNavMenu lang={params().lang} slug={params().slug} />
  <div class="min-w-0 flex flex-1 justify-center gap-5">
@@ -100,6 +100,6 @@ export default function Docs(props: { children: JSXElement }) {
  />
  )}
  </Show>
- </SearchProvider>
+ </>
  );
 }