victory-core 36.5.0 → 36.5.3

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

@@ -13,12 +13,15 @@ import * as CustomPropTypes from "../victory-util/prop-types";
 import * as Style from "../victory-util/style";
 import * as TextSize from "../victory-util/textsize";
 import * as UserProps from "../victory-util/user-props";
-import { StringOrCallback, StringOrNumberOrCallback } from "../types";
 import {
   NumberOrCallback,
+  StringOrCallback,
+  StringOrNumberOrCallback,
+} from "../types/callbacks";
+import {
   PaddingProps,
   VerticalAnchorType,
-  VictoryLabelStyleObject
+  VictoryLabelStyleObject,
 } from "../victory-theme/victory-theme";
 
 export type TextAnchorType = "start" | "middle" | "end" | "inherit";
@@ -68,7 +71,7 @@ const defaultStyles = {
   fontSize: 14,
   fontFamily:
     "'Gill Sans', 'Gill Sans MT', 'Ser­avek', 'Trebuchet MS', sans-serif",
-  stroke: "transparent"
+  stroke: "transparent",
 };
 
 const getPosition = (props, dimension) => {
@@ -114,7 +117,7 @@ const getStyles = (style, props) => {
     const baseStyles = Helpers.evaluateStyle(style, props);
     return {
       // Font size is necessary to calculate the y position of the label
-      fontSize: getFontSize(baseStyles)
+      fontSize: getFontSize(baseStyles),
     };
   }
   const getSingleStyle = (s) => {
@@ -180,10 +183,10 @@ const getDy = (props, verticalAnchor, lineHeight) => {
     ? Helpers.evaluateProp(verticalAnchor, props)
     : "middle";
   const fontSizes = [...Array(length).keys()].map(
-    (i) => getSingleValue(props.style, i).fontSize
+    (i) => getSingleValue(props.style, i).fontSize,
   );
   const lineHeights = [...Array(length).keys()].map((i) =>
-    getSingleValue(lineHeight, i)
+    getSingleValue(lineHeight, i),
   );
 
   if (anchor === "start") {
@@ -270,7 +273,7 @@ const getFullBackground = (calculatedProps, tspanValues) => {
     backgroundStyle,
     inline,
     backgroundPadding,
-    capHeight
+    capHeight,
   } = calculatedProps;
   const textSizes = tspanValues.map((tspan) => {
     return tspan.textSize;
@@ -304,12 +307,12 @@ const getFullBackground = (calculatedProps, tspanValues) => {
     x: inline
       ? xCoordinate - backgroundPadding.left
       : xCoordinate + dx - backgroundPadding.left,
-    y: yCoordinate
+    y: yCoordinate,
   };
 
   return React.cloneElement(
     backgroundComponent,
-    defaults({}, backgroundComponent.props, backgroundProps)
+    defaults({}, backgroundComponent.props, backgroundProps),
   );
 };
 
@@ -348,7 +351,7 @@ const getChildBackgrounds = (calculatedProps, tspanValues) => {
     backgroundPadding,
     backgroundComponent,
     inline,
-    y
+    y,
   } = calculatedProps;
 
   const textElements = tspanValues.map((current, i) => {
@@ -375,14 +378,14 @@ const getChildBackgrounds = (calculatedProps, tspanValues) => {
         labelSize.width + padding.left + padding.right + xOffset,
       y,
       fontSize: current.fontSize,
-      dy: childDy
+      dy: childDy,
     };
   });
 
   return textElements.map((textElement, i) => {
     const xCoordinate = getXCoordinate(
       calculatedProps,
-      textElement.labelSize.width
+      textElement.labelSize.width,
     );
     const yCoordinate = textElements.slice(0, i + 1).reduce((prev, curr) => {
       return prev + curr.dy;
@@ -404,12 +407,12 @@ const getChildBackgrounds = (calculatedProps, tspanValues) => {
       width: textElement.widthWithPadding,
       transform,
       x: xCoord - padding.left,
-      y: yCoord
+      y: yCoord,
     };
 
     return React.cloneElement(
       backgroundComponent,
-      defaults({}, backgroundComponent.props, backgroundProps)
+      defaults({}, backgroundComponent.props, backgroundProps),
     );
   });
 };
@@ -467,10 +470,10 @@ const evaluateProps = (props) => {
   const style = getStyles(props.style, assign({}, props, { text }));
   const backgroundStyle = getBackgroundStyles(
     props.backgroundStyle,
-    assign({}, props, { text, style })
+    assign({}, props, { text, style }),
   );
   const backgroundPadding = getBackgroundPadding(
-    assign({}, props, { text, style, backgroundStyle })
+    assign({}, props, { text, style, backgroundStyle }),
   );
   const id = Helpers.evaluateProp(props.id, props);
   return assign({}, props, {
@@ -478,7 +481,7 @@ const evaluateProps = (props) => {
     backgroundPadding,
     style,
     text,
-    id
+    id,
   });
 };
 
@@ -512,7 +515,7 @@ const getCalculatedProps = <T extends VictoryLabelProps>(props: T) => {
     originalDy: props.dy,
     transform,
     x,
-    y
+    y,
   });
 };
 
@@ -535,7 +538,7 @@ const renderLabel = (calculatedProps, tspanValues) => {
     id,
     tabIndex,
     tspanComponent,
-    textComponent
+    textComponent,
   } = calculatedProps;
   const userProps = UserProps.getSafeUserProps(calculatedProps);
 
@@ -553,7 +556,7 @@ const renderLabel = (calculatedProps, tspanValues) => {
     desc: Helpers.evaluateProp(desc, calculatedProps),
     tabIndex: Helpers.evaluateProp(tabIndex, calculatedProps),
     id,
-    ...userProps
+    ...userProps,
   };
 
   const tspans = text.map((line, i) => {
@@ -565,7 +568,7 @@ const renderLabel = (calculatedProps, tspanValues) => {
       dy: getTSpanDy(tspanValues, calculatedProps, i),
       textAnchor: currentStyle.textAnchor || textAnchor,
       style: currentStyle,
-      children: line
+      children: line,
     };
     return React.cloneElement(tspanComponent, tspanProps);
   });
@@ -591,7 +594,7 @@ export const VictoryLabel: {
     const currentStyle = getSingleValue(style!, i);
     const capHeightPx = TextSize.convertLengthToPixels(
       `${capHeight}em`,
-      currentStyle.fontSize as number
+      currentStyle.fontSize as number,
     );
     const currentLineHeight = getSingleValue(lineHeight, i);
     return {
@@ -602,7 +605,7 @@ export const VictoryLabel: {
       // @ts-expect-error TODO: This looks like a bug:
       textSize: TextSize.approximateTextSize(line, currentStyle),
       lineHeight: currentLineHeight,
-      backgroundPadding: getSingleValue(backgroundPadding, i)
+      backgroundPadding: getSingleValue(backgroundPadding, i),
     };
   });
 
@@ -611,13 +614,13 @@ export const VictoryLabel: {
   if (props.backgroundStyle) {
     const backgroundElement = getBackgroundElement(
       calculatedProps,
-      tspanValues
+      tspanValues,
     );
     const children = [backgroundElement, label];
     const backgroundWithLabel = React.cloneElement(
       props.groupComponent!,
       {},
-      children
+      children,
     );
 
     return props.renderInPortal ? (
@@ -638,20 +641,20 @@ VictoryLabel.propTypes = {
   angle: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.number,
-    PropTypes.func
+    PropTypes.func,
   ]),
   ariaLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
   backgroundComponent: PropTypes.element,
   backgroundPadding: PropTypes.oneOfType([
     PropTypes.number,
     PropTypes.object,
-    PropTypes.array
+    PropTypes.array,
   ]),
   backgroundStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   capHeight: PropTypes.oneOfType([
     PropTypes.string,
     CustomPropTypes.nonNegative,
-    PropTypes.func
+    PropTypes.func,
   ]),
   className: PropTypes.string,
   data: PropTypes.array,
@@ -671,18 +674,17 @@ VictoryLabel.propTypes = {
     PropTypes.string,
     CustomPropTypes.nonNegative,
     PropTypes.func,
-    PropTypes.array
+    PropTypes.array,
   ]),
-  // @ts-expect-error "x is required in origin"
   origin: PropTypes.shape({
-    x: CustomPropTypes.nonNegative,
-    y: CustomPropTypes.nonNegative
+    x: CustomPropTypes.nonNegative.isRequired,
+    y: CustomPropTypes.nonNegative.isRequired,
   }),
   polar: PropTypes.bool,
   renderInPortal: PropTypes.bool,
   scale: PropTypes.shape({
     x: CustomPropTypes.scale,
-    y: CustomPropTypes.scale
+    y: CustomPropTypes.scale,
   }),
   style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   tabIndex: PropTypes.oneOfType([PropTypes.number, PropTypes.func]),
@@ -690,30 +692,30 @@ VictoryLabel.propTypes = {
     PropTypes.string,
     PropTypes.number,
     PropTypes.func,
-    PropTypes.array
+    PropTypes.array,
   ]),
   // @ts-expect-error Function is not assignable to string"
   textAnchor: PropTypes.oneOfType([
     PropTypes.oneOf(["start", "middle", "end", "inherit"]),
-    PropTypes.func
+    PropTypes.func,
   ]),
   textComponent: PropTypes.element,
   title: PropTypes.string,
   transform: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.object,
-    PropTypes.func
+    PropTypes.func,
   ]),
   tspanComponent: PropTypes.element,
   // @ts-expect-error Function is not assignable to string"
   verticalAnchor: PropTypes.oneOfType([
     PropTypes.oneOf(["start", "middle", "end"]),
-    PropTypes.func
+    PropTypes.func,
   ]),
   // @ts-expect-error Number is not assignable to string
   x: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   // @ts-expect-error Number is not assignable to string
-  y: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+  y: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 };
 
 VictoryLabel.defaultProps = {
@@ -723,5 +725,5 @@ VictoryLabel.defaultProps = {
   textComponent: <Text />,
   tspanComponent: <TSpan />,
   capHeight: 0.71, // Magic number from d3.
-  lineHeight: 1
+  lineHeight: 1,
 };

package/src/victory-portal/portal.tsx

@@ -23,7 +23,7 @@ export class Portal
     height: CustomPropTypes.nonNegative,
     style: PropTypes.object,
     viewBox: PropTypes.string,
-    width: CustomPropTypes.nonNegative
+    width: CustomPropTypes.nonNegative,
   };
   private readonly map: Record<string, React.ReactElement>;
   private index: number;

package/src/victory-portal/victory-portal.tsx

@@ -21,11 +21,11 @@ export class VictoryPortal extends React.Component<VictoryPortalProps> {
 
   static propTypes = {
     children: PropTypes.node,
-    groupComponent: PropTypes.element
+    groupComponent: PropTypes.element,
   };
 
   static defaultProps = {
-    groupComponent: <g />
+    groupComponent: <g />,
   };
 
   static contextType = PortalContext;
@@ -84,7 +84,7 @@ export class VictoryPortal extends React.Component<VictoryPortalProps> {
     const newProps = defaults(
       standardProps,
       childProps,
-      Helpers.omit(this.props, ["children", "groupComponent"])
+      Helpers.omit(this.props, ["children", "groupComponent"]),
     );
     const child = children && React.cloneElement(children, newProps);
     return this.renderPortal(child);

package/src/victory-primitives/arc.tsx

@@ -3,9 +3,11 @@ import React from "react";
 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 {
+  CommonProps,
+  VictoryCommonPrimitiveProps,
+} from "../victory-util/common-props";
 import { Path } from "./path";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
 
 export interface ArcProps extends VictoryCommonPrimitiveProps {
   closedPath?: boolean;
@@ -53,7 +55,7 @@ const evaluateProps = (props) => {
   const id = Helpers.evaluateProp(props.id, props);
   const style = Helpers.evaluateStyle(
     assign({ stroke: "black", fill: "none" }, props.style),
-    props
+    props,
   );
   const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
 
@@ -74,7 +76,7 @@ export const Arc = (props: ArcProps) => {
     role: props.role,
     shapeRendering: props.shapeRendering,
     transform: props.transform,
-    clipPath: props.clipPath
+    clipPath: props.clipPath,
   });
 };
 
@@ -87,11 +89,11 @@ Arc.propTypes = {
   endAngle: PropTypes.number,
   pathComponent: PropTypes.element,
   r: PropTypes.number,
-  startAngle: PropTypes.number
+  startAngle: PropTypes.number,
 };
 
 Arc.defaultProps = {
   pathComponent: <Path />,
   role: "presentation",
-  shapeRendering: "auto"
+  shapeRendering: "auto",
 };

package/src/victory-primitives/background.tsx

@@ -2,10 +2,12 @@ import React from "react";
 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 {
+  CommonProps,
+  VictoryCommonPrimitiveProps,
+} from "../victory-util/common-props";
 import { Rect } from "./rect";
 import { Circle } from "./circle";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
 
 export interface BackgroundProps extends VictoryCommonPrimitiveProps {
   circleComponent?: React.ReactElement;
@@ -40,7 +42,7 @@ export const Background = (props: BackgroundProps) => {
         cx: props.x,
         cy: props.y,
         r: props.height,
-        className: props.className
+        className: props.className,
       })
     : React.cloneElement(props.rectComponent!, {
         ...props.events,
@@ -53,7 +55,7 @@ export const Background = (props: BackgroundProps) => {
         ry: props.ry,
         width: props.width,
         height: props.height,
-        className: props.className
+        className: props.className,
       });
 };
 
@@ -66,12 +68,12 @@ Background.propTypes = {
   ry: PropTypes.number,
   width: PropTypes.number,
   x: PropTypes.number,
-  y: PropTypes.number
+  y: PropTypes.number,
 };
 
 Background.defaultProps = {
   circleComponent: <Circle />,
   rectComponent: <Rect />,
   role: "presentation",
-  shapeRendering: "auto"
+  shapeRendering: "auto",
 };

package/src/victory-primitives/border.tsx

@@ -2,9 +2,11 @@ import React from "react";
 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 {
+  CommonProps,
+  VictoryCommonPrimitiveProps,
+} from "../victory-util/common-props";
 import { Rect } from "./rect";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
 
 export interface BorderProps extends VictoryCommonPrimitiveProps {
   width?: number;
@@ -28,7 +30,7 @@ const evaluateProps = (props) => {
   const id = Helpers.evaluateProp(props.id, props);
   const style = Helpers.evaluateStyle(
     assign({ fill: "none" }, props.style),
-    props
+    props,
   );
   const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
 
@@ -52,7 +54,7 @@ export const Border = (props: BorderProps) => {
     y: props.y,
     width: props.width,
     height: props.height,
-    clipPath: props.clipPath
+    clipPath: props.clipPath,
   });
 };
 
@@ -62,11 +64,11 @@ Border.propTypes = {
   rectComponent: PropTypes.element,
   width: PropTypes.number,
   x: PropTypes.number,
-  y: PropTypes.number
+  y: PropTypes.number,
 };
 
 Border.defaultProps = {
   rectComponent: <Rect />,
   role: "presentation",
-  shapeRendering: "auto"
+  shapeRendering: "auto",
 };

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

@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 
 export interface ClipPathProps extends VictoryCommonPrimitiveProps {
   children?: React.ReactNode[] | React.ReactNode;
@@ -19,7 +19,7 @@ export const ClipPath = (props: ClipPathProps) => (
 ClipPath.propTypes = {
   children: PropTypes.oneOfType([
     PropTypes.arrayOf(PropTypes.node),
-    PropTypes.node
+    PropTypes.node,
   ]),
-  clipId: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+  clipId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 };

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

@@ -2,9 +2,11 @@ import React from "react";
 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 {
+  CommonProps,
+  VictoryCommonPrimitiveProps,
+} from "../victory-util/common-props";
 import { Line } from "./line";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
 
 export interface LineSegmentProps extends VictoryCommonPrimitiveProps {
   datum?: any;
@@ -29,7 +31,7 @@ const evaluateProps = (props) => {
   const id = Helpers.evaluateProp(props.id, props);
   const style = Helpers.evaluateStyle(
     assign({ stroke: "black" }, props.style),
-    props
+    props,
   );
   const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
 
@@ -53,7 +55,7 @@ export const LineSegment = (props: LineSegmentProps) => {
     y1: props.y1,
     y2: props.y2,
     transform: props.transform,
-    clipPath: props.clipPath
+    clipPath: props.clipPath,
   });
 };
 
@@ -64,11 +66,11 @@ LineSegment.propTypes = {
   x1: PropTypes.number,
   x2: PropTypes.number,
   y1: PropTypes.number,
-  y2: PropTypes.number
+  y2: PropTypes.number,
 };
 
 LineSegment.defaultProps = {
   lineComponent: <Line />,
   role: "presentation",
-  shapeRendering: "auto"
+  shapeRendering: "auto",
 };

package/src/victory-primitives/point.tsx

@@ -3,10 +3,12 @@ import PropTypes from "prop-types";
 import React from "react";
 import * as Helpers from "../victory-util/helpers";
 import * as pathHelpers from "../victory-util/point-path-helpers";
-import * as CommonProps from "../victory-util/common-props";
+import {
+  CommonProps,
+  VictoryCommonPrimitiveProps,
+} from "../victory-util/common-props";
 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 {
@@ -60,7 +62,7 @@ const evaluateProps = (props) => {
     size,
     style,
     symbol,
-    tabIndex
+    tabIndex,
   });
 };
 
@@ -80,7 +82,7 @@ export const Point = (props: PointProps) => {
     className: props.className,
     transform: props.transform,
     clipPath: props.clipPath,
-    ...userProps
+    ...userProps,
   });
 };
 
@@ -100,16 +102,16 @@ Point.propTypes = {
       "square",
       "star",
       "triangleDown",
-      "triangleUp"
+      "triangleUp",
     ]),
-    PropTypes.func
+    PropTypes.func,
   ]),
   x: PropTypes.number,
