victory-core 36.4.1 → 36.5.2

package/src/victory-util/{wrapper.js → wrapper.tsx}

@@ -1,4 +1,3 @@
-/* eslint-disable func-style */
 import {
   assign,
   defaults,
@@ -8,7 +7,7 @@ import {
   groupBy,
   uniqBy,
   values,
-  isPlainObject
+  isPlainObject,
 } from "lodash";
 import React from "react";
 import * as Axis from "./axis";
@@ -25,7 +24,7 @@ export function addBinsToParentPropsIfHistogram({
   children,
   props,
   childComponents,
-  parentProps
+  parentProps,
 }) {
   const someChildrenAreHistograms = children.some((child) => {
     return child.type && child.type.role === "histogram";
@@ -40,7 +39,7 @@ export function addBinsToParentPropsIfHistogram({
 
   if (someChildrenAreHistograms && !allChildrenAreHistograms) {
     Log.warn(
-      "VictoryHistogram only supports being stacked with other VictoryHistogram components. Check to make sure that you are only passing VictoryHistogram components to VictoryStack"
+      "VictoryHistogram only supports being stacked with other VictoryHistogram components. Check to make sure that you are only passing VictoryHistogram components to VictoryStack",
     );
   }
 
@@ -57,7 +56,7 @@ export function addBinsToParentPropsIfHistogram({
     const combinedData = children.reduce((memo, child) => {
       const xAccessor = Helpers.createAccessor(child.props.x || "x");
       return memo.concat(
-        child.props.data.map((datum) => ({ x: xAccessor(datum) }))
+        child.props.data.map((datum) => ({ x: xAccessor(datum) })),
       );
     }, []);
 
@@ -66,11 +65,11 @@ export function addBinsToParentPropsIfHistogram({
     const getFormattedHistogramData = children[0].type.getFormattedData;
     childBins = getFormattedHistogramData({
       data: combinedData,
-      bins: childBins
+      bins: childBins,
     }).reduce(
       (memo, { x0, x1 }, index) =>
         index === 0 ? memo.concat([x0, x1]) : memo.concat(x1),
-      []
+      [],
     );
   }
 
@@ -86,7 +85,7 @@ export function getDataFromChildren(props, childComponents) {
     endAngle,
     categories,
     minDomain,
-    maxDomain
+    maxDomain,
   };
   let stack = 0;
   const children = childComponents
@@ -97,7 +96,7 @@ export function getDataFromChildren(props, childComponents) {
     children,
     props,
     childComponents,
-    parentProps
+    parentProps,
   });
 
   const iteratee = (child, childName, parent) => {
@@ -113,12 +112,12 @@ export function getDataFromChildren(props, childComponents) {
     }
     stack += 1;
     return childData.map((datum, index) =>
-      assign({ _stack: stack, _group: index }, datum)
+      assign({ _stack: stack, _group: index }, datum),
     );
   };
 
   const stacked = children.filter(
-    (c) => c.type && c.type.role === "stack"
+    (c) => c.type && c.type.role === "stack",
   ).length;
   const combine = (memo, val) => memo.concat(uniqBy(val, "_group"));
   const datasets = Helpers.reduceChildren(
@@ -126,7 +125,7 @@ export function getDataFromChildren(props, childComponents) {
     iteratee,
     props,
     [],
-    combine
+    combine,
   );
   const group = stacked ? "_group" : "_stack";
   return values(groupBy(datasets, group));
@@ -137,10 +136,10 @@ export function getData(props, childComponents) {
     return Data.getData(props);
   }
   childComponents = childComponents || React.Children.toArray(props.children);
-  return getDataFromChildren(childComponents);
+  return getDataFromChildren(props, childComponents);
 }
 
-export function getWidth(props, groupLength, seriesLength) {
+export function getWidth(props, groupLength?, seriesLength?) {
   const { datasets, horizontal } = props;
   const range = horizontal
     ? Helpers.getRange(props, "y")
@@ -191,7 +190,7 @@ export function getDefaultDomainPadding(props, axis, childComponents) {
   return {
     x:
       (width * children.length) / 2 +
-      (offset - width * ((children.length - 1) / 2))
+      (offset - width * ((children.length - 1) / 2)),
   };
 }
 
@@ -200,7 +199,7 @@ export function getDomainFromChildren(props, axis, childComponents) {
   const children = childComponents
     ? childComponents.slice(0)
     : React.Children.toArray(props.children);
-  const parentData = props.data ? Data.getData(props, axis) : undefined;
+  const parentData = props.data ? Data.getData(props) : undefined;
   const {
     polar,
     startAngle,
@@ -208,7 +207,7 @@ export function getDomainFromChildren(props, axis, childComponents) {
     categories,
     minDomain,
     maxDomain,
-    horizontal
+    horizontal,
   } = props;
   const baseParentProps = {
     horizontal,
@@ -217,7 +216,7 @@ export function getDomainFromChildren(props, axis, childComponents) {
     endAngle,
     minDomain,
     maxDomain,
-    categories
+    categories,
   };
   const parentProps = parentData
     ? assign(baseParentProps, { data: parentData })
@@ -256,7 +255,7 @@ export function getDomain(props, axis, childComponents) {
     const maxDomain = Domain.getMaxFromProps(props, axis);
     const dataset = (props.data || props.y) && Data.getData(props);
     const dataDomain = dataset
-      ? Domain.getDomainFromData(props, axis, dataset)
+      ? Domain.getDomainFromData(props, axis, dataset)!
       : [];
     const childDomain = getDomainFromChildren(props, axis, childComponents);
     const min =
@@ -268,7 +267,7 @@ export function getDomain(props, axis, childComponents) {
   return Domain.formatDomain(domain, assign({ domainPadding }, props), axis);
 }
 
-export function getScale(props, axis, childComponents) {
+export function getScale(props, axis, childComponents?) {
   if (props.data) {
     return Scale.getBaseScale(props, axis);
   }
@@ -277,13 +276,15 @@ export function getScale(props, axis, childComponents) {
     : React.Children.toArray(props.children);
   const iteratee = (child) => {
     const sharedProps = assign({}, child.props, {
-      horizontal: props.horizontal
+      horizontal: props.horizontal,
     });
     return Scale.getScaleType(sharedProps, axis);
   };
-  const childScale = uniq(Helpers.reduceChildren(children, iteratee, props));
-  // default to linear scale if more than one uniq scale type is given by children
+  const childScale: string[] = uniq(
+    Helpers.reduceChildren(children, iteratee, props),
+  );
 
+  // default to linear scale if more than one uniq scale type is given by children
   return childScale.length > 1
     ? Scale.getScaleFromName("linear")
     : Scale.getScaleFromName(childScale[0]);
@@ -344,13 +345,13 @@ export function getChildStyle(child, index, calculatedProps) {
   const dataStyle = defaults(
     {},
     childStyle.data,
-    assign({}, dataWidth, style.data, defaultColor)
+    assign({}, dataWidth, style.data, defaultColor),
   );
   const labelsStyle = defaults({}, childStyle.labels, style.labels);
   return {
     parent: style.parent,
     data: dataStyle,
-    labels: labelsStyle
+    labels: labelsStyle,
   };
 }
 
@@ -386,8 +387,11 @@ export function getStringsFromData(childComponents) {
     return data.map((d) => ({ x: d.xName, y: d.yName }));
   };
 
-  const initialMemo = { x: [], y: [] };
-  const combine = (memo, datum) => {
+  const initialMemo = { x: [] as number[], y: [] as number[] };
+  const combine = (
+    memo: typeof initialMemo,
+    datum: NonNullable<ReturnType<typeof iteratee>>,
+  ) => {
     const x = Array.isArray(datum)
       ? datum.map((d) => d.x).filter(Boolean)
       : datum.x;
@@ -396,7 +400,7 @@ export function getStringsFromData(childComponents) {
       : datum.y;
     return {
       x: x !== undefined ? memo.x.concat(x) : memo.x,
-      y: y !== undefined ? memo.y.concat(y) : memo.y
+      y: y !== undefined ? memo.y.concat(y) : memo.y,
     };
   };
   return Helpers.reduceChildren(
@@ -404,14 +408,14 @@ export function getStringsFromData(childComponents) {
     iteratee,
     {},
     initialMemo,
-    combine
+    combine,
   );
 }
 
 export function getCategoryAndAxisStringsFromChildren(
   props,
   axis,
-  childComponents
+  childComponents,
 ) {
   const categories = isPlainObject(props.categories)
     ? props.categories[axis]
@@ -431,19 +435,19 @@ export function getStringsFromChildren(props, childComponents) {
   const xStrings = getCategoryAndAxisStringsFromChildren(
     props,
     "x",
-    childComponents
+    childComponents,
   );
   const yStrings = getCategoryAndAxisStringsFromChildren(
     props,
     "y",
-    childComponents
+    childComponents,
   );
 
   const dataStrings = getStringsFromData(childComponents);
 
   return {
     x: uniq(flatten([...xStrings, ...dataStrings.x])),
-    y: uniq(flatten([...yStrings, ...dataStrings.y]))
+    y: uniq(flatten([...yStrings, ...dataStrings.y])),
   };
 }
 
@@ -469,6 +473,6 @@ export function getCategories(props, childComponents, allStrings) {
 
   return {
     x: xCategories.length > 0 ? xCategories : undefined,
-    y: yCategories.length > 0 ? yCategories : undefined
+    y: yCategories.length > 0 ? yCategories : undefined,
   };
 }