From c4349daabffad6773760ae2ca243921522927af8 Mon Sep 17 00:00:00 2001
From: tengda <506036406@qq.com>
Date: Sat, 28 Dec 2019 16:53:02 +0800
Subject: [PATCH] fix(user-select): move addUserSelectStyles from
 handleDragStart to handleDrag

---
 lib/DraggableCore.js     | 11 +++++++----
 specs/draggable.spec.jsx |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/DraggableCore.js b/lib/DraggableCore.js
index 2429a612..999290a5 100644
--- a/lib/DraggableCore.js
+++ b/lib/DraggableCore.js
@@ -279,10 +279,6 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
     const shouldUpdate = this.props.onStart(e, coreEvent);
     if (shouldUpdate === false) return;
 
-    // Add a style to the body to disable user-select. This prevents text from
-    // being selected all over the page.
-    if (this.props.enableUserSelectHack) addUserSelectStyles(ownerDocument);
-
     // Initiate dragging. Set the current x and y as offsets
     // so we know how much we've moved during the drag. This allows us
     // to drag elements around even if they have been moved, without issue.
@@ -339,6 +335,13 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
       return;
     }
 
+    const thisNode = ReactDOM.findDOMNode(this);
+    if (thisNode) {
+      // Add a style to the body to disable user-select. This prevents text from
+      // being selected all over the page.
+      if (this.props.enableUserSelectHack) addUserSelectStyles(thisNode.ownerDocument);
+    }
+
     this.setState({
       lastX: x,
       lastY: y
diff --git a/specs/draggable.spec.jsx b/specs/draggable.spec.jsx
index 376f2afe..4a923565 100644
--- a/specs/draggable.spec.jsx
+++ b/specs/draggable.spec.jsx
@@ -366,6 +366,8 @@ describe('react-draggable', function () {
 
          assert(!document.body.classList.contains('react-draggable-transparent-selection'));
          TestUtils.Simulate.mouseDown(node, {clientX: 0, clientY: 0});
+         assert(!document.body.classList.contains('react-draggable-transparent-selection'));
+         mouseMove(100, 100, node);
          assert(document.body.classList.contains('react-draggable-transparent-selection'));
          TestUtils.Simulate.mouseUp(node);
          assert(!document.body.classList.contains('react-draggable-transparent-selection'));
@@ -452,6 +454,9 @@ describe('react-draggable', function () {
           assert(!iframeDoc.body.classList.contains('react-draggable-transparent-selection'));
           TestUtils.Simulate.mouseDown(node, {clientX: 0, clientY: 0});
           assert(!document.body.classList.contains('react-draggable-transparent-selection'));
+          assert(!iframeDoc.body.classList.contains('react-draggable-transparent-selection'));
+          mouseMove(100, 100, node);
+          assert(!document.body.classList.contains('react-draggable-transparent-selection'));
           assert(iframeDoc.body.classList.contains('react-draggable-transparent-selection'));
           TestUtils.Simulate.mouseUp(node);
           assert(!document.body.classList.contains('react-draggable-transparent-selection'));