victory-core 36.5.3 → 36.6.2

package/src/victory-util/axis.tsx

@@ -154,14 +154,13 @@ function getDefaultTickFormat(props) {
     return stringTicks(props)
       ? (x, index) => tickValues[index]
       : fallbackFormat;
-  } else {
-    const invertedStringMap = stringMap && invert(stringMap);
-    const tickValueArray = orderBy(values(stringMap), (n) => n);
-    const dataNames = tickValueArray.map((tick) => invertedStringMap[tick]);
-    // string ticks should have one tick of padding at the beginning
-    const dataTicks = ["", ...dataNames, ""];
-    return (x) => dataTicks[x];
   }
+  const invertedStringMap = stringMap && invert(stringMap);
+  const tickValueArray = orderBy(values(stringMap), (n) => n);
+  const dataNames = tickValueArray.map((tick) => invertedStringMap[tick]);
+  // string ticks should have one tick of padding at the beginning
+  const dataTicks = ["", ...dataNames, ""];
+  return (x) => dataTicks[x];
 }
 
 function getStringTicks(props) {
@@ -207,7 +206,7 @@ function getTickArray(props) {
     const newTickArray = [] as Array<{ value: number; index: number }>;
     const domain = (props.domain && props.domain[axis]) || props.domain;
     if (arr) {
-      arr.forEach(function (t, index) {
+      arr.forEach((t, index) => {
         if (Array.isArray(domain)) {
           if (
             t >= Collection.getMinValue(domain) &&
@@ -226,7 +225,8 @@ function getTickArray(props) {
         }
       });
       return newTickArray;
-    } else return undefined;
+    }
+    return undefined;
   };
   return Array.isArray(tickArray) && tickArray.length
     ? buildTickArray(tickArray)
@@ -261,9 +261,8 @@ export function getTickFormat(props, scale) {
       return props.tickFormat(invertedStringMap[tick], index, stringTickArray);
     };
     return stringMap ? applyStringTicks : tickFormat;
-  } else {
-    return (x) => x;
   }
+  return (x) => x;
 }
 
 function downsampleTicks(ticks: number[], tickCount: number) {
@@ -304,7 +303,7 @@ export function getTicks(props, scale: D3Scale, filterZero = false) {
  * @param {String} axis: either x or y
  * @returns {Array} returns a domain from tickValues
  */
-//eslint-disable-next-line max-statements
+// eslint-disable-next-line max-statements
 function getDomainFromData(props, axis) {
   const { polar, startAngle = 0, endAngle = 360 } = props;
   const tickArray = getTickArray(props);
@@ -315,7 +314,7 @@ function getDomainFromData(props, axis) {
   const minDomain = Domain.getMinFromProps(props, axis);
   const maxDomain = Domain.getMaxFromProps(props, axis);
   const tickStrings = stringTicks(props);
-  const ticks = tickValues.map((value) => +value);
+  const ticks = tickValues.map((value) => Number(value));
   const defaultMin = tickStrings ? 1 : Collection.getMinValue(ticks);
   const defaultMax = tickStrings
     ? tickValues.length

package/src/victory-util/collection.tsx

@@ -1,4 +1,6 @@
-function isNonEmptyArray(collection) {
+function isNonEmptyArray<T>(
+  collection: Array<T> | unknown,
+): collection is Array<T> {
   return Array.isArray(collection) && collection.length > 0;
 }
 
@@ -23,15 +25,22 @@ export function containsNumbers(collection) {
   );
 }
 
-export function containsOnlyStrings(collection) {
+export function containsOnlyStrings(
+  collection: Array<string> | unknown,
+): collection is Array<string> {
   return (
     isNonEmptyArray(collection) &&
     collection.every((value) => typeof value === "string")
   );
 }
 
-export function isArrayOfArrays(collection) {
-  return isNonEmptyArray(collection) && collection.every(Array.isArray);
+export function isArrayOfArrays<T>(
+  collection: Array<T> | Array<Array<T>> | unknown,
+): collection is Array<Array<T>> {
+  return (
+    isNonEmptyArray(collection) &&
+    (collection as Array<Array<T>>).every(Array.isArray)
+  );
 }
 
 export function removeUndefined(arr) {

package/src/victory-util/data.ts

@@ -117,16 +117,15 @@ function addEventKeys(props, data) {
     } else if (hasEventKeyAccessor) {
       const eventKey = eventKeyAccessor(datum, index);
       return eventKey !== undefined ? assign({ eventKey }, datum) : datum;
-    } else {
-      return datum;
     }
+    return datum;
   });
 }
 
 // Exported Functions
 
 // This method will remove data points that fall outside of the desired domain (non-continuous charts only)
-export function formatDataFromDomain(dataset, domain, defaultBaseline) {
+export function formatDataFromDomain(dataset, domain, defaultBaseline?) {
   const exists = (val) => val !== undefined;
 
   const minDomainX = Collection.getMinValue(domain.x);

package/src/victory-util/domain.ts

@@ -74,7 +74,7 @@ function getExtremeFromData(dataset, axis, type = "min") {
   return containsDate ? new Date(result) : result;
 }
 
-//eslint-disable-next-line max-statements
+// eslint-disable-next-line max-statements
 function padDomain(domain, props, axis) {
   if (!props.domainPadding) {
     return domain;
@@ -311,15 +311,15 @@ export function getDomainFromMinMax(min, max) {
     const verySmallDate = 1;
     const minVal =
       val instanceof Date
-        ? new Date(+val - verySmallDate)
-        : +val - verySmallNumber;
+        ? new Date(Number(val) - verySmallDate)
+        : Number(val) - verySmallNumber;
     const maxVal =
       val instanceof Date
-        ? new Date(+val + verySmallDate)
-        : +val + verySmallNumber;
+        ? new Date(Number(val) + verySmallDate)
+        : Number(val) + verySmallNumber;
     return val === 0 ? [0, maxVal] : [minVal, maxVal];
   };
-  return +min === +max ? getSinglePointDomain(max) : [min, max];
+  return Number(min) === Number(max) ? getSinglePointDomain(max) : [min, max];
 }
 
 /**

package/src/victory-util/events.ts

@@ -20,7 +20,8 @@ export interface ComponentEvent {
   eventKey?: ComponentEventKey | ComponentEventKey[];
   eventHandlers: ComponentEventHandlers;
 }
-export type ComponentEventName = `on${Capitalize<string>}`;
+// Normally we'd use Template Literal Types, but we're avoiding it to maximize TS compatibility with TS < 4.1
+export type ComponentEventName = string; // `on${Capitalize<string>}`;
 export interface ComponentEventHandlers {
   [k: ComponentEventName]: ComponentEventHandler;
 }
@@ -447,9 +448,8 @@ export function getExternalMutation(
       // coerce arrays to strings before matching
       const stringArray = mutation[type].map((m) => `${m}`);
       return includes(stringArray, identifier[type]);
-    } else {
-      return false;
     }
+    return false;
   };
 
   mutations = Array.isArray(mutations) ? mutations : [mutations];

package/src/victory-util/helpers.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-use-before-define */
 import React from "react";
 import { defaults, isFunction, property, pick, assign, keys } from "lodash";
+import { CallbackArgs, ValueOrCallback } from "../types/callbacks";
 
 // Private Functions
 
@@ -126,7 +127,10 @@ export function getStyles(style, defaultStyles) {
   };
 }
 
-export function evaluateProp(prop, props) {
+export function evaluateProp<TValue>(
+  prop: ValueOrCallback<TValue>,
+  props: CallbackArgs,
+): TValue {
   return isFunction(prop) ? prop(props) : prop;
 }
 

package/src/victory-util/hooks/{use-animation-state.js → use-animation-state.ts}

@@ -4,18 +4,33 @@ import { defaults, some } from "lodash";
 import * as Collection from "../collection";
 import * as Transitions from "../transitions";
 
-const INITIAL_STATE = {
+const INITIAL_STATE: AnimationState = {
   nodesShouldLoad: false,
   nodesDoneLoad: false,
   animating: true,
 };
 
+type AnyObject = Record<string, any>;
+
+export type AnimationState = {
+  nodesShouldLoad?: boolean;
+  nodesDoneLoad?: boolean;
+  animating?: boolean;
+  childrenTransitions?: any[];
+  nodesWillExit?: boolean;
+  nodesWillEnter?: boolean;
+  nodesShouldEnter?: boolean;
+  oldProps?: AnyObject;
+  nextProps?: AnyObject;
+  continuous?: boolean;
+};
+
 export const useAnimationState = (initialState = INITIAL_STATE) => {
   const [state, _setState] = React.useState(initialState);
 
   // This allows us to use a state object and maintain the same API as this.setState
   const setState = React.useCallback(
-    (newState) => {
+    (newState: AnimationState) => {
       _setState((oldState) => ({ ...oldState, ...newState }));
     },
     [_setState],
@@ -23,7 +38,7 @@ export const useAnimationState = (initialState = INITIAL_STATE) => {
 
   // This is a copy of Wrapper.getAnimationProps
   const getAnimationProps = React.useCallback(
-    (props, child, index) => {
+    (props: AnyObject | undefined, child, index) => {
       if (!props?.animate) {
         return child.props.animate;
       }
@@ -59,8 +74,8 @@ export const useAnimationState = (initialState = INITIAL_STATE) => {
 
   // This is a copy of Wrapper.setAnimationState
   const setAnimationState = React.useCallback(
-    (props, nextProps) => {
-      if (!props || !props.animate) {
+    (props: AnyObject | undefined, nextProps) => {
+      if (!props?.animate) {
         return;
       }
       if (props.animate.parentState) {
@@ -81,7 +96,7 @@ export const useAnimationState = (initialState = INITIAL_STATE) => {
 
         const continuous =
           !props.polar &&
-          some(oldChildren, (child) => {
+          some(oldChildren, (child: React.ReactElement) => {
             return (
               isContinuous(child) ||
               (child.props.children && isContinuous(child.props.children))
@@ -101,7 +116,7 @@ export const useAnimationState = (initialState = INITIAL_STATE) => {
           childrenTransitions: Collection.isArrayOfArrays(childrenTransitions)
             ? childrenTransitions[0]
             : childrenTransitions,
-          oldProps: nodesWillExit ? props : null,
+          oldProps: nodesWillExit ? props : undefined,
           nextProps,
           continuous,
         });
@@ -111,7 +126,7 @@ export const useAnimationState = (initialState = INITIAL_STATE) => {
   );
 
   const getProps = React.useCallback(
-    (initialProps) => {
+    (initialProps: AnyObject) => {
       return state && state.nodesWillExit
         ? state.oldProps || initialProps
         : initialProps;

package/src/victory-util/label-helpers.ts

@@ -12,9 +12,8 @@ function getVerticalAnchor(props, datum) {
     return datum.verticalAnchor || labelStyle.verticalAnchor;
   } else if (!props.horizontal) {
     return sign >= 0 ? "end" : "start";
-  } else {
-    return "middle";
   }
+  return "middle";
 }
 
 function getTextAnchor(props, datum) {
@@ -26,9 +25,8 @@ function getTextAnchor(props, datum) {
     return datum.verticalAnchor || labelStyle.verticalAnchor;
   } else if (!horizontal) {
     return "middle";
-  } else {
-    return sign >= 0 ? "start" : "end";
   }
+  return sign >= 0 ? "start" : "end";
 }
 
 function getAngle(props, datum) {
@@ -66,13 +64,12 @@ function getPosition(props, datum) {
   const { x, y } = Helpers.scalePoint(props, datum);
   if (!polar) {
     return { x, y };
-  } else {
-    const polarPadding = getPolarPadding(props, datum);
-    return {
-      x: x + polarPadding.x,
-      y: y + polarPadding.y,
-    };
   }
+  const polarPadding = getPolarPadding(props, datum);
+  return {
+    x: x + polarPadding.x,
+    y: y + polarPadding.y,
+  };
 }
 
 function getPolarPadding(props, datum) {
@@ -106,9 +103,8 @@ function getPolarOrientation(degrees) {
     // eslint-disable-next-line no-magic-numbers
   } else if (degrees > 135 && degrees < 225) {
     return "left";
-  } else {
-    return "bottom";
   }
+  return "bottom";
 }
 
 // Exported Functions

package/src/victory-util/point-path-helpers.ts

@@ -1,4 +1,4 @@
-/*eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 2.5, 3] }]*/
+/* eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 2.5, 3] }]*/
 import { range } from "lodash";
 
 export function circle(x: number, y: number, size: number) {

package/src/victory-util/prop-types.ts

@@ -49,9 +49,8 @@ const getConstructor = (value) => {
     return undefinedConstructor;
   } else if (value === null) {
     return nullConstructor;
-  } else {
-    return value.constructor;
   }
+  return value.constructor;
 };
 
 /**

package/src/victory-util/scale.ts

@@ -39,7 +39,7 @@ function isScaleDefined(props, axis: "x" | "y") {
   if (!props.scale) {
     return false;
   } else if (props.scale.x || props.scale.y) {
-    return props.scale[axis] ? true : false;
+    return !!props.scale[axis];
   }
   return true;
 }

package/src/victory-util/selection.ts

@@ -1,5 +1,7 @@
 import React from "react";
-import { Collection, VictoryCommonProps } from "./index";
+import * as Collection from "./collection";
+import { VictoryCommonProps } from "./common-props";
+
 import type { DomainPropType, ScaleXYPropType } from "../types/prop-types";
 
 // Private Functions
@@ -50,9 +52,8 @@ export function getParentSVG(
   const getParent = (target) => {
     if (target.nodeName === "svg") {
       return target;
-    } else {
-      return target.parentNode ? getParent(target.parentNode) : target;
     }
+    return target.parentNode ? getParent(target.parentNode) : target;
   };
   return getParent(evt.target);
 }
@@ -83,7 +84,7 @@ export function getSVGEventCoordinates(
 export function getDomainCoordinates(
   props: Pick<VictoryCommonProps, "scale" | "horizontal">,
   domain?: DomainPropType,
-): DomainPropType {
+) {
   const { horizontal } = props;
   const scale = props.scale as ScaleXYPropType;
   // FIXME: add support for DomainTuple: [number, number]
@@ -114,17 +115,16 @@ export function getDataCoordinates(
       x: horizontal ? scale.x.invert(y) : scale.x.invert(x),
       y: horizontal ? scale.y.invert(x) : scale.y.invert(y),
     };
-  } else {
-    const origin = props.origin || { x: 0, y: 0 };
-    const baseX = x - origin.x;
-    const baseY = y - origin.y;
-    const radius = Math.abs(baseX * Math.sqrt(1 + Math.pow(-baseY / baseX, 2)));
-    const angle = (-Math.atan2(baseY, baseX) + Math.PI * 2) % (Math.PI * 2);
-    return {
-      x: scale.x.invert(angle),
-      y: scale.y.invert(radius),
-    };
   }
+  const origin = props.origin || { x: 0, y: 0 };
+  const baseX = x - origin.x;
+  const baseY = y - origin.y;
+  const radius = Math.abs(baseX * Math.sqrt(1 + Math.pow(-baseY / baseX, 2)));
+  const angle = (-Math.atan2(baseY, baseX) + Math.PI * 2) % (Math.PI * 2);
+  return {
+    x: scale.x.invert(angle),
+    y: scale.y.invert(radius),
+  };
 }
 
 export function getBounds(props: ComputedCommonProps): SVGCoordinateBounds {
@@ -155,4 +155,5 @@ type ComputedCommonProps = {
   x2: number;
   y1: number;
   y2: number;
+  horizontal?: boolean;
 };

package/src/victory-util/style.ts

@@ -14,19 +14,18 @@ export const toTransformString = function (obj, ...more) {
         return [memo, toTransformString(currentObj)].join(" ");
       }, toTransformString(obj))
       .trim();
-  } else {
-    if (obj === undefined || obj === null || typeof obj === "string") {
-      return obj;
-    }
-    const transforms = [] as string[];
-    for (const key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        const value = obj[key];
-        transforms.push(`${key}(${value})`);
-      }
+  }
+  if (obj === undefined || obj === null || typeof obj === "string") {
+    return obj;
+  }
+  const transforms = [] as string[];
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      const value = obj[key];
+      transforms.push(`${key}(${value})`);
     }
-    return transforms.join(" ").trim();
   }
+  return transforms.join(" ").trim();
 };
 
 /**

package/src/victory-util/textsize.ts

@@ -1,10 +1,10 @@
 // http://www.pearsonified.com/2012/01/characters-per-line.php
-/*eslint-disable no-magic-numbers */
+/* eslint-disable no-magic-numbers */
 import { assign, defaults } from "lodash";
 
 // Based on measuring specific character widths
 // as in the following example https://bl.ocks.org/tophtucker/62f93a4658387bb61e4510c37e2e97cf
-//prettier-ignore
+// prettier-ignore
 const fonts = {
   "American Typewriter": {
     widths: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.25,0.4203125,0.3296875,0.6,0.6375,0.8015625,0.8203125,0.1875,0.45625,0.45625,0.6375,0.5,0.2734375,0.309375,0.2734375,0.4390625,0.6375,0.6375,0.6375,0.6375,0.6375,0.6375,0.6375,0.6375,0.6375,0.6375,0.2734375,0.2734375,0.5,0.5,0.5,0.6,0.6921875,0.7640625,0.6921875,0.6375,0.728125,0.6734375,0.6203125,0.7109375,0.784375,0.3828125,0.6421875,0.7859375,0.6375,0.9484375,0.7640625,0.65625,0.6375,0.65625,0.7296875,0.6203125,0.6375,0.7109375,0.740625,0.940625,0.784375,0.7578125,0.6203125,0.4375,0.5,0.4375,0.5,0.5,0.4921875,0.5734375,0.5890625,0.5109375,0.6,0.528125,0.43125,0.5578125,0.6375,0.3109375,0.40625,0.6234375,0.309375,0.928125,0.6375,0.546875,0.6,0.58125,0.4921875,0.4921875,0.4,0.6203125,0.625,0.825,0.6375,0.640625,0.528125,0.5,0.5,0.5,0.6671875],
@@ -112,7 +112,7 @@ const fonts = {
   }
 }
 
-//https://developer.mozilla.org/en/docs/Web/CSS/length
+// https://developer.mozilla.org/en/docs/Web/CSS/length
 // Absolute sizes in pixels for obsolete measurement units.
 const absoluteMeasurementUnitsToPixels = {
   mm: 3.8,

package/src/victory-util/transitions.ts

@@ -342,9 +342,8 @@ export function getTransitionPropsFactory(props, state, setState) {
       return animationDuration !== undefined
         ? animationDuration
         : defaultTransitions[type] && defaultTransitions[type].duration;
-    } else {
-      return {};
     }
+    return {};
   };
 
   // eslint-disable-next-line max-statements, complexity, max-len

package/src/victory-util/user-props.ts

@@ -11,7 +11,8 @@ const USER_PROPS_SAFELIST = {
   exactMatch: [] as string[],
 };
 
-type SafeAttribute = `data-${string}` | `aria-${string}`;
+// Normally we'd use Template Literal Types, but we're avoiding it to maximize TS compatibility with TS < 4.1
+type SafeAttribute = string; // `data-${string}` | `aria-${string}`;
 
 /**
  * doesPropStartWith: Function that takes a prop's key and runs it against all

package/src/victory-util/with-container.tsx

@@ -1,9 +1,6 @@
 import React from "react";
-import {
-  VictoryProvider,
-  VictoryProviderProps,
-  VictoryContainer,
-} from "victory-core";
+import { VictoryProvider, VictoryProviderProps } from "../victory-state";
+import { VictoryContainer } from "../victory-container/victory-container";
 import { VictoryCommonProps } from "./common-props";
 
 const defaultProviderProps = {
@@ -14,9 +11,9 @@ const defaultProviderProps = {
 };
 
 export function withContainer<Props extends VictoryCommonProps>(
-  WrappedComponent: (props: Props) => React.ReactElement,
+  WrappedComponent: React.FC<Props>,
   initialProviderProps: Partial<VictoryProviderProps> = {},
-) {
+): React.FC<Props> {
   return (props: Props) => {
     const providerProps = {
       ...defaultProviderProps,

package/src/victory-util/wrapper.tsx

@@ -228,9 +228,8 @@ export function getDomainFromChildren(props, axis, childComponents) {
       return null;
     } else if (child.type && isFunction(child.type.getDomain)) {
       return child.props && child.type.getDomain(sharedProps, axis);
-    } else {
-      return Domain.getDomain(sharedProps, axis);
     }
+    return Domain.getDomain(sharedProps, axis);
   };
 
   const childDomains = Helpers.reduceChildren(children, iteratee, props);
@@ -360,15 +359,14 @@ export function getStringsFromCategories(childComponents, axis) {
     const childProps = child.props || {};
     if (!Domain.isDomainComponent(child) || !childProps.categories) {
       return null;
-    } else {
-      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.removeUndefined(categoryStrings) : [];
     }
+    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.removeUndefined(categoryStrings) : [];
   };
   return Helpers.reduceChildren(childComponents.slice(0), iteratee);
 }
@@ -451,7 +449,7 @@ export function getStringsFromChildren(props, childComponents) {
   };
 }
 
-export function getCategories(props, childComponents, allStrings) {
+export function getCategories(props, childComponents, allStrings?) {
   const xPropCategories =
     props.categories && !Array.isArray(props.categories)
       ? props.categories.x