Merge pull request #60 from recogito/draggable-editor

Draggable editor
2021-06-19 18:14:36 +02:00 · 2021-06-19 18:14:36 +02:00 · 730b3960cb
parent efc1e30bb6 242926ae8a
commit 730b3960cb
8 changed files with 93 additions and 48 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -13,6 +13,7 @@
        "fast-deep-equal": "^3.1.3",
        "node-polyglot": "^2.4.0",
        "react-autosize-textarea": "^7.1.0",
+        "react-draggable": "^4.4.3",
        "react-select": "^4.3.1",
        "react-transition-group": "^4.4.2",
        "timeago-react": "^3.0.2",
@ -1641,6 +1642,11 @@
        "fsevents": "~2.1.1"
      }
    },
+    "node_modules/classnames": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+    },
    "node_modules/cliui": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@ -2956,6 +2962,15 @@
        "react": "^16.14.0"
      }
    },
+    "node_modules/react-draggable": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.3.tgz",
+      "integrity": "sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==",
+      "dependencies": {
+        "classnames": "^2.2.5",
+        "prop-types": "^15.6.0"
+      }
+    },
    "node_modules/react-input-autosize": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
@ -4903,6 +4918,11 @@
        "readdirp": "~3.2.0"
      }
    },
+    "classnames": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+    },
    "cliui": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@ -5881,6 +5901,15 @@
        "scheduler": "^0.19.1"
      }
    },
+    "react-draggable": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.3.tgz",
+      "integrity": "sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==",
+      "requires": {
+        "classnames": "^2.2.5",
+        "prop-types": "^15.6.0"
+      }
+    },
    "react-input-autosize": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
--- a/package.json
+++ b/package.json
@ -32,6 +32,7 @@
    "fast-deep-equal": "^3.1.3",
    "node-polyglot": "^2.4.0",
    "react-autosize-textarea": "^7.1.0",
+    "react-draggable": "^4.4.3",
    "react-select": "^4.3.1",
    "react-transition-group": "^4.4.2",
    "timeago-react": "^3.0.2",
--- a/src/editor/Editor.jsx
+++ b/src/editor/Editor.jsx
@ -1,4 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react';
+import Draggable from 'react-draggable';
 import { getWidget, DEFAULT_WIDGETS } from './widgets';
 import { TrashIcon } from '../Icons';
 import setPosition from './setPosition';
