victory-core 37.2.0 → 37.3.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # victory-core
 
+## 37.3.0
+
+### Minor Changes
+
+- Clean theme color updates and other minor adjustments ([#2920](https://github.com/FormidableLabs/victory/pull/2920))
+
+* Fix VictoryPortal id changing for every render ([#2929](https://github.com/FormidableLabs/victory/pull/2929))
+
+### Patch Changes
+
+- fix categories array of strings ([#2919](https://github.com/FormidableLabs/victory/pull/2919))
+
 ## 37.2.0
 
 ### Minor Changes

package/dist/victory-core.js

@@ -1433,7 +1433,7 @@ const VictoryPortal = initialProps => {
     ...defaultProps,
     ...initialProps
   };
-  const id = lodash_uniqueId__WEBPACK_IMPORTED_MODULE_0___default()();
+  const [id] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(lodash_uniqueId__WEBPACK_IMPORTED_MODULE_0___default()());
   const portalContext = (0,_portal_context__WEBPACK_IMPORTED_MODULE_3__.usePortalContext)();
   if (!portalContext) {
     const msg = "`renderInPortal` is not supported outside of `VictoryContainer`. " + "Component will be rendered in place";
@@ -2314,20 +2314,16 @@ const orange = {
   "100": "#FEE2D5",
   "300": "#FFA981",
   "500": "#FF6F2C",
+  "700": "#FF4E1B",
   "900": "#D74D26"
 };
 const red = {
   "100": "#FFDCE5",
   "300": "#FF9EB7",
   "500": "#F82B60",
+  "700": "#D31A3D",
   "900": "#BA1E45"
 };
-const pink = {
-  "100": "#FFDAF6",
-  "300": "#F99DE2",
-  "500": "#FF08C2",
-  "900": "#B2158B"
-};
 const purple = {
   "100": "#EDE3FE",
   "300": "#CDB0FF",
@@ -2338,6 +2334,7 @@ const blue = {
   "100": "#CFDFFF",
   "300": "#9CC7FF",
   "500": "#2D7FF9",
+  "700": "#0056B3",
   "900": "#2750AE"
 };
 const cyan = {
@@ -2356,27 +2353,28 @@ const green = {
   "100": "#D1F7C4",
   "300": "#93E088",
   "500": "#20C933",
+  "700": "#1B9B2A",
   "900": "#338A17"
 };
 const colors = {
   blue: blue["500"],
-  pink: pink["500"],
-  teal: teal["500"],
-  purple: purple["500"],
+  cyan: cyan["500"],
   green: green["500"],
+  yellow: yellow["500"],
   orange: orange["500"],
-  cyan: cyan["500"],
   red: red["500"],
-  yellow: yellow["500"]
+  purple: purple["500"],
+  teal: teal["500"]
 };
 const colorScale = Object.values(colors);
-const grayscale = [gray["200"], gray["400"], gray["600"], gray["900"]];
-const warm = [yellow["500"], orange["500"], red["500"], pink["500"]];
-const cool = [cyan["500"], teal["500"], blue["500"], purple["500"]];
-const heatmap = [green["500"], yellow["500"], red["500"]];
-const redPalette = [red["500"], red["300"], red["100"]];
-const greenPalette = [green["500"], green["300"], green["100"]];
-const bluePalette = [blue["500"], blue["300"], blue["100"]];
+const grayscale = [gray["100"], gray["300"], gray["500"], gray["700"], gray["900"]];
+const warm = [yellow["300"], yellow["500"], orange["500"], orange["900"], red["500"]];
+const cool = [purple["500"], blue["500"], cyan["500"], teal["500"], green["500"]];
+const heatmap = [green["900"], green["500"], yellow["500"], orange["500"], red["500"]];
+const redPalette = Object.values(red);
+const greenPalette = Object.values(green);
+const bluePalette = Object.values(blue);
+const defaultColor = blue["500"];
 
 // *
 // * Typography
@@ -2391,7 +2389,7 @@ const padding = 8;
 const baseProps = {
   width: 450,
   height: 300,
-  padding: 50,
+  padding: 60,
   colorScale
 };
 // *
@@ -2435,7 +2433,7 @@ const clean = {
   area: Object.assign({
     style: {
       data: {
-        fill: blue["500"],
+        fill: defaultColor,
         strokeWidth: 2,
         fillOpacity: 0.5
       },
@@ -2452,7 +2450,7 @@ const clean = {
         strokeLinejoin
       },
       axisLabel: Object.assign({}, centeredLabelStyles, {
-        padding,
+        padding: 35,
         stroke: "transparent"
       }),
       grid: {
@@ -2517,7 +2515,7 @@ const clean = {
   bar: Object.assign({
     style: {
       data: {
-        fill: blue["500"],
+        fill: defaultColor,
         padding,
         strokeWidth: 1,
         fillOpacity: 0.5
@@ -2556,7 +2554,7 @@ const clean = {
       }),
       q1: {
         padding,
-        fill: teal["500"],
+        fill: colorScale[0],
         rx: borderRadius,
         strokeWidth: 2
       },
@@ -2565,7 +2563,7 @@ const clean = {
       }),
       q3: {
         padding,
-        fill: cyan["500"],
+        fill: colorScale[1],
         rx: borderRadius
       },
       q3Labels: Object.assign({}, baseLabelStyles, {
@@ -2586,8 +2584,8 @@ const clean = {
       })
     },
     candleColors: {
-      positive: teal["500"],
-      negative: orange["500"]
+      positive: green["500"],
+      negative: red["500"]
     },
     wickStrokeWidth: 2
   }, baseProps),
@@ -2653,7 +2651,7 @@ const clean = {
       data: {
         fill: "transparent",
         opacity: 1,
-        stroke: blue["500"],
+        stroke: defaultColor,
         strokeWidth: 2,
         strokeLinecap,
         strokeLinejoin
@@ -2684,7 +2682,7 @@ const clean = {
   scatter: Object.assign({
     style: {
       data: {
-        fill: purple["500"],
+        fill: defaultColor,
         opacity: 1,
         stroke: "transparent",
         strokeWidth: 0
@@ -2722,9 +2720,8 @@ const clean = {
     style: {
       data: {
         fill: blue["100"],
-        stroke: blue["500"],
-        strokeWidth: 2,
-        opacity: 0.4
+        stroke: defaultColor,
+        strokeWidth: 2
       },
       labels: Object.assign({}, baseLabelStyles, {
         padding: 5,
@@ -8310,34 +8307,31 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getDomain": function() { return /* binding */ getDomain; },
 /* harmony export */   "getDomainFromChildren": function() { return /* binding */ getDomainFromChildren; },
 /* harmony export */   "getScale": function() { return /* binding */ getScale; },
-/* harmony export */   "getStringsFromCategories": function() { return /* binding */ getStringsFromCategories; },
 /* harmony export */   "getStringsFromChildren": function() { return /* binding */ getStringsFromChildren; },
+/* harmony export */   "getStringsFromChildrenCategories": function() { return /* binding */ getStringsFromChildrenCategories; },
 /* harmony export */   "getStringsFromData": function() { return /* binding */ getStringsFromData; },
 /* harmony export */   "getStyle": function() { return /* binding */ getStyle; },
 /* harmony export */   "getWidth": function() { return /* binding */ getWidth; }
 /* harmony export */ });
-/* harmony import */ var lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lodash/isPlainObject */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/isPlainObject.js");
-/* harmony import */ var lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var lodash_uniqBy__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash/uniqBy */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqBy.js");
-/* harmony import */ var lodash_uniqBy__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_uniqBy__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var lodash_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! lodash/groupBy */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/groupBy.js");
-/* harmony import */ var lodash_groupBy__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lodash_groupBy__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var lodash_uniq__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! lodash/uniq */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniq.js");
-/* harmony import */ var lodash_uniq__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_uniq__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! lodash/defaults */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/defaults.js");
-/* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(lodash_defaults__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _axis__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./axis */ "./victory-util/axis.tsx");
-/* harmony import */ var _style__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./style */ "./victory-util/style.ts");
-/* harmony import */ var _data__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./data */ "./victory-util/data.ts");
-/* harmony import */ var _domain__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./domain */ "./victory-util/domain.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./events */ "./victory-util/events.ts");
-/* harmony import */ var _collection__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./collection */ "./victory-util/collection.tsx");
-/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./helpers */ "./victory-util/helpers.ts");
-/* harmony import */ var _scale__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./scale */ "./victory-util/scale.ts");
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./log */ "./victory-util/log.ts");
-
+/* harmony import */ var lodash_uniqBy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lodash/uniqBy */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqBy.js");
+/* harmony import */ var lodash_uniqBy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_uniqBy__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var lodash_groupBy__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash/groupBy */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/groupBy.js");
+/* harmony import */ var lodash_groupBy__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_groupBy__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var lodash_uniq__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! lodash/uniq */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniq.js");
+/* harmony import */ var lodash_uniq__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lodash_uniq__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! lodash/defaults */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/defaults.js");
+/* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_defaults__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _axis__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./axis */ "./victory-util/axis.tsx");
+/* harmony import */ var _style__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./style */ "./victory-util/style.ts");
+/* harmony import */ var _data__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./data */ "./victory-util/data.ts");
+/* harmony import */ var _domain__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./domain */ "./victory-util/domain.ts");
+/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./events */ "./victory-util/events.ts");
+/* harmony import */ var _collection__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./collection */ "./victory-util/collection.tsx");
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./helpers */ "./victory-util/helpers.ts");
+/* harmony import */ var _scale__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./scale */ "./victory-util/scale.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./log */ "./victory-util/log.ts");
 
 
 
@@ -8366,7 +8360,7 @@ function addBinsToParentPropsIfHistogram(_ref) {
     return child.type && child.type.role === "histogram";
   });
   if (someChildrenAreHistograms && !allChildrenAreHistograms) {
-    _log__WEBPACK_IMPORTED_MODULE_6__.warn("VictoryHistogram only supports being stacked with other VictoryHistogram components. Check to make sure that you are only passing VictoryHistogram components to VictoryStack");
+    _log__WEBPACK_IMPORTED_MODULE_5__.warn("VictoryHistogram only supports being stacked with other VictoryHistogram components. Check to make sure that you are only passing VictoryHistogram components to VictoryStack");
   }
 
   // if we are stacking histograms, we need to generate explicit bins
@@ -8379,7 +8373,7 @@ function addBinsToParentPropsIfHistogram(_ref) {
   // if we have explicit bins then we don't need to calculate them
   if (!Array.isArray(childBins)) {
     const combinedData = children.reduce((memo, child) => {
-      const xAccessor = _helpers__WEBPACK_IMPORTED_MODULE_7__.createAccessor(child.props.x || "x");
+      const xAccessor = _helpers__WEBPACK_IMPORTED_MODULE_6__.createAccessor(child.props.x || "x");
       return memo.concat(child.props.data.map(datum => ({
         x: xAccessor(datum)
       })));
@@ -8422,7 +8416,7 @@ function getDataFromChildren(props, childComponents) {
     maxDomain
   };
   let stack = 0;
-  const children = childComponents ? childComponents.slice(0) : react__WEBPACK_IMPORTED_MODULE_5___default().Children.toArray(props.children);
+  const children = childComponents ? childComponents.slice(0) : react__WEBPACK_IMPORTED_MODULE_4___default().Children.toArray(props.children);
   parentProps = addBinsToParentPropsIfHistogram({
     children,
     props,
@@ -8433,13 +8427,13 @@ function getDataFromChildren(props, childComponents) {
     const childProps = Object.assign({}, child.props, parentProps);
     let childData;
     let childElement = child;
-    if (!_data__WEBPACK_IMPORTED_MODULE_8__.isDataComponent(child)) {
+    if (!_data__WEBPACK_IMPORTED_MODULE_7__.isDataComponent(child)) {
       return null;
-    } else if (child.type && _helpers__WEBPACK_IMPORTED_MODULE_7__.isFunction(child.type.getData)) {
-      childElement = parent ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default().cloneElement(child, parent.props) : child;
+    } else if (child.type && _helpers__WEBPACK_IMPORTED_MODULE_6__.isFunction(child.type.getData)) {
+      childElement = parent ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default().cloneElement(child, parent.props) : child;
       childData = childElement.type.getData(childProps);
     } else {
-      childData = _data__WEBPACK_IMPORTED_MODULE_8__.getData(childProps);
+      childData = _data__WEBPACK_IMPORTED_MODULE_7__.getData(childProps);
     }
     stack += 1;
     return childData.map((datum, index) => Object.assign({
@@ -8448,23 +8442,23 @@ function getDataFromChildren(props, childComponents) {
     }, datum));
   };
   const stacked = children.filter(c => c.type && c.type.role === "stack").length;
-  const combine = (memo, val) => memo.concat(lodash_uniqBy__WEBPACK_IMPORTED_MODULE_1___default()(val, "_group"));
-  const datasets = _helpers__WEBPACK_IMPORTED_MODULE_7__.reduceChildren(children, iteratee, props, [], combine);
+  const combine = (memo, val) => memo.concat(lodash_uniqBy__WEBPACK_IMPORTED_MODULE_0___default()(val, "_group"));
+  const datasets = _helpers__WEBPACK_IMPORTED_MODULE_6__.reduceChildren(children, iteratee, props, [], combine);
   const group = stacked ? "_group" : "_stack";
-  return Object.values(lodash_groupBy__WEBPACK_IMPORTED_MODULE_2___default()(datasets, group));
+  return Object.values(lodash_groupBy__WEBPACK_IMPORTED_MODULE_1___default()(datasets, group));
 }
 function getData(props, childComponents) {
   if (props.data) {
-    return _data__WEBPACK_IMPORTED_MODULE_8__.getData(props);
+    return _data__WEBPACK_IMPORTED_MODULE_7__.getData(props);
   }
-  return getDataFromChildren(props, childComponents || react__WEBPACK_IMPORTED_MODULE_5___default().Children.toArray(props.children));
+  return getDataFromChildren(props, childComponents || react__WEBPACK_IMPORTED_MODULE_4___default().Children.toArray(props.children));
 }
 function getWidth(props, groupLength, seriesLength) {
   const {
     datasets,
     horizontal
   } = props;
-  const range = horizontal ? _helpers__WEBPACK_IMPORTED_MODULE_7__.getRange(props, "y") : _helpers__WEBPACK_IMPORTED_MODULE_7__.getRange(props, "x");
+  const range = horizontal ? _helpers__WEBPACK_IMPORTED_MODULE_6__.getRange(props, "y") : _helpers__WEBPACK_IMPORTED_MODULE_6__.getRange(props, "x");
   const extent = Math.abs(range[1] - range[0]);
   const seriesLengthValue = seriesLength !== undefined ? seriesLength : Array.isArray(datasets[0]) && datasets[0].length || 1;
   const groupLengthValue = groupLength || datasets.length;
@@ -8510,8 +8504,8 @@ function getDefaultDomainPadding(props, axis, childComponents) {
 }
 function getDomainFromChildren(props, axis, childComponents) {
   // eslint-disable-line max-statements, complexity, max-len
-  const children = childComponents ? childComponents.slice(0) : react__WEBPACK_IMPORTED_MODULE_5___default().Children.toArray(props.children);
-  const parentData = props.data ? _data__WEBPACK_IMPORTED_MODULE_8__.getData(props) : undefined;
+  const children = childComponents ? childComponents.slice(0) : react__WEBPACK_IMPORTED_MODULE_4___default().Children.toArray(props.children);
+  const parentData = props.data ? _data__WEBPACK_IMPORTED_MODULE_7__.getData(props) : undefined;
   const {
     polar,
     startAngle,
@@ -8535,58 +8529,58 @@ function getDomainFromChildren(props, axis, childComponents) {
   }) : baseParentProps;
   const iteratee = child => {
     const sharedProps = Object.assign({}, child.props, parentProps);
-    if (!_domain__WEBPACK_IMPORTED_MODULE_9__.isDomainComponent(child)) {
+    if (!_domain__WEBPACK_IMPORTED_MODULE_8__.isDomainComponent(child)) {
       return null;
-    } else if (child.type && _helpers__WEBPACK_IMPORTED_MODULE_7__.isFunction(child.type.getDomain)) {
+    } else if (child.type && _helpers__WEBPACK_IMPORTED_MODULE_6__.isFunction(child.type.getDomain)) {
       return child.props && child.type.getDomain(sharedProps, axis);
     }
-    return _domain__WEBPACK_IMPORTED_MODULE_9__.getDomain(sharedProps, axis);
+    return _domain__WEBPACK_IMPORTED_MODULE_8__.getDomain(sharedProps, axis);
   };
-  const childDomains = _helpers__WEBPACK_IMPORTED_MODULE_7__.reduceChildren(children, iteratee, props);
-  const min = childDomains.length === 0 ? 0 : _collection__WEBPACK_IMPORTED_MODULE_10__.getMinValue(childDomains);
-  const max = childDomains.length === 0 ? 1 : _collection__WEBPACK_IMPORTED_MODULE_10__.getMaxValue(childDomains);
+  const childDomains = _helpers__WEBPACK_IMPORTED_MODULE_6__.reduceChildren(children, iteratee, props);
+  const min = childDomains.length === 0 ? 0 : _collection__WEBPACK_IMPORTED_MODULE_9__.getMinValue(childDomains);
+  const max = childDomains.length === 0 ? 1 : _collection__WEBPACK_IMPORTED_MODULE_9__.getMaxValue(childDomains);
   return [min, max];
 }
 function getDomain(props, axis, childComponents) {
-  const children = childComponents || react__WEBPACK_IMPORTED_MODULE_5___default().Children.toArray(props.children);
-  const propsDomain = _domain__WEBPACK_IMPORTED_MODULE_9__.getDomainFromProps(props, axis);
+  const children = childComponents || react__WEBPACK_IMPORTED_MODULE_4___default().Children.toArray(props.children);
+  const propsDomain = _domain__WEBPACK_IMPORTED_MODULE_8__.getDomainFromProps(props, axis);
   const domainPadding = getDefaultDomainPadding(props, axis, children);
   let domain;
   if (propsDomain) {
     domain = propsDomain;
   } else {
-    const minDomain = _domain__WEBPACK_IMPORTED_MODULE_9__.getMinFromProps(props, axis);
-    const maxDomain = _domain__WEBPACK_IMPORTED_MODULE_9__.getMaxFromProps(props, axis);
-    const dataset = (props.data || props.y) && _data__WEBPACK_IMPORTED_MODULE_8__.getData(props);
-    const dataDomain = dataset ? _domain__WEBPACK_IMPORTED_MODULE_9__.getDomainFromData(props, axis, dataset) : [];
+    const minDomain = _domain__WEBPACK_IMPORTED_MODULE_8__.getMinFromProps(props, axis);
+    const maxDomain = _domain__WEBPACK_IMPORTED_MODULE_8__.getMaxFromProps(props, axis);
+    const dataset = (props.data || props.y) && _data__WEBPACK_IMPORTED_MODULE_7__.getData(props);
+    const dataDomain = dataset ? _domain__WEBPACK_IMPORTED_MODULE_8__.getDomainFromData(props, axis, dataset) : [];
     const childDomain = getDomainFromChildren(props, axis, children);
-    const min = minDomain || _collection__WEBPACK_IMPORTED_MODULE_10__.getMinValue([...dataDomain, ...childDomain]);
-    const max = maxDomain || _collection__WEBPACK_IMPORTED_MODULE_10__.getMaxValue([...dataDomain, ...childDomain]);
-    domain = _domain__WEBPACK_IMPORTED_MODULE_9__.getDomainFromMinMax(min, max);
+    const min = minDomain || _collection__WEBPACK_IMPORTED_MODULE_9__.getMinValue([...dataDomain, ...childDomain]);
+    const max = maxDomain || _collection__WEBPACK_IMPORTED_MODULE_9__.getMaxValue([...dataDomain, ...childDomain]);
+    domain = _domain__WEBPACK_IMPORTED_MODULE_8__.getDomainFromMinMax(min, max);
   }
-  return _domain__WEBPACK_IMPORTED_MODULE_9__.formatDomain(domain, Object.assign({
+  return _domain__WEBPACK_IMPORTED_MODULE_8__.formatDomain(domain, Object.assign({
     domainPadding
   }, props), axis);
 }
 function getScale(props, axis, childComponents) {
   if (props.data) {
-    return _scale__WEBPACK_IMPORTED_MODULE_11__.getBaseScale(props, axis);
+    return _scale__WEBPACK_IMPORTED_MODULE_10__.getBaseScale(props, axis);
   }
-  const children = childComponents ? childComponents.slice(0) : react__WEBPACK_IMPORTED_MODULE_5___default().Children.toArray(props.children);
+  const children = childComponents ? childComponents.slice(0) : react__WEBPACK_IMPORTED_MODULE_4___default().Children.toArray(props.children);
   const iteratee = child => {
     const sharedProps = Object.assign({}, child.props, {
       horizontal: props.horizontal
     });
-    return _scale__WEBPACK_IMPORTED_MODULE_11__.getScaleType(sharedProps, axis);
+    return _scale__WEBPACK_IMPORTED_MODULE_10__.getScaleType(sharedProps, axis);
   };
-  const childScale = lodash_uniq__WEBPACK_IMPORTED_MODULE_3___default()(_helpers__WEBPACK_IMPORTED_MODULE_7__.reduceChildren(children, iteratee, props));
+  const childScale = lodash_uniq__WEBPACK_IMPORTED_MODULE_2___default()(_helpers__WEBPACK_IMPORTED_MODULE_6__.reduceChildren(children, iteratee, props));
 
   // default to linear scale if more than one uniq scale type is given by children
-  return childScale.length > 1 ? _scale__WEBPACK_IMPORTED_MODULE_11__.getScaleFromName("linear") : _scale__WEBPACK_IMPORTED_MODULE_11__.getScaleFromName(childScale[0]);
+  return childScale.length > 1 ? _scale__WEBPACK_IMPORTED_MODULE_10__.getScaleFromName("linear") : _scale__WEBPACK_IMPORTED_MODULE_10__.getScaleFromName(childScale[0]);
 }
 function getAllEvents(props) {
   const components = ["groupComponent", "containerComponent", "labelComponent"];
-  const componentEvents = _events__WEBPACK_IMPORTED_MODULE_12__.getComponentEvents(props, components);
+  const componentEvents = _events__WEBPACK_IMPORTED_MODULE_11__.getComponentEvents(props, components);
   let events = props.events;
   if (Array.isArray(componentEvents)) {
     events = Array.isArray(props.events) ? componentEvents.concat(...props.events) : componentEvents;
@@ -8612,12 +8606,12 @@ function getColor(calculatedProps, child, index, theme) {
   if (!colorScale && !color) {
     return undefined;
   }
-  const colors = Array.isArray(colorScale) ? colorScale : _style__WEBPACK_IMPORTED_MODULE_13__.getColorScale(colorScale, theme);
+  const colors = Array.isArray(colorScale) ? colorScale : _style__WEBPACK_IMPORTED_MODULE_12__.getColorScale(colorScale, theme);
   return color || colors[index % colors.length];
 }
 function getStyle(theme, style, role) {
   const defaultStyle = theme && theme[role] && theme[role].style ? theme[role].style : {};
-  return _helpers__WEBPACK_IMPORTED_MODULE_7__.getStyles(style, defaultStyle);
+  return _helpers__WEBPACK_IMPORTED_MODULE_6__.getStyles(style, defaultStyle);
 }
 
 // eslint-disable-next-line max-params
@@ -8641,8 +8635,8 @@ function getChildStyle(child, index, calculatedProps, theme) {
   const dataWidth = role === "stack" ? {} : {
     width: getWidth(calculatedProps)
   };
-  const dataStyle = lodash_defaults__WEBPACK_IMPORTED_MODULE_4___default()({}, childStyle.data, Object.assign({}, dataWidth, style.data, defaultColor));
-  const labelsStyle = lodash_defaults__WEBPACK_IMPORTED_MODULE_4___default()({}, childStyle.labels, style.labels);
+  const dataStyle = lodash_defaults__WEBPACK_IMPORTED_MODULE_3___default()({}, childStyle.data, Object.assign({}, dataWidth, style.data, defaultColor));
+  const labelsStyle = lodash_defaults__WEBPACK_IMPORTED_MODULE_3___default()({}, childStyle.labels, style.labels);
   return {
     ...childStyle,
     parent: style.parent,
@@ -8650,28 +8644,26 @@ function getChildStyle(child, index, calculatedProps, theme) {
     labels: labelsStyle
   };
 }
-function getStringsFromCategories(childComponents, axis) {
+function getStringsFromChildrenCategories(childComponents, axis) {
   const iteratee = child => {
-    const childProps = child.props || {};
-    if (!_domain__WEBPACK_IMPORTED_MODULE_9__.isDomainComponent(child) || !childProps.categories) {
+    if (!_domain__WEBPACK_IMPORTED_MODULE_8__.isDomainComponent(child)) {
       return null;
     }
-    const categories = childProps.categories && !Array.isArray(childProps.categories) ? childProps.categories[axis] : childProps.props.categories;
-    const categoryStrings = categories && categories.filter(val => typeof val === "string");
-    return categoryStrings ? _collection__WEBPACK_IMPORTED_MODULE_10__.removeUndefined(categoryStrings) : [];
+    const childProps = child.props || {};
+    return _data__WEBPACK_IMPORTED_MODULE_7__.getStringsFromCategories(childProps, axis);
   };
-  return _helpers__WEBPACK_IMPORTED_MODULE_7__.reduceChildren(childComponents.slice(0), iteratee);
+  return _helpers__WEBPACK_IMPORTED_MODULE_6__.reduceChildren(childComponents.slice(0), iteratee);
 }
 function getStringsFromData(childComponents) {
   const iteratee = child => {
     const childProps = child.props || {};
     let data;
-    if (!_data__WEBPACK_IMPORTED_MODULE_8__.isDataComponent(child)) {
+    if (!_data__WEBPACK_IMPORTED_MODULE_7__.isDataComponent(child)) {
       return null;
-    } else if (child.type && _helpers__WEBPACK_IMPORTED_MODULE_7__.isFunction(child.type.getData)) {
+    } else if (child.type && _helpers__WEBPACK_IMPORTED_MODULE_6__.isFunction(child.type.getData)) {
       data = child.type.getData(childProps);
     } else {
-      data = _data__WEBPACK_IMPORTED_MODULE_8__.getData(childProps);
+      data = _data__WEBPACK_IMPORTED_MODULE_7__.getData(childProps);
     }
     return data.map(d => ({
       x: d.xName,
@@ -8690,28 +8682,28 @@ function getStringsFromData(childComponents) {
       y: y !== undefined ? memo.y.concat(y) : memo.y
     };
   };
-  return _helpers__WEBPACK_IMPORTED_MODULE_7__.reduceChildren(childComponents.slice(0), iteratee, {}, initialMemo, combine);
+  return _helpers__WEBPACK_IMPORTED_MODULE_6__.reduceChildren(childComponents.slice(0), iteratee, {}, initialMemo, combine);
 }
 function getCategoryAndAxisStringsFromChildren(props, axis, childComponents) {
-  const categories = lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_0___default()(props.categories) ? props.categories[axis] : props.categories;
-  const axisComponent = _axis__WEBPACK_IMPORTED_MODULE_14__.getAxisComponent(childComponents, axis);
-  const axisStrings = axisComponent ? _data__WEBPACK_IMPORTED_MODULE_8__.getStringsFromAxes(axisComponent.props, axis) : [];
-  const categoryStrings = categories || getStringsFromCategories(childComponents, axis);
-  return lodash_uniq__WEBPACK_IMPORTED_MODULE_3___default()([...categoryStrings, ...axisStrings].flat());
+  const categories = _data__WEBPACK_IMPORTED_MODULE_7__.getStringsFromCategories(props, axis);
+  const axisComponent = _axis__WEBPACK_IMPORTED_MODULE_13__.getAxisComponent(childComponents, axis);
+  const axisStrings = axisComponent ? _data__WEBPACK_IMPORTED_MODULE_7__.getStringsFromAxes(axisComponent.props, axis) : [];
+  const categoryStrings = categories.length ? categories : getStringsFromChildrenCategories(childComponents, axis);
+  return lodash_uniq__WEBPACK_IMPORTED_MODULE_2___default()([...categoryStrings, ...axisStrings].flat());
 }
 function getStringsFromChildren(props, childComponents) {
-  const children = childComponents || react__WEBPACK_IMPORTED_MODULE_5___default().Children.toArray(props.children);
+  const children = childComponents || react__WEBPACK_IMPORTED_MODULE_4___default().Children.toArray(props.children);
   const xStrings = getCategoryAndAxisStringsFromChildren(props, "x", children);
   const yStrings = getCategoryAndAxisStringsFromChildren(props, "y", children);
   const dataStrings = getStringsFromData(children);
   return {
-    x: lodash_uniq__WEBPACK_IMPORTED_MODULE_3___default()([...xStrings, ...dataStrings.x].flat()),
-    y: lodash_uniq__WEBPACK_IMPORTED_MODULE_3___default()([...yStrings, ...dataStrings.y].flat())
+    x: lodash_uniq__WEBPACK_IMPORTED_MODULE_2___default()([...xStrings, ...dataStrings.x].flat()),
+    y: lodash_uniq__WEBPACK_IMPORTED_MODULE_2___default()([...yStrings, ...dataStrings.y].flat())
   };
 }
 function getCategories(props, childComponents, allStrings) {
-  const xPropCategories = props.categories && !Array.isArray(props.categories) ? props.categories.x : props.categories;
-  const yPropCategories = props.categories && !Array.isArray(props.categories) ? props.categories.y : props.categories;
+  const xPropCategories = props.categories && _data__WEBPACK_IMPORTED_MODULE_7__.getStringsFromCategories(props, "x");
+  const yPropCategories = props.categories && _data__WEBPACK_IMPORTED_MODULE_7__.getStringsFromCategories(props, "y");
   const fallbackRequired = !xPropCategories || !yPropCategories;
   const fallbackProps = fallbackRequired ? allStrings || getStringsFromChildren(props, childComponents) : {};
   const xCategories = xPropCategories || fallbackProps.x;