victory-errorbar 36.9.2 → 37.0.0

package/es/error-bar.js

@@ -1,51 +1,46 @@
-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; }
-
 /* eslint-disable max-statements */
 import React from "react";
 import { Helpers, Line, UserProps } from "victory-core";
-
-var renderBorder = function (props, error, type) {
-  var vertical = type === "right" || type === "left";
-  return /*#__PURE__*/React.cloneElement(props.lineComponent, _objectSpread(_objectSpread({}, props.events), {}, {
+const renderBorder = (props, error, type) => {
+  const vertical = type === "right" || type === "left";
+  return /*#__PURE__*/React.cloneElement(props.lineComponent, {
+    ...props.events,
     role: props.role,
     shapeRendering: props.shapeRendering,
     className: props.className,
     style: props.style,
     transform: props.transform,
-    key: "".concat(props.id, "-border-").concat(type),
+    key: `${props.id}-border-${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],
-    "data-type": "border-".concat(type)
-  }));
+    "data-type": `border-${type}`
+  });
 };
-
-var renderCross = function (props, error, type) {
-  var vertical = type === "top" || type === "bottom";
-  return /*#__PURE__*/React.cloneElement(props.lineComponent, _objectSpread(_objectSpread({}, props.events), {}, {
+const renderCross = (props, error, type) => {
+  const vertical = type === "top" || type === "bottom";
+  return /*#__PURE__*/React.cloneElement(props.lineComponent, {
+    ...props.events,
     role: props.role,
     shapeRendering: props.shapeRendering,
     className: props.className,
     style: props.style,
     transform: props.transform,
-    key: "".concat(props.id, "-cross-").concat(type),
+    key: `${props.id}-cross-${type}`,
     x1: props.x,
     x2: vertical ? props.x : error[type],
     y1: props.y,
     y2: vertical ? error[type] : props.y,
-    "data-type": "cross-".concat(type)
-  }));
+    "data-type": `cross-${type}`
+  });
 };
-
-var calculateError = function (props) {
-  var errorX = props.errorX,
-      errorY = props.errorY;
-  var settings = {
+const calculateError = props => {
+  const {
+    errorX,
+    errorY
+  } = props;
+  const settings = {
     right: {
       error: errorX,
       errorIndex: 0
@@ -63,22 +58,20 @@ var calculateError = function (props) {
       errorIndex: 0
     }
   };
-
-  var getError = function (direction) {
-    var _settings$direction = settings[direction],
-        error = _settings$direction.error,
-        errorIndex = _settings$direction.errorIndex;
+  const getError = direction => {
+    const {
+      error,
+      errorIndex
+    } = settings[direction];
     return error ? error[errorIndex] : undefined;
   };
-
-  var result = ["right", "left", "top", "bottom"].reduce(function (memo, dir) {
+  const result = ["right", "left", "top", "bottom"].reduce((memo, dir) => {
     memo[dir] = getError(dir);
     return memo;
   }, {});
   return result;
 };
-
-var evaluateProps = function (props) {
+const evaluateProps = props => {
   /**
    * Potential evaluated props are:
    * `ariaLabel`
@@ -86,36 +79,48 @@ var evaluateProps = function (props) {
    * `style`
    * `tabIndex`
    */
-  var ariaLabel = Helpers.evaluateProp(props.ariaLabel, props);
-  var id = Helpers.evaluateProp(props.id, props);
-  var style = Helpers.evaluateStyle(Object.assign({
+  const ariaLabel = Helpers.evaluateProp(props.ariaLabel, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const style = Helpers.evaluateStyle(Object.assign({
     stroke: "black"
   }, props.style), props);
-  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
   return Object.assign({}, props, {
-    ariaLabel: ariaLabel,
-    id: id,
-    style: style,
-    tabIndex: tabIndex
+    ariaLabel,
+    id,
+    style,
+    tabIndex
   });
 };
 
-var defaultProps = {
+// ErrorProps for calculateError
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+
+const defaultProps = {
   groupComponent: /*#__PURE__*/React.createElement("g", null),
   lineComponent: /*#__PURE__*/React.createElement(Line, null),
   role: "presentation",
   shapeRendering: "auto"
 };
-export var ErrorBar = function (initialProps) {
-  var props = evaluateProps(_objectSpread(_objectSpread({}, defaultProps), initialProps));
-  var groupComponent = props.groupComponent;
-  var userProps = UserProps.getSafeUserProps(props);
-  var 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(groupComponent, _objectSpread({
-    tabIndex: tabIndex,
-    "aria-label": ariaLabel
-  }, userProps), children);
+export const ErrorBar = initialProps => {
+  const props = evaluateProps({
+    ...defaultProps,
+    ...initialProps
+  });
+  const {
+    groupComponent
+  } = props;
+  const userProps = UserProps.getSafeUserProps(props);
+  const {
+    tabIndex,
+    ariaLabel
+  } = props;
+  const error = calculateError(props);
+  const 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(groupComponent, {
+    tabIndex,
+    "aria-label": ariaLabel,
+    ...userProps
+  }, children);
 };

package/es/helper-methods.js

@@ -1,235 +1,224 @@
 import _assign from "lodash/assign";
 import _defaults from "lodash/defaults";
 import { Helpers, LabelHelpers, Scale, Domain, Data, Collection } from "victory-core";
-
-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)];
 };
-
-export var getData = function (props) {
-  var accessorTypes = ["x", "y", "errorX", "errorY"];
-
+export const getData = props => {
+  const accessorTypes = ["x", "y", "errorX", "errorY"];
   if (props.data) {
     return Data.formatData(props.data, props, accessorTypes);
   }
-
-  var generatedData = props.errorX || props.errorY ? Data.generateData(props) : [];
+  const generatedData = props.errorX || props.errorY ? Data.generateData(props) : [];
   return Data.formatData(generatedData, props, accessorTypes);
 };
-
-var getDomainFromData = function (props, axis) {
-  var minDomain = Domain.getMinFromProps(props, axis);
-  var maxDomain = Domain.getMaxFromProps(props, axis);
-  var dataset = getData(props);
-
+const getDomainFromData = (props, axis) => {
+  const minDomain = Domain.getMinFromProps(props, axis);
+  const maxDomain = Domain.getMaxFromProps(props, axis);
+  const dataset = getData(props);
   if (dataset.length < 1) {
     return minDomain !== undefined && maxDomain !== undefined ? 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 Domain.getDomainFromMinMax(min, max);
 };
-
-export var getDomain = function (props, axis) {
+export const getDomain = (props, axis) => {
   return Domain.createDomainFunction(getDomainFromData)(props, axis);
-}; // This method will edit or remove errorbar data points that fall outside of the desired domain
-
-var formatDataFromDomain = function (datum, domain) {
-  var minDomainX = Collection.getMinValue(domain.x);
-  var maxDomainX = Collection.getMaxValue(domain.x);
-  var minDomainY = Collection.getMinValue(domain.y);
-  var maxDomainY = 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
+};
 
+// This method will edit or remove errorbar data points that fall outside of the desired domain
+const formatDataFromDomain = (datum, domain) => {
+  const minDomainX = Collection.getMinValue(domain.x);
+  const maxDomainX = Collection.getMaxValue(domain.x);
+  const minDomainY = Collection.getMinValue(domain.y);
+  const maxDomainY = 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 = Helpers.getDefaultStyles(props, "errorbar");
-  var style = Helpers.getStyles(props.style, defaultStyles) || {};
-  var data = getData(props);
-  var range = {
+const getCalculatedValues = props => {
+  const defaultStyles = Helpers.getDefaultStyles(props, "errorbar");
+  const style = Helpers.getStyles(props.style, defaultStyles) || {};
+  const data = getData(props);
+  const range = {
     x: Helpers.getRange(props, "x"),
     y: Helpers.getRange(props, "y")
   };
-  var domain = {
+  const domain = {
     x: getDomain(props, "x"),
     y: getDomain(props, "y")
   };
-  var scale = {
+  const scale = {
     x: Scale.getBaseScale(props, "x").domain(domain.x).range(props.horizontal ? range.y : range.x),
     y: Scale.getBaseScale(props, "y").domain(domain.y).range(props.horizontal ? range.x : range.y)
   };
-  var origin = props.polar ? props.origin || Helpers.getPolarOrigin(props) : undefined;
+  const origin = props.polar ? props.origin || 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 (!Helpers.isTooltip(labelComponent)) {
     return labelProps;
   }
-
-  var tooltipTheme = theme && theme.tooltip || {};
+  const tooltipTheme = theme && theme.tooltip || {};
   return _defaults({}, labelProps, Helpers.omit(tooltipTheme, ["style"]));
 };
-
-export var getBaseProps = function (initialProps, fallbackProps) {
-  var modifiedProps = 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 = {
+export const getBaseProps = (initialProps, fallbackProps) => {
+  const modifiedProps = 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 = !Helpers.isNil(datum.eventKey) ? datum.eventKey : index;
-
-    var _Helpers$scalePoint = Helpers.scalePoint(_assign({}, 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 = !Helpers.isNil(datum.eventKey) ? datum.eventKey : index;
+    const {
+      x,
+      y
+    } = Helpers.scalePoint(_assign({}, 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 = LabelHelpers.getText(props, datum, index);
-
+    const text = 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);
 };