ページ読み込み時のサイドバーの動作を修正

na-trium-144 · na-trium-144 · commit 2ee88b7bc35d · 2025-10-30T11:03:54.000+09:00
diff --git a/app/[docs_id]/dynamicMdContext.tsx b/app/[docs_id]/dynamicMdContext.tsx
diff --git a/app/[docs_id]/pageContent.tsx b/app/[docs_id]/pageContent.tsx
@@ -5,7 +5,7 @@ import { MarkdownSection } from "./splitMarkdown";
 import { ChatForm } from "./chatForm";
 import { Heading, StyledMarkdown } from "./markdown";
 import { useChatHistoryContext } from "./chatHistory";
-import { useSidebarMdContext } from "./dynamicMdContext";
+import { useSidebarMdContext } from "../sidebar";
 import clsx from "clsx";
 
 // MarkdownSectionに追加で、ユーザーが今そのセクションを読んでいるかどうか、などの動的な情報を持たせる
@@ -41,12 +41,7 @@ export function PageContent(props: PageContentProps) {
       sectionId: `${props.docs_id}-${i}`,
     }));
     setDynamicMdContent(newContent);
-    setSidebarMdContent(newContent);
-    
-    // クリーンアップ：コンポーネントがアンマウントされたらcontextをクリア
-    return () => {
-      setSidebarMdContent([]);
-    };
+    setSidebarMdContent(props.docs_id, newContent);
   }, [props.splitMdContent, props.docs_id, setSidebarMdContent]);
 
   const sectionRefs = useRef<Array<HTMLDivElement | null>>([]);
@@ -71,14 +66,14 @@ export function PageContent(props: PageContentProps) {
       
       // ローカルstateとcontextの両方を更新
       setDynamicMdContent(updateContent);
-      setSidebarMdContent(updateContent);
+      setSidebarMdContent(props.docs_id, updateContent);
     };
     window.addEventListener("scroll", handleScroll);
     handleScroll();
     return () => {
       window.removeEventListener("scroll", handleScroll);
     };
-  }, [setSidebarMdContent]);
+  }, [setSidebarMdContent, props.docs_id]);
 
   const [isFormVisible, setIsFormVisible] = useState(false);
 
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -7,7 +7,7 @@ import { Sidebar } from "./sidebar";
 import { ReactNode } from "react";
 import { EmbedContextProvider } from "./terminal/embedContext";
 import { AutoAnonymousLogin } from "./accountMenu";
