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

fix(#19132): fix component tree defaultExpandAll does not work when u… #19148

Merged
merged 9 commits into from Oct 12, 2019
Merged

fix(#19132): fix component tree defaultExpandAll does not work when u… #19148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d409d2
fix(#19132): fix component tree defaultExpandAll does not work when u…
Oct 10, 2019
bcffcc3
fix(#19132): fix component tree defaultExpandAll does not work when u…
Oct 10, 2019
a915207
fix(#19132): fix component tree defaultExpandAll does not work when u…
Oct 10, 2019
3bd2c80
fix(#19132): fix component tree defaultExpandAll does not work when u…
Oct 10, 2019
fb751a7
Merge branch 'master' into fix-treedata
Oct 10, 2019
744a6d0
fix(#19132): fix component DirectoryTree
Oct 11, 2019
3397ee6
fix(#19132): remove console log
Oct 11, 2019
c04c9fb
fix(#19132): add test file
Oct 11, 2019
959ffba
fix(test case): fix test case for directory tree component
Oct 12, 2019
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
13 changes: 11 additions & 2 deletions components/tree/DirectoryTree.tsx
View file
Open in desktop
Expand Up @@ -13,7 +13,12 @@ import Tree, {
AntTreeNodeSelectedEvent,
AntTreeNode,
} from './Tree';
import { calcRangeKeys, getFullKeyList, convertDirectoryKeysToNodes } from './util';
import {
calcRangeKeys,
getFullKeyList,
convertDirectoryKeysToNodes,
getFullKeyListByTreeData,
} from './util';
import Icon from '../icon';

export type ExpandAction = false | 'click' | 'doubleClick';
Expand Down Expand Up @@ -82,7 +87,11 @@ class DirectoryTree extends React.Component<DirectoryTreeProps, DirectoryTreeSta

// Expanded keys
if (defaultExpandAll) {
this.state.expandedKeys = getFullKeyList(props.children);
if (props.treeData) {
this.state.expandedKeys = getFullKeyListByTreeData(props.treeData);
} else {
this.state.expandedKeys = getFullKeyList(props.children);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to:

if (treeData) {
  this.state.expandedKeys = ...
} else {
  this.state.expandedKeys = ...
}

treeData priority should be higher than children.

} else if (defaultExpandParent) {
this.state.expandedKeys = conductExpandParent(
expandedKeys || defaultExpandedKeys,
Expand Down
184 changes: 184 additions & 0 deletions components/tree/__tests__/__snapshots__/directory.test.js.snap
View file
Open in desktop
@@ -1,5 +1,189 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Directory Tree DirectoryTree should expend all when use treeData and defaultExpandAll is true 1`] = `
<ul
class="ant-tree ant-tree-directory"
role="tree"
unselectable="on"
>
<li
class="ant-tree-treenode-switcher-open"
role="treeitem"
>
<span
class="ant-tree-switcher ant-tree-switcher_open"
>
<i
aria-label="icon: caret-down"
class="anticon anticon-caret-down ant-tree-switcher-icon"
>
<svg
aria-hidden="true"
class=""
data-icon="caret-down"
fill="currentColor"
focusable="false"
height="1em"
viewBox="0 0 1024 1024"
width="1em"
>
<path
d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"
/>
</svg>
</i>
</span>
<span
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
title="Folder"
>
<span
class="ant-tree-iconEle ant-tree-icon__customize"
>
<i
aria-label="icon: folder-open"
class="anticon anticon-folder-open"
>
<svg
aria-hidden="true"
class=""
data-icon="folder-open"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M928 444H820V330.4c0-17.7-14.3-32-32-32H473L355.7 186.2a8.15 8.15 0 0 0-5.5-2.2H96c-17.7 0-32 14.3-32 32v592c0 17.7 14.3 32 32 32h698c13 0 24.8-7.9 29.7-20l134-332c1.5-3.8 2.3-7.9 2.3-12 0-17.7-14.3-32-32-32zM136 256h188.5l119.6 114.4H748V444H238c-13 0-24.8 7.9-29.7 20L136 643.2V256zm635.3 512H159l103.3-256h612.4L771.3 768z"
/>
</svg>
</i>
</span>
<span
class="ant-tree-title"
>
Folder
</span>
</span>
<ul
class="ant-tree-child-tree ant-tree-child-tree-open"
data-expanded="true"
role="group"
>
<li
class="ant-tree-treenode-switcher-open"
role="treeitem"
>
<span
class="ant-tree-switcher ant-tree-switcher_open"
>
<i
aria-label="icon: caret-down"
class="anticon anticon-caret-down ant-tree-switcher-icon"
>
<svg
aria-hidden="true"
class=""
data-icon="caret-down"
fill="currentColor"
focusable="false"
height="1em"
viewBox="0 0 1024 1024"
width="1em"
>
<path
d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"
/>
</svg>
</i>
</span>
<span
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
title="Folder2"
>
<span
class="ant-tree-iconEle ant-tree-icon__customize"
>
<i
aria-label="icon: folder-open"
class="anticon anticon-folder-open"
>
<svg
aria-hidden="true"
class=""
data-icon="folder-open"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M928 444H820V330.4c0-17.7-14.3-32-32-32H473L355.7 186.2a8.15 8.15 0 0 0-5.5-2.2H96c-17.7 0-32 14.3-32 32v592c0 17.7 14.3 32 32 32h698c13 0 24.8-7.9 29.7-20l134-332c1.5-3.8 2.3-7.9 2.3-12 0-17.7-14.3-32-32-32zM136 256h188.5l119.6 114.4H748V444H238c-13 0-24.8 7.9-29.7 20L136 643.2V256zm635.3 512H159l103.3-256h612.4L771.3 768z"
/>
</svg>
</i>
</span>
<span
class="ant-tree-title"
>
Folder2
</span>
</span>
<ul
class="ant-tree-child-tree ant-tree-child-tree-open"
data-expanded="true"
role="group"
>
<li
class=""
role="treeitem"
>
<span
class="ant-tree-switcher ant-tree-switcher-noop"
/>
<span
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
title="File"
>
<span
class="ant-tree-iconEle ant-tree-icon__customize"
>
<i
aria-label="icon: file"
class="anticon anticon-file"
>
<svg
aria-hidden="true"
class=""
data-icon="file"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0 0 42 42h216v494z"
/>
</svg>
</i>
</span>
<span
class="ant-tree-title"
>
File
</span>
</span>
</li>
</ul>
</li>
</ul>
</li>
</ul>
`;

exports[`Directory Tree defaultExpandAll 1`] = `
<ul
class="ant-tree ant-tree-directory"
Expand Down
24 changes: 24 additions & 0 deletions components/tree/__tests__/directory.test.js
View file
Open in desktop
Expand Up @@ -119,6 +119,30 @@ describe('Directory Tree', () => {
expect(wrapper).toMatchSnapshot();
});

it('DirectoryTree should expend all when use treeData and defaultExpandAll is true', () => {
const treeData = [
{
key: '0-0-0',
title: 'Folder',
children: [
{
title: 'Folder2',
key: '0-0-1',
children: [
{
title: 'File',
key: '0-0-2',
isLeaf: true,
},
],
},
],
},
];
const wrapper = render(createTree({ defaultExpandAll: true, treeData }));
expect(wrapper).toMatchSnapshot();
});

it('defaultExpandParent', () => {
const wrapper = render(createTree({ defaultExpandParent: true }));
expect(wrapper).toMatchSnapshot();
Expand Down
12 changes: 12 additions & 0 deletions components/tree/util.ts
View file
Open in desktop
Expand Up @@ -101,3 +101,15 @@ export function convertDirectoryKeysToNodes(
});
return nodes;
}

export function getFullKeyListByTreeData(treeData: any[], keys: any = []): any[] {
(treeData || []).forEach(item => {
if (item.children) {
keys.push(item.key);
keys.concat(getFullKeyListByTreeData(item.children, keys));
} else {
keys.push(item.key);
}
});
return keys;
}