victory-core 36.7.0 → 36.8.2

package/src/victory-primitives/circle.tsx

@@ -1,16 +1,26 @@
-import React from "react";
+import React, { forwardRef } from "react";
+import { evaluateProp } from "../victory-util/helpers";
 import { VictoryPrimitiveShapeProps } from "./types";
 
-export const Circle = (props: VictoryPrimitiveShapeProps) => {
-  // eslint-disable-next-line react/prop-types
-  const { desc, ...rest } = props;
-  return desc ? (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <circle vectorEffect="non-scaling-stroke" {...rest}>
-      <desc>{desc}</desc>
-    </circle>
-  ) : (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <circle vectorEffect="non-scaling-stroke" {...rest} />
-  );
-};
+export const Circle = forwardRef<SVGCircleElement, VictoryPrimitiveShapeProps>(
+  (props, ref) => {
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+     * origin conflicts with the SVG element's origin attribute
+     */
+    const { desc, id, tabIndex, origin, ...rest } = props;
+
+    const svgProps: React.SVGProps<SVGCircleElement> = {
+      vectorEffect: "non-scaling-stroke",
+      id: evaluateProp(id, props)?.toString(),
+      tabIndex: evaluateProp(tabIndex, props),
+      ...rest,
+    };
+    return desc ? (
+      <circle {...svgProps} ref={ref}>
+        <desc>{desc}</desc>
+      </circle>
+    ) : (
+      <circle {...svgProps} ref={ref} />
+    );
+  },
+);

package/src/victory-primitives/clip-path.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import PropTypes from "prop-types";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 
 export interface ClipPathProps extends VictoryCommonPrimitiveProps {
@@ -9,17 +8,6 @@ export interface ClipPathProps extends VictoryCommonPrimitiveProps {
 
 export const ClipPath = (props: ClipPathProps) => (
   <defs>
-    {
-      // @ts-expect-error FIXME: "id cannot be a number"
-      <clipPath id={props.clipId}>{props.children}</clipPath>
-    }
+    {<clipPath id={props.clipId?.toString()}>{props.children}</clipPath>}
   </defs>
 );
-
-ClipPath.propTypes = {
-  children: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.node),
-    PropTypes.node,
-  ]),
-  clipId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-};

package/src/victory-primitives/line-segment.tsx

@@ -38,8 +38,14 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
+const defaultProps = {
+  lineComponent: <Line />,
+  role: "presentation",
+  shapeRendering: "auto",
+};
+
 export const LineSegment = (props: LineSegmentProps) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
 
   return React.cloneElement(props.lineComponent!, {
     ...props.events,
@@ -68,9 +74,3 @@ LineSegment.propTypes = {
   y1: PropTypes.number,
   y2: PropTypes.number,
 };
-
-LineSegment.defaultProps = {
-  lineComponent: <Line />,
-  role: "presentation",
-  shapeRendering: "auto",
-};

package/src/victory-primitives/line.tsx

@@ -1,16 +1,27 @@
-import React from "react";
+import React, { forwardRef } from "react";
+import { evaluateProp } from "../victory-util/helpers";
 import { VictoryPrimitiveShapeProps } from "./types";
 
-export const Line = (props: VictoryPrimitiveShapeProps) => {
-  // eslint-disable-next-line react/prop-types
-  const { desc, ...rest } = props;
-  return desc ? (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <line vectorEffect="non-scaling-stroke" {...rest}>
-      <desc>{desc}</desc>
-    </line>
-  ) : (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <line vectorEffect="non-scaling-stroke" {...rest} />
-  );
-};
+export const Line = forwardRef<SVGLineElement, VictoryPrimitiveShapeProps>(
+  (props, ref) => {
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+     * origin conflicts with the SVG element's origin attribute
+     */
+    const { desc, id, tabIndex, origin, ...rest } = props;
+
+    const svgProps: React.SVGProps<SVGLineElement> = {
+      vectorEffect: "non-scaling-stroke",
+      id: evaluateProp(id, props)?.toString(),
+      tabIndex: evaluateProp(tabIndex, props),
+      ...rest,
+    };
+
+    return desc ? (
+      <line {...svgProps} ref={ref}>
+        <desc>{desc}</desc>
+      </line>
+    ) : (
+      <line {...svgProps} ref={ref} />
+    );
+  },
+);

package/src/victory-primitives/path.tsx

@@ -1,20 +1,26 @@
 import React, { forwardRef } from "react";
+import { evaluateProp } from "../victory-util/helpers";
 import { VictoryPrimitiveShapeProps } from "./types";
 
-// eslint-disable-next-line prefer-arrow-callback
-export const Path = forwardRef(function Path(
-  props: VictoryPrimitiveShapeProps,
-  ref,
-) {
-  // eslint-disable-next-line react/prop-types
-  const { desc, ...rest } = props;
-  return desc ? (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <path {...rest} ref={ref}>
-      <desc>{desc}</desc>
-    </path>
-  ) : (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <path {...rest} ref={ref} />
-  );
-});
+export const Path = forwardRef<SVGPathElement, VictoryPrimitiveShapeProps>(
+  (props, ref) => {
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+     * origin conflicts with the SVG element's origin attribute
+     */
+    const { desc, id, tabIndex, origin, ...rest } = props;
+
+    const svgProps: React.SVGProps<SVGPathElement> = {
+      id: evaluateProp(id, props)?.toString(),
+      tabIndex: evaluateProp(tabIndex, props),
+      ...rest,
+    };
+
+    return desc ? (
+      <path {...svgProps} ref={ref}>
+        <desc>{desc}</desc>
+      </path>
+    ) : (
+      <path {...svgProps} ref={ref} />
+    );
+  },
+);

package/src/victory-primitives/point.tsx

@@ -66,8 +66,14 @@ const evaluateProps = (props) => {
   });
 };
 
