victory-core 30.6.1 → 31.2.0

package/src/victory-label/victory-label.js

@@ -20,32 +20,18 @@ const defaultStyles = {
 export default class VictoryLabel extends React.Component {
   static displayName = "VictoryLabel";
   static role = "label";
+  static defaultStyles = defaultStyles;
   static propTypes = {
     active: PropTypes.bool,
-    angle: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.number
-    ]),
-    capHeight: PropTypes.oneOfType([
-      PropTypes.string,
-      CustomPropTypes.nonNegative,
-      PropTypes.func
-    ]),
+    angle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    capHeight: PropTypes.oneOfType([PropTypes.string, CustomPropTypes.nonNegative, PropTypes.func]),
     className: PropTypes.string,
     data: PropTypes.array,
     datum: PropTypes.any,
     desc: PropTypes.string,
     direction: PropTypes.oneOf(["rtl", "ltr", "inherit"]),
-    dx: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    dy: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string,
-      PropTypes.func
-    ]),
+    dx: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.func]),
+    dy: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.func]),
     events: PropTypes.object,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     index: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -57,14 +43,17 @@ export default class VictoryLabel extends React.Component {
       PropTypes.func,
       PropTypes.array
     ]),
-    origin: PropTypes.shape({ x: CustomPropTypes.nonNegative, y: CustomPropTypes.nonNegative }),
+    origin: PropTypes.shape({
+      x: CustomPropTypes.nonNegative,
+      y: CustomPropTypes.nonNegative
+    }),
     polar: PropTypes.bool,
     renderInPortal: PropTypes.bool,
-    scale: PropTypes.shape({ x: CustomPropTypes.scale, y: CustomPropTypes.scale }),
-    style: PropTypes.oneOfType([
-      PropTypes.object,
-      PropTypes.array
-    ]),
+    scale: PropTypes.shape({
+      x: CustomPropTypes.scale,
+      y: CustomPropTypes.scale
+    }),
+    style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
     text: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.number,
@@ -72,52 +61,32 @@ export default class VictoryLabel extends React.Component {
       PropTypes.array
     ]),
     textAnchor: PropTypes.oneOfType([
-      PropTypes.oneOf([
-        "start",
-        "middle",
-        "end",
-        "inherit"
-      ]),
+      PropTypes.oneOf(["start", "middle", "end", "inherit"]),
       PropTypes.func
     ]),
     textComponent: PropTypes.element,
     title: PropTypes.string,
-    transform: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object,
-      PropTypes.func
-    ]),
+    transform: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.func]),
     tspanComponent: PropTypes.element,
     verticalAnchor: PropTypes.oneOfType([
-      PropTypes.oneOf([
-        "start",
-        "middle",
-        "end"
-      ]),
+      PropTypes.oneOf(["start", "middle", "end"]),
       PropTypes.func
     ]),
