fix(v2): sidebar_label should be used to compute next/previous button labels (#4970)

* sidebar_label should be used to compute next/previous button texts, as documented.

* improve docs frontmatter doc

* use a little bit of destructuring
This commit is contained in:
Sébastien Lorber 2021-06-15 12:04:29 +02:00 committed by GitHub
parent aeb8e9da51
commit 737f80a026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 75 additions and 38 deletions

View file

@ -1,6 +1,7 @@
---
id: hello
title: Hello, World !
sidebar_label: Hello sidebar_label
---
Hi, Endilie here :)

View file

@ -208,7 +208,7 @@ Object {
\\"permalink\\": \\"/docs/foo/bar\\"
},
\\"next\\": {
\\"title\\": \\"Hello, World !\\",
\\"title\\": \\"Hello sidebar_label\\",
\\"permalink\\": \\"/docs/\\"
}
}",
@ -238,7 +238,8 @@ Object {
\\"version\\": \\"current\\",
\\"frontMatter\\": {
\\"id\\": \\"hello\\",
\\"title\\": \\"Hello, World !\\"
\\"title\\": \\"Hello, World !\\",
\\"sidebar_label\\": \\"Hello sidebar_label\\"
},
\\"sidebar\\": \\"docs\\",
\\"previous\\": {
@ -435,7 +436,7 @@ Object {
},
{
\\"type\\": \\"link\\",
\\"label\\": \\"Hello, World !\\",
\\"label\\": \\"Hello sidebar_label\\",
\\"href\\": \\"/docs/\\"
}
]
@ -447,7 +448,7 @@ Object {
\\"items\\": [
{
\\"type\\": \\"link\\",
\\"label\\": \\"Hello, World !\\",
\\"label\\": \\"Hello sidebar_label\\",
\\"href\\": \\"/docs/\\"
}
]

View file

@ -201,6 +201,7 @@ describe('simple site', () => {
frontMatter: {
id: 'hello',
title: 'Hello, World !',
sidebar_label: 'Hello sidebar_label',
},
});
});
@ -230,6 +231,7 @@ describe('simple site', () => {
frontMatter: {
id: 'hello',
title: 'Hello, World !',
sidebar_label: 'Hello sidebar_label',
},
});
});

View file

@ -328,6 +328,39 @@ describe('simple website', () => {
expect(content.loadedVersions.length).toEqual(1);
const [currentVersion] = content.loadedVersions;
expect(findDocById(currentVersion, 'foo/baz')).toEqual({
...defaultDocMetadata,
version: 'current',
id: 'foo/baz',
unversionedId: 'foo/baz',
sourceDirName: 'foo',
isDocsHomePage: false,
permalink: '/docs/foo/bazSlug.html',
slug: '/foo/bazSlug.html',
previous: {
title: 'Bar',
permalink: '/docs/foo/bar',
},
next: {
title: 'Hello sidebar_label',
permalink: '/docs/',
},
sidebar: 'docs',
source: path.posix.join(
'@site',
posixPath(path.relative(siteDir, currentVersion.contentPath)),
'foo',
'baz.md',
),
title: 'baz',
description: 'Images',
frontMatter: {
id: 'baz',
title: 'baz',
slug: 'bazSlug.html',
},
});
expect(findDocById(currentVersion, 'hello')).toEqual({
...defaultDocMetadata,
version: 'current',
@ -352,6 +385,7 @@ describe('simple website', () => {
frontMatter: {
id: 'hello',
title: 'Hello, World !',
sidebar_label: 'Hello sidebar_label',
},
});

View file

@ -11,21 +11,7 @@ import {
JoiFrontMatter as Joi, // Custom instance for frontmatter
validateFrontMatter,
} from '@docusaurus/utils-validation';
export type DocFrontMatter = {
id?: string;
title?: string;
hide_title?: boolean;
hide_table_of_contents?: boolean;
keywords?: string[];
image?: string;
description?: string;
slug?: string;
sidebar_label?: string;
sidebar_position?: number;
custom_edit_url?: string | null;
parse_number_prefixes?: boolean;
};
import {DocFrontMatter} from './types';
// NOTE: we don't add any default value on purpose here
// We don't want default values to magically appear in doc metadatas and props

View file

@ -198,10 +198,13 @@ export default function pluginContentDocs(
previousId,
nextId,
} = sidebarsUtils.getDocNavigation(doc.id);
const toDocNavLink = (navDocId: string): DocNavLink => ({
title: docsBaseById[navDocId].title,
permalink: docsBaseById[navDocId].permalink,
});
const toDocNavLink = (navDocId: string): DocNavLink => {
const {title, permalink, frontMatter} = docsBaseById[navDocId];
return {
title: frontMatter.sidebar_label ?? title,
permalink,
};
};
return {
...doc,
sidebar: sidebarName,

View file

@ -181,9 +181,19 @@ export type LastUpdateData = {
lastUpdatedBy?: string;
};
export type FrontMatter = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
export type DocFrontMatter = {
id?: string;
title?: string;
hide_title?: boolean;
hide_table_of_contents?: boolean;
keywords?: string[];
image?: string;
description?: string;
slug?: string;
sidebar_label?: string;
sidebar_position?: number;
custom_edit_url?: string | null;
parse_number_prefixes?: boolean;
};
export type DocMetadataBase = LastUpdateData & {
@ -200,7 +210,7 @@ export type DocMetadataBase = LastUpdateData & {
// eslint-disable-next-line camelcase
sidebarPosition?: number;
editUrl?: string | null;
frontMatter: FrontMatter;
frontMatter: DocFrontMatter & Record<string, unknown>;
};
export type DocNavLink = {