From 6da52908d9194e081d13240e92e0f2cfbb8e914b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFs=20Poujade?= <lois.poujade@tetras-libre.fr>
Date: Wed, 30 Nov 2022 10:22:01 +0100
Subject: [PATCH] Hide annotation autoscroll button if not on video
+ remove unwanted property
---
src/components/AnnotationSettings.js | 7 ++++++-
src/state/reducers/windows.js | 1 -
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/AnnotationSettings.js b/src/components/AnnotationSettings.js
index 9e764a4ce..7bb90697e 100644
--- a/src/components/AnnotationSettings.js
+++ b/src/components/AnnotationSettings.js
@@ -5,6 +5,7 @@ import SyncDisabledIcon from '@material-ui/icons/SyncDisabled';
import VisibilityIcon from '@material-ui/icons/VisibilitySharp';
import VisibilityOffIcon from '@material-ui/icons/VisibilityOffSharp';
import MiradorMenuButton from '../containers/MiradorMenuButton';
+import { VideoViewersReferences } from '../plugins/VideoViewersReferences';
/**
* AnnotationSettings is a component to handle various annotation
@@ -16,10 +17,12 @@ export class AnnotationSettings extends Component {
*/
render() {
const {
- autoScroll, autoScrollDisabled,
+ windowId, autoScroll, autoScrollDisabled,
displayAll, displayAllDisabled, t, toggleAnnotationAutoScroll, toggleAnnotationDisplay,
} = this.props;
+ const mediaIsVideo = typeof VideoViewersReferences.get(windowId) !== 'undefined';
+
return (
<>
<MiradorMenuButton
@@ -30,6 +33,7 @@ export class AnnotationSettings extends Component {
>
{ displayAll ? <VisibilityIcon /> : <VisibilityOffIcon /> }
</MiradorMenuButton>
+ { mediaIsVideo && (
<MiradorMenuButton
aria-label={autoScroll ? 'Disable auto scroll' : 'Enable auto scroll'}
onClick={toggleAnnotationAutoScroll}
@@ -38,6 +42,7 @@ export class AnnotationSettings extends Component {
>
{ autoScroll ? <SyncIcon /> : <SyncDisabledIcon /> }
</MiradorMenuButton>
+ )}
</>
);
}
diff --git a/src/state/reducers/windows.js b/src/state/reducers/windows.js
index 10644ee99..1009c575f 100644
--- a/src/state/reducers/windows.js
+++ b/src/state/reducers/windows.js
@@ -75,7 +75,6 @@ export const windowsReducer = (state = {}, action) => {
{
...(orig || {}),
canvasId: action.canvasId,
- currentTime: 0,
visibleCanvases: action.visibleCanvases || [],
}), state);
case ActionTypes.ADD_COMPANION_WINDOW:
--
GitLab