victory-core 37.0.2 → 37.0.3-next.0

package/es/victory-clip-container/victory-clip-container.d.ts

@@ -1,47 +1,47 @@
-import React from "react";
-import { BlockProps } from "../victory-theme/victory-theme";
-import { OriginType } from "../victory-label/victory-label";
-export interface VictoryClipContainerProps {
-    "aria-label"?: string;
-    children?: React.ReactElement | React.ReactElement[];
-    circleComponent?: React.ReactElement;
-    className?: string;
-    clipHeight?: number;
-    clipId?: number | string;
-    clipPadding?: BlockProps;
-    clipPathComponent?: React.ReactElement;
-    clipWidth?: number;
-    events?: React.DOMAttributes<any>;
-    groupComponent?: React.ReactElement;
-    origin?: OriginType;
-    polar?: boolean;
-    radius?: number;
-    rectComponent?: React.ReactElement;
-    translateX?: number;
-    translateY?: number;
-}
-export declare class VictoryClipContainer extends React.Component<VictoryClipContainerProps> {
-    static displayName: string;
-    static role: string;
-    static defaultProps: {
-        circleComponent: JSX.Element;
-        rectComponent: JSX.Element;
-        clipPathComponent: JSX.Element;
-        groupComponent: JSX.Element;
-    };
-    clipId: VictoryClipContainerProps["clipId"];
-    constructor(props: VictoryClipContainerProps);
-    calculateAttributes(props: any): {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
-    renderClippedGroup(props: any, clipId: any): React.DetailedReactHTMLElement<any, HTMLElement>;
-    renderGroup(props: any): React.DetailedReactHTMLElement<any, HTMLElement>;
-    renderClipComponent(props: any, clipId: any): React.DetailedReactHTMLElement<any, HTMLElement>;
-    getClipValue(props: any, axis: any): any;
-    getTranslateValue(props: any, axis: any): any;
-    render(): React.DetailedReactHTMLElement<any, HTMLElement>;
-}
+import React from "react";
+import { BlockProps } from "../victory-theme/victory-theme";
+import { OriginType } from "../victory-label/victory-label";
+export interface VictoryClipContainerProps {
+    "aria-label"?: string;
+    children?: React.ReactElement | React.ReactElement[];
+    circleComponent?: React.ReactElement;
+    className?: string;
+    clipHeight?: number;
+    clipId?: number | string;
+    clipPadding?: BlockProps;
+    clipPathComponent?: React.ReactElement;
+    clipWidth?: number;
+    events?: React.DOMAttributes<any>;
+    groupComponent?: React.ReactElement;
+    origin?: OriginType;
+    polar?: boolean;
+    radius?: number;
+    rectComponent?: React.ReactElement;
+    translateX?: number;
+    translateY?: number;
+}
+export declare class VictoryClipContainer extends React.Component<VictoryClipContainerProps> {
+    static displayName: string;
+    static role: string;
+    static defaultProps: {
+        circleComponent: JSX.Element;
+        rectComponent: JSX.Element;
+        clipPathComponent: JSX.Element;
+        groupComponent: JSX.Element;
+    };
+    clipId: VictoryClipContainerProps["clipId"];
+    constructor(props: VictoryClipContainerProps);
+    calculateAttributes(props: any): {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    renderClippedGroup(props: any, clipId: any): React.DetailedReactHTMLElement<any, HTMLElement>;
+    renderGroup(props: any): React.DetailedReactHTMLElement<any, HTMLElement>;
+    renderClipComponent(props: any, clipId: any): React.DetailedReactHTMLElement<any, HTMLElement>;
+    getClipValue(props: any, axis: any): any;
+    getTranslateValue(props: any, axis: any): any;
+    render(): React.DetailedReactHTMLElement<any, HTMLElement>;
+}
 //# sourceMappingURL=victory-clip-container.d.ts.map

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

@@ -1,69 +1,63 @@
-import React from "react";
-import { OriginType } from "../victory-label/victory-label";
-import { D3Scale } from "../types/prop-types";
-import { VictoryThemeDefinition } from "../victory-theme/types";
-export interface VictoryContainerProps {
-    "aria-describedby"?: string;
-    "aria-labelledby"?: string;
-    children?: React.ReactElement | React.ReactElement[];
-    className?: string;
-    containerId?: number | string;
-    containerRef?: React.Ref<HTMLElement>;
-    desc?: string;
-    events?: React.DOMAttributes<any>;
-    height?: number;
-    name?: string;
-    origin?: OriginType;
-    ouiaId?: number | string;
-    ouiaSafe?: boolean;
-    ouiaType?: string;
-    polar?: boolean;
-    portalComponent?: React.ReactElement;
-    portalZIndex?: number;
-    preserveAspectRatio?: string;
-    responsive?: boolean;
-    role?: string;
-    scale?: {
-        x?: D3Scale;
-        y?: D3Scale;
-    };
-    style?: React.CSSProperties;
-    tabIndex?: number;
-    theme?: VictoryThemeDefinition;
-    title?: string;
-    width?: number;
-}
-export declare class VictoryContainer<TProps extends VictoryContainerProps> extends React.Component<TProps> {
-    static displayName: string;
-    static role: string;
-    static defaultProps: {
-        className: string;
-        portalComponent: JSX.Element;
-        portalZIndex: number;
-        responsive: boolean;
-        role: string;
-    };
-    static contextType: React.Context<{
-        transitionTimer: import("..").Timer;
-        animationTimer: import("..").Timer;
-    }>;
-    private containerId;
-    private portalRef;
-    private containerRef;
-    private shouldHandleWheel;
-    constructor(props: TProps);
-    savePortalRef: (portal: any) => any;
-    portalUpdate: (key: any, el: any) => void;
-    portalRegister: () => number;
-    portalDeregister: (key: any) => void;
-    saveContainerRef: (container: HTMLElement) => HTMLElement;
-    handleWheel: (e: any) => any;
-    componentDidMount(): void;
-    componentWillUnmount(): void;
-    getIdForElement(elementName: any): string;
-    getChildren(props: any): any;
-    getOUIAProps(props: any): any;
-    renderContainer(props: any, svgProps: any, style: any): JSX.Element;
-    render(): JSX.Element;
-}
+import React from "react";
+import { OriginType } from "../victory-label/victory-label";
+import { D3Scale } from "../types/prop-types";
+import { VictoryThemeDefinition } from "../victory-theme/types";
+export interface VictoryContainerProps {
+    "aria-describedby"?: string;
+    "aria-labelledby"?: string;
+    children?: React.ReactElement | React.ReactElement[];
+    className?: string;
+    containerId?: number | string;
+    containerRef?: React.Ref<HTMLElement>;
+    desc?: string;
+    events?: React.DOMAttributes<any>;
+    height?: number;
+    name?: string;
+    origin?: OriginType;
+    polar?: boolean;
+    portalComponent?: React.ReactElement;
+    portalZIndex?: number;
+    preserveAspectRatio?: string;
+    responsive?: boolean;
+    role?: string;
+    scale?: {
+        x?: D3Scale;
+        y?: D3Scale;
+    };
+    style?: React.CSSProperties;
+    tabIndex?: number;
+    theme?: VictoryThemeDefinition;
+    title?: string;
+    width?: number;
+    ouiaId?: number | string;
+    ouiaSafe?: boolean;
+    ouiaType?: string;
+}
+export declare function useVictoryContainer<TProps extends VictoryContainerProps>(initialProps: TProps): {
+    className: string;
+    portalComponent: JSX.Element;
+    portalZIndex: number;
+    responsive: boolean;
+    role: string;
+} & TProps & {
+    titleId: string;
+    descId: string;
+    dimensions: {
+        width: string;
+        height: string;
+    } | {
+        width: number | undefined;
+        height: number | undefined;
+    };
+    viewBox: string | undefined;
+    preserveAspectRatio: string | undefined;
+    ariaLabelledBy: string | undefined;
+    ariaDescribedBy: string | undefined;
+    userProps: Record<string, string>;
+    localContainerRef: React.RefObject<HTMLDivElement>;
+};
+export declare const VictoryContainer: {
+    (initialProps: VictoryContainerProps): JSX.Element;
+    role: string;
+};
 //# sourceMappingURL=victory-container.d.ts.map

package/es/victory-container/victory-container.js

@@ -1,179 +1,151 @@
-import _isObject from "lodash/isObject";
 import _uniqueId from "lodash/uniqueId";
-import _defaults from "lodash/defaults";
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-import React from "react";
+import React, { useRef } from "react";
 import { Portal } from "../victory-portal/portal";
-import { PortalContext } from "../victory-portal/portal-context";
-import TimerContext from "../victory-util/timer-context";
-import * as Helpers from "../victory-util/helpers";
 import * as UserProps from "../victory-util/user-props";
-export class VictoryContainer extends React.Component {
-  static displayName = "VictoryContainer";
-  static role = "container";
-  static defaultProps = {
-    className: "VictoryContainer",
-    portalComponent: /*#__PURE__*/React.createElement(Portal, null),
-    portalZIndex: 99,
-    responsive: true,
-    role: "img"
+import { mergeRefs } from "../victory-util";
+import { PortalOutlet } from "../victory-portal/portal-outlet";
+import { PortalProvider } from "../victory-portal/portal-context";
+const defaultProps = {
+  className: "VictoryContainer",
+  portalComponent: /*#__PURE__*/React.createElement(Portal, null),
+  portalZIndex: 99,
+  responsive: true,
+  role: "img"
+};
+export function useVictoryContainer(initialProps) {
+  const props = {
+    ...defaultProps,
+    ...initialProps
   };
-  static contextType = TimerContext;
+  const {
+    title,
+    desc,
+    width,
+    height,
+    responsive
+  } = props;
+  const localContainerRef = useRef(null);
 
-  // @ts-expect-error Ref will be initialized on mount
-
-  // @ts-expect-error Ref will be initialized on mount
-
-  constructor(props) {
-    super(props);
-    this.containerId = !_isObject(props) || props.containerId === undefined ? _uniqueId("victory-container-") : props.containerId;
-    this.shouldHandleWheel = !!(props && props.events && props.events.onWheel);
-  }
-  savePortalRef = portal => {
-    this.portalRef = portal;
-    return portal;
+  // Generated ID stored in ref because it needs to persist across renders
+  const generatedId = useRef(_uniqueId("victory-container-"));
+  const containerId = props.containerId ?? generatedId.current;
+  const getIdForElement = elName => `${containerId}-${elName}`;
+  const userProps = UserProps.getSafeUserProps(props);
+  const dimensions = responsive ? {
+    width: "100%",
+    height: "100%"
+  } : {
+    width,
+    height
   };
-  portalUpdate = (key, el) => this.portalRef.portalUpdate(key, el);
-  portalRegister = () => this.portalRef.portalRegister();
-  portalDeregister = key => this.portalRef.portalDeregister(key);
-  saveContainerRef = container => {
-    if (Helpers.isFunction(this.props.containerRef)) {
-      this.props.containerRef(container);
-    }
-    this.containerRef = container;
-    return container;
+  const viewBox = responsive ? `0 0 ${width} ${height}` : undefined;
+  const preserveAspectRatio = responsive ? props.preserveAspectRatio : undefined;
+  const ariaLabelledBy = [title && getIdForElement("title"), props["aria-labelledby"]].filter(Boolean).join(" ") || undefined;
+  const ariaDescribedBy = [desc && getIdForElement("desc"), props["aria-describedby"]].filter(Boolean).join(" ") || undefined;
+  const titleId = getIdForElement("title");
+  const descId = getIdForElement("desc");
+  return {
+    ...props,
+    titleId,
+    descId,
+    dimensions,
+    viewBox,
+    preserveAspectRatio,
+    ariaLabelledBy,
+    ariaDescribedBy,
+    userProps,
+    localContainerRef
   };
-  handleWheel = e => e.preventDefault();
-  componentDidMount() {
-    if (this.shouldHandleWheel && this.containerRef) {
-      this.containerRef.addEventListener("wheel", this.handleWheel);
-    }
-  }
-  componentWillUnmount() {
-    if (this.shouldHandleWheel && this.containerRef) {
-      this.containerRef.removeEventListener("wheel", this.handleWheel);
-    }
-  }
-  getIdForElement(elementName) {
-    return `${this.containerId}-${elementName}`;
-  }
-
-  // overridden in custom containers
-  getChildren(props) {
-    return props.children;
-  }
-
-  // Get props defined by the Open UI Automation (OUIA) 1.0-RC spec
-  // See https://ouia.readthedocs.io/en/latest/README.html#ouia-component
-  getOUIAProps(props) {
-    const {
-      ouiaId,
-      ouiaSafe,
-      ouiaType
-    } = props;
-    return {
-      ...(ouiaId && {
-        "data-ouia-component-id": ouiaId
-      }),
-      ...(ouiaType && {
-        "data-ouia-component-type": ouiaType
-      }),
-      ...(ouiaSafe !== undefined && {
-        "data-ouia-safe": ouiaSafe
-      })
+}
+export const VictoryContainer = initialProps => {
+  const {
+    role,
+    title,
+    desc,
+    children,
+    className,
+    portalZIndex,
+    portalComponent,
+    width,
+    height,
+    style,
+    tabIndex,
+    responsive,
+    events,
+    ouiaId,
+    ouiaSafe,
+    ouiaType,
+    dimensions,
+    ariaDescribedBy,
+    ariaLabelledBy,
+    viewBox,
+    preserveAspectRatio,
+    userProps,
+    titleId,
+    descId,
+    containerRef,
+    localContainerRef
+  } = useVictoryContainer(initialProps);
+  React.useEffect(() => {
+    if (!events?.onWheel) return;
+    const handleWheel = e => e.preventDefault();
+    const container = localContainerRef?.current;
+    container?.addEventListener("wheel", handleWheel);
+    return () => {
+      container?.removeEventListener("wheel", handleWheel);
     };
-  }
-  renderContainer(props, svgProps, style) {
-    const {
-      title,
-      desc,
-      portalComponent,
-      className,
-      width,
-      height,
-      portalZIndex,
-      responsive
-    } = props;
-    const children = this.getChildren(props);
-    const dimensions = responsive ? {
-      width: "100%",
-      height: "100%"
-    } : {
-      width,
-      height
-    };
-    const divStyle = Object.assign({
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return /*#__PURE__*/React.createElement(PortalProvider, null, /*#__PURE__*/React.createElement("div", {
+    className: className,
+    style: {
+      ...style,
+      width: responsive ? style?.width : dimensions.width,
+      height: responsive ? style?.height : dimensions.height,
       pointerEvents: "none",
       touchAction: "none",
       position: "relative"
-    }, dimensions);
-    const portalDivStyle = Object.assign({
+    },
+    "data-ouia-component-id": ouiaId,
+    "data-ouia-component-type": ouiaType,
+    "data-ouia-safe": ouiaSafe,
+    ref: mergeRefs([localContainerRef, containerRef])
+  }, /*#__PURE__*/React.createElement("svg", _extends({
+    width: width,
+    height: height,
+    tabIndex: tabIndex,
+    role: role,
+    "aria-labelledby": ariaLabelledBy,
+    "aria-describedby": ariaDescribedBy,
+    viewBox: viewBox,
+    preserveAspectRatio: preserveAspectRatio,
+    style: {
+      ...dimensions,
+      pointerEvents: "all"
+    }
+  }, userProps, events), title ? /*#__PURE__*/React.createElement("title", {
+    id: titleId
+  }, title) : null, desc ? /*#__PURE__*/React.createElement("desc", {
+    id: descId
+  }, desc) : null, children), /*#__PURE__*/React.createElement("div", {
+    style: {
+      ...dimensions,
       zIndex: portalZIndex,
       position: "absolute",
       top: 0,
       left: 0
-    }, dimensions);
-    const svgStyle = Object.assign({
-      pointerEvents: "all"
-    }, dimensions);
-    const portalSvgStyle = Object.assign({
+    }
+  }, /*#__PURE__*/React.createElement(PortalOutlet, {
+    as: portalComponent,
+    width: width,
+    height: height,
+    viewBox: viewBox,
+    preserveAspectRatio: preserveAspectRatio,
+    style: {
+      ...dimensions,
       overflow: "visible"
-    }, dimensions);
-    const portalProps = {
-      width,
-      height,
-      viewBox: svgProps.viewBox,
-      preserveAspectRatio: svgProps.preserveAspectRatio,
-      style: portalSvgStyle
-    };
-    return /*#__PURE__*/React.createElement(PortalContext.Provider, {
-      value: {
-        portalUpdate: this.portalUpdate,
-        portalRegister: this.portalRegister,
-        portalDeregister: this.portalDeregister
-      }
-    }, /*#__PURE__*/React.createElement("div", _extends({
-      style: _defaults({}, style, divStyle),
-      className: className,
-      ref: this.saveContainerRef
-    }, this.getOUIAProps(props)), /*#__PURE__*/React.createElement("svg", _extends({}, svgProps, {
-      style: svgStyle
-    }), title ? /*#__PURE__*/React.createElement("title", {
-      id: this.getIdForElement("title")
-    }, title) : null, desc ? /*#__PURE__*/React.createElement("desc", {
-      id: this.getIdForElement("desc")
-    }, desc) : null, children), /*#__PURE__*/React.createElement("div", {
-      style: portalDivStyle
-    }, /*#__PURE__*/React.cloneElement(portalComponent, {
-      ...portalProps,
-      ref: this.savePortalRef
-    }))));
-  }
-  render() {
-    const {
-      width,
-      height,
-      responsive,
-      events,
-      title,
-      desc,
-      tabIndex,
-      preserveAspectRatio,
-      role
-    } = this.props;
-    const style = responsive ? this.props.style : Helpers.omit(this.props.style, ["height", "width"]);
-    const userProps = UserProps.getSafeUserProps(this.props);
-    const svgProps = Object.assign({
-      width,
-      height,
-      tabIndex,
-      role,
-      "aria-labelledby": [title && this.getIdForElement("title"), this.props["aria-labelledby"]].filter(Boolean).join(" ") || undefined,
-      "aria-describedby": [desc && this.getIdForElement("desc"), this.props["aria-describedby"]].filter(Boolean).join(" ") || undefined,
-      viewBox: responsive ? `0 0 ${width} ${height}` : undefined,
-      preserveAspectRatio: responsive ? preserveAspectRatio : undefined,
-      ...userProps
-    }, events);
-    return this.renderContainer(this.props, svgProps, style);
-  }
-}
+    }
+  }))));
+};
+VictoryContainer.role = "container";

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

@@ -1,59 +1,59 @@
-import React from "react";
-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 = {
-    x: number;
-    y: number;
-};
-export declare type LabelOrientationType = "parallel" | "perpendicular" | "vertical";
-export interface VictoryLabelProps {
-    angle?: StringOrNumberOrCallback;
-    ariaLabel?: StringOrCallback;
-    backgroundComponent?: React.ReactElement;
-    backgroundStyle?: VictoryLabelStyleObject | VictoryLabelStyleObject[];
-    backgroundPadding?: PaddingProps | PaddingProps[];
-    capHeight?: StringOrNumberOrCallback;
-    children?: StringOrNumberOrCallback;
-    className?: string;
-    datum?: Record<string, any>;
-    data?: any[];
-    desc?: string;
-    direction?: string;
-    disableInlineStyles?: boolean;
-    events?: React.DOMAttributes<any>;
-    groupComponent?: React.ReactElement;
-    id?: StringOrNumberOrCallback;
-    inline?: boolean;
-    labelPlacement?: LabelOrientationType;
-    lineHeight?: StringOrNumberOrCallback | (string | number)[];
-    origin?: OriginType;
-    polar?: boolean;
-    renderInPortal?: boolean;
-    style?: VictoryLabelStyleObject | VictoryLabelStyleObject[];
-    tabIndex?: NumberOrCallback;
-    text?: string[] | StringOrNumberOrCallback;
-    textComponent?: React.ReactElement;
-    textAnchor?: ValueOrAccessor<TextAnchorType>;
-    title?: string;
-    transform?: ValueOrAccessor<string | object>;
-    tspanComponent?: React.ReactElement;
-    verticalAnchor?: ValueOrAccessor<VerticalAnchorType>;
-    x?: number;
-    y?: number;
-    dx?: StringOrNumberOrCallback;
-    dy?: StringOrNumberOrCallback;
-}
-declare const defaultStyles: {
-    fill: string;
-    fontSize: number;
-    fontFamily: string;
-    stroke: string;
-};
-export declare const VictoryLabel: {
-    role: string;
-    defaultStyles: typeof defaultStyles;
-} & React.FC<VictoryLabelProps>;
-export {};
+import React from "react";
+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 = {
+    x: number;
+    y: number;
+};
+export declare type LabelOrientationType = "parallel" | "perpendicular" | "vertical";
+export interface VictoryLabelProps {
+    angle?: StringOrNumberOrCallback;
+    ariaLabel?: StringOrCallback;
+    backgroundComponent?: React.ReactElement;
+    backgroundStyle?: VictoryLabelStyleObject | VictoryLabelStyleObject[];
+    backgroundPadding?: PaddingProps | PaddingProps[];
+    capHeight?: StringOrNumberOrCallback;
+    children?: StringOrNumberOrCallback;
+    className?: string;
+    datum?: Record<string, any>;
+    data?: any[];
+    desc?: string;
+    direction?: string;
+    disableInlineStyles?: boolean;
+    events?: React.DOMAttributes<any>;
+    groupComponent?: React.ReactElement;
+    id?: StringOrNumberOrCallback;
+    inline?: boolean;
+    labelPlacement?: LabelOrientationType;
+    lineHeight?: StringOrNumberOrCallback | (string | number)[];
+    origin?: OriginType;
+    polar?: boolean;
+    renderInPortal?: boolean;
+    style?: VictoryLabelStyleObject | VictoryLabelStyleObject[];
+    tabIndex?: NumberOrCallback;
+    text?: string[] | StringOrNumberOrCallback;
+    textComponent?: React.ReactElement;
+    textAnchor?: ValueOrAccessor<TextAnchorType>;
+    title?: string;
+    transform?: ValueOrAccessor<string | object>;
+    tspanComponent?: React.ReactElement;
+    verticalAnchor?: ValueOrAccessor<VerticalAnchorType>;
+    x?: number;
+    y?: number;
+    dx?: StringOrNumberOrCallback;
+    dy?: StringOrNumberOrCallback;
+}
+declare const defaultStyles: {
+    fill: string;
+    fontSize: number;
+    fontFamily: string;
+    stroke: string;
+};
+export declare const VictoryLabel: {
+    role: string;
+    defaultStyles: typeof defaultStyles;
+} & React.FC<VictoryLabelProps>;
+export {};
 //# sourceMappingURL=victory-label.d.ts.map