mirador-annotation-editor-video 0.0.43 → 0.0.45

package/es/wrapper/AnnotationCreationCompanionWindowWrapper.js

@@ -10,10 +10,12 @@ var _canvases = require("mirador/dist/es/src/state/selectors/canvases");
 var _annotations = require("mirador/dist/es/src/state/selectors/annotations");
 var _AnnotationForm = _interopRequireDefault(require("mirador-annotations/src/annotationForm/AnnotationForm"));
 var _playerReferences = require("mirador-annotations/src/playerReferences");
+var _AnnotationFormUtils = require("mirador-annotations/es/annotationForm/AnnotationFormUtils");
 var _OSDReferences = require("mirador/dist/es/src/plugins/OSDReferences");
 var _VideosReferences = require("mirador/dist/es/src/plugins/VideosReferences");
 var _reactI18next = require("react-i18next");
 var _locales = _interopRequireDefault(require("../locales"));
+var _playerReferences2 = require("mirador-annotations/es/playerReferences");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -44,16 +46,15 @@ function mapStateToProps(state, {
   const canvases = (0, _canvases.getVisibleCanvases)(state, {
     windowId
   });
-  const videoResources = (0, _canvases.getVisibleCanvasVideoResources)(state, {
-    windowId
-  });
-  // TODO add check on audioResources  getVisibleCanvasAudioResources
-
-  if (videoResources && videoResources.length > 0) {
-    _playerReferences.playerReferences.init(state, windowId, _VideosReferences.VideosReferences, actions);
-  } else {
-    _playerReferences.playerReferences.init(state, windowId, _OSDReferences.OSDReferences, actions);
+  const mediaTypes = (0, _playerReferences.checkMediaType)(state, windowId);
+  let playerReferences;
+  if (mediaTypes === _AnnotationFormUtils.MEDIA_TYPES.IMAGE) {
+    playerReferences = new _playerReferences2.WindowPlayer(state, windowId, _OSDReferences.OSDReferences.get(windowId), actions);
+  }
+  if (mediaTypes === _AnnotationFormUtils.MEDIA_TYPES.VIDEO || mediaTypes === _AnnotationFormUtils.MEDIA_TYPES.AUDIO) {
+    playerReferences = new _playerReferences2.WindowPlayer(state, windowId, _VideosReferences.VideosReferences.get(windowId), actions);
   }
+
   // This could be removed but it's serve the useEffect in AnnotationForm for now.
   let annotation = (0, _annotations.getPresentAnnotationsOnSelectedCanvases)(state, {
     windowId
@@ -69,16 +70,14 @@ function mapStateToProps(state, {
     };
   }
   return {
-    currentTime,
     annotation,
     canvases,
     config: {
       ...state.config,
       translations: _locales.default
     },
-    getMediaAudio: (0, _canvases.getVisibleCanvasAudioResources)(state, {
-      windowId
-    })
+    currentTime,
+    playerReferences
   };
 }
 const AnnotationFormWithTranslation = (0, _reactI18next.withTranslation)()(_AnnotationForm.default);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirador-annotation-editor-video",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "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.68",
+    "mirador-annotations": "npm:mirador-annotation-editor@1.0.74",
     "react-i18next": "^15.4.0"
   },
   "peerDependencies": {

package/src/wrapper/AnnotationCreationCompanionWindowWrapper.js

@@ -1,17 +1,17 @@
 import * as actions from 'mirador/dist/es/src/state/actions';
 import { getCompanionWindow } from 'mirador/dist/es/src/state/selectors/companionWindows';
 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';
+import { checkMediaType } from 'mirador-annotations/src/playerReferences'
+import { MEDIA_TYPES} from "mirador-annotations/es/annotationForm/AnnotationFormUtils";
 import { OSDReferences } from 'mirador/dist/es/src/plugins/OSDReferences';
 import {VideosReferences} from "mirador/dist/es/src/plugins/VideosReferences";
 import { withTranslation } from 'react-i18next';
 import translations from '../locales';
+import {WindowPlayer} from "mirador-annotations/es/playerReferences";
 
 /** */
 const mapDispatchToProps = (dispatch, { id, windowId }) => ({
@@ -32,14 +32,17 @@ function mapStateToProps(state, { id: companionWindowId, windowId }) {
     const { annotationid } = cw;
     const canvases = getVisibleCanvases(state, { windowId });
 
-    const videoResources = getVisibleCanvasVideoResources(state, { windowId });
-    // TODO add check on audioResources  getVisibleCanvasAudioResources
+    const mediaTypes = checkMediaType(state, windowId);
+
+    let playerReferences;
+
+     if(mediaTypes === MEDIA_TYPES.IMAGE) {
+        playerReferences = new WindowPlayer(state, windowId,OSDReferences.get(windowId), actions);
+     }
+    if(mediaTypes === MEDIA_TYPES.VIDEO || mediaTypes === MEDIA_TYPES.AUDIO) {
+        playerReferences = new WindowPlayer(state, windowId,VideosReferences.get(windowId), actions);
+     }
 
-    if(videoResources && videoResources.length > 0){
-        playerReferences.init(state, windowId,VideosReferences, actions);
-    }else{
-        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 })
         .flatMap((annoPage) => annoPage.json.items || [])
@@ -56,11 +59,11 @@ function mapStateToProps(state, { id: companionWindowId, windowId }) {
     }
 
     return {
-        currentTime,
         annotation,
         canvases,
         config: {...state.config, translations},
-        getMediaAudio: getVisibleCanvasAudioResources(state, { windowId }),
+        currentTime,
+        playerReferences,
     };
 }