victory-core 36.6.3 → 36.6.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # victory-core
 
+## 36.6.4
+
+### Patch Changes
+
+- Allow data accessors to accept any data types (fixes [#2360](https://github.com/FormidableLabs/victory/issues/2360)) ([#2436](https://github.com/FormidableLabs/victory/pull/2436))
+
+- Updated dependencies [[`9a6319cff`](https://github.com/FormidableLabs/victory/commit/9a6319cffbc480711b8c286dcae00575081170f0)]:
+  - victory-vendor@36.6.4
+
 ## 36.6.3
 
 ### Patch Changes

package/es/types/callbacks.d.ts

@@ -34,5 +34,4 @@ 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/types/prop-types.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ScaleLinear, ScaleLogarithmic, ScalePower, ScaleTime } from "victory-vendor/d3-scale";
 import { AnimationEasing, AnimationStyle } from "../victory-animation/victory-animation";
-import { StringOrNumberOrCallback } from "./callbacks";
+import { CallbackArgs, StringOrNumberOrCallback } from "./callbacks";
 export declare type AxisType = "x" | "y";
 export declare type DatumValue = number | string | Date | null | undefined;
 export declare type Datum = any;
@@ -10,7 +10,7 @@ export declare type ForAxes<T> = T | {
     y?: T;
 };
 export declare type ID = number | string;
-export declare type ValueOrAccessor<ValueType = unknown, PropsType = object> = ValueType | ((props: PropsType) => ValueType);
+export declare type ValueOrAccessor<ValueType, PropsType = CallbackArgs> = ValueType | ((props: PropsType) => ValueType);
 export declare type Tuple<T> = [T, T];
 export declare type ValueOrAxes<T> = T | ForAxes<T>;
 export declare type DomainPaddingPropType = ValueOrAxes<PaddingType>;
@@ -105,7 +105,7 @@ export declare type CategoryPropType = string[] | {
     x: string[];
     y: string[];
 };
-export declare type DataGetterPropType = ValueOrAccessor<string | string[] | number | number[]>;
+export declare type DataGetterPropType = ValueOrAccessor<string | string[] | number | number[], any>;
 export declare type InterpolationPropType = "basis" | "basisClosed" | "basisOpen" | "bundle" | "cardinal" | "cardinalClosed" | "cardinalOpen" | "catmullRom" | "catmullRomClosed" | "catmullRomOpen" | "linear" | "linearClosed" | "monotoneX" | "monotoneY" | "natural" | "radial" | "step" | "stepAfter" | "stepBefore";
 export declare type ColorScalePropType = "grayscale" | "qualitative" | "heatmap" | "warm" | "cool" | "red" | "green" | "blue" | string[];
 export declare type SortOrderPropType = "ascending" | "descending";

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

@@ -1,5 +1,6 @@
 import React from "react";
-import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback, ValueOrCallback } from "../types/callbacks";
+import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback } from "../types/callbacks";
+import { ValueOrAccessor } from "../types/prop-types";
 import { PaddingProps, VerticalAnchorType, VictoryLabelStyleObject } from "../victory-theme/victory-theme";
 export declare type TextAnchorType = "start" | "middle" | "end" | "inherit";
 export declare type OriginType = {
@@ -34,11 +35,11 @@ export interface VictoryLabelProps {
     tabIndex?: NumberOrCallback;
     text?: string[] | StringOrNumberOrCallback;
     textComponent?: React.ReactElement;
-    textAnchor?: ValueOrCallback<TextAnchorType>;
+    textAnchor?: ValueOrAccessor<TextAnchorType>;
     title?: string;
-    transform?: ValueOrCallback<string | object>;
+    transform?: ValueOrAccessor<string | object>;
     tspanComponent?: React.ReactElement;
-    verticalAnchor?: ValueOrCallback<VerticalAnchorType>;
+    verticalAnchor?: ValueOrAccessor<VerticalAnchorType>;
     x?: number;
     y?: number;
     dx?: StringOrNumberOrCallback;

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

@@ -1,5 +1,6 @@
 import React from "react";
-import { CallbackArgs, ValueOrCallback } from "../types/callbacks";
+import { CallbackArgs } from "../types/callbacks";
+import { ValueOrAccessor } from "../types/prop-types";
 /**
  * creates an object with some keys excluded
  * replacement for lodash.omit for performance. does not mimic the entire lodash.omit api
@@ -24,7 +25,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<TValue>(prop: ValueOrCallback<TValue>, props: CallbackArgs): TValue;
+export declare function evaluateProp<TValue>(prop: ValueOrAccessor<TValue, CallbackArgs>, 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/types/callbacks.d.ts

@@ -34,5 +34,4 @@ 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/types/prop-types.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ScaleLinear, ScaleLogarithmic, ScalePower, ScaleTime } from "victory-vendor/d3-scale";
 import { AnimationEasing, AnimationStyle } from "../victory-animation/victory-animation";
-import { StringOrNumberOrCallback } from "./callbacks";
+import { CallbackArgs, StringOrNumberOrCallback } from "./callbacks";
 export declare type AxisType = "x" | "y";
 export declare type DatumValue = number | string | Date | null | undefined;
 export declare type Datum = any;
@@ -10,7 +10,7 @@ export declare type ForAxes<T> = T | {
     y?: T;
 };
 export declare type ID = number | string;
-export declare type ValueOrAccessor<ValueType = unknown, PropsType = object> = ValueType | ((props: PropsType) => ValueType);
+export declare type ValueOrAccessor<ValueType, PropsType = CallbackArgs> = ValueType | ((props: PropsType) => ValueType);
 export declare type Tuple<T> = [T, T];
 export declare type ValueOrAxes<T> = T | ForAxes<T>;
 export declare type DomainPaddingPropType = ValueOrAxes<PaddingType>;
@@ -105,7 +105,7 @@ export declare type CategoryPropType = string[] | {
     x: string[];
     y: string[];
 };
-export declare type DataGetterPropType = ValueOrAccessor<string | string[] | number | number[]>;
+export declare type DataGetterPropType = ValueOrAccessor<string | string[] | number | number[], any>;
 export declare type InterpolationPropType = "basis" | "basisClosed" | "basisOpen" | "bundle" | "cardinal" | "cardinalClosed" | "cardinalOpen" | "catmullRom" | "catmullRomClosed" | "catmullRomOpen" | "linear" | "linearClosed" | "monotoneX" | "monotoneY" | "natural" | "radial" | "step" | "stepAfter" | "stepBefore";
 export declare type ColorScalePropType = "grayscale" | "qualitative" | "heatmap" | "warm" | "cool" | "red" | "green" | "blue" | string[];
 export declare type SortOrderPropType = "ascending" | "descending";

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

@@ -1,5 +1,6 @@
 import React from "react";
-import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback, ValueOrCallback } from "../types/callbacks";
+import { NumberOrCallback, StringOrCallback, StringOrNumberOrCallback } from "../types/callbacks";
+import { ValueOrAccessor } from "../types/prop-types";
 import { PaddingProps, VerticalAnchorType, VictoryLabelStyleObject } from "../victory-theme/victory-theme";
 export declare type TextAnchorType = "start" | "middle" | "end" | "inherit";
 export declare type OriginType = {
@@ -34,11 +35,11 @@ export interface VictoryLabelProps {
     tabIndex?: NumberOrCallback;
     text?: string[] | StringOrNumberOrCallback;
     textComponent?: React.ReactElement;
-    textAnchor?: ValueOrCallback<TextAnchorType>;
+    textAnchor?: ValueOrAccessor<TextAnchorType>;
     title?: string;
-    transform?: ValueOrCallback<string | object>;
+    transform?: ValueOrAccessor<string | object>;
     tspanComponent?: React.ReactElement;
-    verticalAnchor?: ValueOrCallback<VerticalAnchorType>;
+    verticalAnchor?: ValueOrAccessor<VerticalAnchorType>;
     x?: number;
     y?: number;
     dx?: StringOrNumberOrCallback;

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

@@ -1,5 +1,6 @@
 import React from "react";
-import { CallbackArgs, ValueOrCallback } from "../types/callbacks";
+import { CallbackArgs } from "../types/callbacks";
+import { ValueOrAccessor } from "../types/prop-types";
 /**
  * creates an object with some keys excluded
  * replacement for lodash.omit for performance. does not mimic the entire lodash.omit api
@@ -24,7 +25,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<TValue>(prop: ValueOrCallback<TValue>, props: CallbackArgs): TValue;
+export declare function evaluateProp<TValue>(prop: ValueOrAccessor<TValue, CallbackArgs>, 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.6.3",
+  "version": "36.6.4",
   "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.3"
+    "victory-vendor": "^36.6.4"
   },
   "peerDependencies": {
     "react": ">=16.6.0"

package/src/types/callbacks.ts

@@ -51,5 +51,3 @@ export type PaddingOrCallback = number | BlockProps | VictoryPaddingCallback;
 export type OrientationOrCallback =
   | OrientationTypes
   | VictoryOrientationCallback;
-
-export type ValueOrCallback<TValue> = TValue | ((args: CallbackArgs) => TValue);

package/src/types/prop-types.ts

@@ -9,14 +9,14 @@ import {
   AnimationEasing,
   AnimationStyle,
 } from "../victory-animation/victory-animation";
-import { StringOrNumberOrCallback } from "./callbacks";
+import { CallbackArgs, StringOrNumberOrCallback } from "./callbacks";
 
 export type AxisType = "x" | "y";
 export type DatumValue = number | string | Date | null | undefined;
 export type Datum = any;
 export type ForAxes<T> = T | { x?: T; y?: T };
 export type ID = number | string;
-export type ValueOrAccessor<ValueType = unknown, PropsType = object> =
+export type ValueOrAccessor<ValueType, PropsType = CallbackArgs> =
   | ValueType
   | ((props: PropsType) => ValueType);
 export type Tuple<T> = [T, T];
@@ -137,7 +137,8 @@ export type CategoryPropType =
     };
 
 export type DataGetterPropType = ValueOrAccessor<
-  string | string[] | number | number[]
+  string | string[] | number | number[],
+  any // The arg will be the `datum`, which can have any type
 >;
 
 export type InterpolationPropType =

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

@@ -17,8 +17,8 @@ import {
   NumberOrCallback,
   StringOrCallback,
   StringOrNumberOrCallback,
-  ValueOrCallback,
 } from "../types/callbacks";
+import { ValueOrAccessor } from "../types/prop-types";
 import {
   PaddingProps,
   VerticalAnchorType,
@@ -56,11 +56,11 @@ export interface VictoryLabelProps {
   tabIndex?: NumberOrCallback;
   text?: string[] | StringOrNumberOrCallback;
   textComponent?: React.ReactElement;
-  textAnchor?: ValueOrCallback<TextAnchorType>;
+  textAnchor?: ValueOrAccessor<TextAnchorType>;
   title?: string;
-  transform?: ValueOrCallback<string | object>;
+  transform?: ValueOrAccessor<string | object>;
   tspanComponent?: React.ReactElement;
-  verticalAnchor?: ValueOrCallback<VerticalAnchorType>;
+  verticalAnchor?: ValueOrAccessor<VerticalAnchorType>;
   x?: number;
   y?: number;
   dx?: StringOrNumberOrCallback;

package/src/victory-util/helpers.ts

@@ -1,7 +1,8 @@
 /* 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";
+import { CallbackArgs } from "../types/callbacks";
+import { ValueOrAccessor } from "../types/prop-types";
 
 // Private Functions
 
@@ -128,7 +129,7 @@ export function getStyles(style, defaultStyles) {
 }
 
 export function evaluateProp<TValue>(
-  prop: ValueOrCallback<TValue>,
+  prop: ValueOrAccessor<TValue, CallbackArgs>,
   props: CallbackArgs,
 ): TValue {
   return isFunction(prop) ? prop(props) : prop;