@docusaurus/theme-classic 0.0.0-4622 → 0.0.0-4625

package/lib-next/theme/TOCItems/index.js

@@ -7,8 +7,8 @@
 import React, {useMemo} from 'react';
 import {
   useThemeConfig,
-  useTOCFilter,
   useTOCHighlight,
+  useFilteredAndTreeifiedTOC,
 } from '@docusaurus/theme-common'; // Recursive component rendering the toc tree
 
 /* eslint-disable jsx-a11y/control-has-associated-label */
@@ -56,7 +56,7 @@ export default function TOCItems({
     minHeadingLevelOption ?? themeConfig.tableOfContents.minHeadingLevel;
   const maxHeadingLevel =
     maxHeadingLevelOption ?? themeConfig.tableOfContents.maxHeadingLevel;
-  const tocFiltered = useTOCFilter({
+  const tocTree = useFilteredAndTreeifiedTOC({
     toc,
     minHeadingLevel,
     maxHeadingLevel,
@@ -76,7 +76,7 @@ export default function TOCItems({
   useTOCHighlight(tocHighlightConfig);
   return (
     <TOCItemList
-      toc={tocFiltered}
+      toc={tocTree}
       className={className}
       linkClassName={linkClassName}
       {...props}

package/lib-next/theme/Toggle/index.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, {useState, useRef, memo} from 'react';
+import React, {useState, useRef, useEffect, memo} from 'react';
 import {useThemeConfig} from '@docusaurus/theme-common';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import {translate} from '@docusaurus/Translate';
@@ -17,6 +17,9 @@ const ToggleComponent = memo(
     const [checked, setChecked] = useState(defaultChecked);
     const [focused, setFocused] = useState(false);
     const inputRef = useRef(null);
+    useEffect(() => {
+      setChecked(defaultChecked);
+    }, [defaultChecked]);
     return (
       <div
         className={clsx(styles.toggle, className, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-4622",
+  "version": "0.0.0-4625",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -21,15 +21,15 @@
     "format:lib-next": "prettier --config ../../.prettierrc --write \"lib-next/**/*.{js,ts,jsx,tsc}\""
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4622",
-    "@docusaurus/plugin-content-blog": "0.0.0-4622",
-    "@docusaurus/plugin-content-docs": "0.0.0-4622",
-    "@docusaurus/plugin-content-pages": "0.0.0-4622",
-    "@docusaurus/theme-common": "0.0.0-4622",
-    "@docusaurus/theme-translations": "0.0.0-4622",
-    "@docusaurus/utils": "0.0.0-4622",
-    "@docusaurus/utils-common": "0.0.0-4622",
-    "@docusaurus/utils-validation": "0.0.0-4622",
+    "@docusaurus/core": "0.0.0-4625",
+    "@docusaurus/plugin-content-blog": "0.0.0-4625",
+    "@docusaurus/plugin-content-docs": "0.0.0-4625",
+    "@docusaurus/plugin-content-pages": "0.0.0-4625",
+    "@docusaurus/theme-common": "0.0.0-4625",
+    "@docusaurus/theme-translations": "0.0.0-4625",
+    "@docusaurus/utils": "0.0.0-4625",
+    "@docusaurus/utils-common": "0.0.0-4625",
+    "@docusaurus/utils-validation": "0.0.0-4625",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "copy-text-to-clipboard": "^3.0.1",
@@ -42,8 +42,8 @@
     "rtlcss": "^3.3.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4622",
-    "@docusaurus/types": "0.0.0-4622",
+    "@docusaurus/module-type-aliases": "0.0.0-4625",
+    "@docusaurus/types": "0.0.0-4625",
     "@types/mdx-js__react": "^1.5.5",
     "@types/prismjs": "^1.26.0",
     "@types/rtlcss": "^3.1.2",
@@ -59,5 +59,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "88fa597b10a32d3f2e3cff963af8337e66f89a13"
+  "gitHead": "db97af5476fb6b852ff07b1147a8d5a10a102e10"
 }

package/src/theme/TOCItems/index.tsx

@@ -7,12 +7,12 @@
 
 import React, {useMemo} from 'react';
 import type {Props} from '@theme/TOCItems';
-import type {TOCItem} from '@docusaurus/types';
 import {
   type TOCHighlightConfig,
+  type TOCTreeNode,
   useThemeConfig,
-  useTOCFilter,
   useTOCHighlight,
+  useFilteredAndTreeifiedTOC,
 } from '@docusaurus/theme-common';
 
 // Recursive component rendering the toc tree
@@ -23,7 +23,7 @@ function TOCItemList({
   linkClassName,
   isChild,
 }: {
-  readonly toc: readonly TOCItem[];
+  readonly toc: readonly TOCTreeNode[];
   readonly className: string;
   readonly linkClassName: string | null;
   readonly isChild?: boolean;
@@ -70,7 +70,11 @@ export default function TOCItems({
   const maxHeadingLevel =
     maxHeadingLevelOption ?? themeConfig.tableOfContents.maxHeadingLevel;
 
-  const tocFiltered = useTOCFilter({toc, minHeadingLevel, maxHeadingLevel});
+  const tocTree = useFilteredAndTreeifiedTOC({
+    toc,
+    minHeadingLevel,
+    maxHeadingLevel,
+  });
 
   const tocHighlightConfig: TOCHighlightConfig | undefined = useMemo(() => {
     if (linkClassName && linkActiveClassName) {
@@ -87,7 +91,7 @@ export default function TOCItems({
 
   return (
     <TOCItemList
-      toc={tocFiltered}
+      toc={tocTree}
       className={className}
       linkClassName={linkClassName}
       {...props}

package/src/theme/Toggle/index.tsx

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {useState, useRef, memo} from 'react';
+import React, {useState, useRef, useEffect, memo} from 'react';
 import type {Props} from '@theme/Toggle';
 import {useThemeConfig, type ColorModeConfig} from '@docusaurus/theme-common';
 import useIsBrowser from '@docusaurus/useIsBrowser';
@@ -31,6 +31,10 @@ const ToggleComponent = memo(
     const [focused, setFocused] = useState(false);
     const inputRef = useRef<HTMLInputElement>(null);
 
+    useEffect(() => {
+      setChecked(defaultChecked);
+    }, [defaultChecked]);
+
     return (
       <div
         className={clsx(styles.toggle, className, {