From 7d1124c30015dd688b4dbbf0c7095892d37fc673 Mon Sep 17 00:00:00 2001 From: Nils Strelow Date: Thu, 8 Mar 2018 13:20:53 +0100 Subject: [PATCH] Fix IE text selection not working when draggable (#57) * Upgrade react-dnd * Only draggable when not editing. Fixes (#56) --- frontend/lib/js/previous-queries/list/PreviousQuery.js | 4 +++- frontend/package.json | 4 ++-- frontend/yarn.lock | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/lib/js/previous-queries/list/PreviousQuery.js b/frontend/lib/js/previous-queries/list/PreviousQuery.js index 0a6f02adf4..9a38359675 100644 --- a/frontend/lib/js/previous-queries/list/PreviousQuery.js +++ b/frontend/lib/js/previous-queries/list/PreviousQuery.js @@ -68,8 +68,9 @@ const PreviousQuery = (props) => { const executedAt = moment(query.createdAt).fromNow(); const label = query.label || query.id.toString(); const mayEditQuery = query.own || query.shared; + const isNotEditing = !(query.editingLabel || query.editingTags); - return props.connectDragSource( + const content = (
{ }
); + return isNotEditing ? props.connectDragSource(content) : content; }; PreviousQuery.propTypes = { diff --git a/frontend/package.json b/frontend/package.json index 8f9092c98d..16ab8eccf7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -40,8 +40,8 @@ "react": "^16.2.0", "react-addons-test-utils": "^15.3.1", "react-datepicker": "1.2.1", - "react-dnd": "^2.1.4", - "react-dnd-html5-backend": "^2.1.2", + "react-dnd": "^2.5.4", + "react-dnd-html5-backend": "^2.5.4", "react-dom": "^16.2.0", "react-dropzone": "^4.2.8", "react-list": "^0.8.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index fc3b356b6d..528682df57 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -6358,13 +6358,13 @@ react-datepicker@1.2.1: react-onclickoutside "^6.7.1" react-popper "^0.8.2" -react-dnd-html5-backend@^2.1.2: +react-dnd-html5-backend@^2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz#974ad083f67b12d56977a5b171f5ffeb29d78352" dependencies: lodash "^4.2.0" -react-dnd@^2.1.4: +react-dnd@^2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.5.4.tgz#0b6dc5e9d0dfc2909f4f4fe736e5534f3afd1bd9" dependencies: