|
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
|
|
import { isEqual } from 'lodash';
|
|
import { isEqual } from 'lodash';
|
|
import TreeContext from './treeContext';
|
|
import TreeContext from './treeContext';
|
|
import { FlattenNode, NodeListProps, NodeListState, TransitionNodes } from './interface';
|
|
import { FlattenNode, NodeListProps, NodeListState, TransitionNodes } from './interface';
|
|
-import Collapsible from '../collapsible';
|
|
|
|
|
|
+import NodeCollapsible from './nodeCollapsible';
|
|
|
|
|
|
const getTreeNodeKey = (treeNode: FlattenNode) => {
|
|
const getTreeNodeKey = (treeNode: FlattenNode) => {
|
|
const { data } = treeNode;
|
|
const { data } = treeNode;
|
|
@@ -17,7 +17,6 @@ export default class NodeList extends PureComponent<NodeListProps, NodeListState
|
|
super(props);
|
|
super(props);
|
|
this.state = {
|
|
this.state = {
|
|
transitionNodes: [],
|
|
transitionNodes: [],
|
|
- isOpen: false
|
|
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
@@ -46,13 +45,11 @@ export default class NodeList extends PureComponent<NodeListProps, NodeListState
|
|
}
|
|
}
|
|
});
|
|
});
|
|
transitionNodes.splice(rangeStart, 0, transitionRange);
|
|
transitionNodes.splice(rangeStart, 0, transitionRange);
|
|
- const isOpen = motionType === 'hide';
|
|
|
|
newState = {
|
|
newState = {
|
|
transitionNodes,
|
|
transitionNodes,
|
|
cachedData: flattenNodes,
|
|
cachedData: flattenNodes,
|
|
cachedMotionKeys: motionKeys,
|
|
cachedMotionKeys: motionKeys,
|
|
- cachedMotionType: motionType,
|
|
|
|
- isOpen
|
|
|
|
|
|
+ cachedMotionType: motionType
|
|
};
|
|
};
|
|
return newState;
|
|
return newState;
|
|
}
|
|
}
|
|
@@ -62,18 +59,9 @@ export default class NodeList extends PureComponent<NodeListProps, NodeListState
|
|
this.setState({ transitionNodes: [] });
|
|
this.setState({ transitionNodes: [] });
|
|
};
|
|
};
|
|
|
|
|
|
- collapsibleRefCb = () => {
|
|
|
|
- const { motionType } = this.props;
|
|
|
|
- !isEqual(this.state.isOpen, motionType === 'show') && setTimeout(()=>{
|
|
|
|
- this.setState({
|
|
|
|
- isOpen: motionType === 'show',
|
|
|
|
- });
|
|
|
|
- }, 0);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
render() {
|
|
render() {
|
|
const { flattenNodes, motionType, searchTargetIsDeep, renderTreeNode } = this.props;
|
|
const { flattenNodes, motionType, searchTargetIsDeep, renderTreeNode } = this.props;
|
|
- const { transitionNodes, isOpen } = this.state;
|
|
|
|
|
|
+ const { transitionNodes } = this.state;
|
|
const mapData = transitionNodes.length && !searchTargetIsDeep ? transitionNodes : flattenNodes;
|
|
const mapData = transitionNodes.length && !searchTargetIsDeep ? transitionNodes : flattenNodes;
|
|
const options = mapData.map(treeNode => {
|
|
const options = mapData.map(treeNode => {
|
|
const isMotionNode = Array.isArray(treeNode);
|
|
const isMotionNode = Array.isArray(treeNode);
|
|
@@ -83,16 +71,15 @@ export default class NodeList extends PureComponent<NodeListProps, NodeListState
|
|
if (isMotionNode && (treeNode as FlattenNode[]).length) {
|
|
if (isMotionNode && (treeNode as FlattenNode[]).length) {
|
|
const nodeKey = getTreeNodeKey(treeNode[0]);
|
|
const nodeKey = getTreeNodeKey(treeNode[0]);
|
|
return (
|
|
return (
|
|
- <Collapsible
|
|
|
|
|
|
+ <NodeCollapsible
|
|
|
|
+ open={motionType === 'hide'}
|
|
duration={200}
|
|
duration={200}
|
|
- ref={this.collapsibleRefCb}
|
|
|
|
- isOpen={isOpen}
|
|
|
|
motion={Boolean(motionType)}
|
|
motion={Boolean(motionType)}
|
|
key={`motion-${nodeKey}`}
|
|
key={`motion-${nodeKey}`}
|
|
onMotionEnd={this.onMotionEnd}
|
|
onMotionEnd={this.onMotionEnd}
|
|
>
|
|
>
|
|
{treeNode.map(node => renderTreeNode(node))}
|
|
{treeNode.map(node => renderTreeNode(node))}
|
|
- </Collapsible>
|
|
|
|
|
|
+ </NodeCollapsible>
|
|
);
|
|
);
|
|
}
|
|
}
|
|
return renderTreeNode(treeNode as FlattenNode);
|
|
return renderTreeNode(treeNode as FlattenNode);
|