From f94b8e410ce8dcfc031a106960c68690f773a0e2 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.roy@tetras-libre.fr>
Date: Thu, 21 Dec 2023 11:05:00 +0100
Subject: [PATCH] Tentative de rendre compatible le plugin annotation avec
 Mirador qui fonctionne avec React 17

---
 src/AnnotationCreation.js                        | 6 +++---
 src/AnnotationDrawing.js                         | 4 ++--
 src/AnnotationExportDialog.js                    | 1 -
 src/plugins/annotationCreationCompanionWindow.js | 2 +-
 src/plugins/externalStorageAnnotationPlugin.js   | 4 ++--
 src/plugins/miradorAnnotationPlugin.js           | 6 +++---
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/AnnotationCreation.js b/src/AnnotationCreation.js
index 95af50e..3df86ab 100644
--- a/src/AnnotationCreation.js
+++ b/src/AnnotationCreation.js
@@ -22,9 +22,9 @@ import FormatShapesIcon from '@mui/icons-material/FormatShapes';
 import { SketchPicker } from 'react-color';
 import { v4 as uuid } from 'uuid';
 import { styled } from '@mui/system';
-import CompanionWindow from 'mirador/dist/es/src/containers/CompanionWindow';
-import { VideosReferences } from 'mirador/dist/es/src/plugins/VideosReferences';
-import { OSDReferences } from 'mirador/dist/es/src/plugins/OSDReferences';
+import CompanionWindow from '../mirador/dist/es/src/containers/CompanionWindow';
+import { VideosReferences } from '../mirador/dist/es/src/plugins/VideosReferences';
+import { OSDReferences } from '../mirador/dist/es/src/plugins/OSDReferences';
 import Slider from '@mui/material/Slider';
 import AnnotationDrawing from './AnnotationDrawing';
 import TextEditor from './TextEditor';
diff --git a/src/AnnotationDrawing.js b/src/AnnotationDrawing.js
index be5a656..5512fb4 100644
--- a/src/AnnotationDrawing.js
+++ b/src/AnnotationDrawing.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import ResizeObserver from 'react-resize-observer';
-import { OSDReferences } from 'mirador/dist/es/src/plugins/OSDReferences';
-import { VideosReferences } from 'mirador/dist/es/src/plugins/VideosReferences';
+import { OSDReferences } from '../mirador/dist/es/src/plugins/OSDReferences';
+import { VideosReferences } from '../mirador/dist/es/src/plugins/VideosReferences';
 import { renderWithPaperScope, PaperContainer } from '@psychobolt/react-paperjs';
 import
 {
diff --git a/src/AnnotationExportDialog.js b/src/AnnotationExportDialog.js
index bfa897c..fed8a00 100644
--- a/src/AnnotationExportDialog.js
+++ b/src/AnnotationExportDialog.js
@@ -11,7 +11,6 @@ import Typography from '@mui/material/Typography';
 import PropTypes, { bool } from 'prop-types';
 import { styled } from '@mui/system';
 
-
 /** */
 const styles = (theme) => ({
   listitem: {
diff --git a/src/plugins/annotationCreationCompanionWindow.js b/src/plugins/annotationCreationCompanionWindow.js
index 168de53..c8bbac5 100644
--- a/src/plugins/annotationCreationCompanionWindow.js
+++ b/src/plugins/annotationCreationCompanionWindow.js
@@ -2,7 +2,7 @@ import * as actions from "../../mirador/src/state/actions";
 import { getCompanionWindow } from '../../mirador/src/state/selectors/companionWindows';
 import { getWindowCurrentTime, getWindowPausedStatus } from '../../mirador/src/state/selectors/windows'
 import { getVisibleCanvases } from '../../mirador/src/state/selectors/canvases';
-import { getPresentAnnotationsOnSelectedCanvases } from '../../mirador/src/state/selectors/annotations'
+import { getPresentAnnotationsOnSelectedCanvases } from '../../mirador/src/state/selectors/windows'
 import AnnotationCreation from '../AnnotationCreation';
 
 /** */
diff --git a/src/plugins/externalStorageAnnotationPlugin.js b/src/plugins/externalStorageAnnotationPlugin.js
index 2feb02e..ec76a4e 100644
--- a/src/plugins/externalStorageAnnotationPlugin.js
+++ b/src/plugins/externalStorageAnnotationPlugin.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import * as actions from '../../mirador/src/state/actions';
-import { getVisibleCanvases } from 'mirador/src/state/selectors/canvases';
+import { getVisibleCanvases } from '../../mirador/src/state/selectors/canvases';
 import isEqual from 'lodash/isEqual';
+import * as actions from '../../mirador/src/state/actions';
 
 /** */
 class ExternalStorageAnnotation extends Component {
diff --git a/src/plugins/miradorAnnotationPlugin.js b/src/plugins/miradorAnnotationPlugin.js
index 9adf3d5..8ed5486 100644
--- a/src/plugins/miradorAnnotationPlugin.js
+++ b/src/plugins/miradorAnnotationPlugin.js
@@ -1,11 +1,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import * as actions from 'mirador/src/state/actions';
+import * as actions from '../../mirador/src/state/actions';
 import { getWindowViewType } from 'mirador/src/state/selectors';
 import AddBoxIcon from '@mui/icons-material/AddBox';
 import GetAppIcon from '@mui/icons-material/GetApp';
-import { MiradorMenuButton } from 'mirador/src/components/MiradorMenuButton';
-import { getVisibleCanvases } from 'mirador/dist/es/src/state/selectors/canvases';
+import { MiradorMenuButton } from '../../mirador/src/components/MiradorMenuButton';
+import { getVisibleCanvases } from '../../mirador/dist/es/src/state/selectors/canvases';
 import SingleCanvasDialog from '../SingleCanvasDialog';
 import AnnotationExportDialog from '../AnnotationExportDialog';
 import LocalStorageAdapter from '../LocalStorageAdapter';
-- 
GitLab