mirador-annotation-editor-video 0.0.20 → 0.0.22

package/demo/src/index.js

@@ -13,6 +13,7 @@ const config = {
         {manifestId: "https://files.tetras-libre.fr/dev/youtube_withannot.json"},
         {manifestId: "https://files.tetras-libre.fr/dev/peertube.json"},
         {manifestId: "https://files.tetras-libre.fr/dev/cats_simplify_video_with_annot.json"},
+        { manifestId: "https://files.tetras-libre.fr/dev/sun-400x400.json"}
     ],
     theme: {
         palette: {

package/demo/src/manifestsCatalog.js

@@ -13,4 +13,5 @@ export const manifestsCatalog = [
   { manifestId: 'https://iiif.io/api/cookbook/recipe/0074-multiple-language-captions/manifest.json' },
   { manifestId: 'https://iiif.harvardartmuseums.org/manifests/object/299843' },
   { manifestId: 'https://iiif.io/api/cookbook/recipe/0002-mvm-audio/manifest.json' },
+  { manifestId: 'https://files.tetras-libre.fr/dev/sun-400x400.json' }
 ];

package/es/wrapper/AnnotationCreationCompanionWindowWrapper.js

@@ -42,7 +42,12 @@ function mapStateToProps(state, {
   const canvases = (0, _canvases.getVisibleCanvases)(state, {
     windowId
   });
-  if (canvases[0].__jsonld.items) {
+  const videoResources = (0, _canvases.getVisibleCanvasVideoResources)(state, {
+    windowId
+  });
+  // TODO add check on audioResources  getVisibleCanvasAudioResources
+
+  if (videoResources) {
     _playerReferences.playerReferences.init(state, windowId, _VideosReferences.VideosReferences, actions);
   } else {
     _playerReferences.playerReferences.init(state, windowId, _OSDReferences.OSDReferences, actions);

package/es/wrapper/AnnotationCreationWindowWrapper.js

@@ -9,6 +9,7 @@ var _reactRedux = require("react-redux");
 var _selectors = require("mirador/dist/es/src/state/selectors");
 var _canvases = require("mirador/dist/es/src/state/selectors/canvases");
 var _companionWindows = require("mirador/dist/es/src/state/selectors/companionWindows");
+var _window = require("mirador/dist/es/src/state/selectors/window");
 const MiradorAnnotation = require('mirador-annotations/src/plugins/miradorAnnotationPlugin').default;
 // TODO use selector in main componenent
 /**
@@ -28,6 +29,9 @@ function mapStateToProps(state, {
   if (Object.keys(annotationCreationCompanionWindows).length !== 0) {
     annotationEditCompanionWindowIsOpened = false;
   }
+  let currrentTime = (0, _window.getWindowCurrentTime)(state, {
+    windowId
+  });
   return {
     annotationEditCompanionWindowIsOpened,
     canvases: (0, _canvases.getVisibleCanvases)(state, {
@@ -36,7 +40,8 @@ function mapStateToProps(state, {
     config: state.config,
     windowViewType: (0, _selectors.getWindowViewType)(state, {
       windowId
-    })
+    }),
+    currentTime: currrentTime
   };
 }
 const enhance = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirador-annotation-editor-video",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Mirador 4 plugin wrapping Mirador Annotation Editor plugin and adding video annotation support",
   "main": "es/index.js",
   "module": "es/index.js",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@mui/icons-material": "^5.11.16",
     "mirador": "npm:mirador-video@1.0.14",
-    "mirador-annotations": "npm:mirador-annotation-editor@1.0.64"
+    "mirador-annotations": "npm:mirador-annotation-editor@1.0.65"
   },
   "peerDependencies": {
     "lodash": "^4.17.11",
@@ -55,7 +55,7 @@
   },
   "overrides": {
     "mirador-annotations": {
-      "mirador": "npm:mirador-video@1.0.12"
+      "mirador": "npm:mirador-video@1.0.14"
     }
   },
   "author": "",

package/src/wrapper/AnnotationCreationCompanionWindowWrapper.js

@@ -1,6 +1,10 @@
 import * as actions from 'mirador/dist/es/src/state/actions';
 import { getCompanionWindow } from 'mirador/dist/es/src/state/selectors/companionWindows';
-import { getVisibleCanvasAudioResources, getVisibleCanvases } from 'mirador/dist/es/src/state/selectors/canvases';
+import {
+    getVisibleCanvasAudioResources,
+    getVisibleCanvases,
+    getVisibleCanvasVideoResources
+} from 'mirador/dist/es/src/state/selectors/canvases';
 import { getPresentAnnotationsOnSelectedCanvases } from 'mirador/dist/es/src/state/selectors/annotations';
 import annotationForm from 'mirador-annotations/src/annotationForm/AnnotationForm';
 import { playerReferences } from 'mirador-annotations/src/playerReferences';
@@ -25,10 +29,15 @@ function mapStateToProps(state, { id: companionWindowId, windowId }) {
     const cw = getCompanionWindow(state, { companionWindowId, windowId });
     const { annotationid } = cw;
     const canvases = getVisibleCanvases(state, { windowId });
-    if(canvases[0].__jsonld.items){
+
+    const videoResources = getVisibleCanvasVideoResources(state, { windowId });
+    // TODO add check on audioResources  getVisibleCanvasAudioResources
+
+    if(videoResources){
         playerReferences.init(state, windowId,VideosReferences, actions);
     }else{
-    playerReferences.init(state, windowId,OSDReferences, actions);
+
+        playerReferences.init(state, windowId,OSDReferences, actions);
     }
     // This could be removed but it's serve the useEffect in AnnotationForm for now.
     let annotation = getPresentAnnotationsOnSelectedCanvases(state, { windowId })

package/src/wrapper/AnnotationCreationWindowWrapper.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { getWindowViewType } from 'mirador/dist/es/src/state/selectors';
 import { getVisibleCanvases } from 'mirador/dist/es/src/state/selectors/canvases';
 import { getCompanionWindowsForContent } from 'mirador/dist/es/src/state/selectors/companionWindows';
+import { getWindowCurrentTime } from "mirador/dist/es/src/state/selectors/window";
 const MiradorAnnotation = require('mirador-annotations/src/plugins/miradorAnnotationPlugin').default;
 // TODO use selector in main componenent
 /**
@@ -15,11 +16,13 @@ function mapStateToProps(state, { targetProps: { windowId } }) {
     if (Object.keys(annotationCreationCompanionWindows).length !== 0) {
         annotationEditCompanionWindowIsOpened = false;
     }
+    let currrentTime = getWindowCurrentTime(state, { windowId })
     return {
         annotationEditCompanionWindowIsOpened,
         canvases: getVisibleCanvases(state, { windowId }),
         config: state.config,
         windowViewType: getWindowViewType(state, { windowId }),
+        currentTime: currrentTime,
     };
 }