+const defaultProps = {
+  pathComponent: <Path />,
+  role: "presentation",
+  shapeRendering: "auto",
+};
+
 export const Point = (props: PointProps) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
   const userProps = UserProps.getSafeUserProps(props);
 
   return React.cloneElement(props.pathComponent!, {
@@ -109,9 +115,3 @@ Point.propTypes = {
   x: PropTypes.number,
   y: PropTypes.number,
 };
-
-Point.defaultProps = {
-  pathComponent: <Path />,
-  role: "presentation",
-  shapeRendering: "auto",
-};

package/src/victory-primitives/rect.tsx

@@ -1,16 +1,27 @@
-import React from "react";
+import React, { forwardRef } from "react";
+import { evaluateProp } from "../victory-util/helpers";
 import { VictoryPrimitiveShapeProps } from "./types";
 
-export const Rect = (props: VictoryPrimitiveShapeProps) => {
-  // eslint-disable-next-line react/prop-types
-  const { desc, ...rest } = props;
-  return desc ? (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <rect vectorEffect="non-scaling-stroke" {...rest}>
-      <desc>{desc}</desc>
-    </rect>
-  ) : (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <rect vectorEffect="non-scaling-stroke" {...rest} />
-  );
-};
+export const Rect = forwardRef<SVGRectElement, VictoryPrimitiveShapeProps>(
+  (props, ref) => {
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+     * origin conflicts with the SVG element's origin attribute
+     */
+    const { desc, id, tabIndex, origin, ...rest } = props;
+
+    const svgProps: React.SVGProps<SVGRectElement> = {
+      vectorEffect: "non-scaling-stroke",
+      id: evaluateProp(id, props)?.toString(),
+      tabIndex: evaluateProp(tabIndex, props),
+      ...rest,
+    };
+
+    return desc ? (
+      <rect {...svgProps} ref={ref}>
+        <desc>{desc}</desc>
+      </rect>
+    ) : (
+      <rect {...svgProps} ref={ref} />
+    );
+  },
+);

package/src/victory-primitives/text.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import PropTypes from "prop-types";
+import { evaluateProp } from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 
 export interface TextProps extends VictoryCommonPrimitiveProps {
@@ -9,19 +9,22 @@ export interface TextProps extends VictoryCommonPrimitiveProps {
 }
 
 export const Text = (props: TextProps) => {
-  const { children, title, desc, ...rest } = props;
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+   * origin conflicts with the SVG element's origin attribute
+   */
+  const { children, desc, id, origin, tabIndex, title, ...rest } = props;
+
+  const svgProps: React.SVGProps<SVGTextElement> = {
+    id: evaluateProp(id, props)?.toString(),
+    tabIndex: evaluateProp(tabIndex, props),
+    ...rest,
+  };
+
   return (
-    // @ts-expect-error FIXME: "id cannot be a number"
-    <text {...rest}>
+    <text {...svgProps}>
       {title && <title>{title}</title>}
       {desc && <desc>{desc}</desc>}
       {children}
     </text>
   );
 };
-
-Text.propTypes = {
-  children: PropTypes.node,
-  desc: PropTypes.string,
-  title: PropTypes.string,
-};

package/src/victory-primitives/tspan.tsx

@@ -1,7 +1,18 @@
 import React from "react";
+import { evaluateProp } from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 
-export const TSpan = (props: VictoryCommonPrimitiveProps) => (
-  // @ts-expect-error FIXME: "id cannot be a number"
-  <tspan {...props} />
-);
+export const TSpan = (props: VictoryCommonPrimitiveProps) => {
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+   * origin conflicts with the SVG element's origin attribute
+   */
+  const { desc, id, tabIndex, origin, ...rest } = props;
+
+  const svgProps: React.SVGProps<SVGTSpanElement> = {
+    id: evaluateProp(id, props)?.toString(),
+    tabIndex: evaluateProp(tabIndex, props),
+    ...rest,
+  };
+
+  return <tspan {...svgProps} />;
+};

package/src/victory-primitives/whisker.tsx

@@ -40,8 +40,15 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
+const defaultProps = {
+  groupComponent: <g />,
+  lineComponent: <Line />,
+  role: "presentation",
+  shapeRendering: "auto",
+};
+
 export const Whisker = (props: WhiskerProps) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
   const {
     ariaLabel,
     groupComponent,
@@ -107,10 +114,3 @@ Whisker.propTypes = {
     y2: PropTypes.number,
   }),
 };
-
-Whisker.defaultProps = {
-  groupComponent: <g />,
-  lineComponent: <Line />,
-  role: "presentation",
-  shapeRendering: "auto",
-};

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

@@ -68,9 +68,9 @@ export interface EventsMixinClass<TProps> {
     defaultAnimationWhitelist: string[],
   ): React.ReactElement;
   getComponentProps(
-    component: React.ReactElement,
+    component: React.ReactNode,
     type: string,
-    index: number,
+    index: string | number,
   ): TProps;
   dataKeys: string[];
 }
@@ -352,7 +352,11 @@ export function addEvents<
       return props.events;
     }
 
