victory-core 36.7.0 → 36.8.1

package/lib/victory-primitives/point.d.ts

@@ -40,10 +40,5 @@ export declare const Point: {
         tabIndex?: React.Validator<import("..").NumberOrCallback | null | undefined> | undefined;
         transform?: React.Validator<string | null | undefined> | undefined;
     };
-    defaultProps: {
-        pathComponent: JSX.Element;
-        role: string;
-        shapeRendering: string;
-    };
 };
 //# sourceMappingURL=point.d.ts.map

package/lib/victory-primitives/point.js

@@ -77,8 +77,14 @@ var evaluateProps = function (props) {
   });
 };
 
+var defaultProps = {
+  pathComponent: /*#__PURE__*/_react.default.createElement(_path.Path, null),
+  role: "presentation",
+  shapeRendering: "auto"
+};
+
 var Point = function (props) {
-  props = evaluateProps(props);
+  props = evaluateProps(_objectSpread(_objectSpread({}, defaultProps), props));
   var userProps = UserProps.getSafeUserProps(props);
   return /*#__PURE__*/_react.default.cloneElement(props.pathComponent, _objectSpread(_objectSpread({}, props.events), {}, {
     "aria-label": props.ariaLabel,
@@ -103,9 +109,4 @@ Point.propTypes = _objectSpread(_objectSpread({}, _commonProps.CommonProps.primi
   symbol: _propTypes.default.oneOfType([_propTypes.default.oneOf(["circle", "cross", "diamond", "plus", "minus", "square", "star", "triangleDown", "triangleUp"]), _propTypes.default.func]),
   x: _propTypes.default.number,
   y: _propTypes.default.number
-});
-Point.defaultProps = {
-  pathComponent: /*#__PURE__*/_react.default.createElement(_path.Path, null),
-  role: "presentation",
-  shapeRendering: "auto"
-};
+});

package/lib/victory-primitives/rect.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import { VictoryPrimitiveShapeProps } from "./types";
-export declare const Rect: (props: VictoryPrimitiveShapeProps) => JSX.Element;
+export declare const Rect: React.ForwardRefExoticComponent<VictoryPrimitiveShapeProps & React.RefAttributes<SVGRectElement>>;
 //# sourceMappingURL=rect.d.ts.map

package/lib/victory-primitives/rect.js

@@ -5,34 +5,50 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Rect = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _excluded = ["desc"];
+var _helpers = require("../victory-util/helpers");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _excluded = ["desc", "id", "tabIndex", "origin"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 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); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 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; }
 
-var Rect = function (props) {
-  // eslint-disable-next-line react/prop-types
+var Rect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _evaluateProp;
+
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+   * origin conflicts with the SVG element's origin attribute
+   */
   var desc = props.desc,
+      id = props.id,
+      tabIndex = props.tabIndex,
+      origin = props.origin,
       rest = _objectWithoutProperties(props, _excluded);
 
-  return desc ?
-  /*#__PURE__*/
-  // @ts-expect-error FIXME: "id cannot be a number"
-  _react.default.createElement("rect", _extends({
-    vectorEffect: "non-scaling-stroke"
-  }, rest), /*#__PURE__*/_react.default.createElement("desc", null, desc)) :
-  /*#__PURE__*/
-  // @ts-expect-error FIXME: "id cannot be a number"
-  _react.default.createElement("rect", _extends({
-    vectorEffect: "non-scaling-stroke"
-  }, rest));
-};
-
+  var svgProps = _objectSpread({
+    vectorEffect: "non-scaling-stroke",
+    id: (_evaluateProp = (0, _helpers.evaluateProp)(id, props)) === null || _evaluateProp === void 0 ? void 0 : _evaluateProp.toString(),
+    tabIndex: (0, _helpers.evaluateProp)(tabIndex, props)
+  }, rest);
+
+  return desc ? /*#__PURE__*/_react.default.createElement("rect", _extends({}, svgProps, {
+    ref: ref
+  }), /*#__PURE__*/_react.default.createElement("desc", null, desc)) : /*#__PURE__*/_react.default.createElement("rect", _extends({}, svgProps, {
+    ref: ref
+  }));
+});
 exports.Rect = Rect;

package/lib/victory-primitives/text.d.ts

@@ -1,17 +1,9 @@
 import React from "react";
-import PropTypes from "prop-types";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
 export interface TextProps extends VictoryCommonPrimitiveProps {
     children?: React.ReactNode;
     desc?: string;
     title?: string;
 }
-export declare const Text: {
-    (props: TextProps): JSX.Element;
-    propTypes: {
-        children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-        desc: PropTypes.Requireable<string>;
-        title: PropTypes.Requireable<string>;
-    };
-};
+export declare const Text: (props: TextProps) => JSX.Element;
 //# sourceMappingURL=text.d.ts.map

package/lib/victory-primitives/text.js

@@ -7,32 +7,42 @@ exports.Text = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _helpers = require("../victory-util/helpers");
 
