Merge pull request #270 from AUS-DOH-Safety-and-Quality/interactions-…

…multi-selection Add support for AllowInteractions and MultiSelection APIs
AUS-DOH-Safety-and-Quality · Apr 1, 2024 · 1b09830 · 1b09830
2 parents 03da158 + e0ab1d8
commit 1b09830
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/capabilities.json b/capabilities.json
@@ -1,6 +1,7 @@
 {
   "supportsHighlight": true,
   "supportsKeyboardFocus": true,
+  "supportsMultiVisualSelection": true,
   "sorting": {
     "implicit": { "clauses": [{ "role": "key", "direction": 1 }] }
   },

diff --git a/src/D3 Plotting Functions/drawDots.ts b/src/D3 Plotting Functions/drawDots.ts
@@ -21,6 +21,7 @@ export default function drawDots(selection: svgBaseType, visualObj: Visual) {
         return (between(d.value, ylower, yupper) && between(d.x, xlower, xupper)) ? d.aesthetics.colour : "#FFFFFF";
       })
       .on("click", (event, d: plotData) => {
+        if (visualObj.host.hostCapabilities.allowInteractions) {
           if (visualObj.viewModel.inputSettings.settings.spc.split_on_click) {
             // Identify whether limits are already split at datapoint, and undo if so
             const xIndex: number = visualObj.viewModel.splitIndexes.indexOf(d.x)
@@ -49,28 +50,29 @@ export default function drawDots(selection: svgBaseType, visualObj: Visual) {
                 .then(() => { selection.call(updateHighlighting, visualObj); });
           }
           event.stopPropagation();
-        })
-        // Display tooltip content on mouseover
-        .on("mouseover", (event, d: plotData) => {
-          // Get screen coordinates of mouse pointer, tooltip will
-          //   be displayed at these coordinates
-          const x = event.pageX;
-          const y = event.pageY;
+        }
+      })
+      // Display tooltip content on mouseover
+      .on("mouseover", (event, d: plotData) => {
+        // Get screen coordinates of mouse pointer, tooltip will
+        //   be displayed at these coordinates
+        const x = event.pageX;
+        const y = event.pageY;
 
-          visualObj.host.tooltipService.show({
-            dataItems: d.tooltip,
-            identities: [d.identity],
-            coordinates: [x, y],
-            isTouchEvent: false
-          });
-        })
-        // Hide tooltip when mouse moves out of dot
-        .on("mouseout", () => {
-          visualObj.host.tooltipService.hide({
-            immediately: true,
-            isTouchEvent: false
-          })
+        visualObj.host.tooltipService.show({
+          dataItems: d.tooltip,
+          identities: [d.identity],
+          coordinates: [x, y],
+          isTouchEvent: false
         });
+      })
+      // Hide tooltip when mouse moves out of dot
+      .on("mouseout", () => {
+        visualObj.host.tooltipService.hide({
+          immediately: true,
+          isTouchEvent: false
+        })
+      });
 
     selection.on('click', () => {
       visualObj.selectionManager.clear();