-    getComponentProps(component, type, index) {
+    getComponentProps(
+      component: React.ReactNode,
+      type: string,
+      index: string | number,
+    ) {
       const name = this.props.name || WrappedComponent.role;
       const key = (this.dataKeys && this.dataKeys[index]) || index;
       const id = `${name}-${type}-${key}`;
@@ -365,13 +369,18 @@ export function addEvents<
         return undefined;
       }
 
+      const currentProps =
+        component && typeof component === "object" && "props" in component
+          ? component.props
+          : undefined;
+
       if (this.hasEvents) {
         const baseEvents = this.getEvents(this.props, type, key);
         const componentProps = defaults(
           { index, key: id },
           this.getEventState(key, type),
           this.getSharedEventState(key, type),
-          component.props,
+          currentProps,
           baseProps,
           { id },
         );
@@ -385,7 +394,7 @@ export function addEvents<
         return assign({}, componentProps, { events });
       }
 
-      return defaults({ index, key: id }, component.props, baseProps, { id });
+      return defaults({ index, key: id }, currentProps, baseProps, { id });
     }
 
     renderContainer(component, children) {

package/src/victory-util/helpers.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-use-before-define */
-import React from "react";
+import React, { isValidElement } from "react";
 import { defaults, isFunction, property, pick, assign, keys } from "lodash";
 import { CallbackArgs } from "../types/callbacks";
 import { ValueOrAccessor } from "../types/prop-types";
@@ -301,8 +301,10 @@ export function reduceChildren<
       return memo;
     }, initialMemo);
   };
-  const childNames = children.map((c, i) => i);
-  return traverseChildren(children, childNames);
+
+  const validChildren = children.filter(isValidElement);
+  const childNames = validChildren.map((c, i) => i);
+  return traverseChildren(validChildren, childNames);
 }
 
 /**

package/src/victory-util/textsize.ts

@@ -297,7 +297,11 @@ const styleToKeyComponent = (style) => {
 
 const _measureDimensionsInternal = memoize(
   (text: string | string[], style?: TextSizeStyleInterface) => {
-    const containerElement = _getMeasurementContainer();
+    let containerElement = _getMeasurementContainer();
+    if (!containerElement.isConnected) {
+      _getMeasurementContainer.cache.clear?.();
+      containerElement = _getMeasurementContainer();
+    }
 
     const lines = _splitToLines(text);
     let heightAcc = 0;

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

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { evaluateProp } from "./helpers";
 
 /*
   USER_PROPS_SAFELIST is to contain any string deemed safe for user props.
@@ -54,19 +55,6 @@ const testIfSafeProp = (key: string): key is SafeAttribute => {
   return false;
 };
 
-/**
- * Gets the value from props if a function value is provided
- * @param {any} value: maybe function value
- * @param {Object} props: props object
- * @returns {any} newValue
- */
-const getValue = (value, props) => {
-  if (typeof value === "function") {
-    return value(props);
-  }
-  return value;
-};
-
 /**
  * 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
@@ -83,7 +71,7 @@ export const getSafeUserProps = <T>(
     Object.entries(propsToFilter)
       .filter(([key]) => testIfSafeProp(key))
       .map(([key, value]) => {
-        return [key, getValue(value, props)];
+        return [key, evaluateProp(value, props)];
       }),
   );
 };

package/es/v37/clone.d.ts

@@ -1,23 +0,0 @@
-import React from "react";
-/**
- * Syntax sugar for `React.cloneElement`, so that we can use JSX instead
- *
- * @example
- *   // Before:
- *   const children = React.cloneElement(props.groupComponent, { prop2 }, props.children);
- *   return React.cloneElement(props.containerComponent, { prop1 }, children);
- *
- *   // After:
- *   return (
- *     <Clone element={props.containerComponent} prop1={prop1}>
- *       <Clone element={props.groupComponent} prop2={prop2}>
- *         {props.children}
- *       </Clone>
- *     </Clone>
- *   );
- */
-export declare const Clone: <TProps>(props: React.PropsWithChildren<{
-    element: React.ReactElement<TProps, string | React.JSXElementConstructor<any>>;
-    children?: React.ReactNode | React.ReactNode[];
-} & TProps>) => React.ReactElement<TProps, string | React.JSXElementConstructor<any>>;
-//# sourceMappingURL=clone.d.ts.map

