victory-area 37.0.2 → 37.0.3-next.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # victory-area
 
+## 37.0.3-next.0
+
+### Patch Changes
+
+- Updated dependencies [65d02419f]
+  - victory-core@37.0.3-next.0
+  - victory-vendor@37.0.3-next.0
+
 ## 37.0.2
 
 ### Patch Changes

package/dist/victory-area.js

@@ -5436,23 +5436,18 @@ class VictoryClipContainer extends (react__WEBPACK_IMPORTED_MODULE_3___default()
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "VictoryContainer": function() { return /* binding */ VictoryContainer; }
+/* harmony export */   "VictoryContainer": function() { return /* binding */ VictoryContainer; },
+/* harmony export */   "useVictoryContainer": function() { return /* binding */ useVictoryContainer; }
 /* harmony export */ });
-/* harmony import */ var lodash_isObject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lodash/isObject */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/isObject.js");
-/* harmony import */ var lodash_isObject__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_isObject__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var lodash_uniqueId__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash/uniqueId */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqueId.js");
-/* harmony import */ var lodash_uniqueId__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_uniqueId__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! lodash/defaults */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/defaults.js");
-/* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lodash_defaults__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _victory_portal_portal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../victory-portal/portal */ "../../victory-core/es/victory-portal/portal.js");
-/* harmony import */ var _victory_portal_portal_context__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../victory-portal/portal-context */ "../../victory-core/es/victory-portal/portal-context.js");
-/* harmony import */ var _victory_util_timer_context__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../victory-util/timer-context */ "../../victory-core/es/victory-util/timer-context.js");
-/* harmony import */ var _victory_util_helpers__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../victory-util/helpers */ "../../victory-core/es/victory-util/helpers.js");
-/* harmony import */ var _victory_util_user_props__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../victory-util/user-props */ "../../victory-core/es/victory-util/user-props.js");
-
-
+/* harmony import */ var lodash_uniqueId__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lodash/uniqueId */ "../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqueId.js");
+/* harmony import */ var lodash_uniqueId__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_uniqueId__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _victory_portal_portal__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../victory-portal/portal */ "../../victory-core/es/victory-portal/portal.js");
+/* harmony import */ var _victory_util_user_props__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../victory-util/user-props */ "../../victory-core/es/victory-util/user-props.js");
+/* harmony import */ var _victory_util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../victory-util */ "../../victory-core/es/victory-util/merge-refs.js");
+/* harmony import */ var _victory_portal_portal_outlet__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../victory-portal/portal-outlet */ "../../victory-core/es/victory-portal/portal-outlet.js");
+/* harmony import */ var _victory_portal_portal_context__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../victory-portal/portal-context */ "../../victory-core/es/victory-portal/portal-context.js");
 
 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); }
 
