@d3plus/core 3.0.12 → 3.0.14

package/es/src/components/Axis.js

@@ -147,7 +147,7 @@ import { timeFormat, timeFormatDefaultLocale } from "d3-time-format";
 import * as scales from "d3-scale";
 import { select } from "d3-selection";
 import { transition } from "d3-transition";
-import pkg from 'open-color/open-color.js';
+import pkg from "open-color/open-color.js";
 var openColor = pkg.theme;
 import { colorDefaults } from "@d3plus/color";
 import { assign, attrize, date, elem, rtl as detectRTL } from "@d3plus/dom";
@@ -176,6 +176,7 @@ var fixFloat = function(d) {
     if (zeroMatch) return +"".concat(zeroMatch[1]).concat(+zeroMatch[2]);
     return d;
 };
+var maxTimezoneOffset = 1000 * 60 * 60 * 26;
 /**
  * Calculates ticks from a given scale (negative and/or positive)
  * @param {scale} scale A d3-scale object
@@ -220,9 +221,15 @@ var fixFloat = function(d) {
  */ function calculateTicks(scale) {
     var minorTicks = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
     var ticks = [];
-    var step = calculateStep.bind(this)(scale, minorTicks);
-    var domain = scale.domain();
+    var scaleClone = scale.copy();
+    if (this._scale === "time" && this._data.length) {
+        var newDomain = extent(this._data);
+        var range = newDomain.map(scale);
+        scaleClone.domain(newDomain).range(range);
+    }
+    var domain = scaleClone.domain();
     var inverted = domain[1] < domain[0];
+    var step = calculateStep.bind(this)(scaleClone, minorTicks);
     if (!minorTicks && this._scale === "log") {
         var roundDomain = domain.map(function(d) {
             return Math.log10(d) % 1 === 0 ? d : (inverted ? ceilPow : floorPow)(d);
@@ -235,7 +242,7 @@ var fixFloat = function(d) {
             ].includes(d) || Math.abs(d) < 1 ? 1 : Math.log10(Math.abs(d)));
         });
         var powMod = Math.ceil((Math.abs(powers[1] - powers[0]) + 1) / (step * 0.65));
-        ticks = powMod <= 1 && powers[0] === powers[1] || invertedRound !== inverted ? scale.ticks(step).filter(function(d) {
+        ticks = powMod <= 1 && powers[0] === powers[1] || invertedRound !== inverted ? scaleClone.ticks(step).filter(function(d) {
             return +"".concat(d).replace("0.", "") % 2 === 0;
         }) : d3Range(powers[0], powers[1], powers[1] < powers[0] ? -1 : 1).concat([
             powers[1]
@@ -245,7 +252,7 @@ var fixFloat = function(d) {
             return +"".concat((isNegative(d) ? -1 : 1) * (d ? Math.pow(10, Math.abs(d)) : Math.sign(1 / d) > 0 ? 1 : -1)).replace(/9+/g, "1");
         });
     } else {
-        ticks = scale.ticks(step);
+        ticks = scaleClone.ticks(step);
         if (!minorTicks && ![
             "log",
             "time"
@@ -261,6 +268,16 @@ var fixFloat = function(d) {
             });
         }
     }
+    // for time scale, if data array has been provided, filter out ticks that are not in the array
+    if (this._scale === "time" && this._data.length) {
+        var dataNumbers = this._data.map(Number);
+        ticks = ticks.filter(function(t) {
+            var tn = +t;
+            return dataNumbers.find(function(n) {
+                return n >= tn - maxTimezoneOffset && n <= tn + maxTimezoneOffset;
+            });
+        });
+    }
     // forces min/max into ticks, if not present
     if (!this._d3ScaleNegative || isNegative(domain[inverted ? 1 : 0]) === ticks.some(function(d) {
         return isNegative(d);
@@ -276,13 +293,6 @@ var fixFloat = function(d) {
             ticks.push(domain[1]);
         }
     }
-    // for time scale, if data array has been provided, filter out ticks that are not in the array
-    if (this._scale === "time" && this._data.length) {
-        var dataNumbers = this._data.map(Number);
-        ticks = ticks.filter(function(t) {
-            return dataNumbers.includes(+t);
-        });
-    }
     return ticks;
 }
 var Axis = /*#__PURE__*/ function(BaseClass) {
@@ -294,7 +304,7 @@ var Axis = /*#__PURE__*/ function(BaseClass) {
         _this = _call_super(this, Axis);
         _this._align = "middle";
         _this._barConfig = {
-            "stroke": openColor.colors.gray[600],
+            stroke: openColor.colors.gray[600],
             "stroke-width": 1
         };
         _this._data = [];
@@ -304,7 +314,7 @@ var Axis = /*#__PURE__*/ function(BaseClass) {
         ];
         _this._duration = 600;
         _this._gridConfig = {
-            "stroke": colorDefaults.light,
+            stroke: colorDefaults.light,
             "stroke-width": 1
         };
         _this._gridLog = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3plus/core",
-  "version": "3.0.12",
+  "version": "3.0.14",
   "description": "Data visualization made easy. A javascript library that extends the popular D3.js to enable fast and beautiful visualizations.",
   "license": "MIT",
   "type": "module",
@@ -34,13 +34,13 @@
     "test": "eslint index.js src/**/*.js && eslint --global=it test && mocha 'test/**/*-test.js'"
   },
   "dependencies": {
-    "@d3plus/color": "3.0.12",
-    "@d3plus/data": "3.0.12",
-    "@d3plus/dom": "3.0.12",
-    "@d3plus/format": "3.0.12",
-    "@d3plus/locales": "3.0.12",
-    "@d3plus/math": "3.0.12",
-    "@d3plus/text": "3.0.12",
+    "@d3plus/color": "3.0.14",
+    "@d3plus/data": "3.0.14",
+    "@d3plus/dom": "3.0.14",
+    "@d3plus/format": "3.0.14",
+    "@d3plus/locales": "3.0.14",
+    "@d3plus/math": "3.0.14",
+    "@d3plus/text": "3.0.14",
     "@popperjs/core": "^2.11.8",
     "d3-array": "^3.2.4",
     "d3-brush": "^3.0.0",