-var _excluded = ["children", "title", "desc"];
+var _excluded = ["children", "desc", "id", "origin", "tabIndex", "title"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 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; }
 
 var Text = function (props) {
+  var _evaluateProp;
+
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+   * origin conflicts with the SVG element's origin attribute
+   */
   var children = props.children,
-      title = props.title,
       desc = props.desc,
+      id = props.id,
+      origin = props.origin,
+      tabIndex = props.tabIndex,
+      title = props.title,
       rest = _objectWithoutProperties(props, _excluded);
 
-  return (
-    /*#__PURE__*/
-    // @ts-expect-error FIXME: "id cannot be a number"
-    _react.default.createElement("text", rest, title && /*#__PURE__*/_react.default.createElement("title", null, title), desc && /*#__PURE__*/_react.default.createElement("desc", null, desc), children)
-  );
+  var svgProps = _objectSpread({
+    id: (_evaluateProp = (0, _helpers.evaluateProp)(id, props)) === null || _evaluateProp === void 0 ? void 0 : _evaluateProp.toString(),
+    tabIndex: (0, _helpers.evaluateProp)(tabIndex, props)
+  }, rest);
+
+  return /*#__PURE__*/_react.default.createElement("text", svgProps, title && /*#__PURE__*/_react.default.createElement("title", null, title), desc && /*#__PURE__*/_react.default.createElement("desc", null, desc), children);
 };
 
-exports.Text = Text;
-Text.propTypes = {
-  children: _propTypes.default.node,
-  desc: _propTypes.default.string,
-  title: _propTypes.default.string
-};
+exports.Text = Text;

package/lib/victory-primitives/tspan.js

@@ -7,14 +7,40 @@ exports.TSpan = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _helpers = require("../victory-util/helpers");
+
+var _excluded = ["desc", "id", "tabIndex", "origin"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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; }
+
 var TSpan = function (props) {
-  return (
-    /*#__PURE__*/
-    // @ts-expect-error FIXME: "id cannot be a number"
-    _react.default.createElement("tspan", props)
-  );
+  var _evaluateProp;
+
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars --
+   * origin conflicts with the SVG element's origin attribute
+   */
+  var desc = props.desc,
+      id = props.id,
+      tabIndex = props.tabIndex,
+      origin = props.origin,
+      rest = _objectWithoutProperties(props, _excluded);
+
+  var svgProps = _objectSpread({
+    id: (_evaluateProp = (0, _helpers.evaluateProp)(id, props)) === null || _evaluateProp === void 0 ? void 0 : _evaluateProp.toString(),
+    tabIndex: (0, _helpers.evaluateProp)(tabIndex, props)
+  }, rest);
+
+  return /*#__PURE__*/_react.default.createElement("tspan", svgProps);
 };
 
 exports.TSpan = TSpan;

package/lib/victory-primitives/whisker.d.ts

@@ -49,11 +49,5 @@ export declare const Whisker: {
         tabIndex?: React.Validator<import("..").NumberOrCallback | null | undefined> | undefined;
         transform?: React.Validator<string | null | undefined> | undefined;
     };
-    defaultProps: {
-        groupComponent: JSX.Element;
-        lineComponent: JSX.Element;
-        role: string;
-        shapeRendering: string;
-    };
 };
 //# sourceMappingURL=whisker.d.ts.map

package/lib/victory-primitives/whisker.js

@@ -52,8 +52,15 @@ var evaluateProps = function (props) {
   });
 };
 
+var defaultProps = {
+  groupComponent: /*#__PURE__*/_react.default.createElement("g", null),
+  lineComponent: /*#__PURE__*/_react.default.createElement(_line.Line, null),
+  role: "presentation",
+  shapeRendering: "auto"
+};
+
 var Whisker = function (props) {
-  props = evaluateProps(props);
+  props = evaluateProps(_objectSpread(_objectSpread({}, defaultProps), props));
   var _props = props,
       ariaLabel = _props.ariaLabel,
       groupComponent = _props.groupComponent,
@@ -106,10 +113,4 @@ Whisker.propTypes = _objectSpread(_objectSpread({}, _commonProps.CommonProps.pri
     y1: _propTypes.default.number,
     y2: _propTypes.default.number
   })
-});
-Whisker.defaultProps = {
-  groupComponent: /*#__PURE__*/_react.default.createElement("g", null),
-  lineComponent: /*#__PURE__*/_react.default.createElement(_line.Line, null),
-  role: "presentation",
-  shapeRendering: "auto"
-};
+});

package/lib/victory-util/helpers.js

@@ -35,7 +35,11 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -362,10 +366,11 @@ function reduceChildren(children, iteratee) {
     }, initialMemo);
   };
 
