GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-16 00:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

CHANGE search to only search in leafs, to prevent empty groups in the explorer

Browse Source
This commit is contained in:
Norbert de Langen 2020-02-18 16:15:51 +01:00
parent 98d85ed70b
commit 6cf29bb11e
No known key found for this signature in database
GPG Key ID: 976651DA156C2825
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ui/src/components/sidebar/treeview/utils.ts
View File

@ -195,14 +195,15 @@ const fuse = memoize(5)(
const exactMatch = memoize(1)((filter: string) => (i: Item) => {
const reg = new RegExp(filter, 'i');
return (
(isStory(i) && reg.test(i.kind)) ||
(i.name && reg.test(i.name)) ||
(i.parameters &&
typeof i.parameters.fileName === 'string' &&
reg.test(i.parameters.fileName.toString())) ||
(i.parameters &&
typeof i.parameters.notes === 'string' &&
reg.test(i.parameters.notes.toString()))
i.isLeaf &&
((isStory(i) && reg.test(i.kind)) ||
(i.name && reg.test(i.name)) ||
(i.parameters &&
typeof i.parameters.fileName === 'string' &&
reg.test(i.parameters.fileName.toString())) ||
(i.parameters &&
typeof i.parameters.notes === 'string' &&
reg.test(i.parameters.notes.toString())))
);
});
@ -210,7 +211,7 @@ export const toId = (base: string, addition: string) =>
base === '' ? `${addition}` : `${base}-${addition}`;
export const toFiltered = (dataset: Dataset, filter: string) => {
let found;
let found: Item[];
if (filter.length && filter.length > 2) {
found = fuse(dataset).search(filter);
} else {
@ -219,17 +220,24 @@ export const toFiltered = (dataset: Dataset, filter: string) => {
// get all parents for all results
const result = found.reduce((acc, item) => {
getParents(item.id, dataset).forEach(pitem => {
acc[pitem.id] = pitem;
});
if (item.isLeaf) {
getParents(item.id, dataset).forEach(pitem => {
acc[pitem.id] = pitem;
});
acc[item.id] = item;
acc[item.id] = item;
}
return acc;
}, {} as Dataset);
// filter the children of the found items (and their parents) so only found entries are present
return Object.entries(result).reduce((acc, [k, v]) => {
acc[k] = v.children ? { ...v, children: v.children.filter(c => !!result[c]) } : v;
const r = v.children ? { ...v, children: v.children.filter(c => !!result[c]) } : v;
if (r.isLeaf || r.children.length) {
acc[k] = r;
}
return acc;
}, {} as Dataset);
};