victory-bar 36.9.2 → 37.0.0

package/lib/geometry-helper-methods.js

@@ -4,116 +4,106 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.point = exports.circle = void 0;
-
 /**
  * A point in the 2d plane
  */
-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;
+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;
+  }
+});
 exports.point = point;
-
 /**
  * A circle in the 2d plane
  */
-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];
+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];
+  }
+});
 exports.circle = circle;

package/lib/helper-methods.js

@@ -4,157 +4,139 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBaseProps = exports.getBarPosition = void 0;
-
 var _victoryCore = require("victory-core");
-
-var getBarPosition = function (props, datum) {
-  var getDefaultMin = function (axis) {
-    var defaultZero = _victoryCore.Scale.getType(props.scale[axis]) === "log" ? 1 / Number.MAX_SAFE_INTEGER : 0;
-    var defaultMin = defaultZero;
-
-    var minY = _victoryCore.Collection.getMinValue(props.domain[axis]);
-
-    var maxY = _victoryCore.Collection.getMaxValue(props.domain[axis]);
-
+const getBarPosition = (props, datum) => {
+  const getDefaultMin = axis => {
+    const defaultZero = _victoryCore.Scale.getType(props.scale[axis]) === "log" ? 1 / Number.MAX_SAFE_INTEGER : 0;
+    let defaultMin = defaultZero;
+    const minY = _victoryCore.Collection.getMinValue(props.domain[axis]);
+    const maxY = _victoryCore.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 _victoryCore.Helpers.scalePoint(props, Object.assign({}, datum, {
-    _y0: _y0,
-    _x0: _x0
+    _y0,
+    _x0
   }));
 };
-
 exports.getBarPosition = getBarPosition;
-
-var getCalculatedValues = function (props) {
-  var polar = props.polar;
-
-  var defaultStyles = _victoryCore.Helpers.getDefaultStyles(props, "bar");
-
-  var style = !props.disableInlineStyles ? _victoryCore.Helpers.getStyles(props.style, defaultStyles) : {};
-  var range = props.range || {
+const getCalculatedValues = props => {
+  const {
+    polar
+  } = props;
+  const defaultStyles = _victoryCore.Helpers.getDefaultStyles(props, "bar");
+  const style = !props.disableInlineStyles ? _victoryCore.Helpers.getStyles(props.style, defaultStyles) : {};
+  const range = props.range || {
     x: _victoryCore.Helpers.getRange(props, "x"),
     y: _victoryCore.Helpers.getRange(props, "y")
   };
-  var domain = {
+  const domain = {
     x: _victoryCore.Domain.getDomainWithZero(props, "x"),
     y: _victoryCore.Domain.getDomainWithZero(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 = polar ? props.origin || _victoryCore.Helpers.getPolarOrigin(props) : undefined;
-
-  var data = _victoryCore.Data.getData(props);
-
+  const origin = polar ? props.origin || _victoryCore.Helpers.getPolarOrigin(props) : undefined;
+  let data = _victoryCore.Data.getData(props);
   data = _victoryCore.Data.formatDataFromDomain(data, domain, 0);
   return {
-    style: style,
-    data: data,
-    scale: scale,
-    domain: domain,
-    origin: origin
+    style,
+    data,
+    scale,
+    domain,
+    origin
   };
 };
-
-var getBaseProps = function (initialProps, fallbackProps) {
-  var modifiedProps = _victoryCore.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 = {
+const getBaseProps = (initialProps, fallbackProps) => {
+  const modifiedProps = _victoryCore.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 = !_victoryCore.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 = !_victoryCore.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 = _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 = _victoryCore.LabelHelpers.getProps(props, index);
     }
-
     return childProps;
   }, initialChildProps);
 };
-
 exports.getBaseProps = getBaseProps;

package/lib/index.js

@@ -75,9 +75,7 @@ Object.defineProperty(exports, "getVerticalPolarBarPath", {
     return _pathHelperMethods.getVerticalPolarBarPath;
   }
 });
-
 var _victoryBar = require("./victory-bar");
-
 Object.keys(_victoryBar).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -89,9 +87,7 @@ Object.keys(_victoryBar).forEach(function (key) {
     }
   });
 });
-
 var _bar = require("./bar");
-
 Object.keys(_bar).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -103,9 +99,6 @@ Object.keys(_bar).forEach(function (key) {
     }
   });
 });
-
 var _helperMethods = require("./helper-methods");
-
 var _pathHelperMethods = require("./path-helper-methods");
-
 var _barHelperMethods = require("./bar-helper-methods");