@docusaurus/theme-classic 4.0.0-canary-6970 → 4.0.0-canary-6972

package/lib/theme/Blog/Pages/BlogAuthorsListPage/index.js

@@ -37,11 +37,7 @@ function AuthorsList({authors}) {
 export default function BlogAuthorsListPage({authors, sidebar}) {
   const title = translateBlogAuthorsListPageTitle();
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogAuthorsListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogAuthorsListPage}>
       <PageMetadata title={title} />
       <SearchMetadata tag="blog_authors_list" />
       <BlogLayout sidebar={sidebar}>

package/lib/theme/Blog/Pages/BlogAuthorsPostsPage/index.js

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
@@ -64,10 +63,7 @@ function Content({author, items, sidebar, listMetadata}) {
 export default function BlogAuthorsPostsPage(props) {
   return (
     <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogAuthorsPostsPage,
-      )}>
+      className={ThemeClassNames.page.blogAuthorsPostsPage}>
       <Metadata {...props} />
       <Content {...props} />
     </HtmlClassNameProvider>

package/lib/theme/BlogListPage/index.js

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import clsx from 'clsx';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import {
   PageMetadata,
@@ -42,11 +41,7 @@ function BlogListPageContent(props) {
 }
 export default function BlogListPage(props) {
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogListPage}>
       <BlogListPageMetadata {...props} />
       <BlogListPageStructuredData {...props} />
       <BlogListPageContent {...props} />

package/lib/theme/BlogPostPage/index.js

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import clsx from 'clsx';
 import {HtmlClassNameProvider, ThemeClassNames} from '@docusaurus/theme-common';
 import {
   BlogPostProvider,
@@ -51,11 +50,7 @@ export default function BlogPostPage(props) {
   const BlogPostContent = props.content;
   return (
     <BlogPostProvider content={props.content} isBlogPostPage>
-      <HtmlClassNameProvider
-        className={clsx(
-          ThemeClassNames.wrapper.blogPages,
-          ThemeClassNames.page.blogPostPage,
-        )}>
+      <HtmlClassNameProvider className={ThemeClassNames.page.blogPostPage}>
         <BlogPostPageMetadata />
         <BlogPostPageStructuredData />
         <BlogPostPageContent sidebar={props.sidebar}>

package/lib/theme/BlogTagsListPage/index.js

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
@@ -18,11 +17,7 @@ import Heading from '@theme/Heading';
 export default function BlogTagsListPage({tags, sidebar}) {
   const title = translateTagsPageTitle();
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogTagsListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogTagsListPage}>
       <PageMetadata title={title} />
       <SearchMetadata tag="blog_tags_list" />
       <BlogLayout sidebar={sidebar}>

package/lib/theme/BlogTagsPostsPage/index.js

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
@@ -47,11 +46,7 @@ function BlogTagsPostsPageContent({tag, items, sidebar, listMetadata}) {
 }
 export default function BlogTagsPostsPage(props) {
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogTagPostListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogTagPostListPage}>
       <BlogTagsPostsPageMetadata {...props} />
       <BlogTagsPostsPageContent {...props} />
     </HtmlClassNameProvider>

package/lib/theme/DocsRoot/index.js

@@ -4,14 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import clsx from 'clsx';
-import {ThemeClassNames, HtmlClassNameProvider} from '@docusaurus/theme-common';
 import renderRoutes from '@docusaurus/renderRoutes';
 import Layout from '@theme/Layout';
 export default function DocsRoot(props) {
-  return (
-    <HtmlClassNameProvider className={clsx(ThemeClassNames.wrapper.docsPages)}>
-      <Layout>{renderRoutes(props.route.routes)}</Layout>
-    </HtmlClassNameProvider>
-  );
+  return <Layout>{renderRoutes(props.route.routes)}</Layout>;
 }

package/lib/theme/Layout/index.js

@@ -41,7 +41,6 @@ export default function Layout(props) {
         id={SkipToContentFallbackId}
         className={clsx(
           ThemeClassNames.layout.main.container,
-          ThemeClassNames.wrapper.main,
           styles.mainWrapper,
           wrapperClassName,
         )}>

package/lib/theme/MDXPage/index.js

@@ -36,10 +36,7 @@ export default function MDXPage(props) {
   const canDisplayEditMetaRow = !!(editUrl || lastUpdatedAt || lastUpdatedBy);
   return (
     <HtmlClassNameProvider
-      className={clsx(
-        wrapperClassName ?? ThemeClassNames.wrapper.mdxPages,
-        ThemeClassNames.page.mdxPage,
-      )}>
+      className={clsx(wrapperClassName, ThemeClassNames.page.mdxPage)}>
       <Layout>
         <PageMetadata
           title={title}

package/lib/theme/Tabs/index.js

@@ -83,14 +83,7 @@ function TabContent({children}) {
 }
 function TabsContainer({className, children}) {
   return (
-    <div
-      className={clsx(
-        ThemeClassNames.tabs.container,
-        // former name kept for backward compatibility
-        // see https://github.com/facebook/docusaurus/pull/4086
-        'tabs-container',
-        styles.tabList,
-      )}>
+    <div className={clsx(ThemeClassNames.tabs.container, styles.tabList)}>
       <TabList
         // Surprising but historical
         // className is applied on TabList, not on TabsContainer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "4.0.0-canary-6970",
+  "version": "4.0.0-canary-6972",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -14,18 +14,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "4.0.0-canary-6970",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6970",
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6970",
-    "@docusaurus/plugin-content-blog": "4.0.0-canary-6970",
-    "@docusaurus/plugin-content-docs": "4.0.0-canary-6970",
-    "@docusaurus/plugin-content-pages": "4.0.0-canary-6970",
-    "@docusaurus/theme-common": "4.0.0-canary-6970",
-    "@docusaurus/theme-translations": "4.0.0-canary-6970",
-    "@docusaurus/types": "4.0.0-canary-6970",
-    "@docusaurus/utils": "4.0.0-canary-6970",
-    "@docusaurus/utils-common": "4.0.0-canary-6970",
-    "@docusaurus/utils-validation": "4.0.0-canary-6970",
+    "@docusaurus/core": "4.0.0-canary-6972",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6972",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6972",
+    "@docusaurus/plugin-content-blog": "4.0.0-canary-6972",
+    "@docusaurus/plugin-content-docs": "4.0.0-canary-6972",
+    "@docusaurus/plugin-content-pages": "4.0.0-canary-6972",
+    "@docusaurus/theme-common": "4.0.0-canary-6972",
+    "@docusaurus/theme-translations": "4.0.0-canary-6972",
+    "@docusaurus/types": "4.0.0-canary-6972",
+    "@docusaurus/utils": "4.0.0-canary-6972",
+    "@docusaurus/utils-common": "4.0.0-canary-6972",
+    "@docusaurus/utils-validation": "4.0.0-canary-6972",
     "@mdx-js/react": "^3.1.1",
     "clsx": "^2.1.1",
     "copy-text-to-clipboard": "^3.2.2",

package/src/theme/Blog/Pages/BlogAuthorsListPage/index.tsx

@@ -47,11 +47,7 @@ export default function BlogAuthorsListPage({
 }: Props): ReactNode {
   const title: string = translateBlogAuthorsListPageTitle();
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogAuthorsListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogAuthorsListPage}>
       <PageMetadata title={title} />
       <SearchMetadata tag="blog_authors_list" />
       <BlogLayout sidebar={sidebar}>

package/src/theme/Blog/Pages/BlogAuthorsPostsPage/index.tsx

@@ -6,7 +6,6 @@
  */
 
 import type {ReactNode} from 'react';
-import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
@@ -71,10 +70,7 @@ function Content({author, items, sidebar, listMetadata}: Props): ReactNode {
 export default function BlogAuthorsPostsPage(props: Props): ReactNode {
   return (
     <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogAuthorsPostsPage,
-      )}>
+      className={ThemeClassNames.page.blogAuthorsPostsPage}>
       <Metadata {...props} />
       <Content {...props} />
     </HtmlClassNameProvider>

package/src/theme/BlogListPage/index.tsx

@@ -6,7 +6,6 @@
  */
 
 import type {ReactNode} from 'react';
-import clsx from 'clsx';
 
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import {
@@ -49,11 +48,7 @@ function BlogListPageContent(props: Props): ReactNode {
 
 export default function BlogListPage(props: Props): ReactNode {
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogListPage}>
       <BlogListPageMetadata {...props} />
       <BlogListPageStructuredData {...props} />
       <BlogListPageContent {...props} />

package/src/theme/BlogPostPage/index.tsx

@@ -6,7 +6,6 @@
  */
 
 import type {ReactNode} from 'react';
-import clsx from 'clsx';
 import {HtmlClassNameProvider, ThemeClassNames} from '@docusaurus/theme-common';
 import {
   BlogPostProvider,
@@ -63,11 +62,7 @@ export default function BlogPostPage(props: Props): ReactNode {
   const BlogPostContent = props.content;
   return (
     <BlogPostProvider content={props.content} isBlogPostPage>
-      <HtmlClassNameProvider
-        className={clsx(
-          ThemeClassNames.wrapper.blogPages,
-          ThemeClassNames.page.blogPostPage,
-        )}>
+      <HtmlClassNameProvider className={ThemeClassNames.page.blogPostPage}>
         <BlogPostPageMetadata />
         <BlogPostPageStructuredData />
         <BlogPostPageContent sidebar={props.sidebar}>

package/src/theme/BlogTagsListPage/index.tsx

@@ -6,7 +6,6 @@
  */
 
 import type {ReactNode} from 'react';
-import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
@@ -22,11 +21,7 @@ import Heading from '@theme/Heading';
 export default function BlogTagsListPage({tags, sidebar}: Props): ReactNode {
   const title = translateTagsPageTitle();
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogTagsListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogTagsListPage}>
       <PageMetadata title={title} />
       <SearchMetadata tag="blog_tags_list" />
       <BlogLayout sidebar={sidebar}>

package/src/theme/BlogTagsPostsPage/index.tsx

@@ -6,7 +6,6 @@
  */
 
 import type {ReactNode} from 'react';
-import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
@@ -57,11 +56,7 @@ function BlogTagsPostsPageContent({
 }
 export default function BlogTagsPostsPage(props: Props): ReactNode {
   return (
-    <HtmlClassNameProvider
-      className={clsx(
-        ThemeClassNames.wrapper.blogPages,
-        ThemeClassNames.page.blogTagPostListPage,
-      )}>
+    <HtmlClassNameProvider className={ThemeClassNames.page.blogTagPostListPage}>
       <BlogTagsPostsPageMetadata {...props} />
       <BlogTagsPostsPageContent {...props} />
     </HtmlClassNameProvider>

package/src/theme/DocsRoot/index.tsx

@@ -6,17 +6,11 @@
  */
 
 import type {ReactNode} from 'react';
-import clsx from 'clsx';
-import {ThemeClassNames, HtmlClassNameProvider} from '@docusaurus/theme-common';
 import renderRoutes from '@docusaurus/renderRoutes';
 import Layout from '@theme/Layout';
 
 import type {Props} from '@theme/DocVersionRoot';
 
 export default function DocsRoot(props: Props): ReactNode {
-  return (
-    <HtmlClassNameProvider className={clsx(ThemeClassNames.wrapper.docsPages)}>
-      <Layout>{renderRoutes(props.route.routes!)}</Layout>
-    </HtmlClassNameProvider>
-  );
+  return <Layout>{renderRoutes(props.route.routes!)}</Layout>;
 }

package/src/theme/Layout/index.tsx

@@ -46,7 +46,6 @@ export default function Layout(props: Props): ReactNode {
         id={SkipToContentFallbackId}
         className={clsx(
           ThemeClassNames.layout.main.container,
-          ThemeClassNames.wrapper.main,
           styles.mainWrapper,
           wrapperClassName,
         )}>

package/src/theme/MDXPage/index.tsx

@@ -43,10 +43,7 @@ export default function MDXPage(props: Props): ReactNode {
 
   return (
     <HtmlClassNameProvider
-      className={clsx(
-        wrapperClassName ?? ThemeClassNames.wrapper.mdxPages,
-        ThemeClassNames.page.mdxPage,
-      )}>
+      className={clsx(wrapperClassName, ThemeClassNames.page.mdxPage)}>
       <Layout>
         <PageMetadata
           title={title}

package/src/theme/Tabs/index.tsx

@@ -113,14 +113,7 @@ function TabsContainer({
   children: ReactNode;
 }): ReactNode {
   return (
-    <div
-      className={clsx(
-        ThemeClassNames.tabs.container,
-        // former name kept for backward compatibility
-        // see https://github.com/facebook/docusaurus/pull/4086
-        'tabs-container',
-        styles.tabList,
-      )}>
+    <div className={clsx(ThemeClassNames.tabs.container, styles.tabList)}>
       <TabList
         // Surprising but historical
         // className is applied on TabList, not on TabsContainer