Add treeDefaultExpanedKeys

close ant-design/ant-design#4608
react-component · Jan 17, 2017 · a3451dd · a3451dd
1 parent 024b394
commit a3451dd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/SelectTrigger.jsx b/src/SelectTrigger.jsx
@@ -171,6 +171,7 @@ const SelectTrigger = React.createClass({
       showIcon: props.treeIcon,
       showLine: props.treeLine,
       defaultExpandAll: props.treeDefaultExpandAll,
+      defaultExpandedKeys: props.treeDefaultExpandedKeys,
       filterTreeNode: this.highlightTreeNode,
     };
 
@@ -196,7 +197,7 @@ const SelectTrigger = React.createClass({
     }
 
     // expand keys
-    if (!trProps.defaultExpandAll && !props.loadData) {
+    if (!trProps.defaultExpandAll && !trProps.defaultExpandedKeys && !props.loadData) {
       trProps.expandedKeys = keys;
     }
     trProps.autoExpandParent = true;

diff --git a/tests/Select.spec.js b/tests/Select.spec.js
@@ -237,4 +237,19 @@ describe('TreeSelect', () => {
     treeWrapper.find('.rc-tree-select-tree-checkbox').simulate('click');
     expect(wrapper.state().value).toEqual([{ value: '0', label: 'label0' }]);
   });
+
+  it('expand tree nodes by treeDefaultExpandedKeys', () => {
+    const wrapper = mount(
+      <TreeSelect treeDefaultExpandedKeys={['1']}>
+        <TreeNode key="0" value="0" title="0 label"/>
+        <TreeNode key="1" value="1" title="1 label">
+          <TreeNode key="10" value="10" title="10 label"/>
+          <TreeNode key="11" value="11" title="11 label"/>
+        </TreeNode>
+      </TreeSelect>
+    );
+    const treeWrapper = mount(wrapper.find('Trigger').node.getComponent());
+    const node = treeWrapper.find('.rc-tree-select-tree-node-content-wrapper').at(1);
+    expect(node.hasClass('rc-tree-select-tree-node-content-wrapper-open')).toBe(true);
+  });
 });