@docusaurus/theme-classic 0.0.0-4837 → 0.0.0-4838

package/lib/theme-classic.d.ts

@@ -1031,7 +1031,7 @@ declare module '@theme/IconExternalLink' {
 }
 
 declare module '@theme/TagsListByLetter' {
-  import type {TagsListItem} from '@docusaurus/theme-common';
+  import type {TagsListItem} from '@docusaurus/types';
 
   export interface Props {
     readonly tags: readonly TagsListItem[];
@@ -1040,7 +1040,7 @@ declare module '@theme/TagsListByLetter' {
 }
 
 declare module '@theme/TagsListInline' {
-  import type {Tag} from '@docusaurus/utils';
+  import type {Tag} from '@docusaurus/types';
 
   export interface Props {
     readonly tags: readonly Tag[];
@@ -1049,7 +1049,7 @@ declare module '@theme/TagsListInline' {
 }
 
 declare module '@theme/Tag' {
-  import type {TagsListItem} from '@docusaurus/theme-common';
+  import type {TagsListItem} from '@docusaurus/types';
   import type {Optional} from 'utility-types';
 
   export interface Props extends Optional<TagsListItem, 'count'> {}

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

@@ -15,8 +15,7 @@ import {
 } from '@docusaurus/theme-common';
 import SearchMetadata from '../SearchMetadata';
 import clsx from 'clsx';
-export default function BlogTagsListPage(props) {
-  const {tags, sidebar} = props;
+export default function BlogTagsListPage({tags, sidebar}) {
   const title = translateTagsPageTitle();
   return (
     <HtmlClassNameProvider
@@ -28,7 +27,7 @@ export default function BlogTagsListPage(props) {
       <SearchMetadata tag="blog_tags_list" />
       <BlogLayout sidebar={sidebar}>
         <h1>{title}</h1>
-        <TagsListByLetter tags={Object.values(tags)} />
+        <TagsListByLetter tags={tags} />
       </BlogLayout>
     </HtmlClassNameProvider>
   );

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

@@ -38,9 +38,7 @@ function useBlogPostsPlural() {
     );
 }
 
-export default function BlogTagsPostsPage(props) {
-  const {metadata, items, sidebar, listMetadata} = props;
-  const {allTagsPath, name: tagName, count} = metadata;
+export default function BlogTagsPostsPage({tag, items, sidebar, listMetadata}) {
   const blogPostsPlural = useBlogPostsPlural();
   const title = translate(
     {
@@ -49,8 +47,8 @@ export default function BlogTagsPostsPage(props) {
       message: '{nPosts} tagged with "{tagName}"',
     },
     {
-      nPosts: blogPostsPlural(count),
-      tagName,
+      nPosts: blogPostsPlural(tag.count),
+      tagName: tag.label,
     },
   );
   return (
@@ -65,7 +63,7 @@ export default function BlogTagsPostsPage(props) {
         <header className="margin-bottom--xl">
           <h1>{title}</h1>
 
-          <Link href={allTagsPath}>
+          <Link href={tag.allTagsPath}>
             <Translate
               id="theme.tags.tagsPageLink"
               description="The label of the link targeting the tag list page">

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

@@ -56,8 +56,8 @@ export default function DocTagDocListPage({tag}) {
       message: '{nDocsTagged} with "{tagName}"',
     },
     {
-      nDocsTagged: nDocsTaggedPlural(tag.docs.length),
-      tagName: tag.name,
+      nDocsTagged: nDocsTaggedPlural(tag.count),
+      tagName: tag.label,
     },
   );
   return (
@@ -83,7 +83,7 @@ export default function DocTagDocListPage({tag}) {
                 </Link>
               </header>
               <section className="margin-vert--lg">
-                {tag.docs.map((doc) => (
+                {tag.items.map((doc) => (
                   <DocItem key={doc.id} doc={doc} />
                 ))}
               </section>

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

@@ -8,8 +8,7 @@ import React from 'react';
 import clsx from 'clsx';
 import Link from '@docusaurus/Link';
 import styles from './styles.module.css';
-export default function Tag(props) {
-  const {permalink, name, count} = props;
+export default function Tag({permalink, label, count}) {
   return (
     <Link
       href={permalink}
@@ -17,7 +16,7 @@ export default function Tag(props) {
         styles.tag,
         count ? styles.tagWithCount : styles.tagRegular,
       )}>
-      {name}
+      {label}
       {count && <span>{count}</span>}
     </Link>
   );

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

@@ -22,7 +22,7 @@ export default function TagsListInline({tags}) {
       <ul className={clsx(styles.tags, 'padding--none', 'margin-left--sm')}>
         {tags.map(({label, permalink: tagPermalink}) => (
           <li key={tagPermalink} className={styles.tag}>
-            <Tag name={label} permalink={tagPermalink} />
+            <Tag label={label} permalink={tagPermalink} />
           </li>
         ))}
       </ul>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-4837",
+  "version": "0.0.0-4838",
   "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-4837",
-    "@docusaurus/plugin-content-blog": "0.0.0-4837",
-    "@docusaurus/plugin-content-docs": "0.0.0-4837",
-    "@docusaurus/plugin-content-pages": "0.0.0-4837",
-    "@docusaurus/theme-common": "0.0.0-4837",
-    "@docusaurus/theme-translations": "0.0.0-4837",
-    "@docusaurus/utils": "0.0.0-4837",
-    "@docusaurus/utils-common": "0.0.0-4837",
-    "@docusaurus/utils-validation": "0.0.0-4837",
+    "@docusaurus/core": "0.0.0-4838",
+    "@docusaurus/plugin-content-blog": "0.0.0-4838",
+    "@docusaurus/plugin-content-docs": "0.0.0-4838",
+    "@docusaurus/plugin-content-pages": "0.0.0-4838",
+    "@docusaurus/theme-common": "0.0.0-4838",
+    "@docusaurus/theme-translations": "0.0.0-4838",
+    "@docusaurus/utils": "0.0.0-4838",
+    "@docusaurus/utils-common": "0.0.0-4838",
+    "@docusaurus/utils-validation": "0.0.0-4838",
     "@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-4837",
-    "@docusaurus/types": "0.0.0-4837",
+    "@docusaurus/module-type-aliases": "0.0.0-4838",
+    "@docusaurus/types": "0.0.0-4838",
     "@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": "475b73ed768e51837beba5fb7bb3885716120e9a"
+  "gitHead": "e9b56f063a75e637632bdede9cc507bece7c06f1"
 }

package/src/theme/BlogTagsListPage/index.tsx

@@ -19,8 +19,7 @@ import {
 import SearchMetadata from '../SearchMetadata';
 import clsx from 'clsx';
 
-export default function BlogTagsListPage(props: Props): JSX.Element {
-  const {tags, sidebar} = props;
+export default function BlogTagsListPage({tags, sidebar}: Props): JSX.Element {
   const title = translateTagsPageTitle();
   return (
     <HtmlClassNameProvider
@@ -32,7 +31,7 @@ export default function BlogTagsListPage(props: Props): JSX.Element {
       <SearchMetadata tag="blog_tags_list" />
       <BlogLayout sidebar={sidebar}>
         <h1>{title}</h1>
-        <TagsListByLetter tags={Object.values(tags)} />
+        <TagsListByLetter tags={tags} />
       </BlogLayout>
     </HtmlClassNameProvider>
   );

package/src/theme/BlogTagsPostsPage/index.tsx

@@ -40,9 +40,12 @@ function useBlogPostsPlural() {
     );
 }
 
-export default function BlogTagsPostsPage(props: Props): JSX.Element {
-  const {metadata, items, sidebar, listMetadata} = props;
-  const {allTagsPath, name: tagName, count} = metadata;
+export default function BlogTagsPostsPage({
+  tag,
+  items,
+  sidebar,
+  listMetadata,
+}: Props): JSX.Element {
   const blogPostsPlural = useBlogPostsPlural();
   const title = translate(
     {
@@ -50,7 +53,7 @@ export default function BlogTagsPostsPage(props: Props): JSX.Element {
       description: 'The title of the page for a blog tag',
       message: '{nPosts} tagged with "{tagName}"',
     },
-    {nPosts: blogPostsPlural(count), tagName},
+    {nPosts: blogPostsPlural(tag.count), tagName: tag.label},
   );
 
   return (
@@ -65,7 +68,7 @@ export default function BlogTagsPostsPage(props: Props): JSX.Element {
         <header className="margin-bottom--xl">
           <h1>{title}</h1>
 
-          <Link href={allTagsPath}>
+          <Link href={tag.allTagsPath}>
             <Translate
               id="theme.tags.tagsPageLink"
               description="The label of the link targeting the tag list page">

package/src/theme/DocTagDocListPage/index.tsx

@@ -15,7 +15,6 @@ import {
   ThemeClassNames,
   usePluralForm,
 } from '@docusaurus/theme-common';
-import type {PropTagDocListDoc} from '@docusaurus/plugin-content-docs';
 import Translate, {translate} from '@docusaurus/Translate';
 import type {Props} from '@theme/DocTagDocListPage';
 import SearchMetadata from '@theme/SearchMetadata';
@@ -39,7 +38,7 @@ function useNDocsTaggedPlural() {
     );
 }
 
-function DocItem({doc}: {doc: PropTagDocListDoc}): JSX.Element {
+function DocItem({doc}: {doc: Props['tag']['items'][number]}): JSX.Element {
   return (
     <article className="margin-vert--lg">
       <Link to={doc.permalink}>
@@ -58,7 +57,7 @@ export default function DocTagDocListPage({tag}: Props): JSX.Element {
       description: 'The title of the page for a docs tag',
       message: '{nDocsTagged} with "{tagName}"',
     },
-    {nDocsTagged: nDocsTaggedPlural(tag.docs.length), tagName: tag.name},
+    {nDocsTagged: nDocsTaggedPlural(tag.count), tagName: tag.label},
   );
 
   return (
@@ -84,7 +83,7 @@ export default function DocTagDocListPage({tag}: Props): JSX.Element {
                 </Link>
               </header>
               <section className="margin-vert--lg">
-                {tag.docs.map((doc) => (
+                {tag.items.map((doc) => (
                   <DocItem key={doc.id} doc={doc} />
                 ))}
               </section>

package/src/theme/Tag/index.tsx

@@ -12,9 +12,7 @@ import type {Props} from '@theme/Tag';
 
 import styles from './styles.module.css';
 
-export default function Tag(props: Props): JSX.Element {
-  const {permalink, name, count} = props;
-
+export default function Tag({permalink, label, count}: Props): JSX.Element {
   return (
     <Link
       href={permalink}
@@ -22,7 +20,7 @@ export default function Tag(props: Props): JSX.Element {
         styles.tag,
         count ? styles.tagWithCount : styles.tagRegular,
       )}>
-      {name}
+      {label}
       {count && <span>{count}</span>}
     </Link>
   );

package/src/theme/TagsListInline/index.tsx

@@ -26,7 +26,7 @@ export default function TagsListInline({tags}: Props): JSX.Element {
       <ul className={clsx(styles.tags, 'padding--none', 'margin-left--sm')}>
         {tags.map(({label, permalink: tagPermalink}) => (
           <li key={tagPermalink} className={styles.tag}>
-            <Tag name={label} permalink={tagPermalink} />
+            <Tag label={label} permalink={tagPermalink} />
           </li>
         ))}
       </ul>

package/src/theme-classic.d.ts

@@ -1031,7 +1031,7 @@ declare module '@theme/IconExternalLink' {
 }
 
 declare module '@theme/TagsListByLetter' {
-  import type {TagsListItem} from '@docusaurus/theme-common';
+  import type {TagsListItem} from '@docusaurus/types';
 
   export interface Props {
     readonly tags: readonly TagsListItem[];
@@ -1040,7 +1040,7 @@ declare module '@theme/TagsListByLetter' {
 }
 
 declare module '@theme/TagsListInline' {
-  import type {Tag} from '@docusaurus/utils';
+  import type {Tag} from '@docusaurus/types';
 
   export interface Props {
     readonly tags: readonly Tag[];
@@ -1049,7 +1049,7 @@ declare module '@theme/TagsListInline' {
 }
 
 declare module '@theme/Tag' {
-  import type {TagsListItem} from '@docusaurus/theme-common';
+  import type {TagsListItem} from '@docusaurus/types';
   import type {Optional} from 'utility-types';
 
   export interface Props extends Optional<TagsListItem, 'count'> {}