victory-errorbar - npm Package Compare versions

Comparing version 31.2.0 to 32.0.0

es/error-bar.js

@@ -108,16 +108,34 @@ import _assign from "lodash/assign";
       var errorX = props.errorX,
-          errorY = props.errorY,
-          scale = props.scale;
-      var rangeX = scale.x.range();
-      var rangeY = scale.y.range();
-      var positiveErrorX = errorX ? errorX[0] : undefined;
-      var negativeErrorX = errorX ? errorX[1] : undefined;
-      var positiveErrorY = errorY ? errorY[1] : undefined;
-      var negativeErrorY = errorY ? errorY[0] : undefined;
-      return {
-        right: positiveErrorX >= rangeX[1] ? rangeX[1] : positiveErrorX,
-        left: negativeErrorX <= rangeX[0] ? rangeX[0] : negativeErrorX,
-        top: positiveErrorY >= rangeY[0] ? rangeY[0] : positiveErrorY,
-        bottom: negativeErrorY <= rangeY[1] ? rangeY[1] : negativeErrorY
+          errorY = props.errorY;
+      var settings = {
+        right: {
+          error: errorX,
+          errorIndex: 0
+        },
+        left: {
+          error: errorX,
+          errorIndex: 1
+        },
+        top: {
+          error: errorY,
+          errorIndex: 1
+        },
+        bottom: {
+          error: errorY,
+          errorIndex: 0
+        }
       };
+
+      var getError = function (direction) {
+        var _settings$direction = settings[direction],
+            error = _settings$direction.error,
+            errorIndex = _settings$direction.errorIndex;
+        return error ? error[errorIndex] : undefined;
+      };
+
+      var result = ["right", "left", "top", "bottom"].reduce(function (memo, dir) {
+        memo[dir] = getError(dir);
+        return memo;
+      }, {});
+      return result;
     }
