victory-core 36.6.0 → 36.6.3

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

@@ -145,5 +145,4 @@ var CommonProps = {
   baseProps: baseProps,
   primitiveProps: primitiveProps
 };
-exports.CommonProps = CommonProps;
-//# sourceMappingURL=common-props.js.map
+exports.CommonProps = CommonProps;

package/lib/victory-util/data.js

@@ -499,5 +499,4 @@ function isDataComponent(component) {
 
   var whitelist = ["area", "bar", "boxplot", "candlestick", "errorbar", "group", "histogram", "line", "pie", "scatter", "stack", "voronoi"];
   return (0, _includes2.default)(whitelist, role);
-}
-//# sourceMappingURL=data.js.map
+}

package/lib/victory-util/default-transitions.js

@@ -114,5 +114,4 @@ function discreteTransitions() {
       }
     }
   };
-}
-//# sourceMappingURL=default-transitions.js.map
+}

package/lib/victory-util/domain.js

@@ -451,5 +451,4 @@ function isDomainComponent(component) {
 
   var whitelist = ["area", "axis", "bar", "boxplot", "candlestick", "errorbar", "group", "histogram", "line", "pie", "scatter", "stack", "voronoi"];
   return (0, _includes2.default)(whitelist, role);
-}
-//# sourceMappingURL=domain.js.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/events.js

@@ -500,5 +500,4 @@ var emulateReactEvent = function (event) {
   });
 };
 
-exports.emulateReactEvent = emulateReactEvent;
-//# sourceMappingURL=events.js.map
+exports.emulateReactEvent = emulateReactEvent;

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/helpers.js

@@ -393,5 +393,4 @@ function isHorizontal(props) {
   };
 
   return traverseChildren(_react.default.Children.toArray(props.children));
-}
-//# sourceMappingURL=helpers.js.map
+}

package/lib/victory-util/hooks/index.js

@@ -18,5 +18,4 @@ Object.defineProperty(exports, "usePreviousProps", {
 
 var _usePreviousProps = require("./use-previous-props");
 
-var _useAnimationState = require("./use-animation-state");
-//# sourceMappingURL=index.js.map
+var _useAnimationState = require("./use-animation-state");

package/lib/victory-util/hooks/use-animation-state.js

@@ -156,5 +156,4 @@ var useAnimationState = function () {
   };
 };
 
-exports.useAnimationState = useAnimationState;
-//# sourceMappingURL=use-animation-state.js.map
+exports.useAnimationState = useAnimationState;

package/lib/victory-util/hooks/use-previous-props.js

@@ -17,5 +17,4 @@ function usePreviousProps(props) {
   });
 
   return ref.current;
-}
-//# sourceMappingURL=use-previous-props.js.map
+}

package/lib/victory-util/immutable.js

@@ -48,5 +48,4 @@ function shallowToJS(x, whitelist) {
     result[key] = curr;
     return result;
   }, isList(x) ? [] : {}) : x;
-}
-//# sourceMappingURL=immutable.js.map
+}

package/lib/victory-util/index.js

@@ -177,5 +177,4 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-//# sourceMappingURL=index.js.map
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/victory-util/label-helpers.js

@@ -255,5 +255,4 @@ function getProps(props, index) {
 
   var tooltipTheme = theme && theme.tooltip || {};
   return (0, _defaults2.default)({}, labelProps, Helpers.omit(tooltipTheme, ["style"]));
-}
-//# sourceMappingURL=label-helpers.js.map
+}

package/lib/victory-util/line-helpers.js

@@ -75,5 +75,4 @@ var getLineFunction = function (props) {
   return polar ? d3Shape.lineRadial().defined(defined).curve(getInterpolationFunction(props)).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(getInterpolationFunction(props)).x(horizontal ? getYAccessor(scale) : getXAccessor(scale)).y(horizontal ? getXAccessor(scale) : getYAccessor(scale));
 };
 
