fix: Correctly render search nodes.🐛 (#117)

Fixes #111
dowjones · Jun 6, 2018 · d530b51 · d530b51
1 parent 5a253c8
commit d530b51
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/docs/src/stories/BigData/big-data2.json b/docs/src/stories/BigData/big-data2.json
diff --git a/src/tree/index.js b/src/tree/index.js
@@ -5,6 +5,7 @@ import React, { Component } from 'react'
 import TreeNode from '../tree-node'
 
 const shouldRenderNode = (node, searchModeOn, data) => {
+  if (node.hide) return false
   if (searchModeOn || node.expanded) return true
 
   const parent = node._parent && data.get(node._parent)
@@ -52,7 +53,7 @@ class Tree extends Component {
 
   computeInstanceProps = props => {
     this.allVisibleNodes = this.getNodes(props)
-    this.totalPages = this.allVisibleNodes.length / this.props.pageSize
+    this.totalPages = Math.ceil(this.allVisibleNodes.length / this.props.pageSize)
     this.currentPage = 1
   }
 
@@ -83,7 +84,7 @@ class Tree extends Component {
 
   loadMore = () => {
     this.currentPage = this.currentPage + 1
-    const nextItems = this.allVisibleNodes.slice(0, this.currentPage + this.props.pageSize)
+    const nextItems = this.allVisibleNodes.slice(0, this.currentPage * this.props.pageSize)
     this.setState({ items: nextItems })
   }