Skip to content

Commit da9ed0b

Browse files
F-loatAlexVarchuk
andauthored
fix: markdown parent name (#2062)
Co-authored-by: Alex Varchuk <[email protected]>
1 parent 3241000 commit da9ed0b

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src/components/ContentItems/ContentItems.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ export class SectionItem extends React.Component<ContentItemProps> {
7979
</Header>
8080
</MiddlePanel>
8181
</Row>
82-
<AdvancedMarkdown source={description || ''} htmlWrap={middlePanelWrap} />
82+
<AdvancedMarkdown
83+
parentId={this.props.item.id}
84+
source={description || ''}
85+
htmlWrap={middlePanelWrap}
86+
/>
8387
{externalDocs && (
8488
<Row>
8589
<MiddlePanel>

src/components/Markdown/AdvancedMarkdown.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { StoreConsumer } from '../StoreBuilder';
99

1010
export interface AdvancedMarkdownProps extends BaseMarkdownProps {
1111
htmlWrap?: (part: JSX.Element) => JSX.Element;
12+
parentId?: string;
1213
}
1314

1415
export class AdvancedMarkdown extends React.Component<AdvancedMarkdownProps> {
@@ -28,7 +29,7 @@ export class AdvancedMarkdown extends React.Component<AdvancedMarkdownProps> {
2829
throw new Error('When using components in markdown, store prop must be provided');
2930
}
3031

31-
const renderer = new MarkdownRenderer(options);
32+
const renderer = new MarkdownRenderer(options, this.props.parentId);
3233
const parts = renderer.renderMdWithComponents(source);
3334

3435
if (!parts.length) {

src/services/MarkdownRenderer.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ export class MarkdownRenderer {
4646
private headingEnhanceRenderer: marked.Renderer;
4747
private originalHeadingRule: typeof marked.Renderer.prototype.heading;
4848

49-
constructor(public options?: RedocNormalizedOptions) {
49+
constructor(public options?: RedocNormalizedOptions, public parentId?: string) {
50+
this.parentId = parentId;
5051
this.parser = new marked.Parser();
5152
this.headingEnhanceRenderer = new marked.Renderer();
5253
this.originalHeadingRule = this.headingEnhanceRenderer.heading.bind(
@@ -63,7 +64,9 @@ export class MarkdownRenderer {
6364
): MarkdownHeading {
6465
name = unescapeHTMLChars(name);
6566
const item: MarkdownHeading = {
66-
id: parentId ? `${parentId}/${safeSlugify(name)}` : `section/${safeSlugify(name)}`,
67+
id: parentId
68+
? `${parentId}/${safeSlugify(name)}`
69+
: `${this.parentId || 'section'}/${safeSlugify(name)}`,
6770
name,
6871
level,
6972
items: [],

src/services/MenuBuilder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class MenuBuilder {
4141
initialDepth: number,
4242
options: RedocNormalizedOptions,
4343
): ContentItemModel[] {
44-
const renderer = new MarkdownRenderer(options);
44+
const renderer = new MarkdownRenderer(options, parent?.id);
4545
const headings = renderer.extractHeadings(description || '');
4646

4747
if (headings.length && parent && parent.description) {

0 commit comments

Comments
 (0)