package/es/v37/clone.js

@@ -1,32 +0,0 @@
-var _excluded = ["children", "element"];
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-import React from "react";
-/**
- * Syntax sugar for `React.cloneElement`, so that we can use JSX instead
- *
- * @example
- *   // Before:
- *   const children = React.cloneElement(props.groupComponent, { prop2 }, props.children);
- *   return React.cloneElement(props.containerComponent, { prop1 }, children);
- *
- *   // After:
- *   return (
- *     <Clone element={props.containerComponent} prop1={prop1}>
- *       <Clone element={props.groupComponent} prop2={prop2}>
- *         {props.children}
- *       </Clone>
- *     </Clone>
- *   );
- */
-
-export var Clone = function (props) {
-  var children = props.children,
-      element = props.element,
-      rest = _objectWithoutProperties(props, _excluded);
-
-  return /*#__PURE__*/React.cloneElement(element, rest, children);
-};

package/es/v37/index.d.ts

@@ -1,5 +0,0 @@
-export * from "./victory-state";
-export * from "./clone";
-export * from "./with-normalized-props";
-export * from "./with-container";
-//# sourceMappingURL=index.d.ts.map

package/es/v37/index.js

@@ -1,4 +0,0 @@
-export * from "./victory-state";
-export * from "./clone";
-export * from "./with-normalized-props";
-export * from "./with-container";

package/es/v37/victory-state/defaults.d.ts

@@ -1,3 +0,0 @@
-export declare const DEFAULT_HEIGHT = 300;
-export declare const DEFAULT_WIDTH = 450;
-//# sourceMappingURL=defaults.d.ts.map

package/es/v37/victory-state/defaults.js

@@ -1,2 +0,0 @@
-export var DEFAULT_HEIGHT = 300;
-export var DEFAULT_WIDTH = 450;

package/es/v37/victory-state/helpers/get-axis-data.d.ts

@@ -1,3 +0,0 @@
-import { AxisType, Datum } from "../../../types/prop-types";
-export declare function getAxisData(data: Datum[], axis: AxisType): any;
-//# sourceMappingURL=get-axis-data.d.ts.map

package/es/v37/victory-state/helpers/get-axis-data.js

@@ -1,14 +0,0 @@
-import { isKeyValueObject } from "../../../victory-util/type-helpers";
-export function getAxisData(data, axis) {
-  return data.reduce(function (acc, datum) {
-    if (isKeyValueObject(datum)) {
-      var value = datum[axis];
-
-      if (value && typeof value !== "string") {
-        acc.push(value);
-      }
-    }
-
-    return acc;
-  }, []);
-}

package/es/v37/victory-state/helpers/get-data.d.ts

@@ -1,15 +0,0 @@
-import { DatumValue } from "../../../types/prop-types";
-import { VictoryProviderProps } from "../types";
-declare type DataProps = Pick<VictoryProviderProps, "data" | "x" | "y" | "sortKey" | "sortOrder" | "samples">;
-export interface FormattedDatum {
-    x: DatumValue;
-    y: DatumValue;
-    _x: number | Date;
-    _y: number | Date;
-    xName?: string;
-    yName?: string;
-    [key: string]: DatumValue;
-}
-export declare function getData({ x: xAccessor, y: yAccessor, sortKey, sortOrder, data, }?: DataProps): FormattedDatum[];
-export {};
-//# sourceMappingURL=get-data.d.ts.map