From b5a0ca6bdb88aa57a9f13b500c574f3279aafd5f Mon Sep 17 00:00:00 2001
From: Anthony Geourjon <anthony.geourjon@tetras-libre.fr>
Date: Mon, 30 Jan 2023 15:39:37 +0100
Subject: [PATCH] WIP on components AnnotationManifestAccordion
---
.../AnnotationManifestsAccordion.js | 20 +++++++++----------
src/components/CanvasAnnotations.js | 3 +--
.../AnnotationManifestsAccordion.js | 4 +++-
src/containers/CanvasAnnotations.js | 2 +-
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/components/AnnotationManifestsAccordion.js b/src/components/AnnotationManifestsAccordion.js
index 1e2a1853c..bae843da4 100644
--- a/src/components/AnnotationManifestsAccordion.js
+++ b/src/components/AnnotationManifestsAccordion.js
@@ -9,18 +9,17 @@ import PropTypes from 'prop-types';
import { MiradorMenuButton } from './MiradorMenuButton';
/**
- * AnnotationManifestsAccordion ~
+ * AnnotationManifestsAccordion
*/
export class AnnotationManifestsAccordion extends Component {
/**
- * constructor -
+ * constructor
*/
constructor(props) {
super(props);
this.handleOpenManifestSideToSide = this.handleOpenManifestSideToSide.bind(this);
}
-
/** */
handleOpenManifestSideToSide(e, manifestId) {
const { addResource, addWindow } = this.props;
@@ -31,7 +30,7 @@ export class AnnotationManifestsAccordion extends Component {
/** */
render() {
const {
- classes, annotation, t
+ classes, annotation, t,
} = this.props;
/** */
@@ -45,7 +44,7 @@ export class AnnotationManifestsAccordion extends Component {
annotation.idIsManifest = !!searchManifest(annotation.id);
annotation.manifestsInContent = searchManifest(annotation.content);
- if (annotation.manifestsInContent === null) {
+ if (annotation.manifestsInContent === null && annotation.idIsManifest) {
return null;
}
@@ -54,7 +53,7 @@ export class AnnotationManifestsAccordion extends Component {
<div>
<Accordion>
<AccordionSummary
- expandIcon={<ExpandMoreIcon/>}
+ expandIcon={<ExpandMoreIcon />}
>
<Typography className={classes.heading}>Manifests found :</Typography>
</AccordionSummary>
@@ -72,7 +71,7 @@ export class AnnotationManifestsAccordion extends Component {
}}
className={classes.manifestOpeningButton}
>
- <PlaylistAddIcon/>
+ <PlaylistAddIcon />
</MiradorMenuButton>
</div>
)}
@@ -104,12 +103,13 @@ export class AnnotationManifestsAccordion extends Component {
AnnotationManifestsAccordion.propsTypes = {
addResource: PropTypes.func.isRequired,
addWindow: PropTypes.func.isRequired,
- annotation:
- PropTypes.shape({
+ annotation: PropTypes.objectOf(
+ {
id: PropTypes.string.isRequired,
idIsManifest: PropTypes.bool,
manifestsInContent: PropTypes.arrayOf(PropTypes.string),
- }),
+ },
+ ),
classes: PropTypes.objectOf(PropTypes.string),
t: PropTypes.func.isRequired,
};
diff --git a/src/components/CanvasAnnotations.js b/src/components/CanvasAnnotations.js
index 0769f9ead..f0cd9adc4 100644
--- a/src/components/CanvasAnnotations.js
+++ b/src/components/CanvasAnnotations.js
@@ -8,7 +8,7 @@ import ListItemText from '@material-ui/core/ListItemText';
import Typography from '@material-ui/core/Typography';
import { ScrollTo } from './ScrollTo';
import SanitizedHtml from '../containers/SanitizedHtml';
-import { AnnotationManifestsAccordion } from './AnnotationManifestsAccordion';
+import AnnotationManifestsAccordion from '../containers/AnnotationManifestsAccordion';
/**
* CanvasAnnotations ~
@@ -43,7 +43,6 @@ export class CanvasAnnotations extends Component {
/** */
handleAnnotationHover(annotation) {
const { hoverAnnotation, windowId } = this.props;
-
hoverAnnotation(windowId, [annotation.id]);
}
diff --git a/src/containers/AnnotationManifestsAccordion.js b/src/containers/AnnotationManifestsAccordion.js
index 18aa4ec1b..87beffe64 100644
--- a/src/containers/AnnotationManifestsAccordion.js
+++ b/src/containers/AnnotationManifestsAccordion.js
@@ -5,9 +5,11 @@ import { withStyles } from '@material-ui/core/styles';
import { withPlugins } from '../extend/withPlugins';
import { AnnotationManifestsAccordion } from '../components/AnnotationManifestsAccordion';
import * as actions from '../state/actions';
+import { getConfig } from '../state/selectors';
/** For connect */
const mapStateToProps = (state, { canvasId, windowId }) => ({
+ htmlSanitizationRuleSet: getConfig(state).annotations.htmlSanitizationRuleSet,
});
/**
@@ -20,7 +22,7 @@ const mapDispatchToProps = {
addWindow: actions.addWindow,
};
-/** For withStlyes */
+/** For withStyles */
const styles = theme => ({
manifestOpeningIcon: {
width: '30%',
diff --git a/src/containers/CanvasAnnotations.js b/src/containers/CanvasAnnotations.js
index 347011391..2415cd4f0 100644
--- a/src/containers/CanvasAnnotations.js
+++ b/src/containers/CanvasAnnotations.js
@@ -51,7 +51,7 @@ const mapDispatchToProps = {
selectAnnotation: actions.selectAnnotation,
};
-/** For withStlyes */
+/** For withStyles */
const styles = theme => ({
annotationListItem: {
'&$hovered': {
--
GitLab