-  var childNames = children.map(function (c, i) {
+  var validChildren = children.filter(_react.isValidElement);
+  var childNames = validChildren.map(function (c, i) {
     return i;
   });
-  return traverseChildren(children, childNames);
+  return traverseChildren(validChildren, childNames);
 }
 /**
  * @param {Object} props: the props object

package/lib/victory-util/textsize.js

@@ -315,6 +315,13 @@ var styleToKeyComponent = function (style) {
 var _measureDimensionsInternal = (0, _memoize2.default)(function (text, style) {
   var containerElement = _getMeasurementContainer();
 
+  if (!containerElement.isConnected) {
+    var _getMeasurementContai, _getMeasurementContai2;
+
+    (_getMeasurementContai = (_getMeasurementContai2 = _getMeasurementContainer.cache).clear) === null || _getMeasurementContai === void 0 ? void 0 : _getMeasurementContai.call(_getMeasurementContai2);
+    containerElement = _getMeasurementContainer();
+  }
+
   var lines = _splitToLines(text);
 
   var heightAcc = 0;

package/lib/victory-util/user-props.js

@@ -7,6 +7,8 @@ exports.withSafeUserProps = exports.getSafeUserProps = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
+var _helpers = require("./helpers");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -82,21 +84,6 @@ var testIfSafeProp = function (key) {
   if (doesPropStartWith(key) || isExactMatch(key)) return true;
   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
- */
-
-
-var getValue = function (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
@@ -120,7 +107,7 @@ var getSafeUserProps = function (props) {
         key = _ref4[0],
         value = _ref4[1];
 
-    return [key, getValue(value, props)];
+    return [key, (0, _helpers.evaluateProp)(value, props)];
   }));
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.7.0",
+  "version": "36.8.1",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -23,7 +23,7 @@
     "lodash": "^4.17.21",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-vendor": "^36.7.0"
+    "victory-vendor": "^36.8.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"

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

@@ -572,11 +572,20 @@ const renderLabel = (calculatedProps, tspanValues) => {
   return React.cloneElement(textComponent, textProps, tspans);
 };
 
+const defaultProps = {
+  backgroundComponent: <Rect />,
+  groupComponent: <g />,
+  direction: "inherit",
+  textComponent: <Text />,
+  tspanComponent: <TSpan />,
+  capHeight: 0.71, // Magic number from d3.
+  lineHeight: 1,
+};
 export const VictoryLabel: {
   role: string;
   defaultStyles: typeof defaultStyles;
 } & React.FC<VictoryLabelProps> = (props) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
 
   if (props.text === null || props.text === undefined) {
     return null;
@@ -713,13 +722,3 @@ VictoryLabel.propTypes = {
   // @ts-expect-error Number is not assignable to string
   y: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 };
-
-VictoryLabel.defaultProps = {
-  backgroundComponent: <Rect />,
-  groupComponent: <g />,
-  direction: "inherit",
-  textComponent: <Text />,
-  tspanComponent: <TSpan />,
-  capHeight: 0.71, // Magic number from d3.
-  lineHeight: 1,
-};

package/src/victory-primitives/arc.tsx

@@ -62,8 +62,14 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
+const defaultProps = {
+  pathComponent: <Path />,
+  role: "presentation",
+  shapeRendering: "auto",
+};
+
 export const Arc = (props: ArcProps) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
 
   return React.cloneElement(props.pathComponent!, {
     ...props.events,
@@ -91,9 +97,3 @@ Arc.propTypes = {
   r: PropTypes.number,
   startAngle: PropTypes.number,
 };
-
-Arc.defaultProps = {
-  pathComponent: <Path />,
-  role: "presentation",
-  shapeRendering: "auto",
-};

package/src/victory-primitives/background.tsx

@@ -30,8 +30,15 @@ const evaluateProps = (props) => {
   return assign({}, props, { id });
 };
 
+const defaultProps = {
+  circleComponent: <Circle />,
+  rectComponent: <Rect />,
+  role: "presentation",
+  shapeRendering: "auto",
+};
+
 export const Background = (props: BackgroundProps) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
 
   return props.polar
     ? React.cloneElement(props.circleComponent!, {
@@ -70,10 +77,3 @@ Background.propTypes = {
   x: PropTypes.number,
   y: PropTypes.number,
 };
-
-Background.defaultProps = {
-  circleComponent: <Circle />,
-  rectComponent: <Rect />,
-  role: "presentation",
-  shapeRendering: "auto",
-};

package/src/victory-primitives/border.tsx

@@ -37,8 +37,14 @@ const evaluateProps = (props) => {
   return assign({}, props, { ariaLabel, desc, id, style, tabIndex });
 };
 
+const defaultProps = {
+  rectComponent: <Rect />,
+  role: "presentation",
+  shapeRendering: "auto",
+};
+
 export const Border = (props: BorderProps) => {
-  props = evaluateProps(props);
+  props = evaluateProps({ ...defaultProps, ...props });
 
   return React.cloneElement(props.rectComponent!, {
     ...props.events,
@@ -66,9 +72,3 @@ Border.propTypes = {
   x: PropTypes.number,
   y: PropTypes.number,
 };
-
-Border.defaultProps = {
-  rectComponent: <Rect />,
-  role: "presentation",
-  shapeRendering: "auto",
-};

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} />
+    );
+  },
+);