victory-core 36.3.2 → 36.5.0

package/src/victory-portal/{victory-portal.js → victory-portal.tsx}

@@ -3,9 +3,18 @@ import PropTypes from "prop-types";
 import { defaults } from "lodash";
 import * as Log from "../victory-util/log";
 import * as Helpers from "../victory-util/helpers";
-import PortalContext from "./portal-context";
+import { PortalContext } from "./portal-context";
 
-export default class VictoryPortal extends React.Component {
+export interface VictoryPortalProps {
+  children?: React.ReactElement;
+  groupComponent?: React.ReactElement;
+}
+
+export interface VictoryPortal {
+  context: React.ContextType<typeof PortalContext>;
+}
+
+export class VictoryPortal extends React.Component<VictoryPortalProps> {
   static displayName = "VictoryPortal";
 
   static role = "portal";
@@ -20,6 +29,10 @@ export default class VictoryPortal extends React.Component {
   };
 
   static contextType = PortalContext;
+  private checkedContext!: boolean;
+  private renderInPlace!: boolean;
+  private element!: React.ReactElement;
+  private portalKey!: number;
 
   componentDidMount() {
     if (!this.checkedContext) {
@@ -49,7 +62,7 @@ export default class VictoryPortal extends React.Component {
   }
 
   // Overridden in victory-core-native
-  renderPortal(child) {
+  renderPortal(child: React.ReactElement) {
     if (this.renderInPlace) {
       return child;
     }
@@ -58,9 +71,11 @@ export default class VictoryPortal extends React.Component {
   }
 
   render() {
-    const children = Array.isArray(this.props.children)
-      ? this.props.children[0]
-      : this.props.children;
+    const children = (
+      Array.isArray(this.props.children)
+        ? this.props.children[0]
+        : this.props.children
+    ) as React.ReactElement;
     const { groupComponent } = this.props;
     const childProps = (children && children.props) || {};
     const standardProps = childProps.groupComponent

package/src/victory-primitives/{arc.js → arc.tsx}

@@ -4,7 +4,19 @@ import PropTypes from "prop-types";
 import * as Helpers from "../victory-util/helpers";
 import { assign } from "lodash";
 import * as CommonProps from "../victory-util/common-props";
-import Path from "./path";
+import { Path } from "./path";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export interface ArcProps extends VictoryCommonPrimitiveProps {
+  closedPath?: boolean;
+  cx?: number;
+  cy?: number;
+  datum?: any;
+  endAngle?: number;
+  pathComponent?: React.ReactElement;
+  r?: number;
+  startAngle?: number;
+}
 
 const getArcPath = (props) => {
   const { cx, cy, r, startAngle, endAngle, closedPath } = props;
@@ -48,10 +60,10 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
-const Arc = (props) => {
+export const Arc = (props: ArcProps) => {
   props = evaluateProps(props);
 
-  return React.cloneElement(props.pathComponent, {
+  return React.cloneElement(props.pathComponent!, {
     ...props.events,
     "aria-label": props.ariaLabel,
     d: getArcPath(props),
@@ -83,5 +95,3 @@ Arc.defaultProps = {
   role: "presentation",
   shapeRendering: "auto"
 };
-
-export default Arc;

package/src/victory-primitives/{background.js → background.tsx}

@@ -3,8 +3,20 @@ import PropTypes from "prop-types";
 import { assign } from "lodash";
 import * as Helpers from "../victory-util/helpers";
 import * as CommonProps from "../victory-util/common-props";
-import Rect from "./rect";
-import Circle from "./circle";
+import { Rect } from "./rect";
+import { Circle } from "./circle";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export interface BackgroundProps extends VictoryCommonPrimitiveProps {
+  circleComponent?: React.ReactElement;
+  height?: number;
+  rectComponent?: React.ReactElement;
+  rx?: number;
+  ry?: number;
+  width?: number;
+  x?: number;
+  y?: number;
+}
 
 const evaluateProps = (props) => {
   /**
@@ -16,11 +28,11 @@ const evaluateProps = (props) => {
   return assign({}, props, { id });
 };
 
-const Background = (props) => {
+export const Background = (props: BackgroundProps) => {
   props = evaluateProps(props);
 
   return props.polar
-    ? React.cloneElement(props.circleComponent, {
+    ? React.cloneElement(props.circleComponent!, {
         ...props.events,
         style: props.style,
         role: props.role,
@@ -30,7 +42,7 @@ const Background = (props) => {
         r: props.height,
         className: props.className
       })
-    : React.cloneElement(props.rectComponent, {
+    : React.cloneElement(props.rectComponent!, {
         ...props.events,
         style: props.style,
         role: props.role,
@@ -63,5 +75,3 @@ Background.defaultProps = {
   role: "presentation",
   shapeRendering: "auto"
 };
-
-export default Background;

package/src/victory-primitives/{border.js → border.tsx}

@@ -3,7 +3,16 @@ import PropTypes from "prop-types";
 import * as Helpers from "../victory-util/helpers";
 import { assign } from "lodash";
 import * as CommonProps from "../victory-util/common-props";
-import Rect from "./rect";
+import { Rect } from "./rect";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export interface BorderProps extends VictoryCommonPrimitiveProps {
+  width?: number;
+  height?: number;
+  rectComponent?: React.ReactElement;
+  x?: number;
+  y?: number;
+}
 
 const evaluateProps = (props) => {
   /**
@@ -26,10 +35,10 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
-const Border = (props) => {
+export const Border = (props: BorderProps) => {
   props = evaluateProps(props);
 
-  return React.cloneElement(props.rectComponent, {
+  return React.cloneElement(props.rectComponent!, {
     ...props.events,
     "aria-label": props.ariaLabel,
     style: props.style,
@@ -61,5 +70,3 @@ Border.defaultProps = {
   role: "presentation",
   shapeRendering: "auto"
 };
-
-export default Border;

package/src/victory-primitives/{circle.js → circle.tsx}

@@ -1,15 +1,16 @@
 import React from "react";
+import { VictoryPrimitiveShapeProps } from "./types";
 
-const Circle = (props) => {
+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 default Circle;

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

@@ -0,0 +1,25 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export interface ClipPathProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode[] | React.ReactNode;
+  clipId?: number | string;
+}
+
+export const ClipPath = (props: ClipPathProps) => (
+  <defs>
+    {
+      // @ts-expect-error FIXME: "id cannot be a number"
+      <clipPath id={props.clipId}>{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/index.ts

@@ -0,0 +1,14 @@
+export * from "./arc";
+export * from "./background";
+export * from "./border";
+export * from "./circle";
+export * from "./clip-path";
+export * from "./line";
+export * from "./line-segment";
+export * from "./path";
+export * from "./point";
+export * from "./rect";
+export * from "./text";
+export * from "./tspan";
+export * from "./types";
+export * from "./whisker";

package/src/victory-primitives/{line-segment.js → line-segment.tsx}

@@ -3,7 +3,17 @@ import PropTypes from "prop-types";
 import * as Helpers from "../victory-util/helpers";
 import { assign } from "lodash";
 import * as CommonProps from "../victory-util/common-props";
-import Line from "./line";
+import { Line } from "./line";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export interface LineSegmentProps extends VictoryCommonPrimitiveProps {
+  datum?: any;
+  lineComponent?: React.ReactElement;
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+}
 
 const evaluateProps = (props) => {
   /**
@@ -26,10 +36,10 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
-const LineSegment = (props) => {
+export const LineSegment = (props: LineSegmentProps) => {
   props = evaluateProps(props);
 
-  return React.cloneElement(props.lineComponent, {
+  return React.cloneElement(props.lineComponent!, {
     ...props.events,
     "aria-label": props.ariaLabel,
     style: props.style,
@@ -62,5 +72,3 @@ LineSegment.defaultProps = {
   role: "presentation",
   shapeRendering: "auto"
 };
-
-export default LineSegment;

package/src/victory-primitives/{line.js → line.tsx}

@@ -1,15 +1,16 @@
 import React from "react";
+import { VictoryPrimitiveShapeProps } from "./types";
 
-const Line = (props) => {
+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 default Line;

package/src/victory-primitives/{path.js → path.tsx}

@@ -1,15 +1,16 @@
 import React from "react";
+import { VictoryPrimitiveShapeProps } from "./types";
 
-const Path = (props) => {
+export const Path = (props: VictoryPrimitiveShapeProps) => {
   // eslint-disable-next-line react/prop-types
   const { desc, ...rest } = props;
   return desc ? (
+    // @ts-expect-error FIXME: "id cannot be a number"
     <path {...rest}>
       <desc>{desc}</desc>
     </path>
   ) : (
+    // @ts-expect-error FIXME: "id cannot be a number"
     <path {...rest} />
   );
 };
-
-export default Path;

package/src/victory-primitives/{point.js → point.tsx}

@@ -1,27 +1,32 @@
-import React from "react";
-import PropTypes from "prop-types";
 import { assign } from "lodash";
+import PropTypes from "prop-types";
+import React from "react";
 import * as Helpers from "../victory-util/helpers";
-import pathHelpers from "../victory-util/point-path-helpers";
+import * as pathHelpers from "../victory-util/point-path-helpers";
 import * as CommonProps from "../victory-util/common-props";
-import Path from "./path";
+import * as UserProps from "../victory-util/user-props";
+import { Path } from "./path";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+import { ScatterSymbolType } from "./types";
+
+export interface PointProps extends VictoryCommonPrimitiveProps {
+  datum?: any;
+  getPath?: (x: number, y: number, size: number) => string;
+  pathComponent?: React.ReactElement;
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  size?: number | Function;
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  symbol?: ScatterSymbolType | Function;
+  x?: number;
+  y?: number;
+}
 
 const getPath = (props) => {
   const { x, y, size, symbol } = props;
   if (props.getPath) {
     return props.getPath(x, y, size);
   }
-  const pathFunctions = {
-    circle: pathHelpers.circle,
-    square: pathHelpers.square,
-    diamond: pathHelpers.diamond,
-    triangleDown: pathHelpers.triangleDown,
-    triangleUp: pathHelpers.triangleUp,
-    plus: pathHelpers.plus,
-    minus: pathHelpers.minus,
-    star: pathHelpers.star,
-    cross: pathHelpers.cross
-  };
+  const pathFunctions = pathHelpers;
   const symbolFunction =
     typeof pathFunctions[symbol] === "function"
       ? pathFunctions[symbol]
@@ -59,10 +64,11 @@ const evaluateProps = (props) => {
   });
 };
 
-const Point = (props) => {
+export const Point = (props: PointProps) => {
   props = evaluateProps(props);
+  const userProps = UserProps.getSafeUserProps(props);
 
-  return React.cloneElement(props.pathComponent, {
+  return React.cloneElement(props.pathComponent!, {
     ...props.events,
     "aria-label": props.ariaLabel,
     d: getPath(props),
@@ -73,7 +79,8 @@ const Point = (props) => {
     shapeRendering: props.shapeRendering,
     className: props.className,
     transform: props.transform,
-    clipPath: props.clipPath
+    clipPath: props.clipPath,
+    ...userProps
   });
 };
 
@@ -106,5 +113,3 @@ Point.defaultProps = {
   role: "presentation",
   shapeRendering: "auto"
 };
-
-export default Point;

package/src/victory-primitives/{rect.js → rect.tsx}

@@ -1,14 +1,16 @@
 import React from "react";
+import { VictoryPrimitiveShapeProps } from "./types";
 
-const Rect = (props) => {
+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 default Rect;

package/src/victory-primitives/{text.js → text.tsx}

@@ -1,9 +1,17 @@
 import React from "react";
 import PropTypes from "prop-types";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
 
-const Text = (props) => {
+export interface TextProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode;
+  desc?: string;
+  title?: string;
+}
+
+export const Text = (props: TextProps) => {
   const { children, title, desc, ...rest } = props;
   return (
+    // @ts-expect-error FIXME: "id cannot be a number"
     <text {...rest}>
       {title && <title>{title}</title>}
       {desc && <desc>{desc}</desc>}
@@ -17,5 +25,3 @@ Text.propTypes = {
   desc: PropTypes.string,
   title: PropTypes.string
 };
-
-export default Text;

package/src/victory-primitives/tspan.tsx

@@ -0,0 +1,7 @@
+import React from "react";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export const TSpan = (props: VictoryCommonPrimitiveProps) => (
+  // @ts-expect-error FIXME: "id cannot be a number"
+  <tspan {...props} />
+);

package/src/victory-primitives/types.ts

@@ -0,0 +1,19 @@
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export type ScatterSymbolType =
+  | "circle"
+  | "cross"
+  | "diamond"
+  | "plus"
+  | "minus"
+  | "square"
+  | "star"
+  | "triangleDown"
+  | "triangleUp";
+
+export interface VictoryPrimitiveShapeProps
+  extends VictoryCommonPrimitiveProps {
+  desc?: string;
+  rx?: number;
+  ry?: number;
+}

package/src/victory-primitives/{whisker.js → whisker.tsx}

@@ -3,7 +3,22 @@ import { assign } from "lodash";
 import PropTypes from "prop-types";
 import * as Helpers from "../victory-util/helpers";
 import * as CommonProps from "../victory-util/common-props";
-import Line from "./line";
+import { Line } from "./line";
+import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+
+export type WhiskerAxes = {
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+};
+
+export interface WhiskerProps extends VictoryCommonPrimitiveProps {
+  groupComponent?: React.ReactElement;
+  lineComponent?: React.ReactElement;
+  majorWhisker?: WhiskerAxes;
+  minorWhisker?: WhiskerAxes;
+}
 
 const evaluateProps = (props) => {
   /**
@@ -23,7 +38,7 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
-const Whisker = (props) => {
+export const Whisker = (props: WhiskerProps) => {
   props = evaluateProps(props);
   const {
     ariaLabel,
@@ -53,9 +68,9 @@ const Whisker = (props) => {
     shapeRendering
   };
 
-  return React.cloneElement(groupComponent, {}, [
+  return React.cloneElement(groupComponent!, {}, [
     React.cloneElement(
-      lineComponent,
+      lineComponent!,
       assign(
         { key: "major-whisker", "aria-label": ariaLabel },
         baseProps,
@@ -63,7 +78,7 @@ const Whisker = (props) => {
       )
     ),
     React.cloneElement(
-      lineComponent,
+      lineComponent!,
       assign(
         { key: "minor-whisker", "aria-label": ariaLabel },
         baseProps,
@@ -97,5 +112,3 @@ Whisker.defaultProps = {
   role: "presentation",
   shapeRendering: "auto"
 };
-
-export default Whisker;

package/src/victory-theme/{grayscale.js → grayscale.tsx}

@@ -1,4 +1,5 @@
 import { assign } from "lodash";
+import { VictoryThemeDefinition } from "./victory-theme-definition";
 
 // *
 // * Colors
@@ -49,7 +50,7 @@ const centeredLabelStyles = assign({ textAnchor: "middle" }, baseLabelStyles);
 const strokeLinecap = "round";
 const strokeLinejoin = "round";
 
-export default {
+export const grayscale: VictoryThemeDefinition = {
   area: assign(
     {
       style: {

package/src/victory-theme/{material.js → material.tsx}

@@ -1,4 +1,5 @@
 import { assign } from "lodash";
+import { VictoryThemeDefinition } from "./victory-theme-definition";
 
 // *
 // * Colors
@@ -57,7 +58,7 @@ const strokeDasharray = "10, 5";
 const strokeLinecap = "round";
 const strokeLinejoin = "round";
 
-export default {
+export const material: VictoryThemeDefinition = {
   area: assign(
     {
       style: {