Moving logic into TreeContainer

Author: Avivhdr

index.d.ts

@@ -110,8 +110,6 @@ interface Selectors {
   deleteNode: (node: FlattenedNode[]) => NodeAction,
   addNode: (node: FlattenedNode[]) => NodeAction,
   updateNode: (node: FlattenedNode, state: { [stateKey: string]: any }) => NodeAction,
-  getFlattenedTree: (node: node[]) => FlattenedNode,
-  getRowIndexFromId: (node: FlattenedNode, id: number) => number,
 }
 
 export const selectors: Selectors;

src/TreeContainer.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import Tree from './Tree';
 import {UPDATE_TYPE} from './contants';
 import {getFlattenedTree} from './selectors/getFlattenedTree';
-import {deleteNodeFromTree, replaceNodeFromTree} from './selectors/nodes';
+import {deleteNodeFromTree, replaceNodeFromTree, getRowIndexFromId} from './selectors/nodes';
 import {Node} from './shapes/nodeShapes';
 import {createSelector} from 'reselect';
 
@@ -42,14 +42,17 @@ export default class TreeContainer extends React.Component {
     this.props.onChange(updatedNodes);
   };
 
+  
   render() {
+    const flattenedTree = getFlattenedTree(this.props.nodes) 
+    const rowIndex = getRowIndexFromId(flattenedTree, this.props.scrollToId);
     return (
       <Tree
         nodeMarginLeft={this.props.nodeMarginLeft}
-        nodes={getFlattenedTree(this.props.nodes)}
+        nodes={flattenedTree}
         onChange={this.handleChange}
         NodeRenderer={this.props.children}
-        scrollToIndex={this.props.scrollToIndex}
+        scrollToIndex={rowIndex}
       />
     );
   }
@@ -63,7 +66,7 @@ TreeContainer.propTypes = {
   onChange: PropTypes.func,
   children: PropTypes.func.isRequired,
   nodeMarginLeft: PropTypes.number,
-  scrollToIndex: PropTypes.number,
+  scrollToId: PropTypes.number,
 };
 
 TreeContainer.defaultProps = {