victory-core 36.6.0 → 36.6.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # victory-core
 
+## 36.6.1
+
+### Patch Changes
+
+- - Removed Template Literal Types to increase TS compatibility (fixes [#2418](https://github.com/FormidableLabs/victory/issues/2418)) ([#2420](https://github.com/FormidableLabs/victory/pull/2420))
+  - Improved type for `VictoryLabelProps["textAnchor"]` (fixes [#2361](https://github.com/FormidableLabs/victory/issues/2361))
+  - Fixed exported types for `VictoryAxis`, `VictoryBoxPlot`, `VictoryErrorBar`, and `VictoryScatter` (fixes [#2411](https://github.com/FormidableLabs/victory/issues/2411))
+  - Migrate `victory-cursor-container` to TS (fixes [#2402](https://github.com/FormidableLabs/victory/issues/2402))
+- Updated dependencies []:
+  - victory-vendor@36.6.1
+
 ## 36.6.0
 
 ### Minor Changes

package/dist/victory-core.js

@@ -10065,7 +10065,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var USER_PROPS_SAFELIST = {
   startsWith: ["data-", "aria-"],
   exactMatch: []
-};
+}; // Normally we'd use Template Literal Types, but we're avoiding it to maximize TS compatibility with TS < 4.1
+
+// `data-${string}` | `aria-${string}`;
 
 /**
  * doesPropStartWith: Function that takes a prop's key and runs it against all

package/es/types/callbacks.d.ts

@@ -12,7 +12,7 @@ export interface CallbackArgs {
     data?: Datum[];
     datum?: Datum;
     horizontal?: boolean;
-    index: ID;
+    index?: ID;
     x?: number;
     y?: number;
     scale?: {
@@ -34,4 +34,5 @@ export declare type VictoryOrientationCallback = (args: CallbackArgs) => Orienta
 export declare type NumberOrCallback = number | VictoryNumberCallback;
 export declare type PaddingOrCallback = number | BlockProps | VictoryPaddingCallback;
 export declare type OrientationOrCallback = OrientationTypes | VictoryOrientationCallback;
+export declare type ValueOrCallback<TValue> = TValue | ((args: CallbackArgs) => TValue);
 //# sourceMappingURL=callbacks.d.ts.map

package/es/victory-label/victory-label.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback } from "../types/callbacks";
+import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback, ValueOrCallback } from "../types/callbacks";
 import { PaddingProps, VerticalAnchorType, VictoryLabelStyleObject } from "../victory-theme/victory-theme";
 export declare type TextAnchorType = "start" | "middle" | "end" | "inherit";
 export declare type OriginType = {
@@ -34,15 +34,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;

package/es/victory-util/add-events.d.ts

@@ -26,7 +26,7 @@ export interface EventsMixinClass<TProps> {
     getEventState: typeof Events.getEventState;
     renderData(props: TProps): any;
     renderContinuousData(props: TProps): any;
-    animateComponent(props: TProps, defaultAnimationWhitelist: any): any;
+    animateComponent(props: TProps, defaultAnimationWhitelist: string[]): React.ReactElement;
     getComponentProps(component: React.ReactElement, type: string, index: number): TProps;
     dataKeys: string[];
 }
@@ -41,14 +41,30 @@ export interface EventMixinCalculatedValues {
     hasEvents: unknown;
     events: unknown;
 }
+/**
+ * These are the common roles that we care about internally.
+ */
+export declare 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 declare 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 declare function addEvents<TBase extends WrappedComponentClass<TProps>, TProps extends EventMixinCommonProps>(WrappedComponent: TBase, options?: MixinOptions): {
     new (props: TProps): {
@@ -76,7 +92,7 @@ export declare function addEvents<TBase extends WrappedComponentClass<TProps>, T
         getAllEvents(props: any): any;
         getComponentProps(component: any, type: any, index: any): any;
         renderContainer(component: any, children: any): React.DetailedReactHTMLElement<any, HTMLElement>;
-        animateComponent(props: TProps, defaultAnimationWhitelist: string[]): JSX.Element;
+        animateComponent(props: TProps, defaultAnimationWhitelist: string[]): React.ReactElement;
         renderContinuousData(props: TProps): React.DetailedReactHTMLElement<any, HTMLElement>;
         renderData(props: any, shouldRenderDatum?: (datum: any) => boolean): React.DetailedReactHTMLElement<any, HTMLElement>;
         context: unknown;
@@ -104,6 +120,8 @@ export declare function addEvents<TBase extends WrappedComponentClass<TProps>, T
     };
     getBaseProps?(props: TProps): Record<string, object>;
     role?: string | undefined;
-    expectedComponents?: string[] | undefined;
+    expectedComponents?: (string | keyof TProps)[] | undefined;
+    getChildren?: ((props: TProps, childComponents?: React.ReactNode[] | undefined, calculatedProps?: TProps | undefined) => void) | undefined;
+    animationWhitelist?: (string | keyof TProps)[] | undefined;
 } & TBase;
 //# sourceMappingURL=add-events.d.ts.map

package/es/victory-util/events.d.ts

@@ -6,7 +6,7 @@ export interface ComponentEvent {
     eventKey?: ComponentEventKey | ComponentEventKey[];
     eventHandlers: ComponentEventHandlers;
 }
-export declare type ComponentEventName = `on${Capitalize<string>}`;
+export declare type ComponentEventName = string;
 export interface ComponentEventHandlers {
     [k: ComponentEventName]: ComponentEventHandler;
 }

package/es/victory-util/helpers.d.ts

@@ -1,4 +1,5 @@
 import React from "react";
+import { CallbackArgs, ValueOrCallback } from "../types/callbacks";
 /**
  * creates an object with some keys excluded
  * replacement for lodash.omit for performance. does not mimic the entire lodash.omit api
@@ -23,7 +24,7 @@ export declare function getPadding(props: any, name?: string): {
 export declare function isTooltip(component: any): boolean;
 export declare function getDefaultStyles(props: any, role: any): any;
 export declare function getStyles(style: any, defaultStyles: any): any;
-export declare function evaluateProp(prop: any, props: any): any;
+export declare function evaluateProp<TValue>(prop: ValueOrCallback<TValue>, props: CallbackArgs): TValue;
 export declare function evaluateStyle(style: any, props: any): any;
 export declare function degreesToRadians(degrees: any): any;
 export declare function radiansToDegrees(radians: any): any;

package/es/victory-util/user-props.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-declare type SafeAttribute = `data-${string}` | `aria-${string}`;
+declare type SafeAttribute = string;
 /**
  * getSafeUserProps - function that takes in a props object and removes any
  * key-value entries that do not match filter strings in the USER_PROPS_SAFELIST

package/es/victory-util/user-props.js

@@ -27,7 +27,9 @@ import * as React from "react";
 var USER_PROPS_SAFELIST = {
   startsWith: ["data-", "aria-"],
   exactMatch: []
-};
+}; // Normally we'd use Template Literal Types, but we're avoiding it to maximize TS compatibility with TS < 4.1
+
+// `data-${string}` | `aria-${string}`;
 
 /**
  * doesPropStartWith: Function that takes a prop's key and runs it against all

package/es/victory-util/wrapper.d.ts

@@ -31,7 +31,7 @@ export declare function getStringsFromChildren(props: any, childComponents: any)
     x: any[];
     y: any[];
 };
-export declare function getCategories(props: any, childComponents: any, allStrings: any): {
+export declare function getCategories(props: any, childComponents: any, allStrings?: any): {
     x: any;
     y: any;
 };

package/lib/types/callbacks.d.ts

@@ -12,7 +12,7 @@ export interface CallbackArgs {
     data?: Datum[];
     datum?: Datum;
     horizontal?: boolean;
-    index: ID;
+    index?: ID;
     x?: number;
     y?: number;
     scale?: {
@@ -34,4 +34,5 @@ export declare type VictoryOrientationCallback = (args: CallbackArgs) => Orienta
 export declare type NumberOrCallback = number | VictoryNumberCallback;
 export declare type PaddingOrCallback = number | BlockProps | VictoryPaddingCallback;
 export declare type OrientationOrCallback = OrientationTypes | VictoryOrientationCallback;
+export declare type ValueOrCallback<TValue> = TValue | ((args: CallbackArgs) => TValue);
 //# sourceMappingURL=callbacks.d.ts.map

package/lib/victory-label/victory-label.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback } from "../types/callbacks";
+import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback, ValueOrCallback } from "../types/callbacks";
 import { PaddingProps, VerticalAnchorType, VictoryLabelStyleObject } from "../victory-theme/victory-theme";
 export declare type TextAnchorType = "start" | "middle" | "end" | "inherit";
 export declare type OriginType = {
@@ -34,15 +34,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;

package/lib/victory-util/add-events.d.ts

@@ -26,7 +26,7 @@ export interface EventsMixinClass<TProps> {
     getEventState: typeof Events.getEventState;
     renderData(props: TProps): any;
     renderContinuousData(props: TProps): any;
-    animateComponent(props: TProps, defaultAnimationWhitelist: any): any;
+    animateComponent(props: TProps, defaultAnimationWhitelist: string[]): React.ReactElement;
     getComponentProps(component: React.ReactElement, type: string, index: number): TProps;
     dataKeys: string[];
 }
@@ -41,14 +41,30 @@ export interface EventMixinCalculatedValues {
     hasEvents: unknown;
     events: unknown;
 }
+/**
+ * These are the common roles that we care about internally.
+ */
+export declare 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 declare 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 declare function addEvents<TBase extends WrappedComponentClass<TProps>, TProps extends EventMixinCommonProps>(WrappedComponent: TBase, options?: MixinOptions): {
     new (props: TProps): {
@@ -76,7 +92,7 @@ export declare function addEvents<TBase extends WrappedComponentClass<TProps>, T
         getAllEvents(props: any): any;
         getComponentProps(component: any, type: any, index: any): any;
         renderContainer(component: any, children: any): React.DetailedReactHTMLElement<any, HTMLElement>;
-        animateComponent(props: TProps, defaultAnimationWhitelist: string[]): JSX.Element;
+        animateComponent(props: TProps, defaultAnimationWhitelist: string[]): React.ReactElement;
         renderContinuousData(props: TProps): React.DetailedReactHTMLElement<any, HTMLElement>;
         renderData(props: any, shouldRenderDatum?: (datum: any) => boolean): React.DetailedReactHTMLElement<any, HTMLElement>;
         context: unknown;
@@ -104,6 +120,8 @@ export declare function addEvents<TBase extends WrappedComponentClass<TProps>, T
     };
     getBaseProps?(props: TProps): Record<string, object>;
     role?: string | undefined;
-    expectedComponents?: string[] | undefined;
+    expectedComponents?: (string | keyof TProps)[] | undefined;
+    getChildren?: ((props: TProps, childComponents?: React.ReactNode[] | undefined, calculatedProps?: TProps | undefined) => void) | undefined;
+    animationWhitelist?: (string | keyof TProps)[] | undefined;
 } & TBase;
 //# sourceMappingURL=add-events.d.ts.map

package/lib/victory-util/events.d.ts

@@ -6,7 +6,7 @@ export interface ComponentEvent {
     eventKey?: ComponentEventKey | ComponentEventKey[];
     eventHandlers: ComponentEventHandlers;
 }
-export declare type ComponentEventName = `on${Capitalize<string>}`;
+export declare type ComponentEventName = string;
 export interface ComponentEventHandlers {
     [k: ComponentEventName]: ComponentEventHandler;
 }

package/lib/victory-util/helpers.d.ts

@@ -1,4 +1,5 @@
 import React from "react";
+import { CallbackArgs, ValueOrCallback } from "../types/callbacks";
 /**
  * creates an object with some keys excluded
  * replacement for lodash.omit for performance. does not mimic the entire lodash.omit api
@@ -23,7 +24,7 @@ export declare function getPadding(props: any, name?: string): {
 export declare function isTooltip(component: any): boolean;
 export declare function getDefaultStyles(props: any, role: any): any;
 export declare function getStyles(style: any, defaultStyles: any): any;
-export declare function evaluateProp(prop: any, props: any): any;
+export declare function evaluateProp<TValue>(prop: ValueOrCallback<TValue>, props: CallbackArgs): TValue;
 export declare function evaluateStyle(style: any, props: any): any;
 export declare function degreesToRadians(degrees: any): any;
 export declare function radiansToDegrees(radians: any): any;

package/lib/victory-util/user-props.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-declare type SafeAttribute = `data-${string}` | `aria-${string}`;
+declare type SafeAttribute = string;
 /**
  * getSafeUserProps - function that takes in a props object and removes any
  * key-value entries that do not match filter strings in the USER_PROPS_SAFELIST

package/lib/victory-util/user-props.js

@@ -38,7 +38,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var USER_PROPS_SAFELIST = {
   startsWith: ["data-", "aria-"],
   exactMatch: []
-};
+}; // Normally we'd use Template Literal Types, but we're avoiding it to maximize TS compatibility with TS < 4.1
+
+// `data-${string}` | `aria-${string}`;
 
 /**
  * doesPropStartWith: Function that takes a prop's key and runs it against all

package/lib/victory-util/wrapper.d.ts

@@ -31,7 +31,7 @@ export declare function getStringsFromChildren(props: any, childComponents: any)
     x: any[];
     y: any[];
 };
-export declare function getCategories(props: any, childComponents: any, allStrings: any): {
+export declare function getCategories(props: any, childComponents: any, allStrings?: any): {
     x: any;
     y: any;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.6.0",
+  "version": "36.6.1",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -23,7 +23,7 @@
     "lodash": "^4.17.21",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-vendor": "^36.6.0"
+    "victory-vendor": "^36.6.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
@@ -130,6 +130,14 @@
         "pnpm-lock.yaml"
       ]
     },
+    "check": {
+      "dependencies": [
+        "types:check",
+        "jest",
+        "format",
+        "lint"
+      ]
+    },
     "types:check": {
       "command": "nps types:pkg:check",
       "files": [
@@ -184,6 +192,19 @@
         "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": [
@@ -204,19 +225,6 @@
         "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:fix": {
       "command": "pnpm run lint || nps lint:pkg:fix",
       "files": [
@@ -269,6 +277,7 @@
     "build:dist": "wireit",
     "build:dist:dev": "wireit",
     "build:dist:min": "wireit",
+    "check": "wireit",
     "types:check": "wireit",
     "types:create": "wireit",
     "format": "wireit",

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-label/victory-label.tsx

@@ -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;

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

@@ -63,7 +63,10 @@ export interface EventsMixinClass<TProps> {
   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,
@@ -84,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<
@@ -366,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/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;
 }

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/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/wrapper.tsx

@@ -449,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