victory-bar 36.9.2 → 37.0.0

package/es/bar-helper-methods.js

@@ -1,84 +1,75 @@
 import _isPlainObject from "lodash/isPlainObject";
 import { Helpers } from "victory-core";
-var DEFAULT_BAR_WIDTH = 8;
-export var getBarWidth = function (barWidth, props) {
-  var scale = props.scale,
-      data = props.data,
-      style = props.style;
-
+const DEFAULT_BAR_WIDTH = 8;
+export const getBarWidth = (barWidth, props) => {
+  const {
+    scale,
+    data,
+    style
+  } = props;
   if (barWidth) {
     return Helpers.evaluateProp(barWidth, props);
   } else if (style.width) {
     return style.width;
   }
-
-  var range = scale.x.range();
-  var extent = Math.abs(range[1] - range[0]);
-  var bars = data.length + 2;
-  var barRatio = props.barRatio || 0.5;
-  var defaultWidth = barRatio * (data.length < 2 ? DEFAULT_BAR_WIDTH : extent / bars);
+  const range = scale.x.range();
+  const extent = Math.abs(range[1] - range[0]);
+  const bars = data.length + 2;
+  const barRatio = props.barRatio || 0.5;
+  const defaultWidth = barRatio * (data.length < 2 ? DEFAULT_BAR_WIDTH : extent / bars);
   return Math.max(1, defaultWidth);
 };
-
-var getCornerRadiusFromObject = function (cornerRadius, props) {
-  var realCornerRadius = {
+const getCornerRadiusFromObject = (cornerRadius, props) => {
+  const realCornerRadius = {
     topLeft: 0,
     topRight: 0,
     bottomLeft: 0,
     bottomRight: 0
   };
-
-  var updateCornerRadius = function (corner, fallback) {
+  const updateCornerRadius = (corner, fallback) => {
     if (!Helpers.isNil(cornerRadius[corner])) {
       realCornerRadius[corner] = Helpers.evaluateProp(cornerRadius[corner], props);
     } else if (!Helpers.isNil(cornerRadius[fallback])) {
       realCornerRadius[corner] = Helpers.evaluateProp(cornerRadius[fallback], props);
     }
   };
-
   updateCornerRadius("topLeft", "top");
   updateCornerRadius("topRight", "top");
   updateCornerRadius("bottomLeft", "bottom");
   updateCornerRadius("bottomRight", "bottom");
   return realCornerRadius;
 };
-
 function isCornerRadiusObject(cornerRadius) {
   return _isPlainObject(cornerRadius);
 }
-
-export var getCornerRadius = function (cornerRadius, props) {
-  var realCornerRadius = {
+export const getCornerRadius = (cornerRadius, props) => {
+  const realCornerRadius = {
     topLeft: 0,
     topRight: 0,
     bottomLeft: 0,
     bottomRight: 0
   };
-
   if (!cornerRadius) {
     return realCornerRadius;
   }
-
   if (isCornerRadiusObject(cornerRadius)) {
     return getCornerRadiusFromObject(cornerRadius, props);
   }
-
   realCornerRadius.topLeft = Helpers.evaluateProp(cornerRadius, props);
   realCornerRadius.topRight = Helpers.evaluateProp(cornerRadius, props);
   return realCornerRadius;
 };
-export var getStyle = function () {
-  var style = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var props = arguments.length > 1 ? arguments[1] : undefined;
-
+export const getStyle = function (style, props) {
+  if (style === void 0) {
+    style = {};
+  }
   if (props.disableInlineStyles) {
     return {};
   }
-
-  var stroke = style.fill || "black";
-  var baseStyle = {
+  const stroke = style.fill || "black";
+  const baseStyle = {
     fill: "black",
-    stroke: stroke
+    stroke
   };
   return Helpers.evaluateStyle(Object.assign(baseStyle, style), props);
 };

package/es/bar.js

@@ -1,15 +1,8 @@
-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; }
-
 import React, { forwardRef } from "react";
 import { Helpers, Path } from "victory-core";
 import { getStyle, getBarWidth, getCornerRadius } from "./bar-helper-methods";
 import { getPolarBarPath, getBarPath } from "./path-helper-methods";
-
-var evaluateProps = function (props) {
+const evaluateProps = props => {
   /**
    * Potential evaluated props of following must be evaluated in this order:
    * 1) `style`
@@ -22,52 +15,56 @@ var evaluateProps = function (props) {
    * `id`
    * `tabIndex`
    */
-  var style = getStyle(props.style, props);
-  var barWidth = getBarWidth(props.barWidth, Object.assign({}, props, {
-    style: style
+  const style = getStyle(props.style, props);
+  const barWidth = getBarWidth(props.barWidth, Object.assign({}, props, {
+    style
   }));
-  var cornerRadius = getCornerRadius(props.cornerRadius, Object.assign({}, props, {
-    style: style,
-    barWidth: barWidth
+  const cornerRadius = getCornerRadius(props.cornerRadius, Object.assign({}, props, {
+    style,
+    barWidth
   }));
-  var ariaLabel = Helpers.evaluateProp(props.ariaLabel, props);
-  var desc = Helpers.evaluateProp(props.desc, props);
-  var id = Helpers.evaluateProp(props.id, props);
-  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  const ariaLabel = Helpers.evaluateProp(props.ariaLabel, props);
+  const desc = Helpers.evaluateProp(props.desc, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
   return Object.assign({}, props, {
-    ariaLabel: ariaLabel,
-    style: style,
-    barWidth: barWidth,
-    cornerRadius: cornerRadius,
-    desc: desc,
-    id: id,
-    tabIndex: tabIndex
+    ariaLabel,
+    style,
+    barWidth,
+    cornerRadius,
+    desc,
+    id,
+    tabIndex
   });
 };
-
-var defaultProps = {
+const defaultProps = {
   pathComponent: /*#__PURE__*/React.createElement(Path, null),
   role: "presentation",
   shapeRendering: "auto"
-}; // eslint-disable-next-line prefer-arrow-callback
-
-export var Bar = /*#__PURE__*/forwardRef(function Bar(initialProps, ref) {
-  var props = evaluateProps(_objectSpread(_objectSpread({}, defaultProps), initialProps));
-  var polar = props.polar,
-      origin = props.origin,
-      style = props.style,
-      barWidth = props.barWidth,
-      cornerRadius = props.cornerRadius;
-  var path = polar ? getPolarBarPath(props, cornerRadius) : getBarPath(props, barWidth, cornerRadius);
-  var defaultTransform = polar && origin ? "translate(".concat(origin.x, ", ").concat(origin.y, ")") : undefined;
+};
 
+// eslint-disable-next-line prefer-arrow-callback
+export const Bar = /*#__PURE__*/forwardRef(function Bar(initialProps, ref) {
+  const props = evaluateProps({
+    ...defaultProps,
+    ...initialProps
+  });
+  const {
+    polar,
+    origin,
+    style,
+    barWidth,
+    cornerRadius
+  } = props;
+  const path = polar ? getPolarBarPath(props, cornerRadius) : getBarPath(props, barWidth, cornerRadius);
+  const defaultTransform = polar && origin ? `translate(${origin.x}, ${origin.y})` : undefined;
   if (!props.pathComponent) {
     return null;
   }
-
-  return /*#__PURE__*/React.cloneElement(props.pathComponent, _objectSpread(_objectSpread({}, props.events), {}, {
+  return /*#__PURE__*/React.cloneElement(props.pathComponent, {
+    ...props.events,
     "aria-label": props.ariaLabel,
-    style: style,
+    style,
     d: path,
     className: props.className,
     clipPath: props.clipPath,
@@ -77,6 +74,6 @@ export var Bar = /*#__PURE__*/forwardRef(function Bar(initialProps, ref) {
     shapeRendering: props.shapeRendering,
     transform: props.transform || defaultTransform,
     tabIndex: props.tabIndex,
-    ref: ref
-  }));
+    ref
+  });
 });

package/es/geometry-helper-methods.js

@@ -1,108 +1,101 @@
 /**
  * A point in the 2d plane
  */
-export var point = function (x, y) {
-  return {
-    x: x,
-    y: y,
-    distance: function (p1) {
-      return Math.sqrt(Math.pow(this.x - p1.x, 2) + Math.pow(this.y - p1.y, 2));
-    },
-    // vector addition in 2d plane
-    add: function (p1) {
-      return point(this.x + p1.x, this.y + p1.y);
-    },
-    // vector subtraction in 2d
-    // returns p0 - p1
-    subtract: function (p1) {
-      return point(this.x - p1.x, this.y - p1.y);
-    },
-    // multiply a 2d point by a scalar
-    scalarMult: function (n) {
-      return point(this.x * n, this.y * n);
-    },
-    scalarDivide: function (n) {
-      if (n === 0) {
-        throw new Error("Division by 0 error");
-      }
-
-      return point(this.x / n, this.y / n);
-    },
-    equals: function (p1) {
-      return this.x === p1.x && this.y === p1.y;
+export const point = (x, y) => ({
+  x,
+  y,
+  distance(p1) {
+    return Math.sqrt(Math.pow(this.x - p1.x, 2) + Math.pow(this.y - p1.y, 2));
+  },
+  // vector addition in 2d plane
+  add(p1) {
+    return point(this.x + p1.x, this.y + p1.y);
+  },
+  // vector subtraction in 2d
+  // returns p0 - p1
+  subtract(p1) {
+    return point(this.x - p1.x, this.y - p1.y);
+  },
+  // multiply a 2d point by a scalar
+  scalarMult(n) {
+    return point(this.x * n, this.y * n);
+  },
+  scalarDivide(n) {
+    if (n === 0) {
+      throw new Error("Division by 0 error");
     }
-  };
-};
-
+    return point(this.x / n, this.y / n);
+  },
+  equals(p1) {
+    return this.x === p1.x && this.y === p1.y;
+  }
+});
 /**
  * A circle in the 2d plane
  */
-export var circle = function (center, radius) {
-  return {
-    center: center,
-    radius: radius,
-    hasIntersection: function (circle1) {
-      var P0 = this.center;
-      var P1 = circle1.center;
-      var r0 = this.radius;
-      var r1 = circle1.radius;
-      var d = P0.distance(P1);
-
-      if (d > r0 + r1) {
-        return false; // separate circles
-      }
-
-      if (d < Math.abs(r0 - r1)) {
-        return false; // one circle contains another
-      }
-
-      return true;
-    },
-    equals: function (circle1) {
-      var P0 = this.center;
-      var P1 = circle1.center;
-      var r0 = this.radius;
-      var r1 = circle1.radius;
-      return r0 === r1 && P0.equals(P1);
-    },
-    // Source: http://paulbourke.net/geometry/circlesphere/
-    // "Intersection of two circles" by Paul Bourke
-    // Left-most point is returned as 0th element of array
-    // Right-most point is returned as 1st elemennt of array
-    intersection: function (circle1) {
-      // eslint-disable-line max-statements
-      var P0 = this.center;
-      var P1 = circle1.center;
-      var r0 = this.radius;
-      var r1 = circle1.radius;
-      var d = P0.distance(P1);
-
-      if (!this.hasIntersection(circle1) || this.equals(circle1)) {
-        return [];
-      }
-
-      var a = (Math.pow(r0, 2) - Math.pow(r1, 2) + Math.pow(d, 2)) / (2 * d);
-      var h = Math.sqrt(Math.pow(r0, 2) - Math.pow(a, 2));
-      var P2 = P0.add(P1.subtract(P0).scalarMult(a).scalarDivide(d));
-      var x0 = P0.x,
-          y0 = P0.y;
-      var x1 = P1.x,
-          y1 = P1.y;
-      var x2 = P2.x,
-          y2 = P2.y;
-      var P3s = [point(x2 - h * (y1 - y0) / d, y2 + h * (x1 - x0) / d), point(x2 + h * (y1 - y0) / d, y2 - h * (x1 - x0) / d)];
-      P3s.sort(function (Point1, Point2) {
-        return Point1.x - Point2.x;
-      });
-      return P3s;
-    },
-    solveX: function (y) {
-      var sqrt = Math.sqrt(Math.pow(this.radius, 2) - Math.pow(y - this.center.y, 2));
-      return [this.center.x - sqrt, this.center.x + sqrt];
-    },
-    solveY: function (x) {
-      var sqrt = Math.sqrt(Math.pow(this.radius, 2) - Math.pow(x - this.center.x, 2));
-      return [this.center.y - sqrt, this.center.y + sqrt];
+export const circle = (center, radius) => ({
+  center,
+  radius,
+  hasIntersection(circle1) {
+    const P0 = this.center;
+    const P1 = circle1.center;
+    const r0 = this.radius;
+    const r1 = circle1.radius;
+    const d = P0.distance(P1);
+    if (d > r0 + r1) {
+      return false; // separate circles
     }
-  };
-};
+    if (d < Math.abs(r0 - r1)) {
+      return false; // one circle contains another
+    }
+    return true;
+  },
+  equals(circle1) {
+    const P0 = this.center;
+    const P1 = circle1.center;
+    const r0 = this.radius;
+    const r1 = circle1.radius;
+    return r0 === r1 && P0.equals(P1);
+  },
+  // Source: http://paulbourke.net/geometry/circlesphere/
+  // "Intersection of two circles" by Paul Bourke
+  // Left-most point is returned as 0th element of array
+  // Right-most point is returned as 1st elemennt of array
+  intersection(circle1) {
+    // eslint-disable-line max-statements
+    const P0 = this.center;
+    const P1 = circle1.center;
+    const r0 = this.radius;
+    const r1 = circle1.radius;
+    const d = P0.distance(P1);
+    if (!this.hasIntersection(circle1) || this.equals(circle1)) {
+      return [];
+    }
+    const a = (Math.pow(r0, 2) - Math.pow(r1, 2) + Math.pow(d, 2)) / (2 * d);
+    const h = Math.sqrt(Math.pow(r0, 2) - Math.pow(a, 2));
+    const P2 = P0.add(P1.subtract(P0).scalarMult(a).scalarDivide(d));
+    const {
+      x: x0,
+      y: y0
+    } = P0;
+    const {
+      x: x1,
+      y: y1
+    } = P1;
+    const {
+      x: x2,
+      y: y2
+    } = P2;
+    const P3s = [point(x2 - h * (y1 - y0) / d, y2 + h * (x1 - x0) / d), point(x2 + h * (y1 - y0) / d, y2 - h * (x1 - x0) / d)];
+    P3s.sort((Point1, Point2) => Point1.x - Point2.x);
+    return P3s;
+  },
+  solveX(y) {
+    const sqrt = Math.sqrt(Math.pow(this.radius, 2) - Math.pow(y - this.center.y, 2));
+    return [this.center.x - sqrt, this.center.x + sqrt];
+  },
+  solveY(x) {
+    const sqrt = Math.sqrt(Math.pow(this.radius, 2) - Math.pow(x - this.center.x, 2));
+    return [this.center.y - sqrt, this.center.y + sqrt];
+  }
+});

package/es/helper-methods.js

@@ -1,140 +1,134 @@
 import { Collection, Data, Domain, Helpers, LabelHelpers, Scale } from "victory-core";
-export var getBarPosition = function (props, datum) {
-  var getDefaultMin = function (axis) {
-    var defaultZero = Scale.getType(props.scale[axis]) === "log" ? 1 / Number.MAX_SAFE_INTEGER : 0;
-    var defaultMin = defaultZero;
-    var minY = Collection.getMinValue(props.domain[axis]);
-    var maxY = Collection.getMaxValue(props.domain[axis]);
-
+export const getBarPosition = (props, datum) => {
+  const getDefaultMin = axis => {
+    const defaultZero = Scale.getType(props.scale[axis]) === "log" ? 1 / Number.MAX_SAFE_INTEGER : 0;
+    let defaultMin = defaultZero;
+    const minY = Collection.getMinValue(props.domain[axis]);
+    const maxY = Collection.getMaxValue(props.domain[axis]);
     if (minY < 0 && maxY <= 0) {
       defaultMin = maxY;
     } else if (minY >= 0 && maxY > 0) {
       defaultMin = minY;
     }
-
-    return datum["_".concat(axis)] instanceof Date ? new Date(defaultMin) : defaultMin;
+    return datum[`_${axis}`] instanceof Date ? new Date(defaultMin) : defaultMin;
   };
-
-  var _y0 = datum._y0 !== undefined ? datum._y0 : getDefaultMin("y");
-
-  var _x0 = datum._x0 !== undefined ? datum._x0 : getDefaultMin("x");
-
+  const _y0 = datum._y0 !== undefined ? datum._y0 : getDefaultMin("y");
+  const _x0 = datum._x0 !== undefined ? datum._x0 : getDefaultMin("x");
   return Helpers.scalePoint(props, Object.assign({}, datum, {
-    _y0: _y0,
-    _x0: _x0
+    _y0,
+    _x0
   }));
 };
-
-var getCalculatedValues = function (props) {
-  var polar = props.polar;
-  var defaultStyles = Helpers.getDefaultStyles(props, "bar");
-  var style = !props.disableInlineStyles ? Helpers.getStyles(props.style, defaultStyles) : {};
-  var range = props.range || {
+const getCalculatedValues = props => {
+  const {
+    polar
+  } = props;
+  const defaultStyles = Helpers.getDefaultStyles(props, "bar");
+  const style = !props.disableInlineStyles ? Helpers.getStyles(props.style, defaultStyles) : {};
+  const range = props.range || {
     x: Helpers.getRange(props, "x"),
     y: Helpers.getRange(props, "y")
   };
-  var domain = {
+  const domain = {
     x: Domain.getDomainWithZero(props, "x"),
     y: Domain.getDomainWithZero(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 = polar ? props.origin || Helpers.getPolarOrigin(props) : undefined;
-  var data = Data.getData(props);
+  const origin = polar ? props.origin || Helpers.getPolarOrigin(props) : undefined;
+  let data = Data.getData(props);
   data = Data.formatDataFromDomain(data, domain, 0);
   return {
-    style: style,
-    data: data,
-    scale: scale,
-    domain: domain,
-    origin: origin
+    style,
+    data,
+    scale,
+    domain,
+    origin
   };
 };
-
-export var getBaseProps = function (initialProps, fallbackProps) {
-  var modifiedProps = Helpers.modifyProps(initialProps, fallbackProps, "bar");
-  var props = Object.assign({}, modifiedProps, getCalculatedValues(modifiedProps));
-  var alignment = props.alignment,
-      barRatio = props.barRatio,
-      cornerRadius = props.cornerRadius,
-      data = props.data,
-      disableInlineStyles = props.disableInlineStyles,
-      domain = props.domain,
-      events = props.events,
-      height = props.height,
-      horizontal = props.horizontal,
-      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,
-      labels = props.labels,
-      name = props.name,
-      barWidth = props.barWidth,
-      getPath = props.getPath;
-  var initialChildProps = {
+export const getBaseProps = (initialProps, fallbackProps) => {
+  const modifiedProps = Helpers.modifyProps(initialProps, fallbackProps, "bar");
+  const props = Object.assign({}, modifiedProps, getCalculatedValues(modifiedProps));
+  const {
+    alignment,
+    barRatio,
+    cornerRadius,
+    data,
+    disableInlineStyles,
+    domain,
+    events,
+    height,
+    horizontal,
+    origin,
+    padding,
+    polar,
+    scale,
+    sharedEvents,
+    standalone,
+    style,
+    theme,
+    width,
+    labels,
+    name,
+    barWidth,
+    getPath
+  } = props;
+  const initialChildProps = {
     parent: {
-      horizontal: horizontal,
-      domain: domain,
-      scale: scale,
-      width: width,
-      height: height,
-      data: data,
-      standalone: standalone,
-      name: name,
-      theme: theme,
-      polar: polar,
-      origin: origin,
-      padding: padding,
+      horizontal,
+      domain,
+      scale,
+      width,
+      height,
+      data,
+      standalone,
+      name,
+      theme,
+      polar,
+      origin,
+      padding,
       style: style.parent
     }
   };
-  return data.reduce(function (childProps, datum, index) {
-    var eventKey = !Helpers.isNil(datum.eventKey) ? datum.eventKey : index;
-
-    var _getBarPosition = getBarPosition(props, datum),
-        x = _getBarPosition.x,
-        y = _getBarPosition.y,
-        y0 = _getBarPosition.y0,
-        x0 = _getBarPosition.x0;
-
-    var dataProps = {
-      alignment: alignment,
-      barRatio: barRatio,
-      barWidth: barWidth,
-      cornerRadius: cornerRadius,
-      data: data,
-      datum: datum,
-      disableInlineStyles: disableInlineStyles,
-      getPath: getPath,
-      horizontal: horizontal,
-      index: index,
-      polar: polar,
-      origin: origin,
-      scale: scale,
+  return data.reduce((childProps, datum, index) => {
+    const eventKey = !Helpers.isNil(datum.eventKey) ? datum.eventKey : index;
+    const {
+      x,
+      y,
+      y0,
+      x0
+    } = getBarPosition(props, datum);
+    const dataProps = {
+      alignment,
+      barRatio,
+      barWidth,
+      cornerRadius,
+      data,
+      datum,
+      disableInlineStyles,
+      getPath,
+      horizontal,
+      index,
+      polar,
+      origin,
+      scale,
       style: style.data,
-      width: width,
-      height: height,
-      x: x,
-      y: y,
-      y0: y0,
-      x0: x0
+      width,
+      height,
+      x,
+      y,
+      y0,
+      x0
     };
     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 = LabelHelpers.getProps(props, index);
     }
-
     return childProps;
   }, initialChildProps);
 };