@@ -124,0 +142,0 @@ }, {

es/helper-methods.js

 import _isNil from "lodash/isNil";
-import { Helpers, LabelHelpers, Scale, Domain, Data, Collection } from "victory-core";
+import _assign from "lodash/assign";
+import { Helpers, LabelHelpers, Scale, Domain, Data } from "victory-core";
 
-var getErrors = function (datum, scale, axis) {
+var getErrors = function (props, datum, axis) {
   /**
@@ -21,3 +22,4 @@ * check if it is asymmetric error or symmetric error, asymmetric error should be an array
 
-  return Array.isArray(errors) ? [errors[0] === 0 ? false : scale[axis](errors[0] + datum["_".concat(axis)]), errors[1] === 0 ? false : scale[axis](datum["_".concat(axis)] - errors[1])] : [scale[axis](errors + datum["_".concat(axis)]), scale[axis](datum["_".concat(axis)] - errors)];
+  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)];
 };
@@ -42,13 +44,6 @@
   if (dataset.length < 1) {
-    var scaleDomain = Scale.getBaseScale(props, axis).domain();
-
-    var _min = minDomain !== undefined ? minDomain : Collection.getMinValue(scaleDomain);
-
-    var _max = maxDomain !== undefined ? maxDomain : Collection.getMaxValue(scaleDomain);
-
-    return Domain.getDomainFromMinMax(_min, _max);
+    return minDomain !== undefined && maxDomain !== undefined ? Domain.getDomainFromMinMax(minDomain, maxDomain) : undefined;
   }
 
-  var currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-  var error = currentAxis === "x" ? "_errorX" : "_errorY";
+  var error = axis === "x" ? "_errorX" : "_errorY";
 
@@ -61,3 +56,3 @@ var reduceErrorData = function (type) {
       var currentError = Array.isArray(datum[error]) ? datum[error][errorIndex] : datum[error];
-      var current = datum["_".concat(currentAxis)] + sign * (currentError || 0);
+      var current = datum["_".concat(axis)] + sign * (currentError || 0);
       return memo < current && type === "min" || memo > current && type === "max" ? memo : current;
@@ -89,4 +84,4 @@ }, baseCondition);
   var scale = {
-    x: Scale.getBaseScale(props, "x").domain(domain.x).range(range.x),
-    y: Scale.getBaseScale(props, "y").domain(domain.y).range(range.y)
+    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)
   };
@@ -105,12 +100,24 @@ var origin = props.polar ? props.origin || Helpers.getPolarOrigin(props) : undefined;
   var x = dataProps.x,
+      y = dataProps.y,
       index = dataProps.index,
       scale = dataProps.scale,
-      errorY = dataProps.errorY;
-  var error = errorY && Array.isArray(errorY) ? errorY[0] : errorY;
-  var y = error || dataProps.y;
+      errorY = dataProps.errorY,
+      errorX = dataProps.errorX,
+      horizontal = dataProps.horizontal;
+
+  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;
+    return error || dataProps[type];
+  };
+
   var labelStyle = style.labels || {};
+  var padding = labelStyle.padding || 0;
+  var textAnchor = horizontal ? "start" : "middle";
+  var verticalAnchor = horizontal ? "middle" : "end";
   return {
     style: labelStyle,
-    y: y - (labelStyle.padding || 0),
-    x: x,
+    y: horizontal ? y : getError("y") - padding,
+    x: horizontal ? getError("x") + padding : x,
     text: text,
@@ -121,5 +128,6 @@ index: index,
     data: dataProps.data,
-    textAnchor: labelStyle.textAnchor,
-    verticalAnchor: labelStyle.verticalAnchor || "end",
-    angle: labelStyle.angle
+    textAnchor: labelStyle.textAnchor || textAnchor,
+    verticalAnchor: labelStyle.verticalAnchor || verticalAnchor,
+    angle: labelStyle.angle,
+    horizontal: horizontal
   };
@@ -129,38 +137,38 @@ };
 var getBaseProps = function (props, fallbackProps) {
-  props = Helpers.modifyProps(props, fallbackProps, "errorbar");
-
-  var _getCalculatedValues = getCalculatedValues(props, fallbackProps),
-      data = _getCalculatedValues.data,
-      style = _getCalculatedValues.style,
-      scale = _getCalculatedValues.scale,
-      domain = _getCalculatedValues.domain,
-      origin = _getCalculatedValues.origin;
-
+  var modifiedProps = Helpers.modifyProps(props, fallbackProps, "errorbar");
+  props = _assign({}, modifiedProps, getCalculatedValues(modifiedProps));
   var _props = props,
+      borderWidth = _props.borderWidth,
+      data = _props.data,
+      domain = _props.domain,
+      events = _props.events,
       groupComponent = _props.groupComponent,
       height = _props.height,
-      width = _props.width,
-      borderWidth = _props.borderWidth,
+      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,
-      polar = _props.polar,
-      padding = _props.padding,
-      labels = _props.labels,
-      events = _props.events,
-      sharedEvents = _props.sharedEvents,
-      name = _props.name;
+      width = _props.width;
   var initialChildProps = {
     parent: {
+      data: data,
       domain: domain,
+      height: height,
+      horizontal: horizontal,
+      name: name,
+      origin: origin,
+      padding: padding,
+      polar: polar,
       scale: scale,
-      data: data,
-      height: height,
-      width: width,
       standalone: standalone,
+      style: style.parent,
       theme: theme,
-      polar: polar,
-      origin: origin,
-      name: name,
-      padding: padding,
-      style: style.parent
+      width: width
     }
@@ -170,16 +178,24 @@ };
     var eventKey = !_isNil(datum.eventKey) ? datum.eventKey : index;
-    var x = scale.x(datum._x1 !== undefined ? datum._x1 : datum._x);
-    var y = scale.y(datum._y1 !== undefined ? datum._y1 : datum._y);
+
+    var _Helpers$scalePoint = Helpers.scalePoint(_assign({}, props, {
+      scale: scale
+    }), datum),
+        x = _Helpers$scalePoint.x,
+        y = _Helpers$scalePoint.y;
+
+    var errorX = getErrors(props, datum, "x");
+    var errorY = getErrors(props, datum, "y");
     var dataProps = {
-      x: x,
-      y: y,
-      scale: scale,
+      borderWidth: borderWidth,
+      data: data,
       datum: datum,
-      data: data,
+      errorX: horizontal ? errorY : errorX,
+      errorY: horizontal ? errorX : errorY,
+      groupComponent: groupComponent,
+      horizontal: horizontal,
       index: index,
-      groupComponent: groupComponent,
-      borderWidth: borderWidth,
+      scale: scale,
       style: style.data,
-      errorX: getErrors(datum, scale, "x"),
-      errorY: getErrors(datum, scale, "y")
+      x: x,
+      y: y
     };
@@ -186,0 +202,0 @@ childProps[eventKey] = {

es/victory-errorbar.js

@@ -133,3 +133,2 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
     samples: 50,
-    scale: "linear",
     sortOrder: "ascending",
@@ -136,0 +135,0 @@ standalone: true,

lib/error-bar.js

@@ -118,16 +118,34 @@ "use strict";
       var errorX = props.errorX,
-          errorY = props.errorY,
-          scale = props.scale;
-      var rangeX = scale.x.range();
-      var rangeY = scale.y.range();
-      var positiveErrorX = errorX ? errorX[0] : undefined;
-      var negativeErrorX = errorX ? errorX[1] : undefined;
-      var positiveErrorY = errorY ? errorY[1] : undefined;
-      var negativeErrorY = errorY ? errorY[0] : undefined;
-      return {
-        right: positiveErrorX >= rangeX[1] ? rangeX[1] : positiveErrorX,
-        left: negativeErrorX <= rangeX[0] ? rangeX[0] : negativeErrorX,
-        top: positiveErrorY >= rangeY[0] ? rangeY[0] : positiveErrorY,
-        bottom: negativeErrorY <= rangeY[1] ? rangeY[1] : negativeErrorY
+          errorY = props.errorY;
+      var settings = {
+        right: {
+          error: errorX,
+          errorIndex: 0
+        },
+        left: {
+          error: errorX,
+          errorIndex: 1
+        },
+        top: {
+          error: errorY,
+          errorIndex: 1
+        },
+        bottom: {
+          error: errorY,
+          errorIndex: 0
+        }
       };
+
+      var getError = function (direction) {
+        var _settings$direction = settings[direction],
+            error = _settings$direction.error,
+            errorIndex = _settings$direction.errorIndex;
+        return error ? error[errorIndex] : undefined;
+      };
+
+      var result = ["right", "left", "top", "bottom"].reduce(function (memo, dir) {
+        memo[dir] = getError(dir);
+        return memo;
+      }, {});
+      return result;
     }
@@ -134,0 +152,0 @@ }, {

lib/helper-methods.js

@@ -10,2 +10,4 @@ "use strict";
 
+var _assign2 = _interopRequireDefault(require("lodash/assign"));
+
 var _victoryCore = require("victory-core");
@@ -15,3 +17,3 @@
 
-var getErrors = function (datum, scale, axis) {
+var getErrors = function (props, datum, axis) {
   /**
@@ -33,3 +35,4 @@ * check if it is asymmetric error or symmetric error, asymmetric error should be an array
 
-  return Array.isArray(errors) ? [errors[0] === 0 ? false : scale[axis](errors[0] + datum["_".concat(axis)]), errors[1] === 0 ? false : scale[axis](datum["_".concat(axis)] - errors[1])] : [scale[axis](errors + datum["_".concat(axis)]), scale[axis](datum["_".concat(axis)] - errors)];
+  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)];
 };
@@ -58,15 +61,7 @@
   if (dataset.length < 1) {
-    var scaleDomain = _victoryCore.Scale.getBaseScale(props, axis).domain();
-
-    var _min = minDomain !== undefined ? minDomain : _victoryCore.Collection.getMinValue(scaleDomain);
-
-    var _max = maxDomain !== undefined ? maxDomain : _victoryCore.Collection.getMaxValue(scaleDomain);
-
-    return _victoryCore.Domain.getDomainFromMinMax(_min, _max);
+    return minDomain !== undefined && maxDomain !== undefined ? _victoryCore.Domain.getDomainFromMinMax(minDomain, maxDomain) : undefined;
   }
 
-  var currentAxis = _victoryCore.Helpers.getCurrentAxis(axis, props.horizontal);
+  var error = axis === "x" ? "_errorX" : "_errorY";
 
-  var error = currentAxis === "x" ? "_errorX" : "_errorY";
-
   var reduceErrorData = function (type) {
@@ -78,3 +73,3 @@ var baseCondition = type === "min" ? Infinity : -Infinity;
       var currentError = Array.isArray(datum[error]) ? datum[error][errorIndex] : datum[error];
-      var current = datum["_".concat(currentAxis)] + sign * (currentError || 0);
+      var current = datum["_".concat(axis)] + sign * (currentError || 0);
       return memo < current && type === "min" || memo > current && type === "max" ? memo : current;
@@ -108,4 +103,4 @@ }, baseCondition);
   var scale = {
-    x: _victoryCore.Scale.getBaseScale(props, "x").domain(domain.x).range(range.x),
-    y: _victoryCore.Scale.getBaseScale(props, "y").domain(domain.y).range(range.y)
+    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)
   };
@@ -124,12 +119,24 @@ var origin = props.polar ? props.origin || _victoryCore.Helpers.getPolarOrigin(props) : undefined;
   var x = dataProps.x,
+      y = dataProps.y,
       index = dataProps.index,
       scale = dataProps.scale,
-      errorY = dataProps.errorY;
-  var error = errorY && Array.isArray(errorY) ? errorY[0] : errorY;
-  var y = error || dataProps.y;
+      errorY = dataProps.errorY,
+      errorX = dataProps.errorX,
+      horizontal = dataProps.horizontal;
+
+  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;
+    return error || dataProps[type];
+  };
+
   var labelStyle = style.labels || {};
+  var padding = labelStyle.padding || 0;
+  var textAnchor = horizontal ? "start" : "middle";
+  var verticalAnchor = horizontal ? "middle" : "end";
   return {
     style: labelStyle,
-    y: y - (labelStyle.padding || 0),
-    x: x,
+    y: horizontal ? y : getError("y") - padding,
+    x: horizontal ? getError("x") + padding : x,
     text: text,
@@ -140,5 +147,6 @@ index: index,
     data: dataProps.data,
-    textAnchor: labelStyle.textAnchor,
-    verticalAnchor: labelStyle.verticalAnchor || "end",
-    angle: labelStyle.angle
+    textAnchor: labelStyle.textAnchor || textAnchor,
+    verticalAnchor: labelStyle.verticalAnchor || verticalAnchor,
+    angle: labelStyle.angle,
+    horizontal: horizontal
   };
@@ -148,38 +156,39 @@ };
 var getBaseProps = function (props, fallbackProps) {
-  props = _victoryCore.Helpers.modifyProps(props, fallbackProps, "errorbar");
+  var modifiedProps = _victoryCore.Helpers.modifyProps(props, fallbackProps, "errorbar");
 
-  var _getCalculatedValues = getCalculatedValues(props, fallbackProps),
-      data = _getCalculatedValues.data,
-      style = _getCalculatedValues.style,
-      scale = _getCalculatedValues.scale,
-      domain = _getCalculatedValues.domain,
-      origin = _getCalculatedValues.origin;
-
+  props = (0, _assign2.default)({}, modifiedProps, getCalculatedValues(modifiedProps));
   var _props = props,
+      borderWidth = _props.borderWidth,
+      data = _props.data,
+      domain = _props.domain,
+      events = _props.events,
       groupComponent = _props.groupComponent,
       height = _props.height,
-      width = _props.width,
-      borderWidth = _props.borderWidth,
+      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,
-      polar = _props.polar,
-      padding = _props.padding,
-      labels = _props.labels,
-      events = _props.events,
-      sharedEvents = _props.sharedEvents,
-      name = _props.name;
+      width = _props.width;
   var initialChildProps = {
     parent: {
+      data: data,
       domain: domain,
+      height: height,
+      horizontal: horizontal,
+      name: name,
+      origin: origin,
+      padding: padding,
+      polar: polar,
       scale: scale,
-      data: data,
-      height: height,
-      width: width,
       standalone: standalone,
+      style: style.parent,
       theme: theme,
-      polar: polar,
-      origin: origin,
-      name: name,
-      padding: padding,
-      style: style.parent
+      width: width
     }
@@ -189,16 +198,24 @@ };
     var eventKey = !(0, _isNil2.default)(datum.eventKey) ? datum.eventKey : index;
-    var x = scale.x(datum._x1 !== undefined ? datum._x1 : datum._x);
-    var y = scale.y(datum._y1 !== undefined ? datum._y1 : datum._y);
+
+    var _Helpers$scalePoint = _victoryCore.Helpers.scalePoint((0, _assign2.default)({}, props, {
+      scale: scale
+    }), datum),
+        x = _Helpers$scalePoint.x,
+        y = _Helpers$scalePoint.y;
+
+    var errorX = getErrors(props, datum, "x");
+    var errorY = getErrors(props, datum, "y");
     var dataProps = {
-      x: x,
-      y: y,
-      scale: scale,
+      borderWidth: borderWidth,
+      data: data,
       datum: datum,
-      data: data,
+      errorX: horizontal ? errorY : errorX,
+      errorY: horizontal ? errorX : errorY,
+      groupComponent: groupComponent,
+      horizontal: horizontal,
       index: index,
-      groupComponent: groupComponent,
-      borderWidth: borderWidth,
+      scale: scale,
       style: style.data,
-      errorX: getErrors(datum, scale, "x"),
-      errorY: getErrors(datum, scale, "y")
+      x: x,
+      y: y
     };
@@ -205,0 +222,0 @@ childProps[eventKey] = {

lib/victory-errorbar.js

@@ -148,3 +148,2 @@ "use strict";
     samples: 50,
-    scale: "linear",
     sortOrder: "ascending",
@@ -151,0 +150,0 @@ standalone: true,

package.json

 {
   "name": "victory-errorbar",
-  "version": "31.2.0",
+  "version": "32.0.0",
   "description": "Error Bar Component for Victory",
@@ -24,3 +24,3 @@ "keywords": [
     "prop-types": "^15.5.8",
-    "victory-core": "^31.2.0"
+    "victory-core": "^32.0.0"
   },
@@ -27,0 +27,0 @@ "scripts": {

src/error-bar.js

@@ -92,16 +92,20 @@ /* eslint-disable max-statements */
   calculateError(props) {
-    const { errorX, errorY, scale } = props;
-    const rangeX = scale.x.range();
-    const rangeY = scale.y.range();
-    const positiveErrorX = errorX ? errorX[0] : undefined;
-    const negativeErrorX = errorX ? errorX[1] : undefined;
-    const positiveErrorY = errorY ? errorY[1] : undefined;
-    const negativeErrorY = errorY ? errorY[0] : undefined;
+    const { errorX, errorY } = props;
+    const settings = {
+      right: { error: errorX, errorIndex: 0 },
+      left: { error: errorX, errorIndex: 1 },
+      top: { error: errorY, errorIndex: 1 },
+      bottom: { error: errorY, errorIndex: 0 }
+    };
 
-    return {
-      right: positiveErrorX >= rangeX[1] ? rangeX[1] : positiveErrorX,
-      left: negativeErrorX <= rangeX[0] ? rangeX[0] : negativeErrorX,
-      top: positiveErrorY >= rangeY[0] ? rangeY[0] : positiveErrorY,
-      bottom: negativeErrorY <= rangeY[1] ? rangeY[1] : negativeErrorY
+    const getError = (direction) => {
+      const { error, errorIndex } = settings[direction];
+      return error ? error[errorIndex] : undefined;
     };
+
+    const result = ["right", "left", "top", "bottom"].reduce((memo, dir) => {
+      memo[dir] = getError(dir);
+      return memo;
+    }, {});
+    return result;
   }
@@ -108,0 +112,0 @@

src/helper-methods.js

@@ -1,5 +0,5 @@
-import { isNil } from "lodash";
-import { Helpers, LabelHelpers, Scale, Domain, Data, Collection } from "victory-core";
+import { assign, isNil } from "lodash";
+import { Helpers, LabelHelpers, Scale, Domain, Data } from "victory-core";
 
-const getErrors = (datum, scale, axis) => {
+const getErrors = (props, datum, axis) => {
   /**
@@ -18,8 +18,9 @@ * check if it is asymmetric error or symmetric error, asymmetric error should be an array
 
+  const scale = props.scale[axis];
   return Array.isArray(errors)
     ? [
-        errors[0] === 0 ? false : scale[axis](errors[0] + datum[`_${axis}`]),
-        errors[1] === 0 ? false : scale[axis](datum[`_${axis}`] - errors[1])
+        errors[0] === 0 ? false : scale(errors[0] + datum[`_${axis}`]),
+        errors[1] === 0 ? false : scale(datum[`_${axis}`] - errors[1])
       ]
-    : [scale[axis](errors + datum[`_${axis}`]), scale[axis](datum[`_${axis}`] - errors)];
+    : [scale(errors + datum[`_${axis}`]), scale(datum[`_${axis}`] - errors)];
 };
@@ -42,9 +43,7 @@
   if (dataset.length < 1) {
-    const scaleDomain = Scale.getBaseScale(props, axis).domain();
-    const min = minDomain !== undefined ? minDomain : Collection.getMinValue(scaleDomain);
-    const max = maxDomain !== undefined ? maxDomain : Collection.getMaxValue(scaleDomain);
-    return Domain.getDomainFromMinMax(min, max);
+    return minDomain !== undefined && maxDomain !== undefined
+      ? Domain.getDomainFromMinMax(minDomain, maxDomain)
+      : undefined;
   }
-  const currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-  const error = currentAxis === "x" ? "_errorX" : "_errorY";
+  const error = axis === "x" ? "_errorX" : "_errorY";
   const reduceErrorData = (type) => {
@@ -56,3 +55,3 @@ const baseCondition = type === "min" ? Infinity : -Infinity;
       const currentError = Array.isArray(datum[error]) ? datum[error][errorIndex] : datum[error];
-      const current = datum[`_${currentAxis}`] + sign * (currentError || 0);
+      const current = datum[`_${axis}`] + sign * (currentError || 0);
       return (memo < current && type === "min") || (memo > current && type === "max")
@@ -91,6 +90,6 @@ ? memo
       .domain(domain.x)
-      .range(range.x),
+      .range(props.horizontal ? range.y : range.x),
     y: Scale.getBaseScale(props, "y")
       .domain(domain.y)
-      .range(range.y)
+      .range(props.horizontal ? range.x : range.y)
   };
@@ -102,10 +101,16 @@ const origin = props.polar ? props.origin || Helpers.getPolarOrigin(props) : undefined;
 const getLabelProps = (dataProps, text, style) => {
-  const { x, index, scale, errorY } = dataProps;
-  const error = errorY && Array.isArray(errorY) ? errorY[0] : errorY;
-  const y = error || dataProps.y;
+  const { x, y, index, scale, errorY, errorX, horizontal } = dataProps;
+  const getError = (type = "x") => {
+    const baseError = type === "y" ? errorY : errorX;
+    const error = baseError && Array.isArray(baseError) ? baseError[0] : baseError;
+    return error || dataProps[type];
+  };
   const labelStyle = style.labels || {};
+  const padding = labelStyle.padding || 0;
+  const textAnchor = horizontal ? "start" : "middle";
+  const verticalAnchor = horizontal ? "middle" : "end";
   return {
     style: labelStyle,
-    y: y - (labelStyle.padding || 0),
-    x,
+    y: horizontal ? y : getError("y") - padding,
+    x: horizontal ? getError("x") + padding : x,
     text,
@@ -116,5 +121,6 @@ index,
     data: dataProps.data,
-    textAnchor: labelStyle.textAnchor,
-    verticalAnchor: labelStyle.verticalAnchor || "end",
-    angle: labelStyle.angle
+    textAnchor: labelStyle.textAnchor || textAnchor,
+    verticalAnchor: labelStyle.verticalAnchor || verticalAnchor,
+    angle: labelStyle.angle,
+    horizontal
   };
@@ -124,32 +130,39 @@ };
 const getBaseProps = (props, fallbackProps) => {
-  props = Helpers.modifyProps(props, fallbackProps, "errorbar");
-  const { data, style, scale, domain, origin } = getCalculatedValues(props, fallbackProps);
+  const modifiedProps = Helpers.modifyProps(props, fallbackProps, "errorbar");
+  props = assign({}, modifiedProps, getCalculatedValues(modifiedProps));
   const {
+    borderWidth,
+    data,
+    domain,
+    events,
     groupComponent,
     height,
-    width,
-    borderWidth,
+    horizontal,
+    labels,
+    name,
+    origin,
+    padding,
+    polar,
+    scale,
+    sharedEvents,
     standalone,
+    style,
     theme,
-    polar,
-    padding,
-    labels,
-    events,
-    sharedEvents,
-    name
+    width
   } = props;
   const initialChildProps = {
     parent: {
+      data,
       domain,
+      height,
+      horizontal,
+      name,
+      origin,
+      padding,
+      polar,
       scale,
-      data,
-      height,
-      width,
       standalone,
+      style: style.parent,
       theme,
-      polar,
-      origin,
-      name,
-      padding,
-      style: style.parent
+      width
     }
@@ -160,17 +173,18 @@ };
     const eventKey = !isNil(datum.eventKey) ? datum.eventKey : index;
-    const x = scale.x(datum._x1 !== undefined ? datum._x1 : datum._x);
-    const y = scale.y(datum._y1 !== undefined ? datum._y1 : datum._y);
-
+    const { x, y } = Helpers.scalePoint(assign({}, props, { scale }), datum);
+    const errorX = getErrors(props, datum, "x");
+    const errorY = getErrors(props, datum, "y");
     const dataProps = {
-      x,
-      y,
-      scale,
+      borderWidth,
+      data,
       datum,
-      data,
+      errorX: horizontal ? errorY : errorX,
+      errorY: horizontal ? errorX : errorY,
+      groupComponent,
+      horizontal,
       index,
-      groupComponent,
-      borderWidth,
+      scale,
       style: style.data,
-      errorX: getErrors(datum, scale, "x"),
-      errorY: getErrors(datum, scale, "y")
+      x,
+      y
     };
@@ -177,0 +191,0 @@

src/victory-errorbar.js

@@ -73,3 +73,2 @@ import PropTypes from "prop-types";
     samples: 50,
-    scale: "linear",
     sortOrder: "ascending",
@@ -76,0 +75,0 @@ standalone: true,

No alert changes

Improved metrics

Total package byte prevSize

1211128

increased by0.26%

Lines of code

22004

increased by0.53%

Dependency changes

• + Addedvictory-core@32.3.7(transitive)

• - Removedvictory-core@31.2.0(transitive)

• Updatedvictory-core@^32.0.0