@docusaurus/theme-classic 0.0.0-4812 → 0.0.0-4813

package/lib/theme-classic.d.ts

@@ -780,7 +780,14 @@ declare module '@theme/NavbarItem' {
 }
 
 declare module '@theme/NavbarItem/utils' {
-  export function getInfimaActiveClassName(mobile?: boolean): string;
+  /**
+   * On desktop and mobile, we would apply different class names for dropdown
+   * items.
+   * @see https://github.com/facebook/docusaurus/pull/5431
+   */
+  export function getInfimaActiveClassName(
+    mobile?: boolean,
+  ): `${'menu' | 'navbar'}__link--active`;
 }
 
 declare module '@theme/PaginatorNavLink' {

package/lib-next/theme/NavbarItem/DocNavbarItem.js

@@ -6,50 +6,28 @@
  */
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {
-  useLatestVersion,
-  useActiveDocContext,
-} from '@docusaurus/plugin-content-docs/client';
+import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import clsx from 'clsx';
 import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
-import {useDocsPreferredVersion, uniq} from '@docusaurus/theme-common';
-
-function getDocInVersions(versions, docId) {
-  const allDocs = versions.flatMap((version) => version.docs);
-  const doc = allDocs.find((versionDoc) => versionDoc.id === docId);
-
-  if (!doc) {
-    const docIds = allDocs.map((versionDoc) => versionDoc.id).join('\n- ');
-    throw new Error(`DocNavbarItem: couldn't find any doc with id "${docId}" in version${
-      versions.length ? 's' : ''
-    } ${versions.map((version) => version.name).join(', ')}".
-Available doc ids are:\n- ${docIds}`);
-  }
-
-  return doc;
-}
-
+import {useLayoutDoc} from '@docusaurus/theme-common';
 export default function DocNavbarItem({
   docId,
   label: staticLabel,
   docsPluginId,
   ...props
 }) {
-  const {activeVersion, activeDoc} = useActiveDocContext(docsPluginId);
-  const {preferredVersion} = useDocsPreferredVersion(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId); // Versions used to look for the doc to link to, ordered + no duplicate
-
-  const versions = uniq(
-    [activeVersion, preferredVersion, latestVersion].filter(Boolean),
-  );
-  const doc = getDocInVersions(versions, docId);
+  const {activeDoc} = useActiveDocContext(docsPluginId);
+  const doc = useLayoutDoc(docId, docsPluginId);
   const activeDocInfimaClassName = getInfimaActiveClassName(props.mobile);
   return (
     <DefaultNavbarItem
       exact
       {...props}
       className={clsx(props.className, {
+        // Do not make the item active if the active doc doesn't have sidebar.
         [activeDocInfimaClassName]:
+          // If `activeDoc === doc` react-router will make it active anyways,
+          // regardless of the existence of a sidebar
           activeDoc?.sidebar && activeDoc.sidebar === doc.sidebar,
       })}
       activeClassName={activeDocInfimaClassName}

package/lib-next/theme/NavbarItem/DocSidebarNavbarItem.js

@@ -6,57 +6,25 @@
  */
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {
-  useLatestVersion,
-  useActiveDocContext,
-} from '@docusaurus/plugin-content-docs/client';
+import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import clsx from 'clsx';
 import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
-import {useDocsPreferredVersion, uniq} from '@docusaurus/theme-common';
-
-function getSidebarLink(versions, sidebarId) {
-  const allSidebars = versions
-    .flatMap((version) => {
-      if (version.sidebars) {
-        return Object.entries(version.sidebars);
-      }
-
-      return undefined;
-    })
-    .filter((sidebarItem) => !!sidebarItem);
-  const sidebarEntry = allSidebars.find((sidebar) => sidebar[0] === sidebarId);
-
-  if (!sidebarEntry) {
-    throw new Error(`DocSidebarNavbarItem: couldn't find any sidebar with id "${sidebarId}" in version${
-      versions.length ? 's' : ''
-    } ${versions.map((version) => version.name).join(', ')}".
-Available sidebar ids are:
-- ${Object.keys(allSidebars).join('\n- ')}`);
-  }
-
-  if (!sidebarEntry[1].link) {
-    throw new Error(
-      `DocSidebarNavbarItem: couldn't find any document for sidebar with id "${sidebarId}"`,
-    );
-  }
-
-  return sidebarEntry[1].link;
-}
-
+import {useLayoutDocsSidebar} from '@docusaurus/theme-common';
 export default function DocSidebarNavbarItem({
   sidebarId,
   label,
   docsPluginId,
   ...props
 }) {
-  const {activeVersion, activeDoc} = useActiveDocContext(docsPluginId);
-  const {preferredVersion} = useDocsPreferredVersion(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId); // Versions used to look for the doc to link to, ordered + no duplicate
+  const {activeDoc} = useActiveDocContext(docsPluginId);
+  const sidebarLink = useLayoutDocsSidebar(sidebarId, docsPluginId).link;
+
+  if (!sidebarLink) {
+    throw new Error(
+      `DocSidebarNavbarItem: Sidebar with ID "${sidebarId}" doesn't have anything to be linked to.`,
+    );
+  }
 
-  const versions = uniq(
-    [activeVersion, preferredVersion, latestVersion].filter(Boolean),
-  );
-  const sidebarLink = getSidebarLink(versions, sidebarId);
   const activeDocInfimaClassName = getInfimaActiveClassName(props.mobile);
   return (
     <DefaultNavbarItem

package/lib-next/theme/NavbarItem/DocsVersionDropdownNavbarItem.js

@@ -9,10 +9,12 @@ import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
 import {
   useVersions,
-  useLatestVersion,
   useActiveDocContext,
 } from '@docusaurus/plugin-content-docs/client';
-import {useDocsPreferredVersion} from '@docusaurus/theme-common';
+import {
+  useDocsPreferredVersion,
+  useDocsVersionCandidates,
+} from '@docusaurus/theme-common';
 import {translate} from '@docusaurus/Translate';
 
 const getVersionMainDoc = (version) =>
@@ -28,33 +30,27 @@ export default function DocsVersionDropdownNavbarItem({
 }) {
   const activeDocContext = useActiveDocContext(docsPluginId);
   const versions = useVersions(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId);
-  const {preferredVersion, savePreferredVersionName} =
-    useDocsPreferredVersion(docsPluginId);
-
-  function getItems() {
-    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);
-      return {
-        isNavLink: true,
-        label: version.label,
-        to: versionDoc.path,
-        isActive: () => version === activeDocContext?.activeVersion,
-        onClick: () => {
-          savePreferredVersionName(version.name);
-        },
-      };
-    });
-    return [...dropdownItemsBefore, ...versionLinks, ...dropdownItemsAfter];
-  }
-
-  const items = getItems();
-  const dropdownVersion =
-    activeDocContext.activeVersion ?? preferredVersion ?? latestVersion; // Mobile dropdown is handled a bit differently
+  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);
+    return {
+      isNavLink: true,
+      label: version.label,
+      to: versionDoc.path,
+      isActive: () => version === activeDocContext?.activeVersion,
+      onClick: () => savePreferredVersionName(version.name),
+    };
+  });
+  const items = [
+    ...dropdownItemsBefore,
+    ...versionLinks,
+    ...dropdownItemsAfter,
+  ];
+  const dropdownVersion = useDocsVersionCandidates(docsPluginId)[0]; // Mobile dropdown is handled a bit differently
 
   const dropdownLabel =
     mobile && items.length > 1