@ -22,6 +23,8 @@ const Editor = props => {
  // The current state of the edited annotation vs. original
  const [ currentAnnotation, setCurrentAnnotation ] = useState();

+  const [ dragged, setDragged ] = useState(false);
+
  // Reference to the DOM element, so we can set position
  const element = useRef();

@ -46,14 +49,16 @@ const Editor = props => {
  const initResizeObserver = () => {
    if (window?.ResizeObserver) {
      const resizeObserver = new ResizeObserver(() => {
-        setPosition(props.wrapperEl, element.current, props.selectedElement);
+        if (!dragged)
+          setPosition(props.wrapperEl, element.current, props.selectedElement);
      });

      resizeObserver.observe(props.wrapperEl);
      return () => resizeObserver.disconnect();
    } else {
      // Fire setPosition *only* for devices that don't support ResizeObserver
-      setPosition(props.wrapperEl, element.current, props.selectedElement);
+      if (!dragged)
+        setPosition(props.wrapperEl, element.current, props.selectedElement);
    }  
  }

@ -164,51 +169,57 @@ const Editor = props => {
    !widgets.some(isReadOnlyWidget);  // every widget is deletable

  return (
-    <div ref={element} className="r6o-editor">
-      <div className="r6o-arrow" />
-      <div className="r6o-editor-inner">
-        {widgets.map(widget => 
-          React.cloneElement(widget, { 
-            annotation : currentAnnotation,
-            readOnly : props.readOnly,
-            env: props.env,
-            onAppendBody,
-            onUpdateBody,
-            onRemoveBody,
-            onUpsertBody,
-            onSetProperty,
-            onSaveAndClose: onOk              
-          })
-        )}
-        
-        { props.readOnly ? (
-          <div className="r6o-footer">
-            <button
-              className="r6o-btn" 
-              onClick={onCancel}>{i18n.t('Close')}</button>
-          </div>
-        ) : (
-          <div className="r6o-footer">
-            { hasDelete && (
+    <Draggable 
+      cancel=".r6o-btn, .r6o-nodrag" 
+      onDrag={() => setDragged(true)}>
+
+      <div ref={element} className={dragged ? 'r6o-editor dragged' : 'r6o-editor'}>
+        <div className="r6o-arrow" />
+        <div className="r6o-editor-inner">
+          {widgets.map(widget => 
+            React.cloneElement(widget, { 
+              annotation : currentAnnotation,
+              readOnly : props.readOnly,
+              env: props.env,
+              onAppendBody,
+              onUpdateBody,
+              onRemoveBody,
+              onUpsertBody,
+              onSetProperty,
+              onSaveAndClose: onOk              
+            })
+          )}
+          
+          { props.readOnly ? (
+            <div className="r6o-footer">
+              <button
+                className="r6o-btn" 
+                onClick={onCancel}>{i18n.t('Close')}</button>
+            </div>
+          ) : (
+            <div className="r6o-footer">
+              { hasDelete && (
+                <button 
+                  className="r6o-btn left delete-annotation" 
+                  title={i18n.t('Delete')}
+                  onClick={onDelete}>
+                  <TrashIcon width={12} />
+                </button>
+              )}
+
              <button 
-                className="r6o-btn left delete-annotation" 
-                title={i18n.t('Delete')}
-                onClick={onDelete}>
-                <TrashIcon width={12} />
-              </button>
-            )}
+                className="r6o-btn outline"
+                onClick={onCancel}>{i18n.t('Cancel')}</button>

-            <button 
-              className="r6o-btn outline"
-              onClick={onCancel}>{i18n.t('Cancel')}</button>
-
-            <button 
-              className="r6o-btn "
-              onClick={onOk}>{i18n.t('Ok')}</button>
-          </div>
-        )}
+              <button 
+                className="r6o-btn "
+                onClick={onOk}>{i18n.t('Ok')}</button>
+            </div>
+          )}
+        </div>
      </div>
-    </div>
+
+    </Draggable>
  )

 }
--- a/src/editor/widgets/comment/Comment.jsx
+++ b/src/editor/widgets/comment/Comment.jsx
@ -66,7 +66,7 @@ const Comment = props => {
          /> } 
          
      <div 
-        className={isMenuVisible ? "r6o-icon r6o-arrow-down r6o-menu-open" : "r6o-icon r6o-arrow-down"} 
+        className={isMenuVisible ? "r6o-icon r6o-arrow-down r6o-nodrag r6o-menu-open" : "r6o-icon r6o-arrow-down r6o-nodrag"} 
        onClick={() => setIsMenuVisible(!isMenuVisible)}>
        <ChevronDownIcon width={12} />
      </div>
--- a/src/editor/widgets/comment/DropdownMenu.jsx
+++ b/src/editor/widgets/comment/DropdownMenu.jsx
@ -10,7 +10,7 @@ const DropdownMenu = props => {
  useClickOutside(ref, () => props.onClickOutside());

  return (
-    <ul ref={ref} className="r6o-comment-dropdown-menu">
+    <ul ref={ref} className="r6o-comment-dropdown-menu r6o-nodrag">
      <li onClick={props.onEdit}>{i18n.t('Edit')}</li>
      <li onClick={props.onDelete}>{i18n.t('Delete')}</li>
    </ul>
--- a/src/editor/widgets/comment/TextEntryField.jsx
+++ b/src/editor/widgets/comment/TextEntryField.jsx
@ -22,7 +22,7 @@ export default class TextEntryField extends Component {
    return (
      <TextareaAutosize
        ref={this.onRender}
-        className="r6o-editable-text" 
+        className={this.props.editable ? 'r6o-editable-text r6o-nodrag' : 'r6o-editable-text'} 
        value={this.props.content}
        placeholder={this.props.placeholder || i18n.t('Add a comment...')}
        disabled={!this.props.editable}
--- a/src/editor/widgets/tag/TagWidget.jsx
+++ b/src/editor/widgets/tag/TagWidget.jsx
@ -59,7 +59,7 @@ const TagWidget = props => {
  }

  return (
-    <div className="r6o-widget r6o-tag">
+    <div className="r6o-widget r6o-tag r6o-nodrag">
      { tags.length > 0 &&
        <ul className="r6o-taglist">
          { tags.map(tag =>
--- a/themes/default/editor/_editor.scss
+++ b/themes/default/editor/_editor.scss
@ -116,6 +116,10 @@

 }

+.r6o-editor.dragged .r6o-arrow {
+  display:none;
+}
+
 .r6o-purposedropdown {
  width: 150px;
  display: inline-block;