-exports.getLineFunction = getLineFunction;
-//# sourceMappingURL=line-helpers.js.map
+exports.getLineFunction = getLineFunction;

package/lib/victory-util/log.js

@@ -15,5 +15,4 @@ function warn(message) {
       console.warn(message);
     }
   }
-}
-//# sourceMappingURL=log.js.map
+}

package/lib/victory-util/point-path-helpers.js

@@ -93,5 +93,4 @@ function star(x, y, size) {
     return "".concat(length * Math.sin(angle * (index + 1)) + x, ",\n        ").concat(length * Math.cos(angle * (index + 1)) + y);
   });
   return "M ".concat(starCoords.join("L"), " z");
-}
-//# sourceMappingURL=point-path-helpers.js.map
+}

package/lib/victory-util/prop-types.js

@@ -266,5 +266,4 @@ var regExp = makeChainable(function (props, propName, componentName) {
 
   return null;
 });
-exports.regExp = regExp;
-//# sourceMappingURL=prop-types.js.map
+exports.regExp = regExp;

package/lib/victory-util/scale.js

@@ -170,5 +170,4 @@ function getType(scale) {
     return scale[type.method] !== undefined;
   })[0];
   return scaleType ? scaleType.name : undefined;
-}
-//# sourceMappingURL=scale.js.map
+}

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { VictoryCommonProps } from "./index";
+import { VictoryCommonProps } from "./common-props";
 import type { DomainPropType, ScaleXYPropType } from "../types/prop-types";
 export declare function getParentSVG(evt: Pick<React.SyntheticEvent, "target"> & Partial<Pick<React.SyntheticEvent, "nativeEvent">>): SVGElement;
 export declare function getSVGEventCoordinates(evt: React.SyntheticEvent, svg?: SVGElement): SVGCoordinateType;

package/lib/victory-util/selection.js

@@ -9,7 +9,11 @@ exports.getDomainCoordinates = getDomainCoordinates;
 exports.getParentSVG = getParentSVG;
 exports.getSVGEventCoordinates = getSVGEventCoordinates;
 
-var _index = require("./index");
+var Collection = _interopRequireWildcard(require("./collection"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 // Private Functions
 function transformTarget(target, matrix, dimension) {
@@ -119,12 +123,11 @@ function getBounds(props) {
   var point2 = getDataCoordinates(props, scale, x2, y2);
 
   var makeBound = function (a, b) {
-    return [_index.Collection.getMinValue([a, b]), _index.Collection.getMaxValue([a, b])];
+    return [Collection.getMinValue([a, b]), Collection.getMaxValue([a, b])];
   };
 
   return {
     x: makeBound(point1.x, point2.x),
     y: makeBound(point1.y, point2.y)
   };
-}
-//# sourceMappingURL=selection.js.map
+}

package/lib/victory-util/style.js

@@ -64,5 +64,4 @@ function getColorScale(name) {
     green: ["#354722", "#466631", "#649146", "#8AB25C", "#A9C97E"]
   };
   return name ? scales[name] : scales.grayscale;
-}
-//# sourceMappingURL=style.js.map
+}

package/lib/victory-util/textsize.js

@@ -298,5 +298,4 @@ var approximateTextSize = function (text, style) {
   return _approximateTextSizeInternal.impl(text, style);
 };
 
-exports.approximateTextSize = approximateTextSize;
-//# sourceMappingURL=textsize.js.map
+exports.approximateTextSize = approximateTextSize;

package/lib/victory-util/timer-context.js

@@ -22,5 +22,4 @@ var TimerContext = /*#__PURE__*/_react.default.createContext({
 
 TimerContext.displayName = "TimerContext";
 var _default = TimerContext;
-exports.default = _default;
-//# sourceMappingURL=timer-context.js.map
+exports.default = _default;

package/lib/victory-util/timer.js

@@ -91,5 +91,4 @@ var Timer = /*#__PURE__*/function () {
   return Timer;
 }();
 
-exports.default = Timer;
-//# sourceMappingURL=timer.js.map
+exports.default = Timer;

package/lib/victory-util/transitions.js

@@ -416,5 +416,4 @@ function getTransitionPropsFactory(props, state, setState) {
       data: data
     };
   };
-}
-//# sourceMappingURL=transitions.js.map
+}

