@fishawack/lab-d3 - npm Package Compare versions

Comparing version 2.1.7 to 2.1.8

package.json

 {
   "name": "@fishawack/lab-d3",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Abstract layer built on top of d3",
@@ -17,3 +17,3 @@ "vars": {
     "prepublishOnly": "rimraf src && mkdir src && npm test",
-    "pretest": "rimraf src && mkdir src && babel _Build/js/ --out-dir src/ --ignore \"_Build/js/script.js\",\"_Build/js/archive/**/*.js\",\"_Build/js/generated/**/*.js\",\"_Build/js/libs/**/*.js\""
+    "pretest": "rimraf src && mkdir src && babel _Build/js/ --out-dir src/ --ignore \"_Build/js/script.js\",\"_Build/js/archive/**/*.js\",\"_Build/js/generated/**/*.js\",\"_Build/js/libs/archive/**/*.js\",\"_Build/js/libs/*.js\""
   },
@@ -35,3 +35,3 @@ "license": "BSD-3-Clause",
     "@babel/preset-env": "7.3.1",
-    "@fishawack/config-grunt": "4.1.5",
+    "@fishawack/config-grunt": "4.1.13",
     "@fishawack/lab-ui": "9.0.4",
@@ -38,0 +38,0 @@ "breakpoint-sass": "2.7.1",

src/charts/brush.js

@@ -34,3 +34,4 @@ "use strict";
     handles: false,
-    trigger: 'brush end'
+    trigger: 'brush end',
+    clickRecenter: false
   });
@@ -50,4 +51,3 @@ Shared.extend(this.store, {
       att = local.att,
-      data = local.data,
-      chart = local.chart;
+      data = local.data;
   var s = currentEvent.selection;
@@ -98,2 +98,18 @@
 
+var brushcentered = function brushcentered(e, b, node) {
+  var local = this.store,
+      att = local.att,
+      data = local.data;
+  /* If overlay selected and att.clickRecenter true then center selection on click */
+
+  if (d3.select(currentEvent.target).classed("overlay")) {
+    var dx = local.scale.x(att.parseDate(data[0].value[1])) - local.scale.x(att.parseDate(data[0].value[0])),
+        cx = d3.mouse(node[0])[0],
+        x0 = cx - dx / 2,
+        x1 = cx + dx / 2,
+        range = x1 > local.width ? [local.width - dx, local.width] : x0 < 0 ? [0, dx] : [x0, x1];
+    local.draw.select(".brush").call(local.brush.move, range);
+  }
+};
+
 Brush.prototype.init = function () {
@@ -105,4 +121,4 @@ var local = this.store,
   Chart.prototype.init.call(this);
-  local.brush = d3.brushX().on('brush end', brushed.bind(this)).extent([[0, 0], [local.width, local.height]]);
-  var gBrush = local.draw.append("g").attr("class", "brush").call(local.brush);
+  local.brush = d3.brushX().extent([[0, 0], [0, 0]]).on('brush end', brushed.bind(this));
+  var gBrush = local.draw.append("g").call(local.brush).attr("class", "brush").on("mousedown touchstart", brushcentered.bind(this));
   local.handle = gBrush.selectAll(".handle--custom").data([{
@@ -160,2 +176,5 @@ type: "w"
     range = local.scale.x.range();
+    local.data = [{
+      value: [att.formatDate(local.scale.x.invert(range[0])), att.formatDate(local.scale.x.invert(range[1]))]
+    }];
   }
@@ -167,2 +186,8 @@
 
+  if (att.clickRecenter) {
+    temp.selectAll(".overlay").each(function (d) {
+      d.type = "selection";
+    });
+  }
+
   if (att.transitionSpeed || att.delaySpeed) {
@@ -169,0 +194,0 @@ temp = temp.transition().ease(d3['ease' + att.transitionType]).delay(att.delaySpeed).duration(att.transitionSpeed);

src/charts/statemap.js

@@ -7,4 +7,4 @@ "use strict";
 import Chart_Map from '../chart_map';
-import Data_State from '../data/data_state';
-import geoAlbersUsaPr from '../data/geoAlbersUsaPr';
+import Data_State from '../libs/data/data_state';
+import geoAlbersUsaPr from '../libs/data/geoAlbersUsaPr';
 
@@ -11,0 +11,0 @@ var d3 = _extends({}, require("d3-selection"));

src/charts/worldmap.js

@@ -7,3 +7,3 @@ "use strict";
 import Chart_Map from '../chart_map';
-import Data_World from '../data/data_world';
+import Data_World from '../libs/data/data_world';
 
@@ -10,0 +10,0 @@ var d3 = _extends({}, require("d3-selection"), require("d3-geo"));

No alert changes

Improved metrics

Total package byte prevSize

542736

increased by0.18%

Lines of code

5350

increased by0.41%

No dependency changes