victory-core 36.4.0 → 36.4.1

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

@@ -45,6 +45,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import * as CustomPropTypes from "../victory-util/prop-types";
 import * as Helpers from "../victory-util/helpers";
+import * as UserProps from "../victory-util/user-props";
 import ClipPath from "../victory-primitives/clip-path";
 import Circle from "../victory-primitives/circle";
 import Rect from "../victory-primitives/rect";
@@ -91,6 +92,7 @@ var VictoryClipContainer = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "renderClippedGroup",
     value: function renderClippedGroup(props, clipId) {
+      var userProps = UserProps.getSafeUserProps(props);
       var style = props.style,
           events = props.events,
           transform = props.transform,
@@ -109,9 +111,8 @@ var VictoryClipContainer = /*#__PURE__*/function (_React$Component) {
       }, events);
 
       return /*#__PURE__*/React.cloneElement(groupComponent, _objectSpread(_objectSpread({}, groupProps), {}, {
-        "aria-label": props["aria-label"],
         tabIndex: tabIndex
-      }), [clipComponent].concat(_toConsumableArray(React.Children.toArray(children))));
+      }, userProps), [clipComponent].concat(_toConsumableArray(React.Children.toArray(children))));
     }
   }, {
     key: "renderGroup",

package/es/victory-label/victory-label.js

@@ -32,6 +32,7 @@ import * as Log from "../victory-util/log";
 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";
 var defaultStyles = {
   fill: "#252525",
   fontSize: 14,
@@ -468,6 +469,7 @@ var renderLabel = function (calculatedProps, tspanValues) {
       tabIndex = calculatedProps.tabIndex,
       tspanComponent = calculatedProps.tspanComponent,
       textComponent = calculatedProps.textComponent;
+  var userProps = UserProps.getSafeUserProps(calculatedProps);
 
   var textProps = _objectSpread(_objectSpread({
     "aria-label": ariaLabel,
@@ -483,7 +485,7 @@ var renderLabel = function (calculatedProps, tspanValues) {
     desc: Helpers.evaluateProp(desc, calculatedProps),
     tabIndex: Helpers.evaluateProp(tabIndex, calculatedProps),
     id: id
-  });
+  }, userProps);
 
   var tspans = text.map(function (line, i) {
     var currentStyle = tspanValues[i].style;

package/es/victory-util/add-events.js

@@ -45,7 +45,6 @@ import React from "react";
 import * as Events from "./events";
 import isEqual from "react-fast-compare";
 import VictoryTransition from "../victory-transition/victory-transition";
-import * as UserProps from "../victory-util/user-props";
 
 var datumHasXandY = function (datum) {
   return !_isNil(datum._x) && !_isNil(datum._y);
@@ -392,7 +391,6 @@ export default (function (WrappedComponent, options) {
         var dataComponent = props.dataComponent,
             labelComponent = props.labelComponent,
             groupComponent = props.groupComponent;
-        var userProps = UserProps.getSafeUserProps(props);
         var dataComponents = this.dataKeys.reduce(function (validDataComponents, _dataKey, index) {
           var dataProps = _this9.getComponentProps(dataComponent, "data", index);
 
@@ -412,8 +410,7 @@ export default (function (WrappedComponent, options) {
           return undefined;
         }).filter(Boolean);
         var children = [].concat(_toConsumableArray(dataComponents), _toConsumableArray(labelComponents));
-        var group = /*#__PURE__*/React.cloneElement(groupComponent, userProps, children);
-        return this.renderContainer(group, children);
+        return this.renderContainer(groupComponent, children);
       }
     }]);
 

package/es/victory-util/common-props.js

@@ -48,10 +48,10 @@ export var baseProps = {
     eventHandlers: PropTypes.object
   })),
   externalEventMutations: PropTypes.arrayOf(PropTypes.shape({
-    callback: PropTypes.function,
+    callback: PropTypes.func,
     childName: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
     eventKey: PropTypes.oneOfType([PropTypes.array, CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]), PropTypes.string]),
-    mutation: PropTypes.function,
+    mutation: PropTypes.func,
     target: PropTypes.oneOfType([PropTypes.string, PropTypes.array])
   })),
   groupComponent: PropTypes.element,

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

@@ -16,12 +16,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+import * as React from "react";
 /*
   USER_PROPS_SAFELIST is to contain any string deemed safe for user props.
   The startsWidth array will contain the start of any accepted user-prop that 
   starts with these characters.
   The exactMatch will contain a list of exact prop names that are accepted.
 */
+
 var USER_PROPS_SAFELIST = {
   startsWith: ["data-", "aria-"],
   exactMatch: []
@@ -107,4 +109,15 @@ export var getSafeUserProps = function (props) {
 
     return [key, getValue(value, props)];
   }));
+};
+/**
+ * Wraps a component and adds safe user props
+ *
+ * @param {ReactNode} component: parent component
+ * @param {Object} props: props to be filtered
+ * @returns {ReactNode} modified component
+ */
+
+export var withSafeUserProps = function (component, props) {
+  return /*#__PURE__*/React.cloneElement(component, getSafeUserProps(props));
 };