@@ -5461,175 +5456,149 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-class VictoryContainer extends (react__WEBPACK_IMPORTED_MODULE_3___default().Component) {
-  static displayName = "VictoryContainer";
-  static role = "container";
-  static defaultProps = {
-    className: "VictoryContainer",
-    portalComponent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_victory_portal_portal__WEBPACK_IMPORTED_MODULE_4__.Portal, null),
-    portalZIndex: 99,
-    responsive: true,
-    role: "img"
+const defaultProps = {
+  className: "VictoryContainer",
+  portalComponent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_victory_portal_portal__WEBPACK_IMPORTED_MODULE_2__.Portal, null),
+  portalZIndex: 99,
+  responsive: true,
+  role: "img"
+};
+function useVictoryContainer(initialProps) {
+  const props = {
+    ...defaultProps,
+    ...initialProps
   };
-  static contextType = _victory_util_timer_context__WEBPACK_IMPORTED_MODULE_5__["default"];
-
-  // @ts-expect-error Ref will be initialized on mount
-
-  // @ts-expect-error Ref will be initialized on mount
-
-  constructor(props) {
-    super(props);
-    this.containerId = !lodash_isObject__WEBPACK_IMPORTED_MODULE_0___default()(props) || props.containerId === undefined ? lodash_uniqueId__WEBPACK_IMPORTED_MODULE_1___default()("victory-container-") : props.containerId;
-    this.shouldHandleWheel = !!(props && props.events && props.events.onWheel);
-  }
-  savePortalRef = portal => {
-    this.portalRef = portal;
-    return portal;
-  };
-  portalUpdate = (key, el) => this.portalRef.portalUpdate(key, el);
-  portalRegister = () => this.portalRef.portalRegister();
-  portalDeregister = key => this.portalRef.portalDeregister(key);
-  saveContainerRef = container => {
-    if (_victory_util_helpers__WEBPACK_IMPORTED_MODULE_6__.isFunction(this.props.containerRef)) {
-      this.props.containerRef(container);
-    }
-    this.containerRef = container;
-    return container;
+  const {
+    title,
+    desc,
+    width,
+    height,
+    responsive
+  } = props;
+  const localContainerRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
+
+  // Generated ID stored in ref because it needs to persist across renders
+  const generatedId = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(lodash_uniqueId__WEBPACK_IMPORTED_MODULE_0___default()("victory-container-"));
+  const containerId = props.containerId ?? generatedId.current;
+  const getIdForElement = elName => `${containerId}-${elName}`;
+  const userProps = _victory_util_user_props__WEBPACK_IMPORTED_MODULE_3__.getSafeUserProps(props);
+  const dimensions = responsive ? {
+    width: "100%",
+    height: "100%"
+  } : {
+    width,
+    height
   };
-  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
-      })
-    };
-  }
-  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 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
+  };
+}
+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__WEBPACK_IMPORTED_MODULE_1___default().useEffect(() => {
+    if (!events?.onWheel) return;
+    const handleWheel = e => e.preventDefault();
+    const container = localContainerRef?.current;
+    container?.addEventListener("wheel", handleWheel);
+    return () => {
+      container?.removeEventListener("wheel", handleWheel);
     };
-    const divStyle = Object.assign({
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_victory_portal_portal_context__WEBPACK_IMPORTED_MODULE_4__.PortalProvider, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().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: (0,_victory_util__WEBPACK_IMPORTED_MODULE_5__.mergeRefs)([localContainerRef, containerRef])
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().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__WEBPACK_IMPORTED_MODULE_1___default().createElement("title", {
+    id: titleId
+  }, title) : null, desc ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("desc", {
+    id: descId
+  }, desc) : null, children), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().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__WEBPACK_IMPORTED_MODULE_1___default().createElement(_victory_portal_portal_outlet__WEBPACK_IMPORTED_MODULE_6__.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__WEBPACK_IMPORTED_MODULE_3___default().createElement(_victory_portal_portal_context__WEBPACK_IMPORTED_MODULE_7__.PortalContext.Provider, {
-      value: {
-        portalUpdate: this.portalUpdate,
-        portalRegister: this.portalRegister,
-        portalDeregister: this.portalDeregister
-      }
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", _extends({
-      style: lodash_defaults__WEBPACK_IMPORTED_MODULE_2___default()({}, style, divStyle),
-      className: className,
-      ref: this.saveContainerRef
-    }, this.getOUIAProps(props)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("svg", _extends({}, svgProps, {
-      style: svgStyle
-    }), title ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("title", {
-      id: this.getIdForElement("title")
-    }, title) : null, desc ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("desc", {
-      id: this.getIdForElement("desc")
-    }, desc) : null, children), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", {
-      style: portalDivStyle
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().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 : _victory_util_helpers__WEBPACK_IMPORTED_MODULE_6__.omit(this.props.style, ["height", "width"]);
-    const userProps = _victory_util_user_props__WEBPACK_IMPORTED_MODULE_8__.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";
 
 /***/ }),
 
@@ -6142,17 +6111,83 @@ VictoryLabel.defaultStyles = defaultStyles;
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "PortalContext": function() { return /* binding */ PortalContext; }
+/* harmony export */   "PortalContext": function() { return /* binding */ PortalContext; },
+/* harmony export */   "PortalProvider": function() { return /* binding */ PortalProvider; },
+/* harmony export */   "usePortalContext": function() { return /* binding */ usePortalContext; }
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 
-/**
- * The React context object consumers may use to access the context of the
- * portal.
- */
-const PortalContext = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createContext({});
+const PortalContext = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createContext(undefined);
 PortalContext.displayName = "PortalContext";
+const usePortalContext = () => {
+  const context = react__WEBPACK_IMPORTED_MODULE_0___default().useContext(PortalContext);
+  if (!context) {
+    throw new Error("`usePortalContext` must be used within a `<PortalProvider />`");
+  }
+  return context;
+};
+const PortalProvider = _ref => {
+  let {
+    children
+  } = _ref;
+  const [portalChildren, setPortalChildren] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(new Map());
+  const addChild = react__WEBPACK_IMPORTED_MODULE_0___default().useCallback((id, element) => {
+    setPortalChildren(prevChildren => {
+      const nextChildren = new Map(prevChildren);
+      nextChildren.set(id, element);
+      return nextChildren;
+    });
+  }, [setPortalChildren]);
+  const removeChild = react__WEBPACK_IMPORTED_MODULE_0___default().useCallback(id => {
+    setPortalChildren(prevChildren => {
+      const nextChildren = new Map(prevChildren);
+      nextChildren.delete(id);
+      return nextChildren;
+    });
+  }, [setPortalChildren]);
+  const contextValue = react__WEBPACK_IMPORTED_MODULE_0___default().useMemo(() => ({
+    addChild,
+    removeChild,
+    children: portalChildren
+  }), [addChild, removeChild, portalChildren]);
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(PortalContext.Provider, {
+    value: contextValue
+  }, children);
+};
+
+/***/ }),
+
+/***/ "../../victory-core/es/victory-portal/portal-outlet.js":
+/*!*************************************************************!*\
+  !*** ../../victory-core/es/victory-portal/portal-outlet.js ***!
+  \*************************************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "PortalOutlet": function() { return /* binding */ PortalOutlet; }
+/* harmony export */ });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _portal_context__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./portal-context */ "../../victory-core/es/victory-portal/portal-context.js");
+
+
+const PortalOutlet = _ref => {
+  let {
+    as: portalComponent,
+    ...props
+  } = _ref;
+  const portalContext = (0,_portal_context__WEBPACK_IMPORTED_MODULE_1__.usePortalContext)();
+  const children = Array.from(portalContext.children.entries()).map(_ref2 => {
+    let [key, node] = _ref2;
+    return !node.key ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().cloneElement(node, {
+      key
+    }) : node;
+  });
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().cloneElement(portalComponent, props, children);
+};
 
 /***/ }),
 
