From 6b8fd467e4dc8d3c36f836213a2bdfa408521b49 Mon Sep 17 00:00:00 2001
From: Anthony Geourjon <anthony.geourjon@tetras-libre.fr>
Date: Tue, 9 Jan 2024 00:38:39 +0100
Subject: [PATCH] WIP Commit de la victoire, need to be cleaned
---
mirador | 2 +-
src/ImageFormField.js | 2 +-
src/plugins/canvasAnnotationsPlugin.js | 8 +++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/mirador b/mirador
index 1a9ef86..9f36a45 160000
--- a/mirador
+++ b/mirador
@@ -1 +1 @@
-Subproject commit 1a9ef869f8868c6983ba5e465da63598b14d2d8e
+Subproject commit 9f36a451d213fffb794e41198bc312e2b9cfa80e
diff --git a/src/ImageFormField.js b/src/ImageFormField.js
index 5fe3d13..b5583a6 100644
--- a/src/ImageFormField.js
+++ b/src/ImageFormField.js
@@ -19,7 +19,7 @@ function ImageFormField({ value: image, onChange }) {
} else {
setImgIsValid(!!image.id);
}
- }, [image]);
+}, [image]);
const imgUrl = image.id === null ? '' : image.id;
diff --git a/src/plugins/canvasAnnotationsPlugin.js b/src/plugins/canvasAnnotationsPlugin.js
index 4366188..dee3bb9 100644
--- a/src/plugins/canvasAnnotationsPlugin.js
+++ b/src/plugins/canvasAnnotationsPlugin.js
@@ -30,7 +30,7 @@ class CanvasAnnotationsWrapper extends Component {
render() {
const {
addCompanionWindow, annotationsOnCanvases, canvases, config, receiveAnnotation,
- switchToSingleCanvasView, TargetComponent, targetProps, windowViewType,
+ switchToSingleCanvasView, TargetComponent, targetProps, windowViewType, containerRef,
} = this.props;
const { singleCanvasDialogOpen } = this.state;
@@ -55,6 +55,7 @@ class CanvasAnnotationsWrapper extends Component {
>
<TargetComponent
{...props}
+ ref={containerRef}
/>
{windowViewType !== 'single' && (
<SingleCanvasDialog
@@ -79,6 +80,10 @@ CanvasAnnotationsWrapper.propTypes = {
adapter: PropTypes.func,
}),
}).isRequired,
+ containerRef: PropTypes.oneOfType([
+ PropTypes.func,
+ PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+ ]),
receiveAnnotation: PropTypes.func.isRequired,
switchToSingleCanvasView: PropTypes.func.isRequired,
TargetComponent: PropTypes.oneOfType([
@@ -92,6 +97,7 @@ CanvasAnnotationsWrapper.propTypes = {
CanvasAnnotationsWrapper.defaultProps = {
annotationsOnCanvases: {},
canvases: [],
+ containerRef: null,
};
/** */
--
GitLab