Revert "Fixing column drag scroll with cell recycling"

This reverts commit 158a58b.
schrodinger · Aug 3, 2016 · 02dbb62 · 02dbb62
1 parent 158a58b
commit 02dbb62
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/examples/ReorderExample.js b/examples/ReorderExample.js
@@ -96,7 +96,6 @@ class ReorderExample extends React.Component {
         {...this.props}>
         {this.state.columnOrder.map(function (columnKey, i) {
           return <Column
-            allowCellsRecycling={true}
             columnKey={columnKey}
             key={i}
             isReorderable={true}

diff --git a/src/FixedDataTableCellDefault.js b/src/FixedDataTableCellDefault.js
@@ -64,7 +64,7 @@ var FixedDataTableCellDefault = React.createClass({
   },
 
   render() {
-    var {height, width, style, className, children, columnKey, rowIndex, ...props} = this.props;
+    var {height, width, style, className, children, columnKey, ...props} = this.props;
 
     var innerStyle = {
       height,

diff --git a/src/FixedDataTableCellGroup.js b/src/FixedDataTableCellGroup.js
@@ -78,8 +78,7 @@ var FixedDataTableCellGroupImpl = React.createClass({
     var currentPosition = 0;
     for (var i = 0, j = columns.length; i < j; i++) {
       var columnProps = columns[i].props;
-      var recycable = columnProps.allowCellsRecycling && !isColumnReordering;
-      if (!recycable || (
+      if (!columnProps.allowCellsRecycling || (
             currentPosition - props.left <= props.width &&
             currentPosition - props.left + columnProps.width >= 0)) {
         var key = 'cell_' + i;

diff --git a/src/FixedDataTableColumnReorderHandle.js b/src/FixedDataTableColumnReorderHandle.js
@@ -54,8 +54,6 @@ var FixedDataTableColumnReorderHandle = React.createClass({
 
   componentWillUnmount() {
     if (this._mouseMoveTracker) {
-      cancelAnimationFrame(this.frameId);
-      this.frameId = null;
       this._mouseMoveTracker.releaseMouseMoves();
       this._mouseMoveTracker = null;
     }
@@ -103,7 +101,7 @@ var FixedDataTableColumnReorderHandle = React.createClass({
 
     this._distance = 0;
     this._animating = true;
-    this.frameId = requestAnimationFrame(this._updateState);
+    requestAnimationFrame(this._updateState);
   },
 
   _onMove(/*number*/ deltaX) {
@@ -112,15 +110,13 @@ var FixedDataTableColumnReorderHandle = React.createClass({
 
   _onColumnReorderEnd() {
     this._animating = false;
-    cancelAnimationFrame(this.frameId);
-    this.frameId = null;
     this._mouseMoveTracker.releaseMouseMoves();
     this.props.onColumnReorderEnd();
   },
 
   _updateState() {
     if (this._animating) {
-      this.frameId = requestAnimationFrame(this._updateState)
+      requestAnimationFrame(this._updateState)
     }
     this.setState({
       dragDistance: this._distance