@jrkasprzyk/parcoord-es 3.0.1 → 3.0.2

package/dist/parcoords.esm.js

@@ -265,10 +265,12 @@ var brushFor$1 = function brushFor(state, config, pc, events, brushGroup) {
     }
     var brushRangeMax = config.dimensions[axis].type === 'string' ? config.dimensions[axis].yscale.range()[config.dimensions[axis].yscale.range().length - 1] : config.dimensions[axis].yscale.range()[0];
     var _brush = brushY(_selector).extent([[-15, 0], [15, brushRangeMax]]);
-    var convertBrushArguments = function convertBrushArguments(args) {
-      var args_array = Array.prototype.slice.call(args);
-      var axis = args_array[0];
-      var raw = brushSelection(args_array[2][0]) || [];
+
+    // d3 v6+ invokes listeners as (event, datum); the v5 (datum, index, nodes)
+    // layout this used to slice out of `arguments` no longer exists. The axis name
+    // is already in scope above, and the node is the listener's `this`.
+    var convertBrushArguments = function convertBrushArguments(node) {
+      var raw = brushSelection(node) || [];
 
       // handle hidden axes which will not have a yscale
       var yscale = null;
@@ -279,8 +281,8 @@ var brushFor$1 = function brushFor(state, config, pc, events, brushGroup) {
       // ordinal scales do not have invert
       var scaled = invertByScale(raw, yscale);
       return {
-        axis: args_array[0],
-        node: args_array[2][0],
+        axis: axis,
+        node: node,
         selection: {
           raw: raw,
           scaled: scaled
@@ -288,17 +290,19 @@ var brushFor$1 = function brushFor(state, config, pc, events, brushGroup) {
       };
     };
     _brush.on('start', function (event) {
-      if (event.sourceEvent !== null) {
-        events.call('brushstart', pc, config.brushed, convertBrushArguments(arguments));
+      // d3 v6+ leaves sourceEvent undefined for a programmatic brush.move,
+      // where v5 set it to null; `!=` catches both.
+      if (event.sourceEvent != null) {
+        events.call('brushstart', pc, config.brushed, convertBrushArguments(this));
         if (typeof event.sourceEvent.stopPropagation === 'function') {
           event.sourceEvent.stopPropagation();
         }
       }
     }).on('brush', function () {
-      brushUpdated$1(config, pc, events, convertBrushArguments(arguments))(selected$4(state, config, brushGroup)());
+      brushUpdated$1(config, pc, events, convertBrushArguments(this))(selected$4(state, config, brushGroup)());
     }).on('end', function () {
       brushUpdated$1(config, pc, events)(selected$4(state, config, brushGroup)());
-      events.call('brushend', pc, config.brushed, convertBrushArguments(arguments));
+      events.call('brushend', pc, config.brushed, convertBrushArguments(this));
     });
     state.brushes[axis] = _brush;
     state.brushNodes[axis] = _selector.node();
@@ -715,7 +719,9 @@ var _newBrush = function newBrush(state, config, pc, events, brushGroup) {
       }];
     }
     brush.on('start', function (event) {
-      if (event.sourceEvent !== null) {
+      // d3 v6+ leaves sourceEvent undefined for a programmatic brush.move,
+      // where v5 set it to null; `!=` catches both.
+      if (event.sourceEvent != null) {
         events.call('brushstart', pc, config.brushed);
         if (typeof event.sourceEvent.stopPropagation === 'function') {
           event.sourceEvent.stopPropagation();
@@ -2023,11 +2029,16 @@ var brushable = function brushable(config, pc, flags) {
       if (config.dimensions[d] !== undefined) {
         config.dimensions[d]['brush'] = brushY(select(this)).extent([[-15, 0], [15, config.dimensions[d].yscale.range()[0]]]);
         select(this).call(config.dimensions[d]['brush'].on('start', function (event) {
-          if (event.sourceEvent !== null && !event.sourceEvent.ctrlKey) {
+          // `!=` also catches the undefined d3 v6+ uses for a
+          // programmatic brush.move, which `!== null` let through
+          // straight into the .ctrlKey dereference below.
+          if (event.sourceEvent != null && !event.sourceEvent.ctrlKey) {
             pc.brushReset();
           }
         }).on('brush', function (event) {
-          if (!event.sourceEvent.ctrlKey) {
+          // A programmatic brush.move leaves sourceEvent undefined in
+          // d3 v6+; treat that as "no Ctrl key" rather than dereferencing.
+          if (!(event.sourceEvent && event.sourceEvent.ctrlKey)) {
             pc.brush();
           }
         }).on('end', function (event) {
@@ -2035,7 +2046,7 @@ var brushable = function brushable(config, pc, flags) {
           // store important brush information and
           // the html element of the selection,
           // to make a dummy selection element
-          if (event.sourceEvent.ctrlKey) {
+          if (event.sourceEvent && event.sourceEvent.ctrlKey) {
             var html = select(this).select('.selection').nodes()[0].outerHTML;
             html = html.replace('class="selection"', 'class="selection dummy' + ' selection-' + config.brushes.length + '"');
             var dat = select(this).nodes()[0].__data__;
@@ -3743,7 +3754,7 @@ var scale = function scale(config, pc) {
   };
 };
 
-const version = "3.0.1";
+const version = "3.0.2";
 
 var DefaultConfig = {
   data: [],