WIP: Moving off of react-virtualized to react-window #467
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| import React, { Component } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import AutoSizer from 'react-virtualized-auto-sizer'; | ||
| import { VariableSizeList } from 'react-window'; | ||
| import isEqual from 'lodash.isequal'; | ||
| import withScrolling, { | ||
| createVerticalStrength, | ||
| createHorizontalStrength, | ||
| } from 'frontend-collective-react-dnd-scrollzone'; | ||
|
|
@@ -98,11 +98,10 @@ class ReactSortableTree extends Component { | |
|
|
||
| // Prepare scroll-on-drag options for this list | ||
| if (isVirtualized) { | ||
| this.scrollZoneVirtualList = withScrolling(VariableSizeList); | ||
| this.vStrength = createVerticalStrength(slideRegionSize); | ||
| this.hStrength = createHorizontalStrength(slideRegionSize); | ||
| this.variableSizeListRef = React.createRef(); | ||
| } | ||
|
|
||
| this.state = { | ||
|
|
@@ -209,6 +208,25 @@ class ReactSortableTree extends Component { | |
| }); | ||
| } | ||
| } | ||
|
|
||
| // if there is search, scroll to component | ||
| if ( | ||
| this.state.searchFocusTreeIndex !== null && | ||
| this.variableSizeListRef.current | ||
| ) { | ||
| this.variableSizeListRef.current.scrollToItem( | ||
| this.state.searchFocusTreeIndex, | ||
| 'start' | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| shouldComponentUpdate(nextProps, nextState) { | ||
| if (nextState.draggedNode !== this.state.draggedNode) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| componentWillUnmount() { | ||
|
|
@@ -585,7 +603,7 @@ class ReactSortableTree extends Component { | |
| return ( | ||
| <TreeNodeRenderer | ||
| style={style} | ||
| key="something" | ||
| listIndex={listIndex} | ||
| getPrevRow={getPrevRow} | ||
| lowerSiblingCounts={lowerSiblingCounts} | ||
|
|
@@ -622,7 +640,6 @@ class ReactSortableTree extends Component { | |
| } = mergeTheme(this.props); | ||
| const { | ||
| searchMatches, | ||
| draggedNode, | ||
| draggedDepth, | ||
| draggedMinimumTreeIndex, | ||
|
|
@@ -664,12 +681,6 @@ class ReactSortableTree extends Component { | |
| matchKeys[path[path.length - 1]] = i; | ||
| }); | ||
|
|
||
| let containerStyle = style; | ||
| let list; | ||
| if (rows.length < 1) { | ||
|
|
@@ -684,40 +695,43 @@ class ReactSortableTree extends Component { | |
| containerStyle = { height: '100%', ...containerStyle }; | ||
|
|
||
| const ScrollZoneVirtualList = this.scrollZoneVirtualList; | ||
|
|
||
| // Render list with react-window | ||
| list = ( | ||
| <AutoSizer> | ||
| {({ height, width }) => ( | ||
| <ScrollZoneVirtualList | ||
| // ref={this.variableSizeListRef} | ||
| // to be fixed in the new version of react-dnd-scrollzone | ||
| direction={rowDirection} | ||
| dragDropManager={dragDropManager} | ||
| verticalStrength={this.vStrength} | ||
| horizontalStrength={this.hStrength} | ||
| speed={30} | ||
| className="rst__virtualScrollOverride" | ||
| width={width} | ||
| onScroll={({ scrollOffset }) => { | ||
| this.scrollTop = scrollOffset; | ||
| }} | ||
| height={height} | ||
| style={innerStyle} | ||
| itemCount={rows.length} | ||
| estimatedItemSize={ | ||
| typeof rowHeight !== 'function' ? rowHeight : undefined | ||
| } | ||
| itemSize={({ index }) => | ||
| typeof rowHeight === 'function' | ||
| ? rowHeight({ | ||
| index, | ||
| treeIndex: index, | ||
| node: rows[index].node, | ||
| path: rows[index].path, | ||
| }) | ||
| : rowHeight | ||
| } | ||
| {...reactVirtualizedListProps} | ||
| > | ||
| {({ index, style: rowStyle }) => | ||
|
There was a problem hiding this comment. This is the issue. It creates new function every render and so every row is mounted and unmounted. You should extract it to extra function and give here only reference to that function so it remains always same. E.g. Should be good to refactor this so there is not much extra computations... There was a problem hiding this comment. But I would also consider it bug in react-dnd, but it is a question if it gets addressed anytime soon ... |
||
| this.renderRow(rows[index], { | ||
| listIndex: index, | ||
| style: rowStyle, | ||
|
|
@@ -728,13 +742,12 @@ class ReactSortableTree extends Component { | |
| swapLength, | ||
| }) | ||
| } | ||
| </ScrollZoneVirtualList> | ||
| )} | ||
| </AutoSizer> | ||
| ); | ||
| } else { | ||
| // Render list without react-window | ||
| list = rows.map((row, index) => | ||
| this.renderRow(row, { | ||
| listIndex: index, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would also add
itemKey={(index) => getNodeKey(rows[index])}