victory-errorbar 36.9.2 → 37.0.0

package/lib/helper-methods.js

@@ -4,259 +4,231 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDomain = exports.getData = exports.getBaseProps = void 0;
-
 var _assign2 = _interopRequireDefault(require("lodash/assign"));
-
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
-
 var _victoryCore = require("victory-core");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var getErrors = function (props, datum, axis) {
+const getErrors = (props, datum, axis) => {
   /**
    * check if it is asymmetric error or symmetric error, asymmetric error should be an array
    * and the first value is the positive error, the second is the negative error
    * @param  {Boolean} isArray(errorX)
    * @return {String or Array}
    */
-  var errorNames = {
+
+  const errorNames = {
     x: "_errorX",
     y: "_errorY"
   };
-  var errors = datum[errorNames[axis]];
-
+  const errors = datum[errorNames[axis]];
   if (errors === 0) {
     return false;
   }
-
-  var scale = props.scale[axis];
-  return Array.isArray(errors) ? [errors[0] === 0 ? false : scale(errors[0] + datum["_".concat(axis)]), errors[1] === 0 ? false : scale(datum["_".concat(axis)] - errors[1])] : [scale(errors + datum["_".concat(axis)]), scale(datum["_".concat(axis)] - errors)];
+  const scale = props.scale[axis];
+  return Array.isArray(errors) ? [errors[0] === 0 ? false : scale(errors[0] + datum[`_${axis}`]), errors[1] === 0 ? false : scale(datum[`_${axis}`] - errors[1])] : [scale(errors + datum[`_${axis}`]), scale(datum[`_${axis}`] - errors)];
 };
-
-var getData = function (props) {
-  var accessorTypes = ["x", "y", "errorX", "errorY"];
-
+const getData = props => {
+  const accessorTypes = ["x", "y", "errorX", "errorY"];
   if (props.data) {
     return _victoryCore.Data.formatData(props.data, props, accessorTypes);
   }
-
-  var generatedData = props.errorX || props.errorY ? _victoryCore.Data.generateData(props) : [];
+  const generatedData = props.errorX || props.errorY ? _victoryCore.Data.generateData(props) : [];
   return _victoryCore.Data.formatData(generatedData, props, accessorTypes);
 };
-
 exports.getData = getData;
-
-var getDomainFromData = function (props, axis) {
-  var minDomain = _victoryCore.Domain.getMinFromProps(props, axis);
-
-  var maxDomain = _victoryCore.Domain.getMaxFromProps(props, axis);
-
-  var dataset = getData(props);
-
+const getDomainFromData = (props, axis) => {
+  const minDomain = _victoryCore.Domain.getMinFromProps(props, axis);
+  const maxDomain = _victoryCore.Domain.getMaxFromProps(props, axis);
+  const dataset = getData(props);
   if (dataset.length < 1) {
     return minDomain !== undefined && maxDomain !== undefined ? _victoryCore.Domain.getDomainFromMinMax(minDomain, maxDomain) : undefined;
   }
-
-  var error = axis === "x" ? "_errorX" : "_errorY";
-
-  var reduceErrorData = function (type) {
-    var baseCondition = type === "min" ? Infinity : -Infinity;
-    var errorIndex = type === "min" ? 1 : 0;
-    var sign = type === "min" ? -1 : 1;
-    return dataset.reduce(function (memo, datum) {
-      var currentError = Array.isArray(datum[error]) ? datum[error][errorIndex] : datum[error];
-      var current = datum["_".concat(axis)] + sign * (currentError || 0);
+  const error = axis === "x" ? "_errorX" : "_errorY";
+  const reduceErrorData = type => {
+    const baseCondition = type === "min" ? Infinity : -Infinity;
+    const errorIndex = type === "min" ? 1 : 0;
+    const sign = type === "min" ? -1 : 1;
+    return dataset.reduce((memo, datum) => {
+      const currentError = Array.isArray(datum[error]) ? datum[error][errorIndex] : datum[error];
+      const current = datum[`_${axis}`] + sign * (currentError || 0);
       return memo < current && type === "min" || memo > current && type === "max" ? memo : current;
     }, baseCondition);
   };
-
-  var min = minDomain !== undefined ? minDomain : reduceErrorData("min");
-  var max = maxDomain !== undefined ? maxDomain : reduceErrorData("max");
+  const min = minDomain !== undefined ? minDomain : reduceErrorData("min");
+  const max = maxDomain !== undefined ? maxDomain : reduceErrorData("max");
   return _victoryCore.Domain.getDomainFromMinMax(min, max);
 };
-
-var getDomain = function (props, axis) {
+const getDomain = (props, axis) => {
   return _victoryCore.Domain.createDomainFunction(getDomainFromData)(props, axis);
-}; // This method will edit or remove errorbar data points that fall outside of the desired domain
-
+};
 
+// This method will edit or remove errorbar data points that fall outside of the desired domain
 exports.getDomain = getDomain;
-
-var formatDataFromDomain = function (datum, domain) {
-  var minDomainX = _victoryCore.Collection.getMinValue(domain.x);
-
-  var maxDomainX = _victoryCore.Collection.getMaxValue(domain.x);
-
-  var minDomainY = _victoryCore.Collection.getMinValue(domain.y);
-
-  var maxDomainY = _victoryCore.Collection.getMaxValue(domain.y);
-
-  var _x = datum._x,
-      _y = datum._y; // if either x or y center point is outside of the domain, null the entire data point
-
+const formatDataFromDomain = (datum, domain) => {
+  const minDomainX = _victoryCore.Collection.getMinValue(domain.x);
+  const maxDomainX = _victoryCore.Collection.getMaxValue(domain.x);
+  const minDomainY = _victoryCore.Collection.getMinValue(domain.y);
+  const maxDomainY = _victoryCore.Collection.getMaxValue(domain.y);
+  let {
+    _x,
+    _y
+  } = datum;
+
+  // if either x or y center point is outside of the domain, null the entire data point
   if (_x < minDomainX || _x > maxDomainX || _y < minDomainY || _y > maxDomainY) _x = _y = null;
   return Object.assign({}, datum, {
-    _x: _x,
-    _y: _y
+    _x,
+    _y
   });
 };
-
-var getCalculatedValues = function (props) {
-  var defaultStyles = _victoryCore.Helpers.getDefaultStyles(props, "errorbar");
-
-  var style = _victoryCore.Helpers.getStyles(props.style, defaultStyles) || {};
-  var data = getData(props);
-  var range = {
+const getCalculatedValues = props => {
+  const defaultStyles = _victoryCore.Helpers.getDefaultStyles(props, "errorbar");
+  const style = _victoryCore.Helpers.getStyles(props.style, defaultStyles) || {};
+  const data = getData(props);
+  const range = {
     x: _victoryCore.Helpers.getRange(props, "x"),
     y: _victoryCore.Helpers.getRange(props, "y")
   };
-  var domain = {
+  const domain = {
     x: getDomain(props, "x"),
     y: getDomain(props, "y")
   };
-  var scale = {
+  const scale = {
     x: _victoryCore.Scale.getBaseScale(props, "x").domain(domain.x).range(props.horizontal ? range.y : range.x),
     y: _victoryCore.Scale.getBaseScale(props, "y").domain(domain.y).range(props.horizontal ? range.x : range.y)
   };
-  var origin = props.polar ? props.origin || _victoryCore.Helpers.getPolarOrigin(props) : undefined;
+  const origin = props.polar ? props.origin || _victoryCore.Helpers.getPolarOrigin(props) : undefined;
   return {
-    domain: domain,
-    data: data,
-    scale: scale,
-    style: style,
-    origin: origin
+    domain,
+    data,
+    scale,
+    style,
+    origin
   };
 };
-
-var getLabelProps = function (dataProps, text, style) {
-  var x = dataProps.x,
-      y = dataProps.y,
-      index = dataProps.index,
-      scale = dataProps.scale,
-      errorY = dataProps.errorY,
-      errorX = dataProps.errorX,
-      horizontal = dataProps.horizontal,
-      labelComponent = dataProps.labelComponent,
-      theme = dataProps.theme,
-      disableInlineStyles = dataProps.disableInlineStyles;
-
-  var getError = function () {
-    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "x";
-    var baseError = type === "y" ? errorY : errorX;
-    var error = baseError && Array.isArray(baseError) ? baseError[0] : baseError;
+const getLabelProps = (dataProps, text, style) => {
+  const {
+    x,
+    y,
+    index,
+    scale,
+    errorY,
+    errorX,
+    horizontal,
+    labelComponent,
+    theme,
+    disableInlineStyles
+  } = dataProps;
+  const getError = function (type) {
+    if (type === void 0) {
+      type = "x";
+    }
+    const baseError = type === "y" ? errorY : errorX;
+    const error = baseError && Array.isArray(baseError) ? baseError[0] : baseError;
     return error || dataProps[type];
   };
-
-  var labelStyle = style.labels || {};
-  var padding = labelStyle.padding || 0;
-  var textAnchor = horizontal ? "start" : "middle";
-  var verticalAnchor = horizontal ? "middle" : "end";
-  var labelProps = {
+  const labelStyle = style.labels || {};
+  const padding = labelStyle.padding || 0;
+  const textAnchor = horizontal ? "start" : "middle";
+  const verticalAnchor = horizontal ? "middle" : "end";
+  const labelProps = {
     style: labelStyle,
     y: horizontal ? y : getError("y"),
     x: horizontal ? getError("x") : x,
     dy: horizontal ? 0 : -padding,
     dx: horizontal ? padding : 0,
-    text: text,
-    index: index,
-    scale: scale,
+    text,
+    index,
+    scale,
     datum: dataProps.datum,
     data: dataProps.data,
     textAnchor: labelStyle.textAnchor || textAnchor,
     verticalAnchor: labelStyle.verticalAnchor || verticalAnchor,
     angle: labelStyle.angle,
-    horizontal: horizontal,
-    disableInlineStyles: disableInlineStyles
+    horizontal,
+    disableInlineStyles
   };
-
   if (!_victoryCore.Helpers.isTooltip(labelComponent)) {
     return labelProps;
   }
-
-  var tooltipTheme = theme && theme.tooltip || {};
+  const tooltipTheme = theme && theme.tooltip || {};
   return (0, _defaults2.default)({}, labelProps, _victoryCore.Helpers.omit(tooltipTheme, ["style"]));
 };
-
-var getBaseProps = function (initialProps, fallbackProps) {
-  var modifiedProps = _victoryCore.Helpers.modifyProps(initialProps, fallbackProps, "errorbar");
-
-  var props = Object.assign({}, modifiedProps, getCalculatedValues(modifiedProps));
-  var borderWidth = props.borderWidth,
-      data = props.data,
-      domain = props.domain,
-      events = props.events,
-      groupComponent = props.groupComponent,
-      height = props.height,
-      horizontal = props.horizontal,
-      labels = props.labels,
-      name = props.name,
-      origin = props.origin,
-      padding = props.padding,
-      polar = props.polar,
-      scale = props.scale,
-      sharedEvents = props.sharedEvents,
-      standalone = props.standalone,
-      style = props.style,
-      theme = props.theme,
-      width = props.width,
-      disableInlineStyles = props.disableInlineStyles;
-  var initialChildProps = {
+const getBaseProps = (initialProps, fallbackProps) => {
+  const modifiedProps = _victoryCore.Helpers.modifyProps(initialProps, fallbackProps, "errorbar");
+  const props = Object.assign({}, modifiedProps, getCalculatedValues(modifiedProps));
+  const {
+    borderWidth,
+    data,
+    domain,
+    events,
+    groupComponent,
+    height,
+    horizontal,
+    labels,
+    name,
+    origin,
+    padding,
+    polar,
+    scale,
+    sharedEvents,
+    standalone,
+    style,
+    theme,
+    width,
+    disableInlineStyles
+  } = props;
+  const initialChildProps = {
     parent: {
-      data: data,
-      domain: domain,
-      height: height,
-      horizontal: horizontal,
-      name: name,
-      origin: origin,
-      padding: padding,
-      polar: polar,
-      scale: scale,
-      standalone: standalone,
+      data,
+      domain,
+      height,
+      horizontal,
+      name,
+      origin,
+      padding,
+      polar,
+      scale,
+      standalone,
       style: style.parent,
-      theme: theme,
-      width: width
+      theme,
+      width
     }
   };
-  return data.reduce(function (childProps, datum, index) {
-    var eventKey = !_victoryCore.Helpers.isNil(datum.eventKey) ? datum.eventKey : index;
-
-    var _Helpers$scalePoint = _victoryCore.Helpers.scalePoint((0, _assign2.default)({}, props, {
-      scale: scale
-    }), datum),
-        x = _Helpers$scalePoint.x,
-        y = _Helpers$scalePoint.y;
-
-    var formattedDatum = formatDataFromDomain(datum, domain);
-    var errorX = getErrors(props, formattedDatum, "x");
-    var errorY = getErrors(props, formattedDatum, "y");
-    var dataProps = {
-      borderWidth: borderWidth,
-      data: data,
+  return data.reduce((childProps, datum, index) => {
+    const eventKey = !_victoryCore.Helpers.isNil(datum.eventKey) ? datum.eventKey : index;
+    const {
+      x,
+      y
+    } = _victoryCore.Helpers.scalePoint((0, _assign2.default)({}, props, {
+      scale
+    }), datum);
+    const formattedDatum = formatDataFromDomain(datum, domain);
+    const errorX = getErrors(props, formattedDatum, "x");
+    const errorY = getErrors(props, formattedDatum, "y");
+    const dataProps = {
+      borderWidth,
+      data,
       datum: formattedDatum,
       errorX: horizontal ? errorY : errorX,
       errorY: horizontal ? errorX : errorY,
-      groupComponent: groupComponent,
-      horizontal: horizontal,
-      index: index,
-      scale: scale,
+      groupComponent,
+      horizontal,
+      index,
+      scale,
       style: disableInlineStyles ? {} : style.data,
-      x: x,
-      y: y,
-      disableInlineStyles: disableInlineStyles
+      x,
+      y,
+      disableInlineStyles
     };
     childProps[eventKey] = {
       data: dataProps
     };
-
-    var text = _victoryCore.LabelHelpers.getText(props, datum, index);
-
+    const text = _victoryCore.LabelHelpers.getText(props, datum, index);
     if (text !== undefined && text !== null || labels && (events || sharedEvents)) {
       childProps[eventKey].labels = getLabelProps(Object.assign({}, props, dataProps), text, style);
     }
-
     return childProps;
   }, initialChildProps);
 };
-
 exports.getBaseProps = getBaseProps;

package/lib/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _victoryErrorbar = require("./victory-errorbar");
-
 Object.keys(_victoryErrorbar).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _victoryErrorbar[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_victoryErrorbar).forEach(function (key) {
     }
   });
 });
-
 var _errorBar = require("./error-bar");
-
 Object.keys(_errorBar).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _errorBar[key]) return;

package/lib/victory-errorbar.js

@@ -4,43 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VictoryErrorBar = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _victoryCore = require("victory-core");
-
 var _errorBar = require("./error-bar");
-
 var _helperMethods = require("./helper-methods");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
-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 ? 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); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-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.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-var fallbackProps = {
+const fallbackProps = {
   width: 450,
   height: 300,
   padding: 50
 };
-var defaultData = [{
+const defaultData = [{
   x: 1,
   y: 1,
   errorX: 0.1,
@@ -62,68 +36,47 @@ var defaultData = [{
   errorY: 0.4
 }];
 
-var VictoryErrorBarBase = /*#__PURE__*/function (_React$Component) {
-  _inherits(VictoryErrorBarBase, _React$Component);
-
-  var _super = _createSuper(VictoryErrorBarBase);
-
-  function VictoryErrorBarBase() {
-    _classCallCheck(this, VictoryErrorBarBase);
-
-    return _super.apply(this, arguments);
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+
+class VictoryErrorBarBase extends _react.default.Component {
+  static animationWhitelist = ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"];
+  static displayName = "VictoryErrorBar";
+  static role = "errorbar";
+  static defaultTransitions = _victoryCore.DefaultTransitions.discreteTransitions();
+  static defaultProps = {
+    containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
+    data: defaultData,
+    dataComponent: /*#__PURE__*/_react.default.createElement(_errorBar.ErrorBar, null),
+    labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
+    groupComponent: /*#__PURE__*/_react.default.createElement("g", {
+      role: "presentation"
+    }),
+    samples: 50,
+    sortOrder: "ascending",
+    standalone: true,
+    theme: _victoryCore.VictoryTheme.grayscale
+  };
+  static getDomain = _helperMethods.getDomain;
+  static getData = _helperMethods.getData;
+  static getBaseProps = props => (0, _helperMethods.getBaseProps)(props, fallbackProps);
+  static expectedComponents = ["dataComponent", "labelComponent", "groupComponent", "containerComponent"];
+
+  // Overridden in native versions
+  shouldAnimate() {
+    return !!this.props.animate;
   }
-
-  _createClass(VictoryErrorBarBase, [{
-    key: "shouldAnimate",
-    value: // Overridden in native versions
-    function shouldAnimate() {
-      return !!this.props.animate;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var animationWhitelist = VictoryErrorBar.animationWhitelist,
-          role = VictoryErrorBar.role;
-
-      var props = _victoryCore.Helpers.modifyProps(this.props, fallbackProps, role);
-
-      if (this.shouldAnimate()) {
-        return this.animateComponent(props, animationWhitelist);
-      }
-
-      var children = this.renderData(props);
-      var component = props.standalone ? this.renderContainer(props.containerComponent, children) : children;
-      return _victoryCore.UserProps.withSafeUserProps(component, props);
+  render() {
+    const {
+      animationWhitelist,
+      role
+    } = VictoryErrorBar;
+    const props = _victoryCore.Helpers.modifyProps(this.props, fallbackProps, role);
+    if (this.shouldAnimate()) {
+      return this.animateComponent(props, animationWhitelist);
     }
-  }]);
-
-  return VictoryErrorBarBase;
-}(_react.default.Component);
-
-VictoryErrorBarBase.animationWhitelist = ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"];
-VictoryErrorBarBase.displayName = "VictoryErrorBar";
-VictoryErrorBarBase.role = "errorbar";
-VictoryErrorBarBase.defaultTransitions = _victoryCore.DefaultTransitions.discreteTransitions();
-VictoryErrorBarBase.defaultProps = {
-  containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
-  data: defaultData,
-  dataComponent: /*#__PURE__*/_react.default.createElement(_errorBar.ErrorBar, null),
-  labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
-  groupComponent: /*#__PURE__*/_react.default.createElement("g", {
-    role: "presentation"
-  }),
-  samples: 50,
-  sortOrder: "ascending",
-  standalone: true,
-  theme: _victoryCore.VictoryTheme.grayscale
-};
-VictoryErrorBarBase.getDomain = _helperMethods.getDomain;
-VictoryErrorBarBase.getData = _helperMethods.getData;
-
-VictoryErrorBarBase.getBaseProps = function (props) {
-  return (0, _helperMethods.getBaseProps)(props, fallbackProps);
-};
-
-VictoryErrorBarBase.expectedComponents = ["dataComponent", "labelComponent", "groupComponent", "containerComponent"];
-var VictoryErrorBar = (0, _victoryCore.addEvents)(VictoryErrorBarBase);
-exports.VictoryErrorBar = VictoryErrorBar;
+    const children = this.renderData(props);
+    const component = props.standalone ? this.renderContainer(props.containerComponent, children) : children;
+    return _victoryCore.UserProps.withSafeUserProps(component, props);
+  }
+}
+const VictoryErrorBar = exports.VictoryErrorBar = (0, _victoryCore.addEvents)(VictoryErrorBarBase);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-errorbar",
-  "version": "36.9.2",
+  "version": "37.0.0",
   "description": "Error Bar Component for Victory",
   "keywords": [
     "data visualization",
@@ -21,7 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.19",
-    "victory-core": "^36.9.2"
+    "victory-core": "^37.0.0"
   },
   "devDependencies": {
     "victory-vendor": "*"