@docusaurus/theme-classic 0.0.0-5993 → 0.0.0-5994

package/lib/theme/NavbarItem/DocsVersionDropdownNavbarItem.js

@@ -15,8 +15,17 @@ import {translate} from '@docusaurus/Translate';
 import {useLocation} from '@docusaurus/router';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
-const getVersionMainDoc = (version) =>
-  version.docs.find((doc) => doc.id === version.mainDocId);
+function getVersionMainDoc(version) {
+  return version.docs.find((doc) => doc.id === version.mainDocId);
+}
+function getVersionTargetDoc(version, activeDocContext) {
+  // We try to link to the same doc, in another version
+  // When not possible, fallback to the "main doc" of the version
+  return (
+    activeDocContext.alternateDocVersions[version.name] ??
+    getVersionMainDoc(version)
+  );
+}
 export default function DocsVersionDropdownNavbarItem({
   mobile,
   docsPluginId,
@@ -29,23 +38,19 @@ export default function DocsVersionDropdownNavbarItem({
   const activeDocContext = useActiveDocContext(docsPluginId);
   const versions = useVersions(docsPluginId);
   const {savePreferredVersionName} = useDocsPreferredVersion(docsPluginId);
-  const versionLinks = versions.map((version) => {
-    // We try to link to the same doc, in another version
-    // When not possible, fallback to the "main doc" of the version
-    const versionDoc =
-      activeDocContext.alternateDocVersions[version.name] ??
-      getVersionMainDoc(version);
+  function versionToLink(version) {
+    const targetDoc = getVersionTargetDoc(version, activeDocContext);
     return {
       label: version.label,
       // preserve ?search#hash suffix on version switches
-      to: `${versionDoc.path}${search}${hash}`,
+      to: `${targetDoc.path}${search}${hash}`,
       isActive: () => version === activeDocContext.activeVersion,
       onClick: () => savePreferredVersionName(version.name),
     };
-  });
+  }
   const items = [
     ...dropdownItemsBefore,
-    ...versionLinks,
+    ...versions.map(versionToLink),
     ...dropdownItemsAfter,
   ];
   const dropdownVersion = useDocsVersionCandidates(docsPluginId)[0];
@@ -62,7 +67,7 @@ export default function DocsVersionDropdownNavbarItem({
   const dropdownTo =
     mobile && items.length > 1
       ? undefined
-      : getVersionMainDoc(dropdownVersion).path;
+      : getVersionTargetDoc(dropdownVersion, activeDocContext).path;
   // We don't want to render a version dropdown with 0 or 1 item. If we build
   // the site with a single docs version (onlyIncludeVersions: ['1.0.0']),
   // We'd rather render a button instead of a dropdown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-5993",
+  "version": "0.0.0-5994",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -20,18 +20,18 @@
     "copy:watch": "node ../../admin/scripts/copyUntypedFiles.js --watch"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5993",
-    "@docusaurus/mdx-loader": "0.0.0-5993",
-    "@docusaurus/module-type-aliases": "0.0.0-5993",
-    "@docusaurus/plugin-content-blog": "0.0.0-5993",
-    "@docusaurus/plugin-content-docs": "0.0.0-5993",
-    "@docusaurus/plugin-content-pages": "0.0.0-5993",
-    "@docusaurus/theme-common": "0.0.0-5993",
-    "@docusaurus/theme-translations": "0.0.0-5993",
-    "@docusaurus/types": "0.0.0-5993",
-    "@docusaurus/utils": "0.0.0-5993",
-    "@docusaurus/utils-common": "0.0.0-5993",
-    "@docusaurus/utils-validation": "0.0.0-5993",
+    "@docusaurus/core": "0.0.0-5994",
+    "@docusaurus/mdx-loader": "0.0.0-5994",
+    "@docusaurus/module-type-aliases": "0.0.0-5994",
+    "@docusaurus/plugin-content-blog": "0.0.0-5994",
+    "@docusaurus/plugin-content-docs": "0.0.0-5994",
+    "@docusaurus/plugin-content-pages": "0.0.0-5994",
+    "@docusaurus/theme-common": "0.0.0-5994",
+    "@docusaurus/theme-translations": "0.0.0-5994",
+    "@docusaurus/types": "0.0.0-5994",
+    "@docusaurus/utils": "0.0.0-5994",
+    "@docusaurus/utils-common": "0.0.0-5994",
+    "@docusaurus/utils-validation": "0.0.0-5994",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "copy-text-to-clipboard": "^3.2.0",
@@ -61,5 +61,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "0ad0160fc910803276cb4b5fe34254b7ec372bd4"
+  "gitHead": "4905b76b4b39c2f102bbc78d018933f57ea39b78"
 }

package/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx

@@ -17,10 +17,28 @@ import {useLocation} from '@docusaurus/router';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
 import type {Props} from '@theme/NavbarItem/DocsVersionDropdownNavbarItem';
-import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
+import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem';
+import type {
+  GlobalVersion,
+  GlobalDoc,
+  ActiveDocContext,
+} from '@docusaurus/plugin-content-docs/client';
 
-const getVersionMainDoc = (version: GlobalVersion) =>
-  version.docs.find((doc) => doc.id === version.mainDocId)!;
+function getVersionMainDoc(version: GlobalVersion): GlobalDoc {
+  return version.docs.find((doc) => doc.id === version.mainDocId)!;
+}
+
+function getVersionTargetDoc(
+  version: GlobalVersion,
+  activeDocContext: ActiveDocContext,
+): GlobalDoc {
+  // We try to link to the same doc, in another version
+  // When not possible, fallback to the "main doc" of the version
+  return (
+    activeDocContext.alternateDocVersions[version.name] ??
+    getVersionMainDoc(version)
+  );
+}
 
 export default function DocsVersionDropdownNavbarItem({
   mobile,
@@ -34,23 +52,21 @@ export default function DocsVersionDropdownNavbarItem({
   const activeDocContext = useActiveDocContext(docsPluginId);
   const versions = useVersions(docsPluginId);
   const {savePreferredVersionName} = useDocsPreferredVersion(docsPluginId);
-  const versionLinks = versions.map((version) => {
-    // We try to link to the same doc, in another version
-    // When not possible, fallback to the "main doc" of the version
-    const versionDoc =
-      activeDocContext.alternateDocVersions[version.name] ??
-      getVersionMainDoc(version);
+
+  function versionToLink(version: GlobalVersion): LinkLikeNavbarItemProps {
+    const targetDoc = getVersionTargetDoc(version, activeDocContext);
     return {
       label: version.label,
       // preserve ?search#hash suffix on version switches
-      to: `${versionDoc.path}${search}${hash}`,
+      to: `${targetDoc.path}${search}${hash}`,
       isActive: () => version === activeDocContext.activeVersion,
       onClick: () => savePreferredVersionName(version.name),
     };
-  });
-  const items = [
+  }
+
+  const items: LinkLikeNavbarItemProps[] = [
     ...dropdownItemsBefore,
-    ...versionLinks,
+    ...versions.map(versionToLink),
     ...dropdownItemsAfter,
   ];
 
@@ -69,7 +85,7 @@ export default function DocsVersionDropdownNavbarItem({
   const dropdownTo =
     mobile && items.length > 1
       ? undefined
-      : getVersionMainDoc(dropdownVersion).path;
+      : getVersionTargetDoc(dropdownVersion, activeDocContext).path;
 
   // We don't want to render a version dropdown with 0 or 1 item. If we build
   // the site with a single docs version (onlyIncludeVersions: ['1.0.0']),