@@ -6169,39 +6204,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+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); }
 
-class Portal extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
-  static displayName = "Portal";
-  constructor(props) {
-    super(props);
-    this.map = {};
-    this.index = 1;
-  }
-  portalRegister = () => {
-    return ++this.index;
-  };
-  portalUpdate = (key, element) => {
-    this.map[key] = element;
-    this.forceUpdate();
-  };
-  portalDeregister = key => {
-    delete this.map[key];
-    this.forceUpdate();
-  };
-  getChildren() {
-    return Object.keys(this.map).map(key => {
-      const el = this.map[key];
-      return el ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().cloneElement(el, {
-        key
-      }) : el;
-    });
-  }
-
-  // Overridden in victory-core-native
-  render() {
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("svg", this.props, this.getChildren());
-  }
-}
+const Portal = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef((props, ref) => {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("svg", _extends({
+    ref: ref
+  }, props));
+});
 
 /***/ }),
 
@@ -6228,59 +6237,42 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-class VictoryPortal extends (react__WEBPACK_IMPORTED_MODULE_1___default().Component) {
-  static displayName = "VictoryPortal";
-  static role = "portal";
-  static defaultProps = {
-    groupComponent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("g", null)
-  };
-  static contextType = _portal_context__WEBPACK_IMPORTED_MODULE_2__.PortalContext;
-  componentDidMount() {
-    if (!this.checkedContext) {
-      if (typeof this.context.portalUpdate !== "function") {
-        const msg = "`renderInPortal` is not supported outside of `VictoryContainer`. " + "Component will be rendered in place";
-        _victory_util_log__WEBPACK_IMPORTED_MODULE_3__.warn(msg);
-        this.renderInPlace = true;
-      }
-      this.checkedContext = true;
-    }
-    this.forceUpdate();
-  }
-  componentDidUpdate() {
-    if (!this.renderInPlace) {
-      this.portalKey = this.portalKey || this.context.portalRegister();
-      this.context.portalUpdate(this.portalKey, this.element);
-    }
-  }
-  componentWillUnmount() {
-    if (this.context && this.context.portalDeregister) {
-      this.context.portalDeregister(this.portalKey);
-    }
-  }
-
-  // Overridden in victory-core-native
-  renderPortal(child) {
-    if (this.renderInPlace) {
-      return child;
-    }
-    this.element = child;
-    return null;
-  }
-  render() {
-    const children = Array.isArray(this.props.children) ? this.props.children[0] : this.props.children;
+const defaultProps = {
+  groupComponent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("g", null)
+};
+const VictoryPortal = initialProps => {
+  const props = {
+    ...defaultProps,
+    ...initialProps
+  };
+  const id = react__WEBPACK_IMPORTED_MODULE_1___default().useId();
+  const portalContext = (0,_portal_context__WEBPACK_IMPORTED_MODULE_2__.usePortalContext)();
+  if (!portalContext) {
+    const msg = "`renderInPortal` is not supported outside of `VictoryContainer`. " + "Component will be rendered in place";
+    _victory_util_log__WEBPACK_IMPORTED_MODULE_3__.warn(msg);
+  }
+  react__WEBPACK_IMPORTED_MODULE_1___default().useEffect(() => {
+    const children = Array.isArray(props.children) ? props.children[0] : props.children;
     const {
       groupComponent
-    } = this.props;
+    } = props;
     const childProps = children && children.props || {};
     const standardProps = childProps.groupComponent ? {
       groupComponent,
       standalone: false
     } : {};
-    const newProps = lodash_defaults__WEBPACK_IMPORTED_MODULE_0___default()(standardProps, childProps, _victory_util_helpers__WEBPACK_IMPORTED_MODULE_4__.omit(this.props, ["children", "groupComponent"]));
+    const newProps = lodash_defaults__WEBPACK_IMPORTED_MODULE_0___default()(standardProps, childProps, _victory_util_helpers__WEBPACK_IMPORTED_MODULE_4__.omit(props, ["children", "groupComponent"]));
     const child = children && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().cloneElement(children, newProps);
-    return this.renderPortal(child);
-  }
-}
+    portalContext.addChild(id, child);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.children]);
+  react__WEBPACK_IMPORTED_MODULE_1___default().useEffect(() => {
+    return () => portalContext.removeChild(id);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return null;
+};
+VictoryPortal.role = "portal";
 
 /***/ }),
 
