Draggable editor experiment

This commit is contained in:
Rainer Simon 2021-06-17 20:59:07 +02:00
parent efc1e30bb6
commit 48c59197f6
4 changed files with 85 additions and 44 deletions

29
package-lock.json generated
View File

@ -13,6 +13,7 @@
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"node-polyglot": "^2.4.0", "node-polyglot": "^2.4.0",
"react-autosize-textarea": "^7.1.0", "react-autosize-textarea": "^7.1.0",
"react-draggable": "^4.4.3",
"react-select": "^4.3.1", "react-select": "^4.3.1",
"react-transition-group": "^4.4.2", "react-transition-group": "^4.4.2",
"timeago-react": "^3.0.2", "timeago-react": "^3.0.2",
@ -1641,6 +1642,11 @@
"fsevents": "~2.1.1" "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": { "node_modules/cliui": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@ -2956,6 +2962,15 @@
"react": "^16.14.0" "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": { "node_modules/react-input-autosize": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz", "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
@ -4903,6 +4918,11 @@
"readdirp": "~3.2.0" "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": { "cliui": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@ -5881,6 +5901,15 @@
"scheduler": "^0.19.1" "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": { "react-input-autosize": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz", "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",

View File

@ -32,6 +32,7 @@
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"node-polyglot": "^2.4.0", "node-polyglot": "^2.4.0",
"react-autosize-textarea": "^7.1.0", "react-autosize-textarea": "^7.1.0",
"react-draggable": "^4.4.3",
"react-select": "^4.3.1", "react-select": "^4.3.1",
"react-transition-group": "^4.4.2", "react-transition-group": "^4.4.2",
"timeago-react": "^3.0.2", "timeago-react": "^3.0.2",

View File

@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect } from 'react'; import React, { useState, useRef, useEffect } from 'react';
import Draggable from 'react-draggable';
import { getWidget, DEFAULT_WIDGETS } from './widgets'; import { getWidget, DEFAULT_WIDGETS } from './widgets';
import { TrashIcon } from '../Icons'; import { TrashIcon } from '../Icons';
import setPosition from './setPosition'; import setPosition from './setPosition';
@ -22,6 +23,8 @@ const Editor = props => {
// The current state of the edited annotation vs. original // The current state of the edited annotation vs. original
const [ currentAnnotation, setCurrentAnnotation ] = useState(); const [ currentAnnotation, setCurrentAnnotation ] = useState();
const [ dragged, setDragged ] = useState(false);
// Reference to the DOM element, so we can set position // Reference to the DOM element, so we can set position
const element = useRef(); const element = useRef();
@ -46,6 +49,7 @@ const Editor = props => {
const initResizeObserver = () => { const initResizeObserver = () => {
if (window?.ResizeObserver) { if (window?.ResizeObserver) {
const resizeObserver = new ResizeObserver(() => { const resizeObserver = new ResizeObserver(() => {
if (!dragged)
setPosition(props.wrapperEl, element.current, props.selectedElement); setPosition(props.wrapperEl, element.current, props.selectedElement);
}); });
@ -53,6 +57,7 @@ const Editor = props => {
return () => resizeObserver.disconnect(); return () => resizeObserver.disconnect();
} else { } else {
// Fire setPosition *only* for devices that don't support ResizeObserver // Fire setPosition *only* for devices that don't support ResizeObserver
if (!dragged)
setPosition(props.wrapperEl, element.current, props.selectedElement); setPosition(props.wrapperEl, element.current, props.selectedElement);
} }
} }
@ -164,6 +169,7 @@ const Editor = props => {
!widgets.some(isReadOnlyWidget); // every widget is deletable !widgets.some(isReadOnlyWidget); // every widget is deletable
return ( return (
<Draggable onStart={() => setDragged(true)}>
<div ref={element} className="r6o-editor"> <div ref={element} className="r6o-editor">
<div className="r6o-arrow" /> <div className="r6o-arrow" />
<div className="r6o-editor-inner"> <div className="r6o-editor-inner">
@ -209,6 +215,7 @@ const Editor = props => {
)} )}
</div> </div>
</div> </div>
</Draggable>
) )
} }

View File

@ -116,6 +116,10 @@
} }
.r6o-editor.react-draggable-dragged .r6o-arrow {
display:none;
}
.r6o-purposedropdown { .r6o-purposedropdown {
width: 150px; width: 150px;
display: inline-block; display: inline-block;