Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI: Fix React unique key warning when using renderLabel #14172

Merged
merged 1 commit into from Mar 9, 2021
Merged

UI: Fix React unique key warning when using renderLabel #14172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 10 additions & 13 deletions lib/api/src/lib/stories.ts
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ export interface Root {
isComponent: false;
isRoot: true;
isLeaf: false;
label?: React.ReactNode;
renderLabel?: (item: Root) => React.ReactNode;
startCollapsed?: boolean;
}

Expand All @@ -34,7 +34,7 @@ export interface Group {
isComponent: boolean;
isRoot: false;
isLeaf: false;
label?: React.ReactNode;
renderLabel?: (item: Group) => React.ReactNode;
// MDX docs-only stories are "Group" type
parameters?: {
docsOnly?: boolean;
Expand All @@ -53,7 +53,7 @@ export interface Story {
isComponent: boolean;
isRoot: false;
isLeaf: true;
label?: React.ReactNode;
renderLabel?: (item: Story) => React.ReactNode;
parameters?: {
fileName: string;
options: {
Expand Down Expand Up @@ -186,19 +186,19 @@ export const transformStoriesRawToStoriesHash = (
}

if (root.length && index === 0) {
const rootElement: Root = {
list.push({
id,
name,
depth: index,
children: [],
isComponent: false,
isLeaf: false,
isRoot: true,
renderLabel,
startCollapsed: collapsedRoots.includes(id),
};
list.push({ ...rootElement, label: renderLabel?.(rootElement) });
});
} else {
const groupElement: Group = {
list.push({
id,
name,
parent,
Expand All @@ -207,14 +207,11 @@ export const transformStoriesRawToStoriesHash = (
isComponent: false,
isLeaf: false,
isRoot: false,
renderLabel,
parameters: {
docsOnly: parameters?.docsOnly,
viewMode: parameters?.viewMode,
},
};
list.push({
...groupElement,
label: renderLabel?.(groupElement),
});
}

Expand All @@ -233,15 +230,15 @@ export const transformStoriesRawToStoriesHash = (
});
});

const story: Story = {
acc[item.id] = {
...item,
depth: rootAndGroups.length,
parent: rootAndGroups[rootAndGroups.length - 1].id,
isLeaf: true,
isComponent: false,
isRoot: false,
renderLabel,
};
acc[item.id] = { ...story, label: renderLabel?.(story) };

return acc;
}, {} as StoriesHash);
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/src/components/sidebar/Tree.tsx
View file
Open in desktop
Expand Up @@ -137,7 +137,7 @@ const Node = React.memo<NodeProps>(
onSelectStoryId(item.id);
}}
>
{item.label || item.name}
{item.renderLabel?.(item) || item.name}
</LeafNode>
);
}
Expand All @@ -162,7 +162,7 @@ const Node = React.memo<NodeProps>(
}}
>
<CollapseIcon isExpanded={isExpanded} />
{item.label || item.name}
{item.renderLabel?.(item) || item.name}
</CollapseButton>
{isExpanded && (
<Action
Expand Down Expand Up @@ -205,7 +205,7 @@ const Node = React.memo<NodeProps>(
if (item.isComponent && !isExpanded) onSelectStoryId(item.id);
}}
>
{item.label || item.name}
{item.renderLabel?.(item) || item.name}
</BranchNode>
);
}
Expand Down