clean up unused code

Author: zombieJ

src/Tree.jsx

@@ -69,17 +69,6 @@ class Tree extends React.Component {
     filterTreeNode: PropTypes.func,
     openTransitionName: PropTypes.string,
     openAnimation: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-
-    // Tree will parse treeNode as entities map,
-    // This prop enable user to process the Tree with additional entities
-    // This function may be remove in future if we start to remove the dependency on key
-    // So any user should not relay on this function.
-    // If you are refactor this code, you can remove it as your wish
-    unstable_processTreeEntity: PropTypes.shape({
-      initWrapper: PropTypes.func.isRequired,
-      processEntity: PropTypes.func.isRequired,
-      onProcessFinished: PropTypes.func.isRequired,
-    }),
     switcherIcon: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   };
 
@@ -191,7 +180,7 @@ class Tree extends React.Component {
       newState.treeNode = treeNode;
 
       // Calculate the entities data for quick match
-      const entitiesMap = convertTreeToEntities(treeNode, props.unstable_processTreeEntity);
+      const entitiesMap = convertTreeToEntities(treeNode);
       newState.posEntities = entitiesMap.posEntities;
       newState.keyEntities = entitiesMap.keyEntities;
     }

src/util.js

@@ -150,14 +150,15 @@ function keyListToString(keyList) {
   return keyList.map(key => String(key));
 }
 
-export function convertDataToTree(treeData) {
+const internalProcessProps = props => props;
+export function convertDataToTree(treeData, { processProps = internalProcessProps } = {}) {
   if (!treeData) return [];
   const list = Array.isArray(treeData) ? treeData : [treeData];
   return list.map(({ children, ...props }) => {
     const childrenNodes = (children || []).map(convertDataToTree);
 
     return (
-      <TreeNode {...props}>
+      <TreeNode {...processProps(props)}>
         {childrenNodes}
       </TreeNode>
     );
@@ -166,7 +167,7 @@ export function convertDataToTree(treeData) {
 
 // TODO: ========================= NEW LOGIC =========================
 /**
- * Calculate treeNodes entities.
+ * Calculate treeNodes entities. `processTreeEntity` is used for `rc-tree-select`
  * @param treeNodes
  * @param processTreeEntity  User can customize the entity
  */

tests/TreeProps.spec.js

@@ -460,7 +460,7 @@ describe('Tree Props', () => {
         });
       };
 
-      mount(
+      const tree = mount(
         <Tree
           loadData={loadData}
           expandedKeys={['0', '1', '2']}
@@ -471,6 +471,42 @@ describe('Tree Props', () => {
         </Tree>
       );
 
+      tree.setProps({ expandedKeys: ['0', '1', '2'] });
+
+      return timeoutPromise().then(() => {
+        expect(called).toBe(3);
+        expect(keys[0]).toBe(1);
+        expect(keys[1]).toBe(1);
+        expect(keys[2]).toBe(1);
+      });
+    });
+
+    it('with defaultExpandedKeys', () => {
+      let called = 0;
+      const keys = {};
+      const loadData = ({ props: { eventKey } }) => {
+        keys[eventKey] = (keys[eventKey] || 0) + 1;
+
+        return new Promise(() => {
+          called += 1;
+        });
+      };
+
+      const wrapper = mount(
+        <Tree
+          loadData={loadData}
+          defaultExpandedKeys={['0', '1', '2']}
+        >
+          <TreeNode key="0" />
+          <TreeNode key="1" />
+          <TreeNode key="2" />
+        </Tree>
+      );
+
+      // Do not trigger loadData
+      wrapper.find('.rc-tree-switcher').at(0).simulate('click');
+      wrapper.find('.rc-tree-switcher').at(0).simulate('click');
+
       return timeoutPromise().then(() => {
         expect(called).toBe(3);
         expect(keys[0]).toBe(1);
@@ -612,35 +648,6 @@ describe('Tree Props', () => {
     expect(wrapper.render()).toMatchSnapshot();
   });
 
-  describe('unstable_processTreeEntity', () => {
-    const onProcessFinished = jest.fn();
-
-    const handler = {
-      initWrapper(wrapper) {
-        return { ...wrapper, valueEntities: {} };
-      },
-      processEntity(entity, { valueEntities }) {
-        valueEntities[entity.node.props.value] = entity;
-      },
-      onProcessFinished,
-    };
-
-    mount(
-      <Tree unstable_processTreeEntity={handler}>
-        <TreeNode key="K0" title="T0" value={0} />
-        <TreeNode key="K1" title="T1" value={1}>
-          <TreeNode key="K10" title="T10" value={10} />
-          <TreeNode key="K11" title="T11" value={11} />
-        </TreeNode>
-      </Tree>
-    );
-
-    expect(onProcessFinished).toBeCalled();
-
-    const valueList = Object.keys(onProcessFinished.mock.calls[0][0].valueEntities);
-    expect(valueList).toEqual(['0', '1', '10', '11']);
-  });
-
   describe('disabled', () => {
     it('basic', () => {
       const wrapper = render(
@@ -696,7 +703,7 @@ describe('Tree Props', () => {
       const sfc = ({ isLeaf }) => {
         if (testLeaf) {
           return isLeaf ? <span>{text}</span> : null;
-        } 
+        }
         return isLeaf ? null : <span>{text}</span>;
       };
 

tests/util.spec.js

@@ -69,6 +69,30 @@ describe('Util', () => {
     expect(convertTreeToData($treeNode)).toEqual(treeData);
   });
 
+  it('convertTreeToEntities with additional handler', () => {
+    const onProcessFinished = jest.fn();
+
+    const tree = (
+      <Tree>
+        <TreeNode key="key" title="test" value="ttt" />
+      </Tree>
+    );
+
+    const { keyEntities, valueEntities } = convertTreeToEntities(tree.props.children, {
+      initWrapper: wrapper => ({
+        ...wrapper,
+        valueEntities: {},
+      }),
+      processEntity: (entity, wrapper) => {
+        wrapper.valueEntities[entity.node.props.value] = entity;
+      },
+      onProcessFinished,
+    });
+
+    expect(onProcessFinished).toBeCalled();
+    expect(valueEntities.ttt).toBe(keyEntities.key);
+  });
+
   // You can remove this test if refactor remove conductCheck function
   describe('conductCheck', () => {
     describe('basic', () => {