Skip to content

Commit 2dbe62b

Browse files
committed
Upgrade react-virtualized to v8
1 parent b166d3a commit 2dbe62b

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"dependencies": {
3434
"react-dnd": "^2.1.4",
3535
"react-dnd-html5-backend": "^2.1.2",
36-
"react-virtualized": "^7.17.0"
36+
"react-virtualized": "^8.0.4"
3737
},
3838
"peerDependencies": {
3939
"react": "^15.3.0",

src/react-sortable-tree.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
import React, { Component, PropTypes } from 'react';
8-
import { AutoSizer, VirtualScroll } from 'react-virtualized';
8+
import { AutoSizer, List } from 'react-virtualized';
99
import 'react-virtualized/styles.css';
1010
import TreeNode from './tree-node';
1111
import {
@@ -206,17 +206,19 @@ class ReactSortableTree extends Component {
206206
>
207207
<AutoSizer>
208208
{({height, width}) => (
209-
<VirtualScroll
209+
<List
210210
className={styles.virtualScrollOverride}
211211
width={width}
212212
height={height}
213213
style={innerStyle}
214214
rowCount={rows.length}
215215
estimatedRowSize={rowHeight}
216216
rowHeight={rowHeight}
217-
rowRenderer={({ index }) => this.renderRow(
217+
rowRenderer={({ index, key, style: rowStyle }) => this.renderRow(
218218
rows[index],
219219
index,
220+
key,
221+
rowStyle,
220222
() => (rows[index - 1] || null)
221223
)}
222224
/>
@@ -226,7 +228,7 @@ class ReactSortableTree extends Component {
226228
);
227229
}
228230

229-
renderRow({ node, path, lowerSiblingCounts, treeIndex }, listIndex, getPrevRow) {
231+
renderRow({ node, path, lowerSiblingCounts, treeIndex }, listIndex, key, style, getPrevRow) {
230232
const NodeContentRenderer = this.nodeContentRenderer;
231233
const nodeProps = !this.props.generateNodeProps ? {} : this.props.generateNodeProps({
232234
node,
@@ -237,6 +239,8 @@ class ReactSortableTree extends Component {
237239

238240
return (
239241
<TreeNode
242+
style={style}
243+
key={key}
240244
treeIndex={treeIndex}
241245
listIndex={listIndex}
242246
getPrevRow={getPrevRow}

src/react-sortable-tree.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
}
1818
}
1919

20-
:global .Grid__innerScrollContainer {
20+
:global .ReactVirtualized__Grid__innerScrollContainer {
2121
overflow: visible;
2222
}
2323

24-
:global .Grid {
24+
:global .ReactVirtualized__Grid {
2525
outline: none;
2626
}

src/tree-node.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ const TreeNode = ({
1111
isOver,
1212
draggedNode,
1313
canDrop,
14+
treeIndex: _treeIndex, // Delete from otherProps
15+
getPrevRow: _getPrevRow, // Delete from otherProps
16+
node: _node, // Delete from otherProps
17+
path: _path, // Delete from otherProps
18+
maxDepth: _maxDepth, // Delete from otherProps
19+
dragHover: _dragHover, // Delete from otherProps
20+
...otherProps,
1421
}) => {
1522
// Construct the scaffold representing the structure of the tree
1623
const scaffoldBlockCount = lowerSiblingCounts.length;
@@ -72,7 +79,10 @@ const TreeNode = ({
7279
});
7380

7481
return connectDropTarget(
75-
<div className={styles.node}>
82+
<div
83+
{...otherProps}
84+
className={styles.node}
85+
>
7686
{scaffold}
7787

7888
<div

src/tree-node.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
.node {
2-
height: 100%;
32
min-width: 100%;
4-
position: relative;
53
white-space: nowrap;
64
}
75

0 commit comments

Comments
 (0)