victory-core 36.5.2 → 36.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.5.2",
+  "version": "36.6.1",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -13,6 +13,7 @@
     "url": "https://github.com/formidablelabs/victory.git"
   },
   "homepage": "https://formidable.com/open-source/victory",
+  "sideEffects": false,
   "main": "lib/index.js",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",
@@ -22,14 +23,267 @@
     "lodash": "^4.17.21",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-vendor": "^36.5.1"
+    "victory-vendor": "^36.6.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
   },
-  "scripts": {
-    "version": "yarn run nps build-libs && nps build-dists"
+  "devDependencies": {
+    "victory-axis": "*",
+    "victory-bar": "*",
+    "victory-core": "*",
+    "victory-line": "*"
   },
-  "sideEffects": false,
-  "gitHead": "def218e9749ecafc159ef458dd03a8b92e227666"
-}
+  "wireit": {
+    "###            THESE WIREIT CONFIGS ARE GENERATED        ####": {},
+    "###            DO NOT MODIFY THESE MANUALLY              ####": {},
+    "build": {
+      "dependencies": [
+        "build:lib",
+        "build:dist",
+        "types:create"
+      ]
+    },
+    "build:lib": {
+      "dependencies": [
+        "build:lib:esm",
+        "build:lib:cjs"
+      ]
+    },
+    "build:lib:esm": {
+      "command": "nps build:lib:esm",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js"
+      ],
+      "output": [
+        "es/**/*.js",
+        "es/**/*.js.map"
+      ],
+      "dependencies": [
+        "../victory-vendor:build:lib:esm"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "build:lib:cjs": {
+      "command": "nps build:lib:cjs",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js"
+      ],
+      "output": [
+        "lib/**/*.js",
+        "lib/**/*.js.map"
+      ],
+      "dependencies": [
+        "../victory-vendor:build:lib:cjs"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "build:dist": {
+      "dependencies": [
+        "build:dist:dev",
+        "build:dist:min"
+      ]
+    },
+    "build:dist:dev": {
+      "command": "nps build:dist:dev",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js",
+        "../../config/webpack.config.js",
+        "../../config/webpack.config.dev.js"
+      ],
+      "output": [
+        "dist/victory*.js",
+        "!dist/victory*.min.js*"
+      ],
+      "dependencies": [
+        "../victory-vendor:build:lib:esm"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "build:dist:min": {
+      "command": "nps build:dist:min",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js",
+        "../../config/webpack.config.js"
+      ],
+      "output": [
+        "dist/victory*.min.js*"
+      ],
+      "dependencies": [
+        "../victory-vendor:build:lib:esm"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "check": {
+      "dependencies": [
+        "types:check",
+        "jest",
+        "format",
+        "lint"
+      ]
+    },
+    "types:check": {
+      "command": "nps types:pkg:check",
+      "files": [
+        "src/**/*.{ts,tsx}",
+        "../../tsconfig.base.json",
+        "tsconfig.json"
+      ],
+      "dependencies": [
+        "types:create",
+        "../victory-vendor:types:create",
+        "../victory-axis:types:create",
+        "../victory-bar:types:create",
+        "../victory-line:types:create",
+        "../victory-voronoi:types:create"
+      ],
+      "output": [],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "types:create": {
+      "command": "nps types:pkg:create",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../tsconfig.base.json",
+        "tsconfig.build.json"
+      ],
+      "output": [
+        "es/**/*.d.ts",
+        "es/**/*.d.ts.map",
+        "lib/**/*.d.ts",
+        "lib/**/*.d.ts.map"
+      ],
+      "dependencies": [
+        "../victory-vendor:types:create"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "format": {
+      "command": "nps format:pkg",
+      "files": [
+        "src/**",
+        "*.json",
+        "../../.prettierignore",
+        "../../.prettierrc.json"
+      ],
+      "output": [],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "format:fix": {
+      "command": "pnpm run format || nps format:pkg:fix",
+      "files": [
+        "src/**",
+        "*.json",
+        "../../.prettierignore",
+        "../../.prettierrc.json"
+      ],
+      "output": [],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "lint": {
+      "command": "nps lint:pkg",
+      "files": [
+        "src/**",
+        "../../.eslintignore",
+        "../../.eslintrc.js"
+      ],
+      "output": [],
+      "dependencies": [
+        "../victory-vendor:build",
+        "../victory-vendor:types:create",
+        "../victory-axis:types:create",
+        "../victory-bar:types:create",
+        "../victory-line:types:create",
+        "../victory-voronoi:types:create"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "lint:fix": {
+      "command": "pnpm run lint || nps lint:pkg:fix",
+      "files": [
+        "src/**",
+        "../../.eslintignore",
+        "../../.eslintrc.js"
+      ],
+      "output": [],
+      "dependencies": [
+        "../victory-vendor:build",
+        "../victory-vendor:types:create",
+        "../victory-axis:types:create",
+        "../victory-bar:types:create",
+        "../victory-line:types:create",
+        "../victory-voronoi:types:create"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "jest": {
+      "command": "nps jest:pkg",
+      "files": [
+        "src/**/*.test.*",
+        "../../.babelrc.js",
+        "../../test/jest-config.js",
+        "../../test/jest-setup.ts"
+      ],
+      "output": [],
+      "dependencies": [
+        "build:lib:cjs",
+        "../victory-axis:build:lib:cjs",
+        "../victory-bar:build:lib:cjs",
+        "../victory-line:build:lib:cjs",
+        "../victory-vendor:build:lib:cjs",
+        "../victory-voronoi:build:lib:cjs"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    }
+  },
+  "scripts": {
+    "###            THESE SCRIPTS ARE GENERATED           ###": "true",
+    "###            DO NOT MODIFY THESE MANUALLY          ###": "true",
+    "build": "wireit",
+    "build:lib": "wireit",
+    "build:lib:esm": "wireit",
+    "build:lib:cjs": "wireit",
+    "build:dist": "wireit",
+    "build:dist:dev": "wireit",
+    "build:dist:min": "wireit",
+    "check": "wireit",
+    "types:check": "wireit",
+    "types:create": "wireit",
+    "format": "wireit",
+    "format:fix": "wireit",
+    "lint": "wireit",
+    "lint:fix": "wireit",
+    "jest": "wireit"
+  }
+}

package/src/index.ts

@@ -13,5 +13,6 @@ export * from "./victory-portal/portal-context";
 export * from "./victory-portal/victory-portal";
 export * from "./victory-primitives";
 export { Border as Box } from "./victory-primitives";
+export type { BorderProps as BoxProps } from "./victory-primitives";
 export * from "./victory-util";
 export * from "./victory-state";

package/src/types/callbacks.ts

@@ -13,7 +13,7 @@ export interface CallbackArgs {
   data?: Datum[];
   datum?: Datum;
   horizontal?: boolean;
-  index: ID;
+  index?: ID;
   x?: number;
   y?: number;
   scale?: {
@@ -51,3 +51,5 @@ export type PaddingOrCallback = number | BlockProps | VictoryPaddingCallback;
 export type OrientationOrCallback =
   | OrientationTypes
   | VictoryOrientationCallback;
+
+export type ValueOrCallback<TValue> = TValue | ((args: CallbackArgs) => TValue);

package/src/victory-animation/victory-animation.tsx

@@ -1,4 +1,4 @@
-/*global setTimeout:false */
+/* global setTimeout:false */
 import React from "react";
 import PropTypes from "prop-types";
 import * as d3Ease from "victory-vendor/d3-ease";

package/src/victory-label/victory-label.tsx

@@ -1,4 +1,4 @@
-/*eslint no-magic-numbers: ["error", { "ignore": [-0.5, 0.5, 0, 1, 2] }]*/
+/* eslint no-magic-numbers: ["error", { "ignore": [-0.5, 0.5, 0, 1, 2] }]*/
 import { assign, defaults, isEmpty } from "lodash";
 import PropTypes from "prop-types";
 import React from "react";
@@ -17,6 +17,7 @@ import {
   NumberOrCallback,
   StringOrCallback,
   StringOrNumberOrCallback,
+  ValueOrCallback,
 } from "../types/callbacks";
 import {
   PaddingProps,
@@ -55,11 +56,11 @@ export interface VictoryLabelProps {
   tabIndex?: NumberOrCallback;
   text?: string[] | StringOrNumberOrCallback;
   textComponent?: React.ReactElement;
-  textAnchor?: TextAnchorType | { (): TextAnchorType };
+  textAnchor?: ValueOrCallback<TextAnchorType>;
   title?: string;
-  transform?: string | object | (() => string | object);
+  transform?: ValueOrCallback<string | object>;
   tspanComponent?: React.ReactElement;
-  verticalAnchor?: VerticalAnchorType | { (): VerticalAnchorType };
+  verticalAnchor?: ValueOrCallback<VerticalAnchorType>;
   x?: number;
   y?: number;
   dx?: StringOrNumberOrCallback;
@@ -89,13 +90,12 @@ const getFontSize = (style) => {
   } else if (baseSize === undefined || baseSize === null) {
     return defaultStyles.fontSize;
   } else if (typeof baseSize === "string") {
-    const fontSize = +baseSize.replace("px", "");
+    const fontSize = Number(baseSize.replace("px", ""));
     if (!isNaN(fontSize)) {
       return fontSize;
-    } else {
-      Log.warn("fontSize should be expressed as a number of pixels");
-      return defaultStyles.fontSize;
     }
+    Log.warn("fontSize should be expressed as a number of pixels");
+    return defaultStyles.fontSize;
   }
   return defaultStyles.fontSize;
 };
@@ -146,19 +146,17 @@ const getBackgroundPadding = (props) => {
       const padding = Helpers.evaluateProp(backgroundPadding, props);
       return Helpers.getPadding({ padding });
     });
-  } else {
-    const padding = Helpers.evaluateProp(props.backgroundPadding, props);
-    return Helpers.getPadding({ padding });
   }
+  const padding = Helpers.evaluateProp(props.backgroundPadding, props);
+  return Helpers.getPadding({ padding });
 };
 
 const getLineHeight = (props) => {
   const lineHeight = Helpers.evaluateProp(props.lineHeight, props);
   if (Array.isArray(lineHeight)) {
     return isEmpty(lineHeight) ? [1] : lineHeight;
-  } else {
-    return lineHeight;
   }
+  return lineHeight;
 };
 
 const getContent = (text, props) => {
@@ -200,20 +198,19 @@ const getDy = (props, verticalAnchor, lineHeight) => {
       ? dy + (capHeight / 2 + (0.5 - length) * lineHeights[0]) * fontSizes[0]
       : dy +
           (capHeight / 2 + (0.5 - length / 2) * lineHeights[0]) * fontSizes[0];
-  } else {
-    const allHeights = [...Array(length).keys()].reduce((memo, i) => {
-      return (
-        memo +
-        ((capHeight / 2 + (0.5 - length) * lineHeights[i]) * fontSizes[i]) /
-          length
-      );
-    }, 0);
-    return anchor === "end"
-      ? dy + allHeights
-      : dy +
-          allHeights / 2 +
-          (capHeight / 2) * lineHeights[length - 1] * fontSizes[length - 1];
   }
+  const allHeights = [...Array(length).keys()].reduce((memo, i) => {
+    return (
+      memo +
+      ((capHeight / 2 + (0.5 - length) * lineHeights[i]) * fontSizes[i]) /
+        length
+    );
+  }, 0);
+  return anchor === "end"
+    ? dy + allHeights
+    : dy +
+        allHeights / 2 +
+        (capHeight / 2) * lineHeights[length - 1] * fontSizes[length - 1];
 };
 
 const getTransform = (props, x, y) => {
@@ -455,9 +452,8 @@ const getTSpanDy = (tspanValues, calculatedProps, i) => {
     return calculateSpanDy(tspanValues, i, calculatedProps);
   } else if (inline) {
     return i === 0 ? current.backgroundPadding.top : undefined;
-  } else {
-    return current.backgroundPadding.top;
   }
+  return current.backgroundPadding.top;
 };
 
 const evaluateProps = (props) => {

package/src/victory-primitives/arc.tsx

@@ -1,4 +1,4 @@
-/*eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 180] }]*/
+/* eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 180] }]*/
 import React from "react";
 import PropTypes from "prop-types";
 import * as Helpers from "../victory-util/helpers";

package/src/victory-transition/victory-transition.tsx

@@ -73,7 +73,7 @@ export class VictoryTransition extends React.Component<
   }
 
   componentDidMount() {
-    this.setState({ nodesShouldLoad: true }); //eslint-disable-line react/no-did-mount-set-state
+    this.setState({ nodesShouldLoad: true }); // eslint-disable-line react/no-did-mount-set-state
   }
 
   shouldComponentUpdate(nextProps: VictoryTransitionProps) {
@@ -101,24 +101,23 @@ export class VictoryTransition extends React.Component<
       const state = animate.parentState;
       const oldProps = state.nodesWillExit ? props : null;
       return { oldProps, nextProps };
-    } else {
-      const oldChildren = React.Children.toArray(props.children);
-      const nextChildren = React.Children.toArray(nextProps.children);
-      const {
-        nodesWillExit,
-        nodesWillEnter,
-        childrenTransitions,
-        nodesShouldEnter,
-      } = Transitions.getInitialTransitionState(oldChildren, nextChildren);
-      return {
-        nodesWillExit,
-        nodesWillEnter,
-        childrenTransitions,
-        nodesShouldEnter,
-        oldProps: nodesWillExit ? props : null,
-        nextProps,
-      };
     }
+    const oldChildren = React.Children.toArray(props.children);
+    const nextChildren = React.Children.toArray(nextProps.children);
+    const {
+      nodesWillExit,
+      nodesWillEnter,
+      childrenTransitions,
+      nodesShouldEnter,
+    } = Transitions.getInitialTransitionState(oldChildren, nextChildren);
+    return {
+      nodesWillExit,
+      nodesWillEnter,
+      childrenTransitions,
+      nodesShouldEnter,
+      oldProps: nodesWillExit ? props : null,
+      nextProps,
+    };
   }
 
   private getDomainFromChildren(
@@ -149,15 +148,14 @@ export class VictoryTransition extends React.Component<
       : childProps.domain && childProps.domain[axis];
     if (!childProps.children && domain) {
       return domain;
-    } else {
-      const childDomains = getChildDomains([child]);
-      return childDomains.length === 0
-        ? [0, 1]
-        : [
-            Collection.getMinValue(childDomains),
-            Collection.getMaxValue(childDomains),
-          ];
     }
+    const childDomains = getChildDomains([child]);
+    return childDomains.length === 0
+      ? [0, 1]
+      : [
+          Collection.getMinValue(childDomains),
+          Collection.getMaxValue(childDomains),
+        ];
   }
 
   pickProps() {

package/src/victory-util/add-events.tsx

@@ -1,4 +1,3 @@
-/*global window:false */
 import React from "react";
 import {
   assign,
@@ -37,7 +36,7 @@ const defaultComponents: NonNullable<MixinOptions["components"]> = [
 export type MixinOptions = {
   components?: Array<{
     name: string;
-    index?: string;
+    index?: string | number;
   }>;
 };
 
@@ -58,12 +57,22 @@ export interface EventMixinCommonProps
 export interface EventsMixinClass<TProps> {
   renderContainer(
     component: React.ReactElement,
-    children: React.ReactElement[],
+    children: React.ReactElement | React.ReactElement[],
   ): React.ReactElement;
   cacheValues<TThis>(this: TThis, obj: Partial<TThis>): void;
   getEventState: typeof Events.getEventState;
+  renderData(props: TProps);
   renderContinuousData(props: TProps);
-  animateComponent(props: TProps, defaultAnimationWhitelist);
+  animateComponent(
+    props: TProps,
+    defaultAnimationWhitelist: string[],
+  ): React.ReactElement;
+  getComponentProps(
+    component: React.ReactElement,
+    type: string,
+    index: number,
+  ): TProps;
+  dataKeys: string[];
 }
 
 /**
@@ -78,14 +87,47 @@ export interface EventMixinCalculatedValues {
   events: unknown;
 }
 
+/**
+ * These are the common roles that we care about internally.
+ */
+export type VictoryComponentCommonRole =
+  | "container"
+  | "group"
+  | "histogram"
+  | "label"
+  | "line"
+  | "portal"
+  | "stack"
+  | "tooltip"
+  | "voronoi";
+
+/**
+ * A component can have any "role",
+ * but there are certain ones that we actually care about internally
+ */
+export type VictoryComponentRole = VictoryComponentCommonRole | string;
+
+/**
+ * Static component fields used by Victory for common behavior
+ */
+export interface VictoryComponentConfiguration<TProps> {
+  getBaseProps?(props: TProps): EventMixinCalculatedValues["baseProps"];
+  role?: VictoryComponentRole;
+  expectedComponents?: Array<keyof TProps | string>;
+  getChildren?: (
+    props: TProps,
+    childComponents?: Array<React.ReactNode>,
+    calculatedProps?: TProps,
+  ) => void;
+  animationWhitelist?: Array<keyof TProps | string>;
+}
+
 /**
  * This represents the class itself, including static fields
  */
-export interface WrappedComponentClass<TProps> {
+export interface WrappedComponentClass<TProps>
+  extends VictoryComponentConfiguration<TProps> {
   new (props: TProps): React.Component<TProps>;
-  getBaseProps?(props: TProps): EventMixinCalculatedValues["baseProps"];
-  role?: string;
-  expectedComponents?: string[];
 }
 
 export function addEvents<
@@ -214,13 +256,12 @@ export function addEvents<
           if (!props.standalone && component.name === "parent") {
             // don't check for changes on parent props for non-standalone components
             return undefined;
-          } else {
-            return component.index !== undefined
-              ? getState(component.index, component.name)
-              : this.dataKeys
-                  .map((key) => getState(key, component.name))
-                  .filter(Boolean);
           }
+          return component.index !== undefined
+            ? getState(component.index, component.name)
+            : this.dataKeys
+                .map((key) => getState(key, component.name))
+                .filter(Boolean);
         })
         .filter(Boolean);
       return stateChanges;
@@ -361,7 +402,10 @@ export function addEvents<
       return React.cloneElement(component, parentProps, children);
     }
 
-    animateComponent(props: TProps, defaultAnimationWhitelist: string[]) {
+    animateComponent(
+      props: TProps,
+      defaultAnimationWhitelist: string[],
+    ): React.ReactElement {
       const animationWhitelist =
         (typeof props.animate === "object" &&
           props.animate?.animationWhitelist) ||

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