fix(ant-design#19132): fix component tree defaultExpandAll does not w…

…ork when using treeData
kavience · Oct 10, 2019 · bcffcc3 · bcffcc3
1 parent d8526f4
commit bcffcc3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/components/tree/DirectoryTree.tsx b/components/tree/DirectoryTree.tsx
@@ -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';
@@ -82,7 +87,15 @@ class DirectoryTree extends React.Component<DirectoryTreeProps, DirectoryTreeSta
 
     // Expanded keys
     if (defaultExpandAll) {
-      this.state.expandedKeys = getFullKeyList(props.children);
+      const expandedKeysByChildren = getFullKeyList(props.children);
+      this.state.expandedKeys = expandedKeysByChildren;
+      if (
+        !!props.treeData &&
+        Array.isArray(expandedKeysByChildren) &&
+        expandedKeysByChildren.length === 0
+      ) {
+        this.state.expandedKeys = getFullKeyListByTreeData(props.treeData);
+      }
     } else if (defaultExpandParent) {
       this.state.expandedKeys = conductExpandParent(
         expandedKeys || defaultExpandedKeys,

diff --git a/components/tree/util.ts b/components/tree/util.ts
@@ -101,3 +101,12 @@ export function convertDirectoryKeysToNodes(
   });
   return nodes;
 }
+
+export function getFullKeyListByTreeData(treeData: any[]): any {
+  for (const item of treeData) {
+    if (item.children) {
+      return getFullKeyListByTreeData(item.children).concat([item.key]);
+    }
+    return [item.key];
+  }
+}