diff --git a/package.json b/package.json index 75405869ce86b22a2a39e59aac56af9a264f6b4c..871e8f71b08f4526c2734dc2b10560f88a2b1b7e 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@mui/system": "^5.15.1", "@psychobolt/react-paperjs": "^1.0.3", "@psychobolt/react-paperjs-editor": "0.0.11", + "axios": "^1.6.7", "draft-js": "^0.11.6", "draft-js-export-html": "^1.4.1", "draft-js-import-html": "^1.4.1", @@ -39,8 +40,8 @@ "react-redux": "8.1.3", "react-resize-observer": "^1.1.1", "react-sortablejs": "^6.1.4", - "sortablejs": "^1.15.2", "redux": "^4.2.1", + "sortablejs": "^1.15.2", "use-image": "^1.1.1" }, "peerDependencies": { diff --git a/src/AnnotationCreation.js b/src/AnnotationCreation.js index ba4ee96f1f4e8c24f8efd9f0c337ab5b3feb4048..65e0758c37d7156d79d6865dc4651fc049189673 100644 --- a/src/AnnotationCreation.js +++ b/src/AnnotationCreation.js @@ -20,7 +20,9 @@ import WebAnnotation from './WebAnnotation'; import { secondsToHMS } from './utils'; import AnnotationFormContent from './annotationForm/AnnotationFormContent'; import AnnotationFormTime from './annotationForm/AnnotationFormTime'; -import {geomFromAnnoTarget, getSvg, saveAnnotation, timeFromAnnoTarget} from './AnnotationCreationUtils'; +import { + geomFromAnnoTarget, getSvg, saveAnnotation, timeFromAnnoTarget, +} from './AnnotationCreationUtils'; import AnnotationFormOverlay from './annotationForm/AnnotationFormOverlay/AnnotationFormOverlay.js'; const TARGET_VIEW = 'target'; @@ -97,14 +99,13 @@ function AnnotationCreation(props) { [tstart, tend] = timeFromAnnoTarget(props.annotation.target); } - if(props.annotation.drawingState) { - setDrawingState(JSON.parse(props.annotation.drawingState)); + if (props.annotation.drawingState) { + setDrawingState(JSON.parse(props.annotation.drawingState)); } } // TODO add a case where no annotation - - if(!annoState?.textBody) { + if (!annoState?.textBody) { annoState.textBody = ''; } @@ -164,7 +165,6 @@ function AnnotationCreation(props) { useLayoutEffect(() => { }, [{ height, width }]); - /** set annotation start time to current time */ const setTstartNow = () => { setState((prevState) => ({ @@ -305,13 +305,13 @@ function AnnotationCreation(props) { // TODO Possibly problem of syncing // TODO Improve this code // If we are in edit mode, we have the transformer on the stage saved in the annotation - /* if (viewTool === OVERLAY_VIEW && state.activeTool === 'edit') { + /* if (viewTool === OVERLAY_VIEW && state.activeTool === 'edit') { setState((prevState) => ({ ...prevState, activeTool: 'cursor', })); return; - }*/ + } */ const { annotation, @@ -324,7 +324,7 @@ function AnnotationCreation(props) { // id: null, // svg, // }; - //state.image = dumbIimage; + // state.image = dumbIimage; const drawingStateSerialized = JSON.stringify(drawingState); diff --git a/src/AnnotationCreationUtils.js b/src/AnnotationCreationUtils.js index 5c3476bf5856b7e1b3b22f324fa405e239aef273..9cff8af130ed4706bc1bd18da02e2c1082825b25 100644 --- a/src/AnnotationCreationUtils.js +++ b/src/AnnotationCreationUtils.js @@ -96,6 +96,7 @@ export function saveAnnotation(canvases, config, receiveAnnotation, annotation, const anno = dumbAnnotation; anno.drawingState = drawingStateSerialized; + anno.body.value = body.value; if (annotation) { storageAdapter.update(anno)