From 6aaacf419feaed9bf918159bb510add9e2c27156 Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Thu, 6 Jan 2022 17:35:36 -0800
Subject: [PATCH 1/3] fix: `grid` prop unused in `handleDragStop`

---
 lib/DraggableCore.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/DraggableCore.js b/lib/DraggableCore.js
index c5a3da8f..f77aa81f 100644
--- a/lib/DraggableCore.js
+++ b/lib/DraggableCore.js
@@ -384,6 +384,15 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
     const position = getControlPosition(e, this.state.touchIdentifier, this);
     if (position == null) return;
     const {x, y} = position;
+
+    // Snap to grid if prop has been provided
+    if (Array.isArray(this.props.grid)) {
+      let deltaX = x - this.state.lastX, deltaY = y - this.state.lastY;
+      [deltaX, deltaY] = snapToGrid(this.props.grid, deltaX, deltaY);
+      if (!deltaX && !deltaY) return; // skip useless drag
+      x = this.state.lastX + deltaX, y = this.state.lastY + deltaY;
+    }
+
     const coreEvent = createCoreData(this, x, y);
 
     // Call event handler

From b39d1cf50b16bf1843d7a411afbff534caa55ab6 Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Thu, 6 Jan 2022 17:38:24 -0800
Subject: [PATCH 2/3] call `onStop` even if `deltaX = 0` and `deltaY = 0`

---
 lib/DraggableCore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/DraggableCore.js b/lib/DraggableCore.js
index f77aa81f..32e9d14f 100644
--- a/lib/DraggableCore.js
+++ b/lib/DraggableCore.js
@@ -389,7 +389,6 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
     if (Array.isArray(this.props.grid)) {
       let deltaX = x - this.state.lastX, deltaY = y - this.state.lastY;
       [deltaX, deltaY] = snapToGrid(this.props.grid, deltaX, deltaY);
-      if (!deltaX && !deltaY) return; // skip useless drag
       x = this.state.lastX + deltaX, y = this.state.lastY + deltaY;
     }
 

From f14b7eef107489973ddc4243a11792adb7a29b75 Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Thu, 27 Jan 2022 00:51:30 -0800
Subject: [PATCH 3/3] fix `const {x, y}` in `handleDragStop`; add test case for
 `grid` prop

---
 lib/DraggableCore.js     |  2 +-
 specs/draggable.spec.jsx | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/DraggableCore.js b/lib/DraggableCore.js
index 32e9d14f..a53b7de8 100644
--- a/lib/DraggableCore.js
+++ b/lib/DraggableCore.js
@@ -383,7 +383,7 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
 
     const position = getControlPosition(e, this.state.touchIdentifier, this);
     if (position == null) return;
-    const {x, y} = position;
+    let {x, y} = position;
 
     // Snap to grid if prop has been provided
     if (Array.isArray(this.props.grid)) {
diff --git a/specs/draggable.spec.jsx b/specs/draggable.spec.jsx
index 23f2f1c9..04f2dd6d 100644
--- a/specs/draggable.spec.jsx
+++ b/specs/draggable.spec.jsx
@@ -942,6 +942,33 @@ describe('react-draggable', function () {
       // (element, fromX, fromY, toX, toY)
       simulateMovementFromTo(drag, 0, 0, 100, 100);
     });
+
+    it('should call back with snapped data output when grid prop is provided', function(done) {
+      function onDrag(event, data) {
+        assert(data.x === 99);
+        assert(data.y === 96);
+        assert(data.deltaX === 99);
+        assert(data.deltaY === 96);
+        assert(data.node === ReactDOM.findDOMNode(drag));
+      }
+      function onStop(event, data) {
+        assert(data.x === 99);
+        assert(data.y === 96);
+        // Single drag-and-stop so stop {x, y} is same as drag {x, y}.
+        assert(data.deltaX === 0);
+        assert(data.deltaY === 0);
+        assert(data.node === ReactDOM.findDOMNode(drag));
+        done();
+      }
+      drag = TestUtils.renderIntoDocument(
+        <DraggableCore onDrag={onDrag} onStop={onStop} grid={[9, 16]}>
+          <div />
+        </DraggableCore>
+      );
+
+      // (element, fromX, fromY, toX, toY)
+      simulateMovementFromTo(drag, 0, 0, 100, 100);
+    });
   });