@docusaurus/theme-classic 0.0.0-5143 → 0.0.0-5149

package/lib/theme/SkipToContent/index.js

@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import Translate from '@docusaurus/Translate';
-import {useSkipToContent} from '@docusaurus/theme-common';
+import {useSkipToContent} from '@docusaurus/theme-common/internal';
 import styles from './styles.module.css';
 export default function SkipToContent() {
   const {containerRef, handleSkip} = useSkipToContent();

package/lib/theme/TOCItems/index.js

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React, {useMemo} from 'react';
+import {useThemeConfig} from '@docusaurus/theme-common';
 import {
-  useThemeConfig,
   useTOCHighlight,
   useFilteredAndTreeifiedTOC,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import TOCItemTree from '@theme/TOCItems/Tree';
 export default function TOCItems({
   toc,

package/lib/theme/Tabs/index.js

@@ -7,11 +7,11 @@
 import React, {useState, cloneElement, isValidElement} from 'react';
 import clsx from 'clsx';
 import useIsBrowser from '@docusaurus/useIsBrowser';
+import {duplicates} from '@docusaurus/theme-common';
 import {
   useScrollPositionBlocker,
-  duplicates,
   useTabGroupChoice,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import styles from './styles.module.css';
 // A very rough duck type, but good enough to guard against mistakes while
 // allowing customization

package/lib/validateThemeConfig.js

@@ -268,6 +268,17 @@ const FooterLinkItemSchema = utils_validation_1.Joi.object({
 const CustomCssSchema = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.array().items(utils_validation_1.Joi.string().required()), utils_validation_1.Joi.string().required())
     .optional();
+const LogoSchema = utils_validation_1.Joi.object({
+    alt: utils_validation_1.Joi.string().allow(''),
+    src: utils_validation_1.Joi.string().required(),
+    srcDark: utils_validation_1.Joi.string(),
+    width: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.number()),
+    height: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.number()),
+    href: utils_validation_1.Joi.string(),
+    target: utils_validation_1.Joi.string(),
+    style: utils_validation_1.Joi.object(),
+    className: utils_validation_1.Joi.string(),
+});
 exports.ThemeConfigSchema = utils_validation_1.Joi.object({
     // TODO temporary (@alpha-58)
     // @ts-expect-error: forbidden
@@ -309,28 +320,11 @@ exports.ThemeConfigSchema = utils_validation_1.Joi.object({
             .items(NavbarItemSchema)
             .default(exports.DEFAULT_CONFIG.navbar.items),
         title: utils_validation_1.Joi.string().allow('', null),
-        logo: utils_validation_1.Joi.object({
-            alt: utils_validation_1.Joi.string().allow(''),
-            src: utils_validation_1.Joi.string().required(),
-            srcDark: utils_validation_1.Joi.string(),
-            width: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.number()),
-            height: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.number()),
-            href: utils_validation_1.Joi.string(),
-            target: utils_validation_1.Joi.string(),
-        }),
+        logo: LogoSchema,
     }).default(exports.DEFAULT_CONFIG.navbar),
     footer: utils_validation_1.Joi.object({
         style: utils_validation_1.Joi.string().equal('dark', 'light').default('light'),
-        logo: utils_validation_1.Joi.object({
-            alt: utils_validation_1.Joi.string().allow(''),
-            src: utils_validation_1.Joi.string().required(),
-            srcDark: utils_validation_1.Joi.string(),
-            // TODO infer this from reading the image
-            width: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.number()),
-            height: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.number()),
-            href: utils_validation_1.Joi.string(),
-            target: utils_validation_1.Joi.string(),
-        }),
+        logo: LogoSchema,
         copyright: utils_validation_1.Joi.string(),
         links: utils_validation_1.Joi.alternatives(utils_validation_1.Joi.array().items(utils_validation_1.Joi.object({
             title: utils_validation_1.Joi.string().allow(null).default(null),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-5143",
+  "version": "0.0.0-5149",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -20,22 +20,22 @@
     "copy:watch": "node ../../admin/scripts/copyUntypedFiles.js --watch"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5143",
-    "@docusaurus/mdx-loader": "0.0.0-5143",
-    "@docusaurus/module-type-aliases": "0.0.0-5143",
-    "@docusaurus/plugin-content-blog": "0.0.0-5143",
-    "@docusaurus/plugin-content-docs": "0.0.0-5143",
-    "@docusaurus/plugin-content-pages": "0.0.0-5143",
-    "@docusaurus/theme-common": "0.0.0-5143",
-    "@docusaurus/theme-translations": "0.0.0-5143",
-    "@docusaurus/types": "0.0.0-5143",
-    "@docusaurus/utils": "0.0.0-5143",
-    "@docusaurus/utils-common": "0.0.0-5143",
-    "@docusaurus/utils-validation": "0.0.0-5143",
+    "@docusaurus/core": "0.0.0-5149",
+    "@docusaurus/mdx-loader": "0.0.0-5149",
+    "@docusaurus/module-type-aliases": "0.0.0-5149",
+    "@docusaurus/plugin-content-blog": "0.0.0-5149",
+    "@docusaurus/plugin-content-docs": "0.0.0-5149",
+    "@docusaurus/plugin-content-pages": "0.0.0-5149",
+    "@docusaurus/theme-common": "0.0.0-5149",
+    "@docusaurus/theme-translations": "0.0.0-5149",
+    "@docusaurus/types": "0.0.0-5149",
+    "@docusaurus/utils": "0.0.0-5149",
+    "@docusaurus/utils-common": "0.0.0-5149",
+    "@docusaurus/utils-validation": "0.0.0-5149",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "copy-text-to-clipboard": "^3.0.1",
-    "infima": "0.2.0-alpha.39",
+    "infima": "0.2.0-alpha.40",
     "lodash": "^4.17.21",
     "nprogress": "^0.2.0",
     "postcss": "^8.4.14",
@@ -64,5 +64,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "bf3edad97a282dde2d811ea8a3bc336618af9848"
+  "gitHead": "da6a2b7ca96c6fac667884ea6c1f9e83370690c6"
 }

package/src/theme/AnnouncementBar/index.tsx

@@ -7,7 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {useThemeConfig, useAnnouncementBar} from '@docusaurus/theme-common';
+import {useThemeConfig} from '@docusaurus/theme-common';
+import {useAnnouncementBar} from '@docusaurus/theme-common/internal';
 import {translate} from '@docusaurus/Translate';
 import IconClose from '@theme/IconClose';
 

package/src/theme/BackToTopButton/index.tsx

@@ -8,7 +8,8 @@
 import React from 'react';
 import clsx from 'clsx';
 import {translate} from '@docusaurus/Translate';
-import {ThemeClassNames, useBackToTopButton} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useBackToTopButton} from '@docusaurus/theme-common/internal';
 
 import styles from './styles.module.css';
 

package/src/theme/CodeBlock/Container/index.tsx

@@ -7,11 +7,8 @@
 
 import React, {type ComponentProps} from 'react';
 import clsx from 'clsx';
-import {
-  usePrismTheme,
-  getPrismCssVariables,
-  ThemeClassNames,
-} from '@docusaurus/theme-common';
+import {ThemeClassNames, usePrismTheme} from '@docusaurus/theme-common';
+import {getPrismCssVariables} from '@docusaurus/theme-common/internal';
 import styles from './styles.module.css';
 
 export default function CodeBlockContainer<T extends 'div' | 'pre'>({

package/src/theme/CodeBlock/Content/String.tsx

@@ -7,15 +7,14 @@
 
 import React from 'react';
 import clsx from 'clsx';
+import {useThemeConfig, usePrismTheme} from '@docusaurus/theme-common';
 import {
-  useThemeConfig,
   parseCodeBlockTitle,
   parseLanguage,
   parseLines,
   containsLineNumbers,
-  usePrismTheme,
   useCodeWordWrap,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import Highlight, {defaultProps, type Language} from 'prism-react-renderer';
 import Line from '@theme/CodeBlock/Line';
 import CopyButton from '@theme/CodeBlock/CopyButton';

package/src/theme/DocBreadcrumbs/index.tsx

@@ -7,11 +7,11 @@
 
 import React, {type ReactNode} from 'react';
 import clsx from 'clsx';
+import {ThemeClassNames} from '@docusaurus/theme-common';
 import {
-  ThemeClassNames,
   useSidebarBreadcrumbs,
   useHomePageRoute,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import Link from '@docusaurus/Link';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import {translate} from '@docusaurus/Translate';

package/src/theme/DocCard/index.tsx

@@ -8,7 +8,10 @@
 import React, {type ReactNode} from 'react';
 import clsx from 'clsx';
 import Link from '@docusaurus/Link';
-import {findFirstCategoryLink, useDocById} from '@docusaurus/theme-common';
+import {
+  findFirstCategoryLink,
+  useDocById,
+} from '@docusaurus/theme-common/internal';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import {translate} from '@docusaurus/Translate';
 import type {Props} from '@theme/DocCard';

package/src/theme/DocCardList/index.tsx

@@ -7,7 +7,7 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {findFirstCategoryLink} from '@docusaurus/theme-common';
+import {findFirstCategoryLink} from '@docusaurus/theme-common/internal';
 import DocCard from '@theme/DocCard';
 import type {Props} from '@theme/DocCardList';
 import type {PropSidebarItem} from '@docusaurus/plugin-content-docs';

package/src/theme/DocItem/Content/index.tsx

@@ -7,7 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {ThemeClassNames, useDoc} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useDoc} from '@docusaurus/theme-common/internal';
 import Heading from '@theme/Heading';
 import MDXContent from '@theme/MDXContent';
 import type {Props} from '@theme/DocItem/Content';

package/src/theme/DocItem/Footer/index.tsx

@@ -7,11 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {
-  ThemeClassNames,
-  useDoc,
-  type DocContextValue,
-} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useDoc, type DocContextValue} from '@docusaurus/theme-common/internal';
 import LastUpdated from '@theme/LastUpdated';
 import EditThisPage from '@theme/EditThisPage';
 import TagsListInline, {

package/src/theme/DocItem/Layout/index.tsx

@@ -7,7 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {useWindowSize, useDoc} from '@docusaurus/theme-common';
+import {useWindowSize} from '@docusaurus/theme-common';
+import {useDoc} from '@docusaurus/theme-common/internal';
 import DocItemPaginator from '@theme/DocItem/Paginator';
 import DocVersionBanner from '@theme/DocVersionBanner';
 import DocVersionBadge from '@theme/DocVersionBadge';

package/src/theme/DocItem/Metadata/index.tsx

@@ -6,7 +6,8 @@
  */
 
 import React from 'react';
-import {PageMetadata, useDoc} from '@docusaurus/theme-common';
+import {PageMetadata} from '@docusaurus/theme-common';
+import {useDoc} from '@docusaurus/theme-common/internal';
 
 export default function DocItemMetadata(): JSX.Element {
   const {metadata, frontMatter, assets} = useDoc();

package/src/theme/DocItem/Paginator/index.tsx

@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import {useDoc} from '@docusaurus/theme-common';
+import {useDoc} from '@docusaurus/theme-common/internal';
 import DocPaginator from '@theme/DocPaginator';
 
 /**

package/src/theme/DocItem/TOC/Desktop/index.tsx

@@ -6,7 +6,8 @@
  */
 
 import React from 'react';
-import {ThemeClassNames, useDoc} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useDoc} from '@docusaurus/theme-common/internal';
 
 import TOC from '@theme/TOC';
 

package/src/theme/DocItem/TOC/Mobile/index.tsx

@@ -7,7 +7,9 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {ThemeClassNames, useDoc} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useDoc} from '@docusaurus/theme-common/internal';
+
 import TOCCollapsible from '@theme/TOCCollapsible';
 
 import styles from './styles.module.css';

package/src/theme/DocItem/index.tsx

@@ -6,7 +6,8 @@
  */
 
 import React from 'react';
-import {HtmlClassNameProvider, DocProvider} from '@docusaurus/theme-common';
+import {HtmlClassNameProvider} from '@docusaurus/theme-common';
+import {DocProvider} from '@docusaurus/theme-common/internal';
 import DocItemMetadata from '@theme/DocItem/Metadata';
 import DocItemLayout from '@theme/DocItem/Layout';
 import type {Props} from '@theme/DocItem';

package/src/theme/DocPage/Layout/Main/index.tsx

@@ -7,7 +7,7 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {useDocsSidebar} from '@docusaurus/theme-common';
+import {useDocsSidebar} from '@docusaurus/theme-common/internal';
 import type {Props} from '@theme/DocPage/Layout/Main';
 
 import styles from './styles.module.css';

package/src/theme/DocPage/Layout/Sidebar/index.tsx

@@ -7,7 +7,8 @@
 
 import React, {type ReactNode, useState, useCallback} from 'react';
 import clsx from 'clsx';
-import {ThemeClassNames, useDocsSidebar} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useDocsSidebar} from '@docusaurus/theme-common/internal';
 import {useLocation} from '@docusaurus/router';
 import DocSidebar from '@theme/DocSidebar';
 import ExpandButton from '@theme/DocPage/Layout/Sidebar/ExpandButton';

package/src/theme/DocPage/Layout/index.tsx

@@ -6,7 +6,7 @@
  */
 
 import React, {useState} from 'react';
-import {useDocsSidebar} from '@docusaurus/theme-common';
+import {useDocsSidebar} from '@docusaurus/theme-common/internal';
 import Layout from '@theme/Layout';
 import BackToTopButton from '@theme/BackToTopButton';
 import DocPageLayoutSidebar from '@theme/DocPage/Layout/Sidebar';

package/src/theme/DocPage/index.tsx

@@ -7,14 +7,13 @@
 
 import React from 'react';
 import clsx from 'clsx';
+import {HtmlClassNameProvider, ThemeClassNames} from '@docusaurus/theme-common';
 import {
-  HtmlClassNameProvider,
-  ThemeClassNames,
   docVersionSearchTag,
   DocsSidebarProvider,
   DocsVersionProvider,
   useDocRouteMetadata,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import DocPageLayout from '@theme/DocPage/Layout';
 import NotFound from '@theme/NotFound';
 import SearchMetadata from '@theme/SearchMetadata';

package/src/theme/DocSidebar/Desktop/Content/index.tsx

@@ -7,11 +7,11 @@
 
 import React, {useState} from 'react';
 import clsx from 'clsx';
+import {ThemeClassNames} from '@docusaurus/theme-common';
 import {
-  ThemeClassNames,
   useAnnouncementBar,
   useScrollPosition,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import DocSidebarItems from '@theme/DocSidebarItems';
 import type {Props} from '@theme/DocSidebar/Desktop/Content';
 

package/src/theme/DocSidebar/Mobile/index.tsx

@@ -11,8 +11,8 @@ import {
   NavbarSecondaryMenuFiller,
   type NavbarSecondaryMenuComponent,
   ThemeClassNames,
-  useNavbarMobileSidebar,
 } from '@docusaurus/theme-common';
+import {useNavbarMobileSidebar} from '@docusaurus/theme-common/internal';
 import DocSidebarItems from '@theme/DocSidebarItems';
 import type {Props} from '@theme/DocSidebar/Mobile';
 

package/src/theme/DocSidebarItem/Category/index.tsx

@@ -8,16 +8,18 @@
 import React, {type ComponentProps, useEffect, useMemo} from 'react';
 import clsx from 'clsx';
 import {
-  isActiveSidebarItem,
+  ThemeClassNames,
+  useThemeConfig,
   usePrevious,
   Collapsible,
   useCollapsible,
+} from '@docusaurus/theme-common';
+import {
+  isActiveSidebarItem,
   findFirstCategoryLink,
-  ThemeClassNames,
-  useThemeConfig,
   useDocSidebarItemsExpandedState,
   isSamePath,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import Link from '@docusaurus/Link';
 import {translate} from '@docusaurus/Translate';
 import useIsBrowser from '@docusaurus/useIsBrowser';

package/src/theme/DocSidebarItem/Link/index.tsx

@@ -7,7 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {isActiveSidebarItem, ThemeClassNames} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {isActiveSidebarItem} from '@docusaurus/theme-common/internal';
 import Link from '@docusaurus/Link';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import IconExternalLink from '@theme/IconExternalLink';

package/src/theme/DocSidebarItems/index.tsx

@@ -6,7 +6,7 @@
  */
 
 import React, {memo} from 'react';
-import {DocSidebarItemsExpandedStateProvider} from '@docusaurus/theme-common';
+import {DocSidebarItemsExpandedStateProvider} from '@docusaurus/theme-common/internal';
 import DocSidebarItem from '@theme/DocSidebarItem';
 
 import type {Props} from '@theme/DocSidebarItems';

package/src/theme/DocVersionBadge/index.tsx

@@ -8,7 +8,8 @@
 import React from 'react';
 import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
-import {ThemeClassNames, useDocsVersion} from '@docusaurus/theme-common';
+import {ThemeClassNames} from '@docusaurus/theme-common';
+import {useDocsVersion} from '@docusaurus/theme-common/internal';
 import type {Props} from '@theme/DocVersionBadge';
 
 export default function DocVersionBadge({

package/src/theme/DocVersionBanner/index.tsx

@@ -15,12 +15,11 @@ import {
   useDocVersionSuggestions,
   type GlobalVersion,
 } from '@docusaurus/plugin-content-docs/client';
+import {ThemeClassNames} from '@docusaurus/theme-common';
 import {
-  ThemeClassNames,
   useDocsPreferredVersion,
   useDocsVersion,
-} from '@docusaurus/theme-common';
-
+} from '@docusaurus/theme-common/internal';
 import type {Props} from '@theme/DocVersionBanner';
 import type {
   VersionBanner,

package/src/theme/Footer/Logo/index.tsx

@@ -6,6 +6,7 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
 import Link from '@docusaurus/Link';
 import {useBaseUrlUtils} from '@docusaurus/useBaseUrl';
 import ThemedImage from '@theme/ThemedImage';
@@ -21,11 +22,12 @@ function LogoImage({logo}: Props) {
   };
   return (
     <ThemedImage
-      className="footer__logo"
+      className={clsx('footer__logo', logo.className)}
       alt={logo.alt}
       sources={sources}
       width={logo.width}
       height={logo.height}
+      style={logo.style}
     />
   );
 }

package/src/theme/Layout/index.tsx

@@ -8,11 +8,8 @@
 import React from 'react';
 import clsx from 'clsx';
 import ErrorBoundary from '@docusaurus/ErrorBoundary';
-import {
-  PageMetadata,
-  ThemeClassNames,
-  useKeyboardNavigation,
-} from '@docusaurus/theme-common';
+import {PageMetadata, ThemeClassNames} from '@docusaurus/theme-common';
+import {useKeyboardNavigation} from '@docusaurus/theme-common/internal';
 import SkipToContent from '@theme/SkipToContent';
 import AnnouncementBar from '@theme/AnnouncementBar';
 import Navbar from '@theme/Navbar';

package/src/theme/LayoutProviders/index.tsx

@@ -14,7 +14,7 @@ import {
   ScrollControllerProvider,
   NavbarProvider,
   PluginHtmlClassNameProvider,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import type {Props} from '@theme/LayoutProviders';
 
 export default function LayoutProviders({children}: Props): JSX.Element {

package/src/theme/Logo/index.tsx

@@ -9,24 +9,53 @@ import React from 'react';
 import Link from '@docusaurus/Link';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import {useThemeConfig} from '@docusaurus/theme-common';
+import {useThemeConfig, type NavbarLogo} from '@docusaurus/theme-common';
 import ThemedImage from '@theme/ThemedImage';
 import type {Props} from '@theme/Logo';
 
+function LogoThemedImage({
+  logo,
+  alt,
+  imageClassName,
+}: {
+  logo: NavbarLogo;
+  alt: string;
+  imageClassName?: string;
+}) {
+  const sources = {
+    light: useBaseUrl(logo.src),
+    dark: useBaseUrl(logo.srcDark || logo.src),
+  };
+  const themedImage = (
+    <ThemedImage
+      className={logo.className}
+      sources={sources}
+      height={logo.height}
+      width={logo.width}
+      alt={alt}
+      style={logo.style}
+    />
+  );
+
+  // Is this extra div really necessary?
+  // introduced in https://github.com/facebook/docusaurus/pull/5666
+  return imageClassName ? (
+    <div className={imageClassName}>{themedImage}</div>
+  ) : (
+    themedImage
+  );
+}
+
 export default function Logo(props: Props): JSX.Element {
   const {
     siteConfig: {title},
   } = useDocusaurusContext();
   const {
-    navbar: {title: navbarTitle, logo = {src: ''}},
+    navbar: {title: navbarTitle, logo},
   } = useThemeConfig();
 
   const {imageClassName, titleClassName, ...propsRest} = props;
-  const logoLink = useBaseUrl(logo.href || '/');
-  const sources = {
-    light: useBaseUrl(logo.src),
-    dark: useBaseUrl(logo.srcDark || logo.src),
-  };
+  const logoLink = useBaseUrl(logo?.href || '/');
 
   // If visible title is shown, fallback alt text should be
   // an empty string to mark the logo as decorative.
@@ -34,28 +63,20 @@ export default function Logo(props: Props): JSX.Element {
 
   // Use logo alt text if provided (including empty string),
   // and provide a sensible fallback otherwise.
-  const alt = logo.alt ?? fallbackAlt;
-
-  const themedImage = (
-    <ThemedImage
-      sources={sources}
-      height={logo.height}
-      width={logo.width}
-      alt={alt}
-    />
-  );
+  const alt = logo?.alt ?? fallbackAlt;
 
   return (
     <Link
       to={logoLink}
       {...propsRest}
-      {...(logo.target && {target: logo.target})}>
-      {logo.src &&
-        (imageClassName ? (
-          <div className={imageClassName}>{themedImage}</div>
-        ) : (
-          themedImage
-        ))}
+      {...(logo?.target && {target: logo.target})}>
+      {logo && (
+        <LogoThemedImage
+          logo={logo}
+          alt={alt}
+          imageClassName={imageClassName}
+        />
+      )}
       {navbarTitle != null && <b className={titleClassName}>{navbarTitle}</b>}
     </Link>
   );

package/src/theme/Navbar/Content/index.tsx

@@ -6,11 +6,11 @@
  */
 
 import React, {type ReactNode} from 'react';
+import {useThemeConfig} from '@docusaurus/theme-common';
 import {
   splitNavbarItems,
   useNavbarMobileSidebar,
-  useThemeConfig,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import NavbarItem, {type Props as NavbarItemConfig} from '@theme/NavbarItem';
 import NavbarColorModeToggle from '@theme/Navbar/ColorModeToggle';
 import SearchBar from '@theme/SearchBar';