-  y: PropTypes.number
+  y: PropTypes.number,
 };
 
 Point.defaultProps = {
   pathComponent: <Path />,
   role: "presentation",
-  shapeRendering: "auto"
+  shapeRendering: "auto",
 };

package/src/victory-primitives/text.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 
 export interface TextProps extends VictoryCommonPrimitiveProps {
   children?: React.ReactNode;
@@ -23,5 +23,5 @@ export const Text = (props: TextProps) => {
 Text.propTypes = {
   children: PropTypes.node,
   desc: PropTypes.string,
-  title: PropTypes.string
+  title: PropTypes.string,
 };

package/src/victory-primitives/tspan.tsx

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

package/src/victory-primitives/types.ts

@@ -1,4 +1,4 @@
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
+import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 
 export type ScatterSymbolType =
   | "circle"

package/src/victory-primitives/whisker.tsx

@@ -2,9 +2,11 @@ import React from "react";
 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 {
+  CommonProps,
+  VictoryCommonPrimitiveProps,
+} from "../victory-util/common-props";
 import { Line } from "./line";
-import { VictoryCommonPrimitiveProps } from "../victory-util/types";
 
 export type WhiskerAxes = {
   x1?: number;
@@ -54,7 +56,7 @@ export const Whisker = (props: WhiskerProps) => {
     shapeRendering,
     style,
     desc,
-    tabIndex
+    tabIndex,
   } = props;
   const baseProps = {
     ...events,
@@ -65,7 +67,7 @@ export const Whisker = (props: WhiskerProps) => {
     transform,
     clipPath,
     role,
-    shapeRendering
+    shapeRendering,
   };
 
   return React.cloneElement(groupComponent!, {}, [
@@ -74,17 +76,17 @@ export const Whisker = (props: WhiskerProps) => {
       assign(
         { key: "major-whisker", "aria-label": ariaLabel },
         baseProps,
-        majorWhisker
-      )
+        majorWhisker,
+      ),
     ),
     React.cloneElement(
       lineComponent!,
       assign(
         { key: "minor-whisker", "aria-label": ariaLabel },
         baseProps,
-        minorWhisker
-      )
-    )
+        minorWhisker,
+      ),
+    ),
   ]);
 };
 
@@ -96,19 +98,19 @@ Whisker.propTypes = {
     x1: PropTypes.number,
     x2: PropTypes.number,
     y1: PropTypes.number,
-    y2: PropTypes.number
+    y2: PropTypes.number,
   }),
   minorWhisker: PropTypes.shape({
     x1: PropTypes.number,
     x2: PropTypes.number,
     y1: PropTypes.number,
-    y2: PropTypes.number
-  })
+    y2: PropTypes.number,
+  }),
 };
 
 Whisker.defaultProps = {
   groupComponent: <g />,
   lineComponent: <Line />,
   role: "presentation",
-  shapeRendering: "auto"
+  shapeRendering: "auto",
 };