package/lib/victory-clip-container/victory-clip-container.js

@@ -21,6 +21,8 @@ var CustomPropTypes = _interopRequireWildcard(require("../victory-util/prop-type
 
 var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
 
+var UserProps = _interopRequireWildcard(require("../victory-util/user-props"));
+
 var _clipPath = _interopRequireDefault(require("../victory-primitives/clip-path"));
 
 var _circle = _interopRequireDefault(require("../victory-primitives/circle"));
@@ -113,6 +115,7 @@ var VictoryClipContainer = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "renderClippedGroup",
     value: function renderClippedGroup(props, clipId) {
+      var userProps = UserProps.getSafeUserProps(props);
       var style = props.style,
           events = props.events,
           transform = props.transform,
@@ -129,9 +132,8 @@ var VictoryClipContainer = /*#__PURE__*/function (_React$Component) {
         clipPath: "url(#".concat(clipId, ")")
       }, events);
       return /*#__PURE__*/_react.default.cloneElement(groupComponent, _objectSpread(_objectSpread({}, groupProps), {}, {
-        "aria-label": props["aria-label"],
         tabIndex: tabIndex
-      }), [clipComponent].concat(_toConsumableArray(_react.default.Children.toArray(children))));
+      }, userProps), [clipComponent].concat(_toConsumableArray(_react.default.Children.toArray(children))));
     }
   }, {
     key: "renderGroup",

package/lib/victory-label/victory-label.js

@@ -35,6 +35,8 @@ var Style = _interopRequireWildcard(require("../victory-util/style"));
 
 var TextSize = _interopRequireWildcard(require("../victory-util/textsize"));
 
+var UserProps = _interopRequireWildcard(require("../victory-util/user-props"));
+
 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; }
@@ -495,6 +497,7 @@ var renderLabel = function (calculatedProps, tspanValues) {
       tabIndex = calculatedProps.tabIndex,
       tspanComponent = calculatedProps.tspanComponent,
       textComponent = calculatedProps.textComponent;
+  var userProps = UserProps.getSafeUserProps(calculatedProps);
 
   var textProps = _objectSpread(_objectSpread({
     "aria-label": ariaLabel,
@@ -510,7 +513,7 @@ var renderLabel = function (calculatedProps, tspanValues) {
     desc: Helpers.evaluateProp(desc, calculatedProps),
     tabIndex: Helpers.evaluateProp(tabIndex, calculatedProps),
     id: id
-  });
+  }, userProps);
 
   var tspans = text.map(function (line, i) {
     var currentStyle = tspanValues[i].style;

package/lib/victory-util/add-events.js

@@ -31,8 +31,6 @@ var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
 
 var _victoryTransition = _interopRequireDefault(require("../victory-transition/victory-transition"));
 
-var UserProps = _interopRequireWildcard(require("../victory-util/user-props"));
-
 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; }
@@ -399,7 +397,6 @@ var _default = function _default(WrappedComponent, options) {
         var dataComponent = props.dataComponent,
             labelComponent = props.labelComponent,
             groupComponent = props.groupComponent;
-        var userProps = UserProps.getSafeUserProps(props);
         var dataComponents = this.dataKeys.reduce(function (validDataComponents, _dataKey, index) {
           var dataProps = _this9.getComponentProps(dataComponent, "data", index);
 
@@ -419,10 +416,7 @@ var _default = function _default(WrappedComponent, options) {
           return undefined;
         }).filter(Boolean);
         var children = [].concat(_toConsumableArray(dataComponents), _toConsumableArray(labelComponents));
-
-        var group = /*#__PURE__*/_react.default.cloneElement(groupComponent, userProps, children);
-
-        return this.renderContainer(group, children);
+        return this.renderContainer(groupComponent, children);
       }
     }]);
 

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

@@ -64,10 +64,10 @@ var baseProps = {
     eventHandlers: _propTypes.default.object
   })),
   externalEventMutations: _propTypes.default.arrayOf(_propTypes.default.shape({
-    callback: _propTypes.default.function,
+    callback: _propTypes.default.func,
     childName: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]),
     eventKey: _propTypes.default.oneOfType([_propTypes.default.array, CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]), _propTypes.default.string]),
-    mutation: _propTypes.default.function,
+    mutation: _propTypes.default.func,
     target: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array])
   })),
   groupComponent: _propTypes.default.element,

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

@@ -3,7 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSafeUserProps = void 0;
+exports.withSafeUserProps = exports.getSafeUserProps = void 0;
+
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -115,5 +121,19 @@ var getSafeUserProps = function (props) {
     return [key, getValue(value, props)];
   }));
 };
+/**
+ * Wraps a component and adds safe user props
+ *
+ * @param {ReactNode} component: parent component
+ * @param {Object} props: props to be filtered
+ * @returns {ReactNode} modified component
+ */
+
+
+exports.getSafeUserProps = getSafeUserProps;
+
+var withSafeUserProps = function (component, props) {
+  return /*#__PURE__*/React.cloneElement(component, getSafeUserProps(props));
+};
 
