Merge pull request #1564 from FormidableLabs/bug/domain-padding

Bug/domain padding

Author: boygirl

packages/victory-bar/src/helper-methods.js

@@ -30,8 +30,8 @@ const getCalculatedValues = (props) => {
     y: Helpers.getRange(props, "y")
   };
   const domain = {
-    x: Domain.getDomainFromProps(props, "x") || Domain.getDomainWithZero(props, "x"),
-    y: Domain.getDomainFromProps(props, "y") || Domain.getDomainWithZero(props, "y")
+    x: Domain.getDomainWithZero(props, "x"),
+    y: Domain.getDomainWithZero(props, "y")
   };
   const scale = {
     x: Scale.getBaseScale(props, "x")

packages/victory-core/src/victory-util/domain.js

@@ -1,7 +1,7 @@
 /* eslint-disable func-style */
 /* eslint-disable no-use-before-define */
 import React from "react";
-import { flatten, isPlainObject, sortedUniq, isFunction, includes } from "lodash";
+import { flatten, isPlainObject, sortedUniq, isFunction, includes, isDate } from "lodash";
 import Data from "./data";
 import Scale from "./scale";
 import Helpers from "./helpers";
@@ -320,26 +320,30 @@ function getDomainWithZero(props, axis) {
  * Returns the maxDomain from props if it exists
  * @param {Object} props: the props object
  * @param {String} axis: the current axis
- * @returns {Number|undefined} the maxDomain based on props
+ * @returns {Number|Date|undefined} the maxDomain based on props
  */
 function getMaxFromProps(props, axis) {
   if (isPlainObject(props.maxDomain) && props.maxDomain[axis] !== undefined) {
     return props.maxDomain[axis];
   }
-  return typeof props.maxDomain === "number" ? props.maxDomain : undefined;
+  return typeof props.maxDomain === "number" || isDate(props.maxDomain)
+    ? props.maxDomain
+    : undefined;
 }
 
 /**
  * Returns the minDomain from props if it exists
  * @param {Object} props: the props object
  * @param {String} axis: the current axis
- * @returns {Number|undefined} the minDomain based on props
+ * @returns {Number|Date|undefined} the minDomain based on props
  */
 function getMinFromProps(props, axis) {
   if (isPlainObject(props.minDomain) && props.minDomain[axis] !== undefined) {
     return props.minDomain[axis];
   }
-  return typeof props.minDomain === "number" ? props.minDomain : undefined;
+  return typeof props.minDomain === "number" || isDate(props.minDomain)
+    ? props.minDomain
+    : undefined;
 }
 
 /**

packages/victory-core/src/victory-util/wrapper.js

@@ -48,13 +48,13 @@ export default {
   getDomain(props, axis, childComponents) {
     childComponents = childComponents || React.Children.toArray(props.children);
     const propsDomain = Domain.getDomainFromProps(props, axis);
-    const minDomain = Domain.getMinFromProps(props, axis);
-    const maxDomain = Domain.getMaxFromProps(props, axis);
     const domainPadding = this.getDefaultDomainPadding(props, axis, childComponents);
     let domain;
     if (propsDomain) {
       domain = propsDomain;
     } else {
+      const minDomain = Domain.getMinFromProps(props, axis);
+      const maxDomain = Domain.getMaxFromProps(props, axis);
       const dataset = (props.data || props.y) && Data.getData(props);
       const dataDomain = dataset ? Domain.getDomainFromData(props, axis, dataset) : [];
       const childDomain = this.getDomainFromChildren(props, axis, childComponents);

packages/victory-group/src/helper-methods.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-use-before-define */
 import { assign } from "lodash";
 import React from "react";
-import { Helpers, Scale, Data, Domain, Wrapper } from "victory-core";
+import { Helpers, Scale, Data, Wrapper } from "victory-core";
 
 const fallbackProps = {
   width: 450,
@@ -20,12 +20,8 @@ function getCalculatedProps(props, childComponents) {
   const categories = props.categories || Wrapper.getCategories(props, childComponents);
   const datasets = props.datasets || Wrapper.getDataFromChildren(props);
   const domain = {
-    x:
-      Domain.getDomainFromProps(props, "x") ||
-      Wrapper.getDomain(assign({}, props, { categories }), "x", childComponents),
-    y:
-      Domain.getDomainFromProps(props, "y") ||
-      Wrapper.getDomain(assign({}, props, { categories }), "y", childComponents)
+    x: Wrapper.getDomain(assign({}, props, { categories }), "x", childComponents),
+    y: Wrapper.getDomain(assign({}, props, { categories }), "y", childComponents)
   };
   const range = props.range || {
     x: Helpers.getRange(props, "x"),

packages/victory-stack/src/helper-methods.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-use-before-define */
 import { assign, keys, orderBy } from "lodash";
 import React from "react";
-import { Domain, Helpers, Scale, Wrapper } from "victory-core";
+import { Helpers, Scale, Wrapper } from "victory-core";
 
 const fallbackProps = {
   width: 450,
@@ -117,12 +117,8 @@ function getCalculatedProps(props, childComponents) {
     return React.cloneElement(c, { data: datasets[i] });
   });
   const domain = {
-    x:
-      Domain.getDomainFromProps(props, "x") ||
-      Wrapper.getDomain(assign({}, props, { categories }), "x", children),
-    y:
-      Domain.getDomainFromProps(props, "y") ||
-      Wrapper.getDomain(assign({}, props, { categories }), "y", children)
+    x: Wrapper.getDomain(assign({}, props, { categories }), "x", children),
+    y: Wrapper.getDomain(assign({}, props, { categories }), "y", children)
   };
   const range = props.range || {
     x: Helpers.getRange(props, "x"),