-import { SidebarMdProvider } from "./[docs_id]/dynamicMdContext";
+import { SidebarMdProvider } from "./sidebar";
 import { RuntimeProvider } from "./terminal/runtime";
 
 export const metadata: Metadata = {
diff --git a/app/sidebar.tsx b/app/sidebar.tsx
@@ -4,17 +4,105 @@ import { usePathname } from "next/navigation";
 import { pagesList } from "./pagesList";
 import { AccountMenu } from "./accountMenu";
 import { ThemeToggle } from "./[docs_id]/themeToggle";
-import { useSidebarMdContext } from "./[docs_id]/dynamicMdContext";
+import {
+  createContext,
+  ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from "react";
+import { DynamicMarkdownSection } from "./[docs_id]/pageContent";
+
+export interface ISidebarMdContext {
+  loadedDocsId: string;
+  sidebarMdContent: DynamicMarkdownSection[];
+  setSidebarMdContent: (
+    docsId: string,
+    content:
+      | DynamicMarkdownSection[]
+      | ((prev: DynamicMarkdownSection[]) => DynamicMarkdownSection[])
+  ) => void;
+}
+
+const SidebarMdContext = createContext<ISidebarMdContext | null>(null);
+
+export function useSidebarMdContext() {
+  const context = useContext(SidebarMdContext);
+  if (!context) {
+    throw new Error(
+      "useSidebarMdContext must be used within a SidebarMdProvider"
+    );
+  }
+  return context;
+}
+
+export function useSidebarMdContextOptional() {
+  return useContext(SidebarMdContext);
+}
+
+export function SidebarMdProvider({ children }: { children: ReactNode }) {
+  const [sidebarMdContent, setSidebarMdContent_] = useState<
+    DynamicMarkdownSection[]
+  >([]);
+  const [loadedDocsId, setLoadedDocsId] = useState<string>("");
+  const setSidebarMdContent = useCallback(
+    (
+      docsId: string,
+      content:
+        | DynamicMarkdownSection[]
+        | ((prev: DynamicMarkdownSection[]) => DynamicMarkdownSection[])
+    ) => {
+      setLoadedDocsId(docsId);
+      setSidebarMdContent_(content);
+    },
+    []
+  );
+  return (
+    <SidebarMdContext.Provider
+      value={{
+        loadedDocsId,
+        sidebarMdContent,
+        setSidebarMdContent,
+      }}
+    >
+      {children}
+    </SidebarMdContext.Provider>
+  );
+}
 
 export function Sidebar() {
   const pathname = usePathname();
-  const docs_id = pathname.replace(/^\//, "");
-  const { sidebarMdContent } = useSidebarMdContext();
-  
+  const currentDocsId = pathname.replace(/^\//, ""); // ちょっと遅延がある
+  const sidebarContext = useSidebarMdContext();
+  // sidebarMdContextの情報が古かったら使わない
+  const sidebarMdContent =
+    sidebarContext.loadedDocsId === currentDocsId
+      ? sidebarContext.sidebarMdContent
+      : [];
+
   // 現在表示中のセクション（最初にinViewがtrueのもの）を見つける
   const currentSectionIndex = sidebarMdContent.findIndex(
     (section) => section.inView
   );
+
+  // 目次の開閉状態
+  const [detailsOpen, setDetailsOpen] = useState<boolean[]>([]);
+  const currentGroupIndex = pagesList.findIndex((group) =>
+    currentDocsId.startsWith(`${group.id}-`)
+  );
+  useEffect(() => {
+    if (currentGroupIndex !== -1 && !detailsOpen[currentGroupIndex]) {
+      const newDetailsOpen = [...detailsOpen];
+      // 現在のグループのdetailsは開いておく
+      while (newDetailsOpen.length <= currentGroupIndex) {
+        newDetailsOpen.push(false);
+      }
+      newDetailsOpen[currentGroupIndex] = true;
+      setDetailsOpen(newDetailsOpen);
+    }
+  }, [currentGroupIndex, detailsOpen]);
+
   return (
     <div className="bg-base-200 h-full w-80 overflow-y-auto">
       {/* todo: 背景色ほんとにこれでいい？ */}
@@ -51,9 +139,19 @@ export function Sidebar() {
       </span>
 
       <ul className="menu w-full">
-        {pagesList.map((group) => (
+        {pagesList.map((group, i) => (
           <li key={group.id}>
-            <details open={docs_id.startsWith(`${group.id}-`)}>
+            <details
+              open={!!detailsOpen.at(i)}
+              onToggle={(e) => {
+                const newDetailsOpen = [...detailsOpen];
+                while (newDetailsOpen.length <= i) {
+                  newDetailsOpen.push(false);
+                }
+                newDetailsOpen[i] = e.currentTarget.open;
+                setDetailsOpen(newDetailsOpen);
+              }}
+            >
               <summary>{group.lang}</summary>
               <ul>
                 {group.pages.map((page) => (
@@ -62,27 +160,31 @@ export function Sidebar() {
                       <span className="mr-0">{page.id}.</span>
                       {page.title}
                     </Link>
-                    {`${group.id}-${page.id}` === docs_id && sidebarMdContent.length > 0 && (
-                      <ul className="ml-4 text-sm">
-                        {sidebarMdContent.slice(1).map((section, idx) => {
-                          // idx + 1 は実際のsectionIndexに対応（slice(1)で最初を除外しているため）
-                          const isCurrentSection = idx + 1 === currentSectionIndex;
-                          return (
-                            <li
-                              key={idx}
-                              style={{ marginLeft: section.level - 2 + "em" }}
-                            >
-                              <Link
-                                href={`#${idx + 1}`}
-                                className={isCurrentSection ? "font-bold" : ""}
+                    {`${group.id}-${page.id}` === currentDocsId &&
+                      sidebarMdContent.length > 0 && (
+                        <ul className="ml-4 text-sm">
+                          {sidebarMdContent.slice(1).map((section, idx) => {
+                            // idx + 1 は実際のsectionIndexに対応（slice(1)で最初を除外しているため）
+                            const isCurrentSection =
+                              idx + 1 === currentSectionIndex;
+                            return (
+                              <li
+                                key={idx}
+                                style={{ marginLeft: section.level - 2 + "em" }}
                               >
-                                {section.title}
-                              </Link>
-                            </li>
-                          );
-                        })}
-                      </ul>
-                    )}
+                                <Link
+                                  href={`#${idx + 1}`}
+                                  className={
+                                    isCurrentSection ? "font-bold" : ""
+                                  }
+                                >
+                                  {section.title}
+                                </Link>
+                              </li>
+                            );
+                          })}
+                        </ul>
+                      )}
                   </li>
                 ))}
               </ul>