@@ -9867,6 +9859,44 @@ function warn(message) {
 
 /***/ }),
 
+/***/ "../../victory-core/es/victory-util/merge-refs.js":
+/*!********************************************************!*\
+  !*** ../../victory-core/es/victory-util/merge-refs.js ***!
+  \********************************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "mergeRefs": function() { return /* binding */ mergeRefs; }
+/* harmony export */ });
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./helpers */ "../../victory-core/es/victory-util/helpers.js");
+
+/**
+ * Used to merge multiple React refs into a single callback ref.
+ *
+ * @example
+ * ```tsx
+ * <div ref={mergeRefs([ref, forwardedRef])} />
+ * ```
+ */
+function mergeRefs(refs) {
+  return value => {
+    refs.forEach(ref => {
+      // If the ref is a function, it's a callback ref and we call it with the value.
+      if (_helpers__WEBPACK_IMPORTED_MODULE_0__.isFunction(ref)) {
+        ref(value);
+      } else if (ref !== null && ref !== undefined) {
+        // If the ref is an object (not null and not undefined), it's an object ref.
+        // We assign the value to its 'current' property.
+        ref.current = value;
+      }
+    });
+  };
+}
+
+/***/ }),
+
 /***/ "../../victory-core/es/victory-util/scale.js":
 /*!***************************************************!*\
   !*** ../../victory-core/es/victory-util/scale.js ***!