package/lib/victory-util/type-helpers.js

@@ -41,5 +41,4 @@ function isDate(value) {
 
 function isKeyValueObject(datum) {
   return typeof datum === "object" && !Array.isArray(datum) && !(datum instanceof Date);
-}
-//# sourceMappingURL=type-helpers.js.map
+}

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
@@ -136,5 +138,4 @@ var withSafeUserProps = function (component, props) {
   return /*#__PURE__*/React.cloneElement(component, getSafeUserProps(props));
 };
 
-exports.withSafeUserProps = withSafeUserProps;
-//# sourceMappingURL=user-props.js.map
+exports.withSafeUserProps = withSafeUserProps;

package/lib/victory-util/with-container.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
 import { VictoryProviderProps } from "../victory-state";
 import { VictoryCommonProps } from "./common-props";
-export declare function withContainer<Props extends VictoryCommonProps>(WrappedComponent: (props: Props) => React.ReactElement, initialProviderProps?: Partial<VictoryProviderProps>): (props: Props) => JSX.Element;
+export declare function withContainer<Props extends VictoryCommonProps>(WrappedComponent: React.FC<Props>, initialProviderProps?: Partial<VictoryProviderProps>): React.FC<Props>;
 //# sourceMappingURL=with-container.d.ts.map

package/lib/victory-util/with-container.js

@@ -42,5 +42,4 @@ function withContainer(WrappedComponent) {
 
     return /*#__PURE__*/_react.default.createElement(WrappedComponent, props);
   };
-}
-//# sourceMappingURL=with-container.js.map
+}

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/lib/victory-util/wrapper.js

@@ -503,5 +503,4 @@ function getCategories(props, childComponents, allStrings) {
     x: xCategories.length > 0 ? xCategories : undefined,
     y: yCategories.length > 0 ? yCategories : undefined
   };
-}
-//# sourceMappingURL=wrapper.js.map
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.6.0",
+  "version": "36.6.3",
   "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.3"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
@@ -55,7 +55,9 @@
       "files": [
         "src/**",
         "!src/**/*.test.*",
-        "../../.babelrc.build.js"
+        "../../.babelrc.build.js",
+        "../../.babelrc.js",
+        "../../package-scripts.js"
       ],
       "output": [
         "es/**/*.js",
@@ -73,7 +75,9 @@
       "files": [
         "src/**",
         "!src/**/*.test.*",
-        "../../.babelrc.build.js"
+        "../../.babelrc.build.js",
+        "../../.babelrc.js",
+        "../../package-scripts.js"
       ],
       "output": [
         "lib/**/*.js",
@@ -98,6 +102,8 @@
         "src/**",
         "!src/**/*.test.*",
         "../../.babelrc.build.js",
+        "../../.babelrc.js",
+        "../../package-scripts.js",
         "../../config/webpack.config.js",
         "../../config/webpack.config.dev.js"
       ],
@@ -118,6 +124,8 @@
         "src/**",
         "!src/**/*.test.*",
         "../../.babelrc.build.js",
+        "../../.babelrc.js",
+        "../../package-scripts.js",
         "../../config/webpack.config.js"
       ],
       "output": [
@@ -130,6 +138,14 @@
         "pnpm-lock.yaml"
       ]
     },
+    "check": {
+      "dependencies": [
+        "types:check",
+        "jest",
+        "format",
+        "lint"
+      ]
+    },
     "types:check": {
       "command": "nps types:pkg:check",
       "files": [
@@ -184,6 +200,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 +233,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 +285,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/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

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

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

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