From 28c99b9cd0650d239290a975b261d46c1ee93d44 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.roy@tetras-libre.fr>
Date: Wed, 20 Dec 2023 17:59:38 +0100
Subject: [PATCH] Tentative de rendre compatible le plugin annotation avec
 Mirador qui fonctionne avec React 17

---
 .gitmodules                                      |  3 +++
 mirador                                          |  1 +
 src/plugins/annotationCreationCompanionWindow.js | 10 +++++-----
 src/plugins/canvasAnnotationsPlugin.js           |  6 +++---
 src/plugins/externalStorageAnnotationPlugin.js   |  4 ++--
 src/plugins/miradorAnnotationPlugin.js           |  6 +++---
 6 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 mirador

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fa5d71c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "mirador"]
+	path = mirador
+	url = https://github.com/ProjectMirador/mirador/tree/mui5.git
diff --git a/mirador b/mirador
new file mode 160000
index 0000000..7d6759b
--- /dev/null
+++ b/mirador
@@ -0,0 +1 @@
+Subproject commit 7d6759baaed88b2a312445061c93768f2a30730a
diff --git a/src/plugins/annotationCreationCompanionWindow.js b/src/plugins/annotationCreationCompanionWindow.js
index 4f8cf03..168de53 100644
--- a/src/plugins/annotationCreationCompanionWindow.js
+++ b/src/plugins/annotationCreationCompanionWindow.js
@@ -1,8 +1,8 @@
-import * as actions from 'mirador/dist/es/src/state/actions';
-import { getCompanionWindow } from 'mirador/dist/es/src/state/selectors/companionWindows';
-import { getWindowCurrentTime, getWindowPausedStatus } from 'mirador/dist/es/src/state/selectors/window';
-import { getVisibleCanvases } from 'mirador/dist/es/src/state/selectors/canvases';
-import { getPresentAnnotationsOnSelectedCanvases } from 'mirador/dist/es/src/state/selectors/annotations';
+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 AnnotationCreation from '../AnnotationCreation';
 
 /** */
diff --git a/src/plugins/canvasAnnotationsPlugin.js b/src/plugins/canvasAnnotationsPlugin.js
index 9102709..96d8e2f 100644
--- a/src/plugins/canvasAnnotationsPlugin.js
+++ b/src/plugins/canvasAnnotationsPlugin.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { getVisibleCanvases } from 'mirador/dist/es/src/state/selectors/canvases';
-import * as actions from 'mirador/dist/es/src/state/actions';
-import { getWindowViewType } from 'mirador/dist/es/src/state/selectors';
+import { getVisibleCanvases } from '../../mirador/src/state/selectors/canvases';
+import * as actions from '../../mirador/src/state/actions';
+import { getWindowViewType } from '../../mirador/src/state/selectors';
 import CanvasListItem from '../CanvasListItem';
 import AnnotationActionsContext from '../AnnotationActionsContext';
 import SingleCanvasDialog from '../SingleCanvasDialog';
diff --git a/src/plugins/externalStorageAnnotationPlugin.js b/src/plugins/externalStorageAnnotationPlugin.js
index f7e4130..2feb02e 100644
--- a/src/plugins/externalStorageAnnotationPlugin.js
+++ b/src/plugins/externalStorageAnnotationPlugin.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import * as actions from 'mirador/dist/es/src/state/actions';
-import { getVisibleCanvases } from 'mirador/dist/es/src/state/selectors/canvases';
+import * as actions from '../../mirador/src/state/actions';
+import { getVisibleCanvases } from 'mirador/src/state/selectors/canvases';
 import isEqual from 'lodash/isEqual';
 
 /** */
diff --git a/src/plugins/miradorAnnotationPlugin.js b/src/plugins/miradorAnnotationPlugin.js
index f8f01aa..9adf3d5 100644
--- a/src/plugins/miradorAnnotationPlugin.js
+++ b/src/plugins/miradorAnnotationPlugin.js
@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import * as actions from 'mirador/dist/es/src/state/actions';
-import { getWindowViewType } from 'mirador/dist/es/src/state/selectors';
+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/dist/es/src/components/MiradorMenuButton';
+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';
-- 
GitLab