LT-352: Fixing Non-Target dialog positioning

Packages/ohif-core/client/components/bootstrap/dialog/form.js

@@ -43,10 +43,19 @@ Template.dialogForm.onCreated(() => {
 Template.dialogForm.onRendered(() => {
     const instance = Template.instance();
 
-    // Create the bootstrap modal
+    // Allow options ovewrite
-    const $modal = instance.$('.modal');
+    const modalOptions = _.extend({
-    $modal.modal({
         backdrop: 'static',
         keyboard: false
-    });
+    }, instance.data.modalOptions);
+
+    const $modal = instance.$('.modal');
+
+    // Create the bootstrap modal
+    $modal.modal(modalOptions);
+
+    const position = instance.data.position;
+    if (position) {
+        OHIF.ui.repositionDialog($modal, position.x, position.y);
+    }
 });

Packages/ohif-core/client/ui/dialog/spatial.js

@@ -0,0 +1,30 @@
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.ui.repositionDialog = ($modal, x, y) => {
+    const $dialog = $modal.find('.modal-dialog');
+
+    // Remove the margins and set its position as fixed
+    $dialog.css({
+        margin: 0,
+        position: 'fixed'
+    }).bounded();
+
+    // Temporarily show the modal
+    const isVisible = $modal.is(':visible');
+    $modal.show();
+
+    // Calculate the center position on screen
+    const height = $dialog.outerHeight();
+    const width = $dialog.outerWidth();
+    const left = parseInt(x - (width / 2));
+    const top = parseInt(y - (height / 2));
+
+    // Reposition the modal and readjust it to the window boundaries if needed
+    $dialog.css({
+        left,
+        top
+    }).trigger('spatialChanged');
+
+    // Switch the modal to its previous visibility state
+    $modal.toggle(isVisible);
+};

Packages/ohif-core/client/ui/index.js

@@ -1,5 +1,6 @@
 import './bounded/bounded.js';
 import './dialog/form.js';
+import './dialog/spatial.js';
 import './draggable/draggable.js';
 import './dropdown/form.js';
 import './resizable/resizable.js';

Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js

@@ -19,10 +19,19 @@ import { OHIF } from 'meteor/ohif:core';
         ESC: 27
     };
 
+    const getPosition = eventData => {
+        const event = eventData.event;
+        return {
+            x: event.clientX,
+            y: event.clientY
+        };
+    };
+
     // Define a callback to get your text annotation
     // This could be used, e.g. to open a modal
     function getMeasurementLocationCallback(measurementData, eventData) {
         OHIF.ui.showFormDialog('dialogNonTargetMeasurement', {
+            position: getPosition(eventData),
             title: 'Select Lesion Location',
             element: eventData.element,
             measurementData
@@ -31,6 +40,7 @@ import { OHIF } from 'meteor/ohif:core';
 
     function changeMeasurementLocationCallback(measurementData, eventData) {
         OHIF.ui.showFormDialog('dialogNonTargetMeasurement', {
+            position: getPosition(eventData),
             title: 'Change Lesion Location',
             element: eventData.element,
             measurementData,

Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js

@@ -39,6 +39,7 @@ Template.dialogNonTargetMeasurement.onCreated(() => {
         // Confirm the deletion of the current non-target measurement
         remove() {
             const dialogSettings = {
+                position: instance.data.position,
                 title: 'Remove Measurement',
                 message: 'Are you sure you want to remove this Non-Target measurement?'
             };
@@ -125,5 +126,4 @@ Template.dialogNonTargetMeasurement.onRendered(() => {
             $set: { location: formData.location }
         });
     });
-
 });