-exports.getSafeUserProps = getSafeUserProps;
+exports.withSafeUserProps = withSafeUserProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.4.0",
+  "version": "36.4.1",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.21",
-    "prop-types": "^15.5.8",
-    "react-fast-compare": "^2.0.0",
+    "prop-types": "^15.8.1",
+    "react-fast-compare": "^3.2.0",
     "victory-vendor": "^36.4.0"
   },
   "peerDependencies": {
@@ -31,5 +31,5 @@
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "2e05481eeb34f9801a90023a131a21aa7deff082"
+  "gitHead": "aa44a22e5a93989773a560f765f83ac151f44c46"
 }

package/src/victory-clip-container/victory-clip-container.js

@@ -2,6 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import * as CustomPropTypes from "../victory-util/prop-types";
 import * as Helpers from "../victory-util/helpers";
+import * as UserProps from "../victory-util/user-props";
 import { assign, defaults, isObject, uniqueId } from "lodash";
 import ClipPath from "../victory-primitives/clip-path";
 import Circle from "../victory-primitives/circle";
@@ -84,6 +85,7 @@ export default class VictoryClipContainer extends React.Component {
   }
 
   renderClippedGroup(props, clipId) {
+    const userProps = UserProps.getSafeUserProps(props);
     const {
       style,
       events,
@@ -106,7 +108,7 @@ export default class VictoryClipContainer extends React.Component {
     );
     return React.cloneElement(
       groupComponent,
-      { ...groupProps, "aria-label": props["aria-label"], tabIndex },
+      { ...groupProps, tabIndex, ...userProps },
       [clipComponent, ...React.Children.toArray(children)]
     );
   }

package/src/victory-label/victory-label.js

@@ -12,6 +12,7 @@ import * as Log from "../victory-util/log";
 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";
 
 const defaultStyles = {
   fill: "#252525",
@@ -487,6 +488,7 @@ const renderLabel = (calculatedProps, tspanValues) => {
     tspanComponent,
     textComponent
   } = calculatedProps;
+  const userProps = UserProps.getSafeUserProps(calculatedProps);
 
   const textProps = {
     "aria-label": ariaLabel,
@@ -501,7 +503,8 @@ const renderLabel = (calculatedProps, tspanValues) => {
     title,
     desc: Helpers.evaluateProp(desc, calculatedProps),
     tabIndex: Helpers.evaluateProp(tabIndex, calculatedProps),
-    id
+    id,
+    ...userProps
   };
 
   const tspans = text.map((line, i) => {
@@ -528,6 +531,7 @@ const VictoryLabel = (props) => {
     return null;
   }
   const calculatedProps = getCalculatedProps(props);
+
   const { text, style, capHeight, backgroundPadding, lineHeight } =
     calculatedProps;
 

package/src/victory-util/add-events.js

@@ -14,7 +14,6 @@ import {
 import * as Events from "./events";
 import isEqual from "react-fast-compare";
 import VictoryTransition from "../victory-transition/victory-transition";
-import * as UserProps from "../victory-util/user-props";
 
 const datumHasXandY = (datum) => {
   return !isNil(datum._x) && !isNil(datum._y);
@@ -330,7 +329,6 @@ export default (WrappedComponent, options) => {
 
     renderData(props, shouldRenderDatum = datumHasXandY) {
       const { dataComponent, labelComponent, groupComponent } = props;
-      const userProps = UserProps.getSafeUserProps(props);
       const dataComponents = this.dataKeys.reduce(
         (validDataComponents, _dataKey, index) => {
           const dataProps = this.getComponentProps(
@@ -363,8 +361,7 @@ export default (WrappedComponent, options) => {
         .filter(Boolean);
 
       const children = [...dataComponents, ...labelComponents];
-      const group = React.cloneElement(groupComponent, userProps, children);
-      return this.renderContainer(group, children);
+      return this.renderContainer(groupComponent, children);
     }
   };
 };

package/src/victory-util/common-props.js

@@ -120,7 +120,7 @@ export const baseProps = {
   ),
   externalEventMutations: PropTypes.arrayOf(
     PropTypes.shape({
-      callback: PropTypes.function,
+      callback: PropTypes.func,
       childName: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
       eventKey: PropTypes.oneOfType([
         PropTypes.array,
@@ -130,7 +130,7 @@ export const baseProps = {
         ]),
         PropTypes.string
       ]),
-      mutation: PropTypes.function,
+      mutation: PropTypes.func,
       target: PropTypes.oneOfType([PropTypes.string, PropTypes.array])
     })
   ),

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

@@ -1,3 +1,5 @@
+import * as React from "react";
+
 /*
   USER_PROPS_SAFELIST is to contain any string deemed safe for user props.
   The startsWidth array will contain the start of any accepted user-prop that 
@@ -79,3 +81,14 @@ export const getSafeUserProps = (props) => {
       })
   );
 };
+
+/**
+ * Wraps a component and adds safe user props
+ *
+ * @param {ReactNode} component: parent component
+ * @param {Object} props: props to be filtered
+ * @returns {ReactNode} modified component
+ */
+export const withSafeUserProps = (component, props) => {
+  return React.cloneElement(component, getSafeUserProps(props));
+};