victory-core 17.2.6 → 17.2.7

package/es/victory-util/domain.js

@@ -68,27 +68,36 @@ export default {
    * @returns {Array} the domain for the given axis
    */
   getDomainWithZero: function (props, axis) {
-    var _this = this;
-
     var propsDomain = this.getDomainFromProps(props, axis);
     if (propsDomain) {
       return this.cleanDomain(this.padDomain(propsDomain, props, axis), props, axis);
     }
     var horizontal = props.horizontal;
 
-    var ensureZero = function (domain) {
-      var isDependent = axis === "y" && !horizontal || axis === "x" && horizontal;
-      var min = Collection.getMinValue(domain, 0);
-      var max = Collection.getMaxValue(domain, 0);
-      var zeroDomain = isDependent ? [min, max] : domain;
-      return _this.padDomain(zeroDomain, props, axis);
+    var ensureZero = function (domain, dataset) {
+      var currentAxis = Helpers.getCurrentAxis(axis, horizontal);
+      if (currentAxis === "x") {
+        return domain;
+      } else if (!dataset) {
+        return [Collection.getMinValue(domain, 0), Collection.getMaxValue(domain, 0)];
+      }
+      var flatData = _flatten(dataset);
+      var minData = flatData.map(function (datum) {
+        return datum["_" + currentAxis + "0"] || 0;
+      });
+      var maxData = flatData.map(function (datum) {
+        return datum["_" + currentAxis + "1"] || datum["_" + currentAxis] || 0;
+      });
+      var min = Collection.getMinValue([].concat(_toConsumableArray(domain), _toConsumableArray(minData)));
+      var max = Collection.getMaxValue([].concat(_toConsumableArray(domain), _toConsumableArray(maxData)));
+      return [min, max];
     };
     var categoryDomain = this.getDomainFromCategories(props, axis);
     if (categoryDomain) {
       return this.cleanDomain(this.padDomain(ensureZero(categoryDomain), props, axis), props, axis);
     }
     var dataset = Data.getData(props);
-    var domain = ensureZero(this.getDomainFromData(props, axis, dataset));
+    var domain = ensureZero(this.getDomainFromData(props, axis, dataset), dataset);
     return this.cleanDomain(this.padDomain(domain, props, axis), props, axis);
   },
 
@@ -118,18 +127,21 @@ export default {
    */
   getDomainFromData: function (props, axis, dataset) {
     var currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-    var allData = _flatten(dataset).map(function (datum) {
-      return datum["_" + currentAxis];
+    var flatData = _flatten(dataset);
+    var allData = flatData.map(function (datum) {
+      return typeof datum["_" + currentAxis + "1"] === "undefined" ? datum["_" + currentAxis] : datum["_" + currentAxis + "1"];
+    });
+    var allMinData = flatData.map(function (datum) {
+      return typeof datum["_" + currentAxis + "0"] === "undefined" ? datum["_" + currentAxis] : datum["_" + currentAxis + "0"];
     });
-
     if (allData.length < 1) {
       return Scale.getBaseScale(props, axis).domain();
     }
 
-    var min = Collection.getMinValue(allData);
+    var min = Collection.getMinValue(allMinData);
     var max = Collection.getMaxValue(allData);
     var domain = void 0;
-    if (min === max) {
+    if (+min === +max) {
       domain = this.getSinglePointDomain(max);
     } else {
       domain = [min, max];
@@ -140,10 +152,11 @@ export default {
   getSinglePointDomain: function (val) {
     // d3-scale does not properly resolve very small differences.
     // eslint-disable-next-line no-magic-numbers
-    var verySmallNumber = Math.pow(10, -15);
-    var adjustedMin = val instanceof Date ? new Date(val - 1) : val - verySmallNumber;
-    var adjustedMax = val instanceof Date ? new Date(val + 1) : val + verySmallNumber;
-    return [adjustedMin, adjustedMax];
+    var verySmallNumber = Math.pow(10, -10);
+    var verySmallDate = 1;
+    var min = val instanceof Date ? new Date(+val - verySmallDate) : val - verySmallNumber;
+    var max = val instanceof Date ? new Date(+val + verySmallDate) : val + verySmallNumber;
+    return [min, max];
   },
   getSymmetricDomain: function (domain, data) {
     var processedData = _sortedUniq(data.sort(function (a, b) {
@@ -234,8 +247,8 @@ export default {
     // use greatest min / max
     var domainMin = cumulativeMin < 0 ? cumulativeMin : Collection.getMinValue(globalDomain);
     var domainMax = Collection.getMaxValue.apply(Collection, [globalDomain].concat(_toConsumableArray(cumulativeMaxArray)));
-    if (domainMin === domainMax) {
-      return this.getSinglePointDomain(domainMax);
+    if (+domainMin === +domainMax) {
+      return this.getSinglePointDomain(domainMin);
     }
     return [domainMin, domainMax];
   },

package/lib/victory-util/domain.js

@@ -96,27 +96,36 @@ exports.default = {
    * @returns {Array} the domain for the given axis
    */
   getDomainWithZero: function (props, axis) {
-    var _this = this;
-
     var propsDomain = this.getDomainFromProps(props, axis);
     if (propsDomain) {
       return this.cleanDomain(this.padDomain(propsDomain, props, axis), props, axis);
     }
     var horizontal = props.horizontal;
 
-    var ensureZero = function (domain) {
-      var isDependent = axis === "y" && !horizontal || axis === "x" && horizontal;
-      var min = _collection2.default.getMinValue(domain, 0);
-      var max = _collection2.default.getMaxValue(domain, 0);
-      var zeroDomain = isDependent ? [min, max] : domain;
-      return _this.padDomain(zeroDomain, props, axis);
+    var ensureZero = function (domain, dataset) {
+      var currentAxis = _helpers2.default.getCurrentAxis(axis, horizontal);
+      if (currentAxis === "x") {
+        return domain;
+      } else if (!dataset) {
+        return [_collection2.default.getMinValue(domain, 0), _collection2.default.getMaxValue(domain, 0)];
+      }
+      var flatData = (0, _flatten3.default)(dataset);
+      var minData = flatData.map(function (datum) {
+        return datum["_" + currentAxis + "0"] || 0;
+      });
+      var maxData = flatData.map(function (datum) {
+        return datum["_" + currentAxis + "1"] || datum["_" + currentAxis] || 0;
+      });
+      var min = _collection2.default.getMinValue([].concat(_toConsumableArray(domain), _toConsumableArray(minData)));
+      var max = _collection2.default.getMaxValue([].concat(_toConsumableArray(domain), _toConsumableArray(maxData)));
+      return [min, max];
     };
     var categoryDomain = this.getDomainFromCategories(props, axis);
     if (categoryDomain) {
       return this.cleanDomain(this.padDomain(ensureZero(categoryDomain), props, axis), props, axis);
     }
     var dataset = _data2.default.getData(props);
-    var domain = ensureZero(this.getDomainFromData(props, axis, dataset));
+    var domain = ensureZero(this.getDomainFromData(props, axis, dataset), dataset);
     return this.cleanDomain(this.padDomain(domain, props, axis), props, axis);
   },
 
@@ -146,18 +155,21 @@ exports.default = {
    */
   getDomainFromData: function (props, axis, dataset) {
     var currentAxis = _helpers2.default.getCurrentAxis(axis, props.horizontal);
-    var allData = (0, _flatten3.default)(dataset).map(function (datum) {
-      return datum["_" + currentAxis];
+    var flatData = (0, _flatten3.default)(dataset);
+    var allData = flatData.map(function (datum) {
+      return typeof datum["_" + currentAxis + "1"] === "undefined" ? datum["_" + currentAxis] : datum["_" + currentAxis + "1"];
+    });
+    var allMinData = flatData.map(function (datum) {
+      return typeof datum["_" + currentAxis + "0"] === "undefined" ? datum["_" + currentAxis] : datum["_" + currentAxis + "0"];
     });
-
     if (allData.length < 1) {
       return _scale2.default.getBaseScale(props, axis).domain();
     }
 
-    var min = _collection2.default.getMinValue(allData);
+    var min = _collection2.default.getMinValue(allMinData);
     var max = _collection2.default.getMaxValue(allData);
     var domain = void 0;
-    if (min === max) {
+    if (+min === +max) {
       domain = this.getSinglePointDomain(max);
     } else {
       domain = [min, max];
@@ -168,10 +180,11 @@ exports.default = {
   getSinglePointDomain: function (val) {
     // d3-scale does not properly resolve very small differences.
     // eslint-disable-next-line no-magic-numbers
-    var verySmallNumber = Math.pow(10, -15);
-    var adjustedMin = val instanceof Date ? new Date(val - 1) : val - verySmallNumber;
-    var adjustedMax = val instanceof Date ? new Date(val + 1) : val + verySmallNumber;
-    return [adjustedMin, adjustedMax];
+    var verySmallNumber = Math.pow(10, -10);
+    var verySmallDate = 1;
+    var min = val instanceof Date ? new Date(+val - verySmallDate) : val - verySmallNumber;
+    var max = val instanceof Date ? new Date(+val + verySmallDate) : val + verySmallNumber;
+    return [min, max];
   },
   getSymmetricDomain: function (domain, data) {
     var processedData = (0, _sortedUniq3.default)(data.sort(function (a, b) {
@@ -262,8 +275,8 @@ exports.default = {
     // use greatest min / max
     var domainMin = cumulativeMin < 0 ? cumulativeMin : _collection2.default.getMinValue(globalDomain);
     var domainMax = _collection2.default.getMaxValue.apply(_collection2.default, [globalDomain].concat(_toConsumableArray(cumulativeMaxArray)));
-    if (domainMin === domainMax) {
-      return this.getSinglePointDomain(domainMax);
+    if (+domainMin === +domainMax) {
+      return this.getSinglePointDomain(domainMin);
     }
     return [domainMin, domainMax];
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "17.2.6",
+  "version": "17.2.7",
   "description": "Victory Core",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/victory-util/domain.js

@@ -66,19 +66,28 @@ export default {
       return this.cleanDomain(this.padDomain(propsDomain, props, axis), props, axis);
     }
     const { horizontal } = props;
-    const ensureZero = (domain) => {
-      const isDependent = (axis === "y" && !horizontal) || (axis === "x" && horizontal);
-      const min = Collection.getMinValue(domain, 0);
-      const max = Collection.getMaxValue(domain, 0);
-      const zeroDomain = isDependent ? [min, max] : domain;
-      return this.padDomain(zeroDomain, props, axis);
+    const ensureZero = (domain, dataset) => {
+      const currentAxis = Helpers.getCurrentAxis(axis, horizontal);
+      if (currentAxis === "x") {
+        return domain;
+      } else if (!dataset) {
+        return [Collection.getMinValue(domain, 0), Collection.getMaxValue(domain, 0)];
+      }
+      const flatData = flatten(dataset);
+      const minData = flatData.map((datum) => datum[`_${currentAxis}0`] || 0);
+      const maxData = flatData.map((datum) => {
+        return datum[`_${currentAxis}1`] || datum[`_${currentAxis}`] || 0;
+      });
+      const min = Collection.getMinValue([...domain, ...minData]);
+      const max = Collection.getMaxValue([...domain, ...maxData]);
+      return [min, max];
     };
     const categoryDomain = this.getDomainFromCategories(props, axis);
     if (categoryDomain) {
       return this.cleanDomain(this.padDomain(ensureZero(categoryDomain), props, axis), props, axis);
     }
     const dataset = Data.getData(props);
-    const domain = ensureZero(this.getDomainFromData(props, axis, dataset));
+    const domain = ensureZero(this.getDomainFromData(props, axis, dataset), dataset);
     return this.cleanDomain(this.padDomain(domain, props, axis), props, axis);
   },
 
@@ -106,16 +115,23 @@ export default {
    */
   getDomainFromData(props, axis, dataset) {
     const currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-    const allData = flatten(dataset).map((datum) => datum[`_${currentAxis}`]);
-
+    const flatData = flatten(dataset);
+    const allData = flatData.map((datum) => {
+      return typeof datum[`_${currentAxis}1`] === "undefined" ?
+        datum[`_${currentAxis}`] : datum[`_${currentAxis}1`];
+    });
+    const allMinData = flatData.map((datum) => {
+      return typeof datum[`_${currentAxis}0`] === "undefined" ?
+        datum[`_${currentAxis}`] : datum[`_${currentAxis}0`];
+    });
     if (allData.length < 1) {
       return Scale.getBaseScale(props, axis).domain();
     }
 
-    const min = Collection.getMinValue(allData);
+    const min = Collection.getMinValue(allMinData);
     const max = Collection.getMaxValue(allData);
     let domain;
-    if (min === max) {
+    if (+min === +max) {
       domain = this.getSinglePointDomain(max);
     } else {
       domain = [min, max];
@@ -128,10 +144,11 @@ export default {
   getSinglePointDomain(val) {
     // d3-scale does not properly resolve very small differences.
     // eslint-disable-next-line no-magic-numbers
-    const verySmallNumber = Math.pow(10, -15);
-    const adjustedMin = val instanceof Date ? new Date(val - 1) : val - verySmallNumber;
-    const adjustedMax = val instanceof Date ? new Date(val + 1) : val + verySmallNumber;
-    return [adjustedMin, adjustedMax];
+    const verySmallNumber = Math.pow(10, -10);
+    const verySmallDate = 1;
+    const min = val instanceof Date ? new Date(+val - verySmallDate) : val - verySmallNumber;
+    const max = val instanceof Date ? new Date(+val + verySmallDate) : val + verySmallNumber;
+    return [min, max];
   },
 
   getSymmetricDomain(domain, data) {
@@ -220,8 +237,8 @@ export default {
     // use greatest min / max
     const domainMin = cumulativeMin < 0 ? cumulativeMin : Collection.getMinValue(globalDomain);
     const domainMax = Collection.getMaxValue(globalDomain, ...cumulativeMaxArray);
-    if (domainMin === domainMax) {
-      return this.getSinglePointDomain(domainMax);
+    if (+domainMin === +domainMax) {
+      return this.getSinglePointDomain(domainMin);
     }
     return [domainMin, domainMax];
   },