package/lib-next/theme/NavbarItem/DocsVersionNavbarItem.js

@@ -6,11 +6,7 @@
  */
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {
-  useActiveVersion,
-  useLatestVersion,
-} from '@docusaurus/plugin-content-docs/client';
-import {useDocsPreferredVersion} from '@docusaurus/theme-common';
+import {useDocsVersionCandidates} from '@docusaurus/theme-common';
 
 const getVersionMainDoc = (version) =>
   version.docs.find((doc) => doc.id === version.mainDocId);
@@ -21,10 +17,7 @@ export default function DocsVersionNavbarItem({
   docsPluginId,
   ...props
 }) {
-  const activeVersion = useActiveVersion(docsPluginId);
-  const {preferredVersion} = useDocsPreferredVersion(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId);
-  const version = activeVersion ?? preferredVersion ?? latestVersion;
+  const version = useDocsVersionCandidates(docsPluginId)[0];
   const label = staticLabel ?? version.label;
   const path = staticTo ?? getVersionMainDoc(version).path;
   return <DefaultNavbarItem {...props} label={label} to={path} />;

package/lib-next/theme/NavbarItem/LocaleDropdownNavbarItem/index.js

@@ -21,11 +21,6 @@ export default function LocaleDropdownNavbarItem({
     i18n: {currentLocale, locales, localeConfigs},
   } = useDocusaurusContext();
   const alternatePageUtils = useAlternatePageUtils();
-
-  function getLocaleLabel(locale) {
-    return localeConfigs[locale].label;
-  }
-
   const localeItems = locales.map((locale) => {
     const to = `pathname://${alternatePageUtils.createUrl({
       locale,
@@ -33,7 +28,7 @@ export default function LocaleDropdownNavbarItem({
     })}`;
     return {
       isNavLink: true,
-      label: getLocaleLabel(locale),
+      label: localeConfigs[locale].label,
       to,
       target: '_self',
       autoAddBaseUrl: false,
@@ -48,7 +43,7 @@ export default function LocaleDropdownNavbarItem({
         id: 'theme.navbar.mobileLanguageDropdown.label',
         description: 'The label for the mobile language switcher dropdown',
       })
-    : getLocaleLabel(currentLocale);
+    : localeConfigs[currentLocale].label;
   return (
     <DropdownNavbarItem
       {...props}

package/lib-next/theme/NavbarItem/utils.js

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-// eslint-disable-next-line import/no-named-export
+
+/* eslint-disable import/no-named-export */
 export const getInfimaActiveClassName = (mobile) =>
   mobile ? 'menu__link--active' : 'navbar__link--active';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-4812",
+  "version": "0.0.0-4813",
   "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-4812",
-    "@docusaurus/plugin-content-blog": "0.0.0-4812",
-    "@docusaurus/plugin-content-docs": "0.0.0-4812",
-    "@docusaurus/plugin-content-pages": "0.0.0-4812",
-    "@docusaurus/theme-common": "0.0.0-4812",
-    "@docusaurus/theme-translations": "0.0.0-4812",
-    "@docusaurus/utils": "0.0.0-4812",
-    "@docusaurus/utils-common": "0.0.0-4812",
-    "@docusaurus/utils-validation": "0.0.0-4812",
+    "@docusaurus/core": "0.0.0-4813",
+    "@docusaurus/plugin-content-blog": "0.0.0-4813",
+    "@docusaurus/plugin-content-docs": "0.0.0-4813",
+    "@docusaurus/plugin-content-pages": "0.0.0-4813",
+    "@docusaurus/theme-common": "0.0.0-4813",
+    "@docusaurus/theme-translations": "0.0.0-4813",
+    "@docusaurus/utils": "0.0.0-4813",
+    "@docusaurus/utils-common": "0.0.0-4813",
+    "@docusaurus/utils-validation": "0.0.0-4813",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "copy-text-to-clipboard": "^3.0.1",
@@ -42,8 +42,8 @@
     "rtlcss": "^3.5.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4812",
-    "@docusaurus/types": "0.0.0-4812",
+    "@docusaurus/module-type-aliases": "0.0.0-4813",
+    "@docusaurus/types": "0.0.0-4813",
     "@types/mdx-js__react": "^1.5.5",
     "@types/prismjs": "^1.26.0",
     "@types/rtlcss": "^3.1.3",
@@ -59,5 +59,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "7b54ca31ae70170874768f01443d6c9b6256054c"
+  "gitHead": "6b8435cb317c3cc6dba4d4085ea9365fd699b8c0"
 }

package/src/theme/NavbarItem/DocNavbarItem.tsx

@@ -7,30 +7,11 @@
 
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {
-  useLatestVersion,
-  useActiveDocContext,
-} from '@docusaurus/plugin-content-docs/client';
+import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import clsx from 'clsx';
 import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
 import type {Props} from '@theme/NavbarItem/DocNavbarItem';
-import {useDocsPreferredVersion, uniq} from '@docusaurus/theme-common';
-import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
-
-function getDocInVersions(versions: GlobalVersion[], docId: string) {
-  const allDocs = versions.flatMap((version) => version.docs);
-  const doc = allDocs.find((versionDoc) => versionDoc.id === docId);
-  if (!doc) {
-    const docIds = allDocs.map((versionDoc) => versionDoc.id).join('\n- ');
-    throw new Error(
-      `DocNavbarItem: couldn't find any doc with id "${docId}" in version${
-        versions.length ? 's' : ''
-      } ${versions.map((version) => version.name).join(', ')}".
-Available doc ids are:\n- ${docIds}`,
-    );
-  }
-  return doc;
-}
+import {useLayoutDoc} from '@docusaurus/theme-common';
 
 export default function DocNavbarItem({
   docId,
@@ -38,17 +19,8 @@ export default function DocNavbarItem({
   docsPluginId,
   ...props
 }: Props): JSX.Element {
-  const {activeVersion, activeDoc} = useActiveDocContext(docsPluginId);
-  const {preferredVersion} = useDocsPreferredVersion(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId);
-
-  // Versions used to look for the doc to link to, ordered + no duplicate
-  const versions = uniq(
-    [activeVersion, preferredVersion, latestVersion].filter(
-      Boolean,
-    ) as GlobalVersion[],
-  );
-  const doc = getDocInVersions(versions, docId);
+  const {activeDoc} = useActiveDocContext(docsPluginId);
+  const doc = useLayoutDoc(docId, docsPluginId);
   const activeDocInfimaClassName = getInfimaActiveClassName(props.mobile);
 
   return (
@@ -57,6 +29,9 @@ export default function DocNavbarItem({
       {...props}
       className={clsx(props.className, {
         [activeDocInfimaClassName]:
+          // Do not make the item active if the active doc doesn't have sidebar.
+          // If `activeDoc === doc` react-router will make it active anyways,
+          // regardless of the existence of a sidebar
           activeDoc?.sidebar && activeDoc.sidebar === doc.sidebar,
       })}
       activeClassName={activeDocInfimaClassName}

package/src/theme/NavbarItem/DocSidebarNavbarItem.tsx

@@ -7,48 +7,12 @@
 
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {
-  useLatestVersion,
-  useActiveDocContext,
-} from '@docusaurus/plugin-content-docs/client';
+import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import clsx from 'clsx';
 import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
-import {useDocsPreferredVersion, uniq} from '@docusaurus/theme-common';
+import {useLayoutDocsSidebar} from '@docusaurus/theme-common';
 
 import type {Props} from '@theme/NavbarItem/DocSidebarNavbarItem';
-import type {
-  GlobalVersion,
-  GlobalSidebar,
-} from '@docusaurus/plugin-content-docs/client';
-
-function getSidebarLink(versions: GlobalVersion[], sidebarId: string) {
-  const allSidebars = versions
-    .flatMap((version) => {
-      if (version.sidebars) {
-        return Object.entries(version.sidebars);
-      }
-      return undefined;
-    })
-    .filter(
-      (sidebarItem): sidebarItem is [string, GlobalSidebar] => !!sidebarItem,
-    );
-  const sidebarEntry = allSidebars.find((sidebar) => sidebar[0] === sidebarId);
-  if (!sidebarEntry) {
-    throw new Error(
-      `DocSidebarNavbarItem: couldn't find any sidebar with id "${sidebarId}" in version${
-        versions.length ? 's' : ''
-      } ${versions.map((version) => version.name).join(', ')}".
-Available sidebar ids are:
-- ${Object.keys(allSidebars).join('\n- ')}`,
-    );
-  }
-  if (!sidebarEntry[1].link) {
-    throw new Error(
-      `DocSidebarNavbarItem: couldn't find any document for sidebar with id "${sidebarId}"`,
-    );
-  }
-  return sidebarEntry[1].link;
-}
 
 export default function DocSidebarNavbarItem({
   sidebarId,
@@ -56,17 +20,13 @@ export default function DocSidebarNavbarItem({
   docsPluginId,
   ...props
 }: Props): JSX.Element {
-  const {activeVersion, activeDoc} = useActiveDocContext(docsPluginId);
-  const {preferredVersion} = useDocsPreferredVersion(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId);
-
-  // Versions used to look for the doc to link to, ordered + no duplicate
-  const versions = uniq(
-    [activeVersion, preferredVersion, latestVersion].filter(
-      Boolean,
-    ) as GlobalVersion[],
-  );
-  const sidebarLink = getSidebarLink(versions, sidebarId);
+  const {activeDoc} = useActiveDocContext(docsPluginId);
+  const sidebarLink = useLayoutDocsSidebar(sidebarId, docsPluginId).link;
+  if (!sidebarLink) {
+    throw new Error(
+      `DocSidebarNavbarItem: Sidebar with ID "${sidebarId}" doesn't have anything to be linked to.`,
+    );
+  }
   const activeDocInfimaClassName = getInfimaActiveClassName(props.mobile);
 
   return (

package/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx

@@ -10,14 +10,15 @@ import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
 import {
   useVersions,
-  useLatestVersion,
   useActiveDocContext,
 } from '@docusaurus/plugin-content-docs/client';
-import type {Props} from '@theme/NavbarItem/DocsVersionDropdownNavbarItem';
-import {useDocsPreferredVersion} from '@docusaurus/theme-common';
+import {
+  useDocsPreferredVersion,
+  useDocsVersionCandidates,
+} from '@docusaurus/theme-common';
 import {translate} from '@docusaurus/Translate';
 import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
-import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem';
+import type {Props} from '@theme/NavbarItem/DocsVersionDropdownNavbarItem';
 
 const getVersionMainDoc = (version: GlobalVersion) =>
   version.docs.find((doc) => doc.id === version.mainDocId)!;
@@ -32,36 +33,28 @@ export default function DocsVersionDropdownNavbarItem({
 }: Props): JSX.Element {
   const activeDocContext = useActiveDocContext(docsPluginId);
   const versions = useVersions(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId);
-
-  const {preferredVersion, savePreferredVersionName} =
-    useDocsPreferredVersion(docsPluginId);
-
-  function getItems(): LinkLikeNavbarItemProps[] {
-    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);
-      return {
-        isNavLink: true,
-        label: version.label,
-        to: versionDoc.path,
-        isActive: () => version === activeDocContext?.activeVersion,
-        onClick: () => {
-          savePreferredVersionName(version.name);
-        },
-      };
-    });
-
-    return [...dropdownItemsBefore, ...versionLinks, ...dropdownItemsAfter];
-  }
-
-  const items = getItems();
+  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);
+    return {
+      isNavLink: true,
+      label: version.label,
+      to: versionDoc.path,
+      isActive: () => version === activeDocContext?.activeVersion,
+      onClick: () => savePreferredVersionName(version.name),
+    };
+  });
+  const items = [
+    ...dropdownItemsBefore,
+    ...versionLinks,
+    ...dropdownItemsAfter,
+  ];
 
-  const dropdownVersion =
-    activeDocContext.activeVersion ?? preferredVersion ?? latestVersion;
+  const dropdownVersion = useDocsVersionCandidates(docsPluginId)[0];
 
   // Mobile dropdown is handled a bit differently
   const dropdownLabel =

package/src/theme/NavbarItem/DocsVersionNavbarItem.tsx

@@ -7,13 +7,9 @@
 
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {
-  useActiveVersion,
-  useLatestVersion,
-  type GlobalVersion,
-} from '@docusaurus/plugin-content-docs/client';
+import {useDocsVersionCandidates} from '@docusaurus/theme-common';
+import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
 import type {Props} from '@theme/NavbarItem/DocsVersionNavbarItem';
-import {useDocsPreferredVersion} from '@docusaurus/theme-common';
 
 const getVersionMainDoc = (version: GlobalVersion) =>
   version.docs.find((doc) => doc.id === version.mainDocId)!;
@@ -24,10 +20,7 @@ export default function DocsVersionNavbarItem({
   docsPluginId,
   ...props
 }: Props): JSX.Element {
-  const activeVersion = useActiveVersion(docsPluginId);
-  const {preferredVersion} = useDocsPreferredVersion(docsPluginId);
-  const latestVersion = useLatestVersion(docsPluginId);
-  const version = activeVersion ?? preferredVersion ?? latestVersion;
+  const version = useDocsVersionCandidates(docsPluginId)[0];
   const label = staticLabel ?? version.label;
   const path = staticTo ?? getVersionMainDoc(version).path;
   return <DefaultNavbarItem {...props} label={label} to={path} />;

package/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx

@@ -27,10 +27,6 @@ export default function LocaleDropdownNavbarItem({
   } = useDocusaurusContext();
   const alternatePageUtils = useAlternatePageUtils();
 
-  function getLocaleLabel(locale: string) {
-    return localeConfigs[locale]!.label;
-  }
-
   const localeItems = locales.map((locale): LinkLikeNavbarItemProps => {
     const to = `pathname://${alternatePageUtils.createUrl({
       locale,
@@ -38,7 +34,7 @@ export default function LocaleDropdownNavbarItem({
     })}`;
     return {
       isNavLink: true,
-      label: getLocaleLabel(locale),
+      label: localeConfigs[locale]!.label,
       to,
       target: '_self',
       autoAddBaseUrl: false,
@@ -55,7 +51,7 @@ export default function LocaleDropdownNavbarItem({
         id: 'theme.navbar.mobileLanguageDropdown.label',
         description: 'The label for the mobile language switcher dropdown',
       })
-    : getLocaleLabel(currentLocale);
+    : localeConfigs[currentLocale]!.label;
 
   return (
     <DropdownNavbarItem

package/src/theme/NavbarItem/utils.ts

@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// eslint-disable-next-line import/no-named-export
-export const getInfimaActiveClassName = (mobile?: boolean): string =>
+/* eslint-disable import/no-named-export */
+
+export const getInfimaActiveClassName = (
+  mobile?: boolean,
+): `${'menu' | 'navbar'}__link--active` =>
   mobile ? 'menu__link--active' : 'navbar__link--active';

package/src/theme-classic.d.ts

@@ -780,7 +780,14 @@ declare module '@theme/NavbarItem' {
 }
 
 declare module '@theme/NavbarItem/utils' {
-  export function getInfimaActiveClassName(mobile?: boolean): string;
+  /**
+   * On desktop and mobile, we would apply different class names for dropdown
+   * items.
+   * @see https://github.com/facebook/docusaurus/pull/5431
+   */
+  export function getInfimaActiveClassName(
+    mobile?: boolean,
+  ): `${'menu' | 'navbar'}__link--active`;
 }
 
 declare module '@theme/PaginatorNavLink' {