Merge pull request #137 from RhoInc/dev-v2.5.5

Dev v2.5.5

package.json

@@ -1,14 +1,14 @@
 {
   "name": "safety-outlier-explorer",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "Chart showing participant trajectories of lab measures, vital signs and other related measures in clinical trials.",
   "module": "./src/index.js",
   "main": "./safetyOutlierExplorer.js",
   "author": "Rho, Inc.",
   "license": "MIT",
   "dependencies": {
     "d3": "^3",
-    "webcharts": "^1.11.5"
+    "webcharts": "^1.11.6"
   },
   "scripts": {
     "build": "npm audit fix && npm run bundle && npm run format && npm run build-wiki && npm run check-settings-schema",
@@ -28,8 +28,8 @@
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-preset-env": "^1.7.0",
     "babel-register": "^6.26.0",
-    "prettier": "^1.17.1",
-    "rollup": "^1.1.2",
+    "prettier": "^1.18.2",
+    "rollup": "^1.19.4",
     "rollup-plugin-babel": "^3.0.7"
   }
 }

safetyOutlierExplorer.js

@@ -859,6 +859,12 @@
         updateNormalRangeControl.call(this);
     }
 
+    function initCustomEvents() {
+        var chart = this;
+        chart.participantsSelected = [];
+        chart.events.participantsSelected = new CustomEvent('participantsSelected');
+    }
+
     function onInit() {
         // 1. Count number of unique participant IDs in data prior to data cleaning.
         countParticipants.call(this);
@@ -874,6 +880,9 @@
 
         // 5. Check controls.
         checkControls.call(this);
+
+        // 6. Initialize custom events
+        initCustomEvents.call(this);
     }
 
     function identifyControls() {
@@ -1587,6 +1596,11 @@
         });
         if (this.multiples.chart) this.multiples.chart.destroy();
         delete this.selected_id;
+
+        //Trigger participantsSelected event
+        this.participantsSelected = [];
+        this.events.participantsSelected.data = this.participantsSelected;
+        this.wrap.node().dispatchEvent(this.events.participantsSelected);
     }
 
     function addOverlayEventListener() {
@@ -2009,6 +2023,11 @@
                 context.selected_id = context.multiples.id;
                 highlightSelected.call(context);
                 smallMultiples.call(context);
+
+                //Trigger participantsSelected event
+                context.participantsSelected = [context.selected_id];
+                context.events.participantsSelected.data = context.participantsSelected;
+                context.wrap.node().dispatchEvent(context.events.participantsSelected);
             });
     }
 
@@ -2060,6 +2079,11 @@
                 highlightSelected.call(_this);
                 reorderMarks.call(_this);
                 smallMultiples.call(_this);
+
+                //Trigger participantsSelected event
+                _this.participantsSelected = [_this.selected_id];
+                _this.events.participantsSelected.data = _this.participantsSelected;
+                _this.wrap.node().dispatchEvent(_this.events.participantsSelected);
             });
     }
 
@@ -2085,6 +2109,11 @@
                 highlightSelected.call(_this);
                 reorderMarks.call(_this);
                 smallMultiples.call(_this);
+
+                //Trigger participantsSelected event
+                _this.participantsSelected = [_this.selected_id];
+                _this.events.participantsSelected.data = _this.participantsSelected;
+                _this.wrap.node().dispatchEvent(_this.events.participantsSelected);
             });
     }
 

src/callbacks/onDraw/updateParticipantCount.js

@@ -14,8 +14,6 @@ export default function updateParticipantCount() {
 
     //update the annotation
     this.participantCount.container.text(
-        `\n${this.participantCount.n} of ${this.participantCount.N} participant(s) shown (${
-            this.participantCount.percentage
-        })`
+        `\n${this.participantCount.n} of ${this.participantCount.N} participant(s) shown (${this.participantCount.percentage})`
     );
 }

src/callbacks/onInit.js

@@ -3,6 +3,7 @@ import cleanData from './onInit/cleanData';
 import addVariables from './onInit/addVariables';
 import defineSets from './onInit/defineSets';
 import checkControls from './onInit/checkControls';
+import initCustomEvents from './onInit/initCustomEvents';
 
 export default function onInit() {
     // 1. Count number of unique participant IDs in data prior to data cleaning.
@@ -19,4 +20,7 @@ export default function onInit() {
 
     // 5. Check controls.
     checkControls.call(this);
+
+    // 6. Initialize custom events
+    initCustomEvents.call(this);
 }