victory-errorbar 36.4.1 → 36.5.0

package/es/error-bar.js

@@ -9,7 +9,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 /* eslint-disable max-statements */
 import React from "react";
 import PropTypes from "prop-types";
-import { Helpers, CommonProps, Line } from "victory-core";
+import { Helpers, CommonProps, Line, UserProps } from "victory-core";
 
 var renderBorder = function (props, error, type) {
   var vertical = type === "right" || type === "left";
@@ -23,7 +23,8 @@ var renderBorder = function (props, error, type) {
     x1: vertical ? error[type] : props.x - props.borderWidth,
     x2: vertical ? error[type] : props.x + props.borderWidth,
     y1: vertical ? props.y - props.borderWidth : error[type],
-    y2: vertical ? props.y + props.borderWidth : error[type]
+    y2: vertical ? props.y + props.borderWidth : error[type],
+    "data-type": "border-".concat(type)
   }));
 };
 
@@ -39,7 +40,8 @@ var renderCross = function (props, error, type) {
     x1: props.x,
     x2: vertical ? props.x : error[type],
     y1: props.y,
-    y2: vertical ? error[type] : props.y
+    y2: vertical ? error[type] : props.y,
+    "data-type": "cross-".concat(type)
   }));
 };
 
@@ -103,15 +105,16 @@ var evaluateProps = function (props) {
 
 var ErrorBar = function (props) {
   props = evaluateProps(props);
+  var userProps = UserProps.getSafeUserProps(props);
   var _props = props,
-      ariaLabel = _props.ariaLabel,
-      tabIndex = _props.tabIndex;
+      tabIndex = _props.tabIndex,
+      ariaLabel = _props.ariaLabel;
   var error = calculateError(props);
   var children = [error.right ? renderBorder(props, error, "right") : null, error.left ? renderBorder(props, error, "left") : null, error.bottom ? renderBorder(props, error, "bottom") : null, error.top ? renderBorder(props, error, "top") : null, error.right ? renderCross(props, error, "right") : null, error.left ? renderCross(props, error, "left") : null, error.bottom ? renderCross(props, error, "bottom") : null, error.top ? renderCross(props, error, "top") : null].filter(Boolean);
-  return /*#__PURE__*/React.cloneElement(props.groupComponent, {
-    "aria-label": ariaLabel,
-    tabIndex: tabIndex
-  }, children);
+  return /*#__PURE__*/React.cloneElement(props.groupComponent, _objectSpread({
+    tabIndex: tabIndex,
+    "aria-label": ariaLabel
+  }, userProps), children);
 };
 
 ErrorBar.propTypes = _objectSpread(_objectSpread({}, CommonProps.primitiveProps), {}, {

package/es/victory-errorbar.js

@@ -2,6 +2,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -10,7 +12,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -20,9 +22,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 import PropTypes from "prop-types";
 import React from "react";
@@ -93,22 +93,17 @@ var VictoryErrorBar = /*#__PURE__*/function (_React$Component) {
   return VictoryErrorBar;
 }(React.Component);
 
-_defineProperty(VictoryErrorBar, "animationWhitelist", ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"]);
-
-_defineProperty(VictoryErrorBar, "displayName", "VictoryErrorBar");
-
-_defineProperty(VictoryErrorBar, "role", "errorbar");
-
-_defineProperty(VictoryErrorBar, "defaultTransitions", DefaultTransitions.discreteTransitions());
-
-_defineProperty(VictoryErrorBar, "propTypes", _objectSpread(_objectSpread(_objectSpread({}, CommonProps.baseProps), CommonProps.dataProps), {}, {
+VictoryErrorBar.animationWhitelist = ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"];
+VictoryErrorBar.displayName = "VictoryErrorBar";
+VictoryErrorBar.role = "errorbar";
+VictoryErrorBar.defaultTransitions = DefaultTransitions.discreteTransitions();
+VictoryErrorBar.propTypes = _objectSpread(_objectSpread(_objectSpread({}, CommonProps.baseProps), CommonProps.dataProps), {}, {
   borderWidth: PropTypes.number,
   errorX: PropTypes.oneOfType([PropTypes.func, CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]), PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
   errorY: PropTypes.oneOfType([PropTypes.func, CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]), PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
   horizontal: PropTypes.bool
-}));
-
-_defineProperty(VictoryErrorBar, "defaultProps", {
+});
+VictoryErrorBar.defaultProps = {
   containerComponent: /*#__PURE__*/React.createElement(VictoryContainer, null),
   data: defaultData,
   dataComponent: /*#__PURE__*/React.createElement(ErrorBar, null),
@@ -120,16 +115,13 @@ _defineProperty(VictoryErrorBar, "defaultProps", {
   sortOrder: "ascending",
   standalone: true,
   theme: VictoryTheme.grayscale
-});
-
-_defineProperty(VictoryErrorBar, "getDomain", getDomain);
-
-_defineProperty(VictoryErrorBar, "getData", getData);
+};
+VictoryErrorBar.getDomain = getDomain;
+VictoryErrorBar.getData = getData;
 
-_defineProperty(VictoryErrorBar, "getBaseProps", function (props) {
+VictoryErrorBar.getBaseProps = function (props) {
   return getBaseProps(props, fallbackProps);
-});
-
-_defineProperty(VictoryErrorBar, "expectedComponents", ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]);
+};
 
+VictoryErrorBar.expectedComponents = ["dataComponent", "labelComponent", "groupComponent", "containerComponent"];
 export default addEvents(VictoryErrorBar);

package/lib/error-bar.js

@@ -33,7 +33,8 @@ var renderBorder = function (props, error, type) {
     x1: vertical ? error[type] : props.x - props.borderWidth,
     x2: vertical ? error[type] : props.x + props.borderWidth,
     y1: vertical ? props.y - props.borderWidth : error[type],
-    y2: vertical ? props.y + props.borderWidth : error[type]
+    y2: vertical ? props.y + props.borderWidth : error[type],
+    "data-type": "border-".concat(type)
   }));
 };
 
@@ -49,7 +50,8 @@ var renderCross = function (props, error, type) {
     x1: props.x,
     x2: vertical ? props.x : error[type],
     y1: props.y,
-    y2: vertical ? error[type] : props.y
+    y2: vertical ? error[type] : props.y,
+    "data-type": "cross-".concat(type)
   }));
 };
 