-    x: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string
-    ]),
-    y: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string
-    ])
+    x: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    y: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
   };
 
   static defaultProps = {
     direction: "inherit",
-    textComponent: <Text/>,
-    tspanComponent: <TSpan/>,
+    textComponent: <Text />,
+    tspanComponent: <TSpan />,
     capHeight: 0.71, // Magic number from d3.
     lineHeight: 1
   };
 
   constructor(props) {
     super(props);
-    this.id = props.id === undefined ?
-      uniqueId("label-") : props.id;
+    this.id = props.id === undefined ? uniqueId("label-") : props.id;
   }
 
   getPosition(props, dimension) {
@@ -136,8 +105,9 @@ export default class VictoryLabel extends React.Component {
   }
 
   getStyles(props) {
-    return Array.isArray(props.style) && !isEmpty(props.style) ?
-      props.style.map((style) => this.getStyle(props, style)) : [this.getStyle(props, props.style)];
+    return Array.isArray(props.style) && !isEmpty(props.style)
+      ? props.style.map((style) => this.getStyle(props, style))
+      : [this.getStyle(props, props.style)];
   }
 
   getHeight(props, type) {
@@ -160,7 +130,8 @@ export default class VictoryLabel extends React.Component {
     return `${child}`.split("\n");
   }
 
-  getDy(props, style, content, lineHeight) { //eslint-disable-line max-params
+  //eslint-disable-next-line max-params
+  getDy(props, style, content, lineHeight) {
     style = Array.isArray(style) ? style[0] : style;
     lineHeight = this.checkLineHeight(lineHeight, lineHeight[0], 1);
     const fontSize = style.fontSize;
@@ -169,15 +140,14 @@ export default class VictoryLabel extends React.Component {
     const length = content.length;
     const capHeight = this.getHeight(props, "capHeight");
     const verticalAnchor = style.verticalAnchor || props.verticalAnchor;
-    const anchor = verticalAnchor ?
-      Helpers.evaluateProp(verticalAnchor, datum) : "middle";
+    const anchor = verticalAnchor ? Helpers.evaluateProp(verticalAnchor, datum) : "middle";
     switch (anchor) {
-    case "end":
-      return dy + (capHeight / 2 + (0.5 - length) * lineHeight) * fontSize;
-    case "middle":
-      return dy + (capHeight / 2 + (0.5 - length / 2) * lineHeight) * fontSize;
-    default:
-      return dy + (capHeight / 2 + lineHeight / 2) * fontSize;
+      case "end":
+        return dy + (capHeight / 2 + (0.5 - length) * lineHeight) * fontSize;
+      case "middle":
+        return dy + (capHeight / 2 + (0.5 - length / 2) * lineHeight) * fontSize;
+      default:
+        return dy + (capHeight / 2 + lineHeight / 2) * fontSize;
     }
   }
 
@@ -196,8 +166,7 @@ export default class VictoryLabel extends React.Component {
     const transform = props.transform || style.transform;
     const transformPart = transform && Helpers.evaluateProp(transform, datum, active);
     const rotatePart = angle && { rotate: [angle, x, y] };
-    return transformPart || angle ?
-      Style.toTransformString(transformPart, rotatePart) : undefined;
+    return transformPart || angle ? Style.toTransformString(transformPart, rotatePart) : undefined;
   }
 
   getFontSize(style) {
@@ -222,8 +191,9 @@ export default class VictoryLabel extends React.Component {
     const { datum, active, inline, className, title, desc, events, direction } = props;
     const style = this.getStyles(props);
     const lineHeight = this.getHeight(props, "lineHeight");
-    const textAnchor = props.textAnchor ?
-      Helpers.evaluateProp(props.textAnchor, datum, active) : "start";
+    const textAnchor = props.textAnchor
+      ? Helpers.evaluateProp(props.textAnchor, datum, active)
+      : "start";
     const dx = props.dx ? Helpers.evaluateProp(props.dx, datum, active) : 0;
     const dy = this.getDy(props, style, content, lineHeight);
     const transform = this.getTransform(props, style);
@@ -235,13 +205,15 @@ export default class VictoryLabel extends React.Component {
       const lastStyle = style[i - 1] || style[0];
       const fontSize = (currentStyle.fontSize + lastStyle.fontSize) / 2;
       const currentLineHeight = this.checkLineHeight(
-        lineHeight, ((lineHeight[i] + (lineHeight[i - 1] || lineHeight[0])) / 2), 1
+        lineHeight,
+        (lineHeight[i] + (lineHeight[i - 1] || lineHeight[0])) / 2,
+        1
       );
       const tspanProps = {
         key: `${this.id}-key-${i}`,
         x: !inline ? props.x : undefined,
         dx,
-        dy: i && !inline ? (currentLineHeight * fontSize) : undefined,
+        dy: i && !inline ? currentLineHeight * fontSize : undefined,
         textAnchor: currentStyle.textAnchor || textAnchor,
         style: currentStyle,
         content: line
@@ -250,7 +222,19 @@ export default class VictoryLabel extends React.Component {
     });
     return React.cloneElement(
       props.textComponent,
-      { direction, dx, dy, x, y, events, transform, className, title, desc, id: this.id },
+      {
+        direction,
+        dx,
+        dy,
+        x,
+        y,
+        events,
+        transform,
+        className,
+        title,
+        desc,
+        id: this.id
+      },
       textChildren
     );
   }

package/src/victory-portal/portal.js

@@ -11,7 +11,7 @@ export default class Portal extends React.Component {
     style: PropTypes.object,
     viewBox: PropTypes.string,
     width: CustomPropTypes.nonNegative
-  }
+  };
 
   constructor(props) {
     super(props);

package/src/victory-portal/victory-portal.js

@@ -15,7 +15,7 @@ export default class VictoryPortal extends React.Component {
   };
 
   static defaultProps = {
-    groupComponent: <g/>
+    groupComponent: <g />
   };
 
   static contextTypes = {
@@ -27,7 +27,8 @@ export default class VictoryPortal extends React.Component {
   componentDidMount() {
     if (!this.checkedContext) {
       if (typeof this.context.portalUpdate !== "function") {
-        const msg = "`renderInPortal` is not supported outside of `VictoryContainer`. " +
+        const msg =
+          "`renderInPortal` is not supported outside of `VictoryContainer`. " +
           "Component will be rendered in place";
         Log.warn(msg);
         this.renderInPlace = true;
@@ -60,16 +61,18 @@ export default class VictoryPortal extends React.Component {
   }
 
   render() {
-    const children = Array.isArray(this.props.children) ?
-      this.props.children[0] : this.props.children;
+    const children = Array.isArray(this.props.children)
+      ? this.props.children[0]
+      : this.props.children;
     const { groupComponent } = this.props;
-    const childProps = children && children.props || {};
+    const childProps = (children && children.props) || {};
     const standardProps = childProps.groupComponent ? { groupComponent, standalone: false } : {};
     const newProps = defaults(
-      standardProps, childProps, Helpers.omit(this.props, ["children", "groupComponent"])
+      standardProps,
+      childProps,
+      Helpers.omit(this.props, ["children", "groupComponent"])
     );
     const child = children && React.cloneElement(children, newProps);
     return this.renderPortal(child);
   }
 }
-

package/src/victory-primitives/arc.js

@@ -20,7 +20,7 @@ export default class Arc extends React.Component {
   };
 
   static defaultProps = {
-    pathComponent: <Path/>
+    pathComponent: <Path />
   };
 
   getStyle(props) {
@@ -31,7 +31,7 @@ export default class Arc extends React.Component {
   getArcPath(props) {
     const { cx, cy, r, startAngle, endAngle, closedPath } = props;
     // Always draw the path as two arcs so that complete circles may be rendered.
-    const halfAngle = (Math.abs(endAngle - startAngle) / 2) + startAngle;
+    const halfAngle = Math.abs(endAngle - startAngle) / 2 + startAngle;
     const x1 = cx + r * Math.cos(Helpers.degreesToRadians(startAngle));
     const y1 = cy - r * Math.sin(Helpers.degreesToRadians(startAngle));
     const x2 = cx + r * Math.cos(Helpers.degreesToRadians(halfAngle));
@@ -49,12 +49,23 @@ export default class Arc extends React.Component {
 
   render() {
     const {
-      role, shapeRendering, className, events, pathComponent, transform, clipPath
+      role,
+      shapeRendering,
+      className,
+      events,
+      pathComponent,
+      transform,
+      clipPath
     } = this.props;
     return React.cloneElement(pathComponent, {
       d: this.getArcPath(this.props),
       style: this.getStyle(this.props),
-      className, role, shapeRendering, events, transform, clipPath
+      className,
+      role,
+      shapeRendering,
+      events,
+      transform,
+      clipPath
     });
   }
 }

package/src/victory-primitives/border.js

@@ -16,17 +16,38 @@ export default class Border extends React.Component {
   };
 
   static defaultProps = {
-    rectComponent: <Rect/>
+    rectComponent: <Rect />
   };
 
   render() {
     const {
-       x, y, width, height, events, datum, active, role, clipPath,
-       className, shapeRendering, rectComponent, transform
-      } = this.props;
+      x,
+      y,
+      width,
+      height,
+      events,
+      datum,
+      active,
+      role,
+      clipPath,
+      className,
+      shapeRendering,
+      rectComponent,
+      transform
+    } = this.props;
     const style = Helpers.evaluateStyle(assign({ fill: "none" }, this.props.style), datum, active);
     return React.cloneElement(rectComponent, {
-      style, className, x, y, width, height, events, role, shapeRendering, transform, clipPath
+      style,
+      className,
+      x,
+      y,
+      width,
+      height,
+      events,
+      role,
+      shapeRendering,
+      transform,
+      clipPath
     });
   }
 }

package/src/victory-primitives/circle.js

@@ -22,11 +22,22 @@ export default class Circle extends React.Component {
 
   render() {
     const {
-      cx, cy, r, events, className, style, role, shapeRendering, transform, clipPath
-     } = this.props;
+      cx,
+      cy,
+      r,
+      events,
+      className,
+      style,
+      role,
+      shapeRendering,
+      transform,
+      clipPath
+    } = this.props;
     return (
       <circle
-        cx={cx} cy={cy} r={r}
+        cx={cx}
+        cy={cy}
+        r={r}
         className={className}
         clipPath={clipPath}
         transform={transform}

package/src/victory-primitives/clip-path.js

@@ -3,10 +3,7 @@ import PropTypes from "prop-types";
 
 export default class ClipPath extends React.Component {
   static propTypes = {
-    children: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.node),
-      PropTypes.node
-    ]),
+    children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
     clipId: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
   };
 
@@ -14,9 +11,7 @@ export default class ClipPath extends React.Component {
     const { children, clipId } = this.props;
     return (
       <defs>
-        <clipPath id={clipId}>
-          {children}
-        </clipPath>
+        <clipPath id={clipId}>{children}</clipPath>
       </defs>
     );
   }

package/src/victory-primitives/line-segment.js

@@ -17,19 +17,42 @@ export default class LineSegment extends React.Component {
   };
 
   static defaultProps = {
-    lineComponent: <Line/>
+    lineComponent: <Line />
   };
 
   render() {
     const {
-      x1, x2, y1, y2, events, datum, active, lineComponent, className, role, shapeRendering,
-      transform, clipPath
+      x1,
+      x2,
+      y1,
+      y2,
+      events,
+      datum,
+      active,
+      lineComponent,
+      className,
+      role,
+      shapeRendering,
+      transform,
+      clipPath
     } = this.props;
     const style = Helpers.evaluateStyle(
-      assign({ stroke: "black" }, this.props.style), datum, active
+      assign({ stroke: "black" }, this.props.style),
+      datum,
+      active
     );
     return React.cloneElement(lineComponent, {
-      style, className, role, shapeRendering, events, x1, x2, y1, y2, transform, clipPath
+      style,
+      className,
+      role,
+      shapeRendering,
+      events,
+      x1,
+      x2,
+      y1,
+      y2,
+      transform,
+      clipPath
     });
   }
 }

package/src/victory-primitives/line.js

@@ -23,11 +23,24 @@ export default class Line extends React.Component {
 
   render() {
     const {
-      x1, x2, y1, y2, events, className, clipPath, transform, style, shapeRendering, role
+      x1,
+      x2,
+      y1,
+      y2,
+      events,
+      className,
+      clipPath,
+      transform,
+      style,
+      shapeRendering,
+      role
     } = this.props;
     return (
       <line
-        x1={x1} x2={x2} y1={y1} y2={y2}
+        x1={x1}
+        x2={x2}
+        y1={y1}
+        y2={y2}
         className={className}
         clipPath={clipPath}
         transform={transform}

package/src/victory-primitives/path-helpers.js

@@ -9,7 +9,6 @@ export default {
       a ${size}, ${size} 0 1,0 ${-size * 2},0`;
   },
 
-
   square(x, y, size) {
     const baseSize = 0.87 * size; // eslint-disable-line no-magic-numbers
     const x0 = x - baseSize;
@@ -34,7 +33,7 @@ export default {
   },
 
   triangleDown(x, y, size) {
-    const height = size / 2 * Math.sqrt(3);
+    const height = (size / 2) * Math.sqrt(3);
     const x0 = x - size;
     const x1 = x + size;
     const y0 = y - size;
@@ -46,7 +45,7 @@ export default {
   },
 
   triangleUp(x, y, size) {
-    const height = size / 2 * Math.sqrt(3);
+    const height = (size / 2) * Math.sqrt(3);
     const x0 = x - size;
     const x1 = x + size;
     const y0 = y - height;
@@ -61,7 +60,7 @@ export default {
     const baseSize = 1.1 * size; // eslint-disable-line no-magic-numbers
     const distance = baseSize / 1.5; // eslint-disable-line no-magic-numbers
     return `
-      M ${x - (distance / 2)}, ${y + baseSize}
+      M ${x - distance / 2}, ${y + baseSize}
       v-${distance}
       h-${distance}
       v-${distance}
@@ -77,9 +76,8 @@ export default {
   },
 
   minus(x, y, size) {
-
     const baseSize = 1.1 * size; // eslint-disable-line no-magic-numbers
-    const lineHeight = baseSize - baseSize * 0.3;// eslint-disable-line no-magic-numbers
+    const lineHeight = baseSize - baseSize * 0.3; // eslint-disable-line no-magic-numbers
     const x0 = x - baseSize;
     const y1 = y + lineHeight / 2;
     const distance = x + baseSize - x0;
@@ -93,7 +91,8 @@ export default {
   star(x, y, size) {
     const baseSize = 1.35 * size; // eslint-disable-line no-magic-numbers
     const angle = Math.PI / 5; // eslint-disable-line no-magic-numbers
-    const starCoords = range(10).map((index) => { // eslint-disable-line no-magic-numbers
+    // eslint-disable-next-line no-magic-numbers
+    const starCoords = range(10).map((index) => {
       const length = index % 2 === 0 ? baseSize : baseSize / 2;
       return `${length * Math.sin(angle * (index + 1)) + x},
         ${length * Math.cos(angle * (index + 1)) + y}`;

package/src/victory-primitives/point.js

@@ -11,13 +11,17 @@ export default class Point extends React.Component {
     datum: PropTypes.object,
     getPath: PropTypes.func,
     pathComponent: PropTypes.element,
-    size: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.func
-    ]),
+    size: PropTypes.oneOfType([PropTypes.number, PropTypes.func]),
     symbol: PropTypes.oneOfType([
       PropTypes.oneOf([
-        "circle", "diamond", "plus", "minus", "square", "star", "triangleDown", "triangleUp"
+        "circle",
+        "diamond",
+        "plus",
+        "minus",
+        "square",
+        "star",
+        "triangleDown",
+        "triangleUp"
       ]),
       PropTypes.func
     ]),
@@ -46,19 +50,34 @@ export default class Point extends React.Component {
       star: pathHelpers.star
     };
     const symbol = Helpers.evaluateProp(props.symbol, datum, active);
-    const symbolFunction = typeof pathFunctions[symbol] === "function" ?
-      pathFunctions[symbol] : pathFunctions.circle;
+    const symbolFunction =
+      typeof pathFunctions[symbol] === "function" ? pathFunctions[symbol] : pathFunctions.circle;
     return symbolFunction(x, y, size);
   }
 
   render() {
     const {
-      active, datum, role, shapeRendering, className, events, pathComponent, transform, clipPath
+      active,
+      datum,
+      role,
+      shapeRendering,
+      className,
+      events,
+      pathComponent,
+      transform,
+      clipPath
     } = this.props;
     const style = Helpers.evaluateStyle(this.props.style, datum, active);
     const d = this.getPath(this.props);
-    return React.cloneElement(
-      pathComponent, { style, role, shapeRendering, className, events, d, transform, clipPath }
-    );
+    return React.cloneElement(pathComponent, {
+      style,
+      role,
+      shapeRendering,
+      className,
+      events,
+      d,
+      transform,
+      clipPath
+    });
   }
 }

package/src/victory-primitives/rect.js

@@ -25,12 +25,28 @@ export default class Rect extends React.Component {
 
   render() {
     const {
-      x, y, rx, ry, width, height, events, className, clipPath, style, role,
-      shapeRendering, transform
+      x,
+      y,
+      rx,
+      ry,
+      width,
+      height,
+      events,
+      className,
+      clipPath,
+      style,
+      role,
+      shapeRendering,
+      transform
     } = this.props;
     return (
       <rect
-        x={x} y={y} rx={rx} ry={ry} width={width} height={height}
+        x={x}
+        y={y}
+        rx={rx}
+        ry={ry}
+        width={width}
+        height={height}
         className={className}
         clipPath={clipPath}
         style={style}