much better reordering logic, dist files

stutrek · stutrek · commit 76f99e09c25b · 2016-03-04T16:07:17.000-05:00
diff --git a/dist/fixed-data-table.js b/dist/fixed-data-table.js
@@ -5383,36 +5383,47 @@ return /******/ (function(modules) { // webpackBootstrap
 	        newState.displacement = reorderCellLeft - props.left;
 	        newState.isReorderingThisColumn = true;
 	      } else {
+	        var reorderCellRight = reorderCellLeft + props.columnReorderingData.columnWidth;
+	        var reorderCellCenter = reorderCellLeft + props.columnReorderingData.columnWidth / 2;
 	        var centerOfThisColumn = left + props.width / 2;
 
-	        // cell is before the one being dragged
-	        if (reorderCellLeft > left) {
+	        var cellIsBeforeOneBeingDragged = reorderCellCenter > centerOfThisColumn;
+	        var cellWasOriginallyBeforeOneBeingDragged = originalLeft > props.left;
+	        var changedPosition = false;
+
+	        var dragPoint, thisCellPoint;
+	        if (cellIsBeforeOneBeingDragged) {
 	          if (reorderCellLeft < centerOfThisColumn) {
-	            newState.displacement = props.columnReorderingData.columnWidth;
-	            if (!props.columnReorderingData.columnAfter) {
-	              props.columnReorderingData.columnAfter = props.columnKey;
+	            changedPosition = true;
+	            if (cellWasOriginallyBeforeOneBeingDragged) {
+	              newState.displacement = props.columnReorderingData.columnWidth;
+	            } else {
+	              newState.displacement = 0;
 	            }
-	          } else {
-	            if (props.left < originalLeft) {
+	          }
+	        } else {
+	          if (reorderCellRight > centerOfThisColumn) {
+	            changedPosition = true;
+	            if (cellWasOriginallyBeforeOneBeingDragged) {
 	              newState.displacement = 0;
+	            } else {
+	              newState.displacement = props.columnReorderingData.columnWidth * -1;
 	            }
-	            props.columnReorderingData.columnBefore = props.columnKey;
 	          }
 	        }
 
-	        // cell is after the one being dragged
-	        if (reorderCellLeft < left) {
-	          if (reorderCellLeft + props.columnReorderingData.columnWidth > centerOfThisColumn) {
-	            newState.displacement = -props.columnReorderingData.columnWidth;
-	            props.columnReorderingData.columnBefore = props.columnKey;
-	          } else {
+	        if (changedPosition) {
+	          if (cellIsBeforeOneBeingDragged) {
 	            if (!props.columnReorderingData.columnAfter) {
 	              props.columnReorderingData.columnAfter = props.columnKey;
 	            }
-	            if (props.left > originalLeft) {
-	              newState.displacement = 0;
-	            }
+	          } else {
+	            props.columnReorderingData.columnBefore = props.columnKey;
 	          }
+	        } else if (cellIsBeforeOneBeingDragged) {
+	          props.columnReorderingData.columnBefore = props.columnKey;
+	        } else if (!props.columnReorderingData.columnAfter) {
+	          props.columnReorderingData.columnAfter = props.columnKey;
 	        }
 	      }
 	    } else {
diff --git a/dist/fixed-data-table.min.js b/dist/fixed-data-table.min.js
diff --git a/examples/ReorderExample.js b/examples/ReorderExample.js
@@ -56,6 +56,7 @@ class ReorderExample extends React.Component {
   }
 
   _onColumnReorderEndCallback(event) {
+    console.log(event);
     var columnOrder = this.state.columnOrder.filter((columnKey) => {
       return columnKey !== event.reorderColumn;
     });
diff --git a/src/FixedDataTableCell.react.js b/src/FixedDataTableCell.react.js
@@ -116,37 +116,50 @@ var FixedDataTableCell = React.createClass({
         newState.isReorderingThisColumn = true;
 
       } else {
+        var reorderCellRight = reorderCellLeft + props.columnReorderingData.columnWidth;
+        var reorderCellCenter = reorderCellLeft + (props.columnReorderingData.columnWidth / 2);
         var centerOfThisColumn = left + (props.width / 2);
 
-        // cell is before the one being dragged
-        if (reorderCellLeft > left) {
+        var cellIsBeforeOneBeingDragged = reorderCellCenter > centerOfThisColumn;
+        var cellWasOriginallyBeforeOneBeingDragged = originalLeft > props.left;
+        var changedPosition = false;
+
+
+        var dragPoint, thisCellPoint;
+        if (cellIsBeforeOneBeingDragged) {
           if (reorderCellLeft < centerOfThisColumn) {
-            newState.displacement = props.columnReorderingData.columnWidth;
-            if (!props.columnReorderingData.columnAfter) {
-              props.columnReorderingData.columnAfter = props.columnKey;
+            changedPosition = true;
+            if (cellWasOriginallyBeforeOneBeingDragged) {
+              newState.displacement = props.columnReorderingData.columnWidth;
+            } else {
+              newState.displacement = 0;
             }
-          } else {
-            if (props.left < originalLeft) {
+          }
+        } else {
+          if (reorderCellRight > centerOfThisColumn) {
+            changedPosition = true;
+            if (cellWasOriginallyBeforeOneBeingDragged) {
               newState.displacement = 0;
+            } else {
+              newState.displacement = props.columnReorderingData.columnWidth * -1;
             }
-            props.columnReorderingData.columnBefore = props.columnKey;
           }
         }
 
-        // cell is after the one being dragged
-        if (reorderCellLeft < left) {
-          if (reorderCellLeft + props.columnReorderingData.columnWidth > centerOfThisColumn) {
-            newState.displacement = -props.columnReorderingData.columnWidth;
-            props.columnReorderingData.columnBefore = props.columnKey;
-          } else {
+        if (changedPosition) {
+          if (cellIsBeforeOneBeingDragged) {
             if (!props.columnReorderingData.columnAfter) {
               props.columnReorderingData.columnAfter = props.columnKey;
             }
-            if (props.left > originalLeft) {
-              newState.displacement = 0;
-            }
+          } else {
+            props.columnReorderingData.columnBefore = props.columnKey;
           }
+        } else if (cellIsBeforeOneBeingDragged) {
+          props.columnReorderingData.columnBefore = props.columnKey;
+        } else if (!props.columnReorderingData.columnAfter) {
+          props.columnReorderingData.columnAfter = props.columnKey;
         }
+
       }
     } else {
       newState.displacement = 0;

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ class ReorderExample extends React.Component {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`_onColumnReorderEndCallback(event) {`
	`59`	`+ console.log(event);`
`59`	`60`	`var columnOrder = this.state.columnOrder.filter((columnKey) => {`
`60`	`61`	`return columnKey !== event.reorderColumn;`
`61`	`62`	`});`