@@ -117,15 +119,18 @@ var evaluateProps = function (props) {
 
 var ErrorBar = function (props) {
   props = evaluateProps(props);
+
+  var userProps = _victoryCore.UserProps.getSafeUserProps(props);
+
   var _props = props,
-      ariaLabel = _props.ariaLabel,
-      tabIndex = _props.tabIndex;
+      tabIndex = _props.tabIndex,
+      ariaLabel = _props.ariaLabel;
   var error = calculateError(props);
   var children = [error.right ? renderBorder(props, error, "right") : null, error.left ? renderBorder(props, error, "left") : null, error.bottom ? renderBorder(props, error, "bottom") : null, error.top ? renderBorder(props, error, "top") : null, error.right ? renderCross(props, error, "right") : null, error.left ? renderCross(props, error, "left") : null, error.bottom ? renderCross(props, error, "bottom") : null, error.top ? renderCross(props, error, "top") : null].filter(Boolean);
-  return /*#__PURE__*/_react.default.cloneElement(props.groupComponent, {
-    "aria-label": ariaLabel,
-    tabIndex: tabIndex
-  }, children);
+  return /*#__PURE__*/_react.default.cloneElement(props.groupComponent, _objectSpread({
+    tabIndex: tabIndex,
+    "aria-label": ariaLabel
+  }, userProps), children);
 };
 
 ErrorBar.propTypes = _objectSpread(_objectSpread({}, _victoryCore.CommonProps.primitiveProps), {}, {

package/lib/victory-errorbar.js

@@ -21,6 +21,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -29,7 +31,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -39,9 +41,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var fallbackProps = {
   width: 450,
@@ -108,22 +108,17 @@ var VictoryErrorBar = /*#__PURE__*/function (_React$Component) {
   return VictoryErrorBar;
 }(_react.default.Component);
 
-_defineProperty(VictoryErrorBar, "animationWhitelist", ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"]);
-
-_defineProperty(VictoryErrorBar, "displayName", "VictoryErrorBar");
-
-_defineProperty(VictoryErrorBar, "role", "errorbar");
-
-_defineProperty(VictoryErrorBar, "defaultTransitions", _victoryCore.DefaultTransitions.discreteTransitions());
-
-_defineProperty(VictoryErrorBar, "propTypes", _objectSpread(_objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), _victoryCore.CommonProps.dataProps), {}, {
+VictoryErrorBar.animationWhitelist = ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"];
+VictoryErrorBar.displayName = "VictoryErrorBar";
+VictoryErrorBar.role = "errorbar";
+VictoryErrorBar.defaultTransitions = _victoryCore.DefaultTransitions.discreteTransitions();
+VictoryErrorBar.propTypes = _objectSpread(_objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), _victoryCore.CommonProps.dataProps), {}, {
   borderWidth: _propTypes.default.number,
   errorX: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
   errorY: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
   horizontal: _propTypes.default.bool
-}));
-
-_defineProperty(VictoryErrorBar, "defaultProps", {
+});
+VictoryErrorBar.defaultProps = {
   containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
   data: defaultData,
   dataComponent: /*#__PURE__*/_react.default.createElement(_errorBar.default, null),
@@ -135,17 +130,15 @@ _defineProperty(VictoryErrorBar, "defaultProps", {
   sortOrder: "ascending",
   standalone: true,
   theme: _victoryCore.VictoryTheme.grayscale
-});
-
-_defineProperty(VictoryErrorBar, "getDomain", _helperMethods.getDomain);
-
-_defineProperty(VictoryErrorBar, "getData", _helperMethods.getData);
+};
+VictoryErrorBar.getDomain = _helperMethods.getDomain;
+VictoryErrorBar.getData = _helperMethods.getData;
 
-_defineProperty(VictoryErrorBar, "getBaseProps", function (props) {
+VictoryErrorBar.getBaseProps = function (props) {
   return (0, _helperMethods.getBaseProps)(props, fallbackProps);
-});
+};
 
-_defineProperty(VictoryErrorBar, "expectedComponents", ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]);
+VictoryErrorBar.expectedComponents = ["dataComponent", "labelComponent", "groupComponent", "containerComponent"];
 
 var _default = (0, _victoryCore.addEvents)(VictoryErrorBar);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-errorbar",
-  "version": "36.4.1",
+  "version": "36.5.0",
   "description": "Error Bar Component for Victory",
   "keywords": [
     "data visualization",
@@ -21,14 +21,14 @@
   "dependencies": {
     "lodash": "^4.17.19",
     "prop-types": "^15.8.1",
-    "victory-core": "^36.4.1"
+    "victory-core": "^36.5.0"
   },
   "peerDependencies": {
-    "react": "^16.6.0 || ^17.0.0"
+    "react": ">=16.6.0"
   },
   "scripts": {
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "aa44a22e5a93989773a560f765f83ac151f44c46"
+  "gitHead": "7cecba921f751c3decc8215f7e866f51d11203c1"
 }

package/src/error-bar.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-statements */
 import React from "react";
 import PropTypes from "prop-types";
-import { Helpers, CommonProps, Line } from "victory-core";
+import { Helpers, CommonProps, Line, UserProps } from "victory-core";
 import { assign } from "lodash";
 
 const renderBorder = (props, error, type) => {
@@ -17,7 +17,8 @@ const renderBorder = (props, error, type) => {
     x1: vertical ? error[type] : props.x - props.borderWidth,
     x2: vertical ? error[type] : props.x + props.borderWidth,
     y1: vertical ? props.y - props.borderWidth : error[type],
-    y2: vertical ? props.y + props.borderWidth : error[type]
+    y2: vertical ? props.y + props.borderWidth : error[type],
+    "data-type": `border-${type}`
   });
 };
 
@@ -34,7 +35,8 @@ const renderCross = (props, error, type) => {
     x1: props.x,
     x2: vertical ? props.x : error[type],
     y1: props.y,
-    y2: vertical ? error[type] : props.y
+    y2: vertical ? error[type] : props.y,
+    "data-type": `cross-${type}`
   });
 };
 
@@ -80,7 +82,8 @@ const evaluateProps = (props) => {
 
 const ErrorBar = (props) => {
   props = evaluateProps(props);
-  const { ariaLabel, tabIndex } = props;
+  const userProps = UserProps.getSafeUserProps(props);
+  const { tabIndex, ariaLabel } = props;
   const error = calculateError(props);
   const children = [
     error.right ? renderBorder(props, error, "right") : null,
@@ -94,7 +97,7 @@ const ErrorBar = (props) => {
   ].filter(Boolean);
   return React.cloneElement(
     props.groupComponent,
-    { "aria-label": ariaLabel, tabIndex },
+    { tabIndex, "aria-label": ariaLabel, ...userProps },
     children
   );
 };