diff --git a/src/AnnotationCreation.js b/src/AnnotationCreation.js index 5dee8640b3f5a03ec92aeece94f365649a61b619..dd378692b1dccb3527f704a9bdc053c924d062ce 100644 --- a/src/AnnotationCreation.js +++ b/src/AnnotationCreation.js @@ -288,7 +288,7 @@ function AnnotationCreation({ imageEvent, } = toolState; - const mediaIsVideo = mediaVideo !== 'undefined'; + const mediaIsVideo = mediaVideo !== undefined; if (mediaIsVideo && valueTime) { valueTime[0] = tstart; valueTime[1] = tend; @@ -302,9 +302,23 @@ function AnnotationCreation({ let overlay = null; if (videoref) { overlay = videoref.canvasOverlay; - } - if (osdref) { - console.debug('osdref', osdref); + } else { + if (osdref) { + console.debug('osdref', osdref); + overlay = { + canvasHeight: osdref.current.canvas.clientHeight, + canvasWidth: osdref.current.canvas.clientWidth, + containerHeight: osdref.current.canvas.clientHeight, + containerWidth: osdref.current.canvas.clientWidth, + }; + } else { + overlay = { + canvasHeight: 500, + canvasWidth: 1000, + containerHeight: 500, + containerWidth: 1000, + }; + } } /** Change scale from container / canva */ @@ -430,6 +444,7 @@ function AnnotationCreation({ resetStateAfterSave={resetStateAfterSave} state={state} windowId={windowId} + mediaIsVideo={mediaIsVideo} /> </StyledForm> </CompanionWindow> diff --git a/src/annotationForm/AnnotationFormFooter.js b/src/annotationForm/AnnotationFormFooter.js index b7dbb888ee97a47b6599580a3498fbce2f2cec39..656786e969e795235b53da9ce74ba072a54c07e0 100644 --- a/src/annotationForm/AnnotationFormFooter.js +++ b/src/annotationForm/AnnotationFormFooter.js @@ -23,10 +23,12 @@ function AnnotationFormFooter({ closeFormCompanionWindow, config, drawingState, + mediaIsVideo, receiveAnnotation, resetStateAfterSave, state, windowId, + }) { /** * Validate form and save annotation