victory-core - npm Package Compare versions

Comparing version 34.3.6 to 34.3.7

es/index.d.ts

@@ -580,3 +580,3 @@ import * as React from "react";
   events?: object;
-  id?: number | string;
+  id?: number | string | Function;
   index?: number | string;
@@ -663,3 +663,15 @@ origin?: OriginType;
 // #region Victory Primitives
+export interface ArcProps extends VictoryCommonPrimitiveProps {
+  closedPath?: boolean;
+  cx?: number;
+  cy?: number;
+  datum?: any;
+  endAngle?: number;
+  pathComponent?: React.ReactElement;
+  r?: number;
+  startAngle?: number;
+}
 
+export class Arc extends React.Component<ArcProps> {}
+
 export interface BackgroundProps extends VictoryCommonPrimitiveProps {
@@ -676,5 +688,33 @@ circleComponent?: React.ReactElement;
 
-export interface VictoryPointProps extends VictoryCommonPrimitiveProps {
+export interface BorderProps extends VictoryCommonPrimitiveProps {
+  width?: number;
+  height?: number;
+  rectComponent?: React.ReactElement;
+  x?: number;
+  y?: number;
+}
+
+export class Border extends React.Component<BorderProps> {}
+
+export interface ClipPathProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode[] | React.ReactNode;
+  clipId?: number | string;
+}
+
+export class ClipPath extends React.Component<ClipPathProps> {}
+
+export interface LineSegmentProps extends VictoryCommonPrimitiveProps {
   datum?: any;
-  getPath?: Function;
+  lineComponent?: React.ReactElement;
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+}
+
+export class LineSegment extends React.Component<LineSegmentProps> {}
+
+export interface PointProps extends VictoryCommonPrimitiveProps {
+  datum?: any;
+  getPath?: (props: PointProps) => void;
   pathComponent?: React.ReactElement;
@@ -687,14 +727,42 @@ size?: number | Function;
 
-export class Point extends React.Component<VictoryPointProps> {}
+export class Point extends React.Component<PointProps> {}
 
-export interface VictoryBorderProps extends VictoryCommonPrimitiveProps {
-  width?: number;
-  height?: number;
-  rectComponent?: React.ReactElement;
-  x?: number;
-  y?: number;
+export interface TextProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode;
+  desc?: string;
+  title?: string;
 }
 
-export class Border extends React.Component<VictoryBorderProps> {}
+export class Text extends React.Component<TextProps> {}
 
+export type WhiskerAxes = {
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+};
+
+export interface WhiskerProps extends VictoryCommonPrimitiveProps {
+  groupComponent?: React.ReactElement;
+  lineComponent?: React.ReactElement;
+  majorWhisker?: WhiskerAxes;
+  minorWhisker?: WhiskerAxes;
+}
+
+export class Whisker extends React.Component<WhiskerProps> {}
+
+export interface VictoryPrimitiveShapeProps extends VictoryCommonPrimitiveProps {
+  desc?: string;
+}
+
+export class Circle extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Line extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Path extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Rect extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class TSpan extends React.Component<VictoryCommonPrimitiveProps> {}
+
 // #endregion

es/victory-primitives/arc.js

@@ -38,11 +38,32 @@ import _assign from "lodash/assign";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = Helpers.evaluateProp(props.desc, props);
+  var id = Helpers.evaluateProp(props.id, props);
+  var style = Helpers.evaluateStyle(_assign({
+    stroke: "black",
+    fill: "none"
+  }, props.style), props);
+  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  return _assign({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var Arc = function (props) {
+  props = evaluateProps(props);
   return React.cloneElement(props.pathComponent, _objectSpread({}, props.events, {
     d: getArcPath(props),
-    style: Helpers.evaluateStyle(_assign({
-      stroke: "black",
-      fill: "none"
-    }, props.style), props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     className: props.className,
@@ -49,0 +70,0 @@ role: props.role,

es/victory-primitives/background.js

@@ -0,1 +1,3 @@
+import _assign from "lodash/assign";
+
 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; }
@@ -7,2 +9,3 @@
 import PropTypes from "prop-types";
+import Helpers from "../victory-util/helpers";
 import CommonProps from "../victory-util/common-props";
@@ -12,3 +15,15 @@ import Rect from "./rect";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated prop is:
+   * `id`
+   */
+  var id = Helpers.evaluateProp(props.id, props);
+  return _assign({}, props, {
+    id: id
+  });
+};
+
 var Background = function (props) {
+  props = evaluateProps(props);
   return props.polar ? React.cloneElement(props.circleComponent, _objectSpread({}, props.events, {
@@ -15,0 +30,0 @@ style: props.style,

es/victory-primitives/border.js

@@ -13,9 +13,30 @@ import _assign from "lodash/assign";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = Helpers.evaluateProp(props.desc, props);
+  var id = Helpers.evaluateProp(props.id, props);
+  var style = Helpers.evaluateStyle(_assign({
+    fill: "none"
+  }, props.style), props);
+  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  return _assign({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var Border = function (props) {
+  props = evaluateProps(props);
   return React.cloneElement(props.rectComponent, _objectSpread({}, props.events, {
-    style: Helpers.evaluateStyle(_assign({
-      fill: "none"
-    }, props.style), props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     transform: props.transform,
@@ -22,0 +43,0 @@ className: props.className,

es/victory-primitives/line-segment.js

@@ -13,9 +13,30 @@ import _assign from "lodash/assign";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = Helpers.evaluateProp(props.desc, props);
+  var id = Helpers.evaluateProp(props.id, props);
+  var style = Helpers.evaluateStyle(_assign({
+    stroke: "black"
+  }, props.style), props);
+  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  return _assign({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var LineSegment = function (props) {
+  props = evaluateProps(props);
   return React.cloneElement(props.lineComponent, _objectSpread({}, props.events, {
-    style: Helpers.evaluateStyle(_assign({
-      stroke: "black"
-    }, props.style), props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     className: props.className,
@@ -22,0 +43,0 @@ role: props.role,

es/victory-primitives/point.js

@@ -0,1 +1,3 @@
+import _assign from "lodash/assign";
+
 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; }
@@ -14,4 +16,5 @@
   var x = props.x,
-      y = props.y;
-  var size = Helpers.evaluateProp(props.size, props);
+      y = props.y,
+      size = props.size,
+      symbol = props.symbol;
 
@@ -32,3 +35,2 @@ if (props.getPath) {
   };
-  var symbol = Helpers.evaluateProp(props.symbol, props);
   var symbolFunction = typeof pathFunctions[symbol] === "function" ? pathFunctions[symbol] : pathFunctions.circle;
@@ -38,8 +40,35 @@ return symbolFunction(x, y, size);
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `size`
+   * `style`
+   * `symbol`
+   * `tabIndex`
+   */
+  var desc = Helpers.evaluateProp(props.desc, props);
+  var id = Helpers.evaluateProp(props.id, props);
+  var size = Helpers.evaluateProp(props.size, props);
+  var style = Helpers.evaluateStyle(props.style, props);
+  var symbol = Helpers.evaluateProp(props.symbol, props);
+  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  return _assign({}, props, {
+    desc: desc,
+    id: id,
+    size: size,
+    style: style,
+    symbol: symbol,
+    tabIndex: tabIndex
+  });
+};
+
 var Point = function (props) {
+  props = evaluateProps(props);
   return React.cloneElement(props.pathComponent, _objectSpread({}, props.events, {
     d: getPath(props),
-    style: Helpers.evaluateStyle(props.style, props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     role: props.role,
@@ -46,0 +75,0 @@ shapeRendering: props.shapeRendering,

es/victory-primitives/whisker.js

@@ -13,18 +13,43 @@ import _assign from "lodash/assign";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = Helpers.evaluateProp(props.desc, props);
+  var id = Helpers.evaluateProp(props.id, props);
+  var style = Helpers.evaluateStyle(props.style, props);
+  var tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+  return _assign({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var Whisker = function (props) {
-  var groupComponent = props.groupComponent,
-      lineComponent = props.lineComponent,
-      events = props.events,
-      className = props.className,
-      majorWhisker = props.majorWhisker,
-      minorWhisker = props.minorWhisker,
-      transform = props.transform,
-      clipPath = props.clipPath,
-      role = props.role,
-      shapeRendering = props.shapeRendering;
+  props = evaluateProps(props);
+  var _props = props,
+      groupComponent = _props.groupComponent,
+      lineComponent = _props.lineComponent,
+      events = _props.events,
+      className = _props.className,
+      majorWhisker = _props.majorWhisker,
+      minorWhisker = _props.minorWhisker,
+      transform = _props.transform,
+      clipPath = _props.clipPath,
+      role = _props.role,
+      shapeRendering = _props.shapeRendering,
+      style = _props.style,
+      desc = _props.desc,
+      tabIndex = _props.tabIndex;
 
   var baseProps = _objectSpread({}, events, {
-    style: Helpers.evaluateStyle(props.style, props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: style,
+    desc: desc,
+    tabIndex: tabIndex,
     className: className,
@@ -31,0 +56,0 @@ transform: transform,

es/victory-util/common-props.js

@@ -97,3 +97,3 @@ import PropTypes from "prop-types";
   events: PropTypes.object,
-  id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  id: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.func]),
   index: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -100,0 +100,0 @@ origin: PropTypes.shape({

lib/index.d.ts

@@ -580,3 +580,3 @@ import * as React from "react";
   events?: object;
-  id?: number | string;
+  id?: number | string | Function;
   index?: number | string;
@@ -663,3 +663,15 @@ origin?: OriginType;
 // #region Victory Primitives
+export interface ArcProps extends VictoryCommonPrimitiveProps {
+  closedPath?: boolean;
+  cx?: number;
+  cy?: number;
+  datum?: any;
+  endAngle?: number;
+  pathComponent?: React.ReactElement;
+  r?: number;
+  startAngle?: number;
+}
 
+export class Arc extends React.Component<ArcProps> {}
+
 export interface BackgroundProps extends VictoryCommonPrimitiveProps {
@@ -676,5 +688,33 @@ circleComponent?: React.ReactElement;
 
-export interface VictoryPointProps extends VictoryCommonPrimitiveProps {
+export interface BorderProps extends VictoryCommonPrimitiveProps {
+  width?: number;
+  height?: number;
+  rectComponent?: React.ReactElement;
+  x?: number;
+  y?: number;
+}
+
+export class Border extends React.Component<BorderProps> {}
+
+export interface ClipPathProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode[] | React.ReactNode;
+  clipId?: number | string;
+}
+
+export class ClipPath extends React.Component<ClipPathProps> {}
+
+export interface LineSegmentProps extends VictoryCommonPrimitiveProps {
   datum?: any;
-  getPath?: Function;
+  lineComponent?: React.ReactElement;
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+}
+
+export class LineSegment extends React.Component<LineSegmentProps> {}
+
+export interface PointProps extends VictoryCommonPrimitiveProps {
+  datum?: any;
+  getPath?: (props: PointProps) => void;
   pathComponent?: React.ReactElement;
@@ -687,14 +727,42 @@ size?: number | Function;
 
-export class Point extends React.Component<VictoryPointProps> {}
+export class Point extends React.Component<PointProps> {}
 
-export interface VictoryBorderProps extends VictoryCommonPrimitiveProps {
-  width?: number;
-  height?: number;
-  rectComponent?: React.ReactElement;
-  x?: number;
-  y?: number;
+export interface TextProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode;
+  desc?: string;
+  title?: string;
 }
 
-export class Border extends React.Component<VictoryBorderProps> {}
+export class Text extends React.Component<TextProps> {}
 
+export type WhiskerAxes = {
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+};
+
+export interface WhiskerProps extends VictoryCommonPrimitiveProps {
+  groupComponent?: React.ReactElement;
+  lineComponent?: React.ReactElement;
+  majorWhisker?: WhiskerAxes;
+  minorWhisker?: WhiskerAxes;
+}
+
+export class Whisker extends React.Component<WhiskerProps> {}
+
+export interface VictoryPrimitiveShapeProps extends VictoryCommonPrimitiveProps {
+  desc?: string;
+}
+
+export class Circle extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Line extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Path extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Rect extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class TSpan extends React.Component<VictoryCommonPrimitiveProps> {}
+
 // #endregion

lib/victory-primitives/arc.js

@@ -50,11 +50,36 @@ "use strict";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = _helpers.default.evaluateProp(props.desc, props);
+
+  var id = _helpers.default.evaluateProp(props.id, props);
+
+  var style = _helpers.default.evaluateStyle((0, _assign2.default)({
+    stroke: "black",
+    fill: "none"
+  }, props.style), props);
+
+  var tabIndex = _helpers.default.evaluateProp(props.tabIndex, props);
+
+  return (0, _assign2.default)({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var Arc = function (props) {
+  props = evaluateProps(props);
   return _react.default.cloneElement(props.pathComponent, _objectSpread({}, props.events, {
     d: getArcPath(props),
-    style: _helpers.default.evaluateStyle((0, _assign2.default)({
-      stroke: "black",
-      fill: "none"
-    }, props.style), props),
-    desc: _helpers.default.evaluateProp(props.desc, props),
-    tabIndex: _helpers.default.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     className: props.className,
@@ -61,0 +86,0 @@ role: props.role,

lib/victory-primitives/background.js

@@ -8,2 +8,4 @@ "use strict";
 
+var _assign2 = _interopRequireDefault(require("lodash/assign"));
+
 var _react = _interopRequireDefault(require("react"));
@@ -13,2 +15,4 @@
 
+var _helpers = _interopRequireDefault(require("../victory-util/helpers"));
+
 var _commonProps = _interopRequireDefault(require("../victory-util/common-props"));
@@ -26,3 +30,16 @@
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated prop is:
+   * `id`
+   */
+  var id = _helpers.default.evaluateProp(props.id, props);
+
+  return (0, _assign2.default)({}, props, {
+    id: id
+  });
+};
+
 var Background = function (props) {
+  props = evaluateProps(props);
   return props.polar ? _react.default.cloneElement(props.circleComponent, _objectSpread({}, props.events, {
@@ -29,0 +46,0 @@ style: props.style,

lib/victory-primitives/border.js

@@ -26,9 +26,34 @@ "use strict";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = _helpers.default.evaluateProp(props.desc, props);
+
+  var id = _helpers.default.evaluateProp(props.id, props);
+
+  var style = _helpers.default.evaluateStyle((0, _assign2.default)({
+    fill: "none"
+  }, props.style), props);
+
+  var tabIndex = _helpers.default.evaluateProp(props.tabIndex, props);
+
+  return (0, _assign2.default)({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var Border = function (props) {
+  props = evaluateProps(props);
   return _react.default.cloneElement(props.rectComponent, _objectSpread({}, props.events, {
-    style: _helpers.default.evaluateStyle((0, _assign2.default)({
-      fill: "none"
-    }, props.style), props),
-    desc: _helpers.default.evaluateProp(props.desc, props),
-    tabIndex: _helpers.default.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     transform: props.transform,
@@ -35,0 +60,0 @@ className: props.className,

lib/victory-primitives/line-segment.js

@@ -26,9 +26,34 @@ "use strict";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = _helpers.default.evaluateProp(props.desc, props);
+
+  var id = _helpers.default.evaluateProp(props.id, props);
+
+  var style = _helpers.default.evaluateStyle((0, _assign2.default)({
+    stroke: "black"
+  }, props.style), props);
+
+  var tabIndex = _helpers.default.evaluateProp(props.tabIndex, props);
+
+  return (0, _assign2.default)({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var LineSegment = function (props) {
+  props = evaluateProps(props);
   return _react.default.cloneElement(props.lineComponent, _objectSpread({}, props.events, {
-    style: _helpers.default.evaluateStyle((0, _assign2.default)({
-      stroke: "black"
-    }, props.style), props),
-    desc: _helpers.default.evaluateProp(props.desc, props),
-    tabIndex: _helpers.default.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     className: props.className,
@@ -35,0 +60,0 @@ role: props.role,

lib/victory-primitives/point.js

@@ -8,2 +8,4 @@ "use strict";
 
+var _assign2 = _interopRequireDefault(require("lodash/assign"));
+
 var _react = _interopRequireDefault(require("react"));
@@ -29,6 +31,6 @@
   var x = props.x,
-      y = props.y;
+      y = props.y,
+      size = props.size,
+      symbol = props.symbol;
 
-  var size = _helpers.default.evaluateProp(props.size, props);
-
   if (props.getPath) {
@@ -48,15 +50,45 @@ return props.getPath(x, y, size);
   };
+  var symbolFunction = typeof pathFunctions[symbol] === "function" ? pathFunctions[symbol] : pathFunctions.circle;
+  return symbolFunction(x, y, size);
+};
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `size`
+   * `style`
+   * `symbol`
+   * `tabIndex`
+   */
+  var desc = _helpers.default.evaluateProp(props.desc, props);
+
+  var id = _helpers.default.evaluateProp(props.id, props);
+
+  var size = _helpers.default.evaluateProp(props.size, props);
+
+  var style = _helpers.default.evaluateStyle(props.style, props);
+
   var symbol = _helpers.default.evaluateProp(props.symbol, props);
 
-  var symbolFunction = typeof pathFunctions[symbol] === "function" ? pathFunctions[symbol] : pathFunctions.circle;
-  return symbolFunction(x, y, size);
+  var tabIndex = _helpers.default.evaluateProp(props.tabIndex, props);
+
+  return (0, _assign2.default)({}, props, {
+    desc: desc,
+    id: id,
+    size: size,
+    style: style,
+    symbol: symbol,
+    tabIndex: tabIndex
+  });
 };
 
 var Point = function (props) {
+  props = evaluateProps(props);
   return _react.default.cloneElement(props.pathComponent, _objectSpread({}, props.events, {
     d: getPath(props),
-    style: _helpers.default.evaluateStyle(props.style, props),
-    desc: _helpers.default.evaluateProp(props.desc, props),
-    tabIndex: _helpers.default.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     role: props.role,
@@ -63,0 +95,0 @@ shapeRendering: props.shapeRendering,

lib/victory-primitives/whisker.js

@@ -26,18 +26,47 @@ "use strict";
 
+var evaluateProps = function (props) {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  var desc = _helpers.default.evaluateProp(props.desc, props);
+
+  var id = _helpers.default.evaluateProp(props.id, props);
+
+  var style = _helpers.default.evaluateStyle(props.style, props);
+
+  var tabIndex = _helpers.default.evaluateProp(props.tabIndex, props);
+
+  return (0, _assign2.default)({}, props, {
+    desc: desc,
+    id: id,
+    style: style,
+    tabIndex: tabIndex
+  });
+};
+
 var Whisker = function (props) {
-  var groupComponent = props.groupComponent,
-      lineComponent = props.lineComponent,
-      events = props.events,
-      className = props.className,
-      majorWhisker = props.majorWhisker,
-      minorWhisker = props.minorWhisker,
-      transform = props.transform,
-      clipPath = props.clipPath,
-      role = props.role,
-      shapeRendering = props.shapeRendering;
+  props = evaluateProps(props);
+  var _props = props,
+      groupComponent = _props.groupComponent,
+      lineComponent = _props.lineComponent,
+      events = _props.events,
+      className = _props.className,
+      majorWhisker = _props.majorWhisker,
+      minorWhisker = _props.minorWhisker,
+      transform = _props.transform,
+      clipPath = _props.clipPath,
+      role = _props.role,
+      shapeRendering = _props.shapeRendering,
+      style = _props.style,
+      desc = _props.desc,
+      tabIndex = _props.tabIndex;
 
   var baseProps = _objectSpread({}, events, {
-    style: _helpers.default.evaluateStyle(props.style, props),
-    desc: _helpers.default.evaluateProp(props.desc, props),
-    tabIndex: _helpers.default.evaluateProp(props.tabIndex, props),
+    style: style,
+    desc: desc,
+    tabIndex: tabIndex,
     className: className,
@@ -44,0 +73,0 @@ transform: transform,

lib/victory-util/common-props.js

@@ -108,3 +108,3 @@ "use strict";
   events: _propTypes.default.object,
-  id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+  id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string, _propTypes.default.func]),
   index: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
@@ -111,0 +111,0 @@ origin: _propTypes.default.shape({

package.json

 {
   "name": "victory-core",
-  "version": "34.3.6",
+  "version": "34.3.7",
   "description": "Victory Core",
@@ -5,0 +5,0 @@ "keywords": [

src/index.d.ts

@@ -580,3 +580,3 @@ import * as React from "react";
   events?: object;
-  id?: number | string;
+  id?: number | string | Function;
   index?: number | string;
@@ -663,3 +663,15 @@ origin?: OriginType;
 // #region Victory Primitives
+export interface ArcProps extends VictoryCommonPrimitiveProps {
+  closedPath?: boolean;
+  cx?: number;
+  cy?: number;
+  datum?: any;
+  endAngle?: number;
+  pathComponent?: React.ReactElement;
+  r?: number;
+  startAngle?: number;
+}
 
+export class Arc extends React.Component<ArcProps> {}
+
 export interface BackgroundProps extends VictoryCommonPrimitiveProps {
@@ -676,5 +688,33 @@ circleComponent?: React.ReactElement;
 
-export interface VictoryPointProps extends VictoryCommonPrimitiveProps {
+export interface BorderProps extends VictoryCommonPrimitiveProps {
+  width?: number;
+  height?: number;
+  rectComponent?: React.ReactElement;
+  x?: number;
+  y?: number;
+}
+
+export class Border extends React.Component<BorderProps> {}
+
+export interface ClipPathProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode[] | React.ReactNode;
+  clipId?: number | string;
+}
+
+export class ClipPath extends React.Component<ClipPathProps> {}
+
+export interface LineSegmentProps extends VictoryCommonPrimitiveProps {
   datum?: any;
-  getPath?: Function;
+  lineComponent?: React.ReactElement;
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+}
+
+export class LineSegment extends React.Component<LineSegmentProps> {}
+
+export interface PointProps extends VictoryCommonPrimitiveProps {
+  datum?: any;
+  getPath?: (props: PointProps) => void;
   pathComponent?: React.ReactElement;
@@ -687,14 +727,42 @@ size?: number | Function;
 
-export class Point extends React.Component<VictoryPointProps> {}
+export class Point extends React.Component<PointProps> {}
 
-export interface VictoryBorderProps extends VictoryCommonPrimitiveProps {
-  width?: number;
-  height?: number;
-  rectComponent?: React.ReactElement;
-  x?: number;
-  y?: number;
+export interface TextProps extends VictoryCommonPrimitiveProps {
+  children?: React.ReactNode;
+  desc?: string;
+  title?: string;
 }
 
-export class Border extends React.Component<VictoryBorderProps> {}
+export class Text extends React.Component<TextProps> {}
 
+export type WhiskerAxes = {
+  x1?: number;
+  x2?: number;
+  y1?: number;
+  y2?: number;
+};
+
+export interface WhiskerProps extends VictoryCommonPrimitiveProps {
+  groupComponent?: React.ReactElement;
+  lineComponent?: React.ReactElement;
+  majorWhisker?: WhiskerAxes;
+  minorWhisker?: WhiskerAxes;
+}
+
+export class Whisker extends React.Component<WhiskerProps> {}
+
+export interface VictoryPrimitiveShapeProps extends VictoryCommonPrimitiveProps {
+  desc?: string;
+}
+
+export class Circle extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Line extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Path extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class Rect extends React.Component<VictoryPrimitiveShapeProps> {}
+
+export class TSpan extends React.Component<VictoryCommonPrimitiveProps> {}
+
 // #endregion

src/victory-primitives/arc.js

@@ -28,9 +28,30 @@ /*eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 180] }]*/
 
-const Arc = (props) =>
-  React.cloneElement(props.pathComponent, {
+const evaluateProps = (props) => {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  const desc = Helpers.evaluateProp(props.desc, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const style = Helpers.evaluateStyle(
+    assign({ stroke: "black", fill: "none" }, props.style),
+    props
+  );
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+
+  return assign({}, props, { desc, id, style, tabIndex });
+};
+
+const Arc = (props) => {
+  props = evaluateProps(props);
+
+  return React.cloneElement(props.pathComponent, {
     ...props.events,
     d: getArcPath(props),
-    style: Helpers.evaluateStyle(assign({ stroke: "black", fill: "none" }, props.style), props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     className: props.className,
@@ -42,2 +63,3 @@ role: props.role,
   });
+};
 
@@ -44,0 +66,0 @@ Arc.propTypes = {

src/victory-primitives/background.js

 import React from "react";
 import PropTypes from "prop-types";
+import { assign } from "lodash";
+import Helpers from "../victory-util/helpers";
 import CommonProps from "../victory-util/common-props";
@@ -7,3 +9,15 @@ import Rect from "./rect";
 
+const evaluateProps = (props) => {
+  /**
+   * Potential evaluated prop is:
+   * `id`
+   */
+  const id = Helpers.evaluateProp(props.id, props);
+
+  return assign({}, props, { id });
+};
+
 const Background = (props) => {
+  props = evaluateProps(props);
+
   return props.polar
@@ -10,0 +24,0 @@ ? React.cloneElement(props.circleComponent, {

src/victory-primitives/border.js

@@ -8,8 +8,26 @@ import React from "react";
 
-const Border = (props) =>
-  React.cloneElement(props.rectComponent, {
+const evaluateProps = (props) => {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  const desc = Helpers.evaluateProp(props.desc, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const style = Helpers.evaluateStyle(assign({ fill: "none" }, props.style), props);
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+
+  return assign({}, props, { desc, id, style, tabIndex });
+};
+
+const Border = (props) => {
+  props = evaluateProps(props);
+
+  return React.cloneElement(props.rectComponent, {
     ...props.events,
-    style: Helpers.evaluateStyle(assign({ fill: "none" }, props.style), props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     transform: props.transform,
@@ -25,2 +43,3 @@ className: props.className,
   });
+};
 
@@ -27,0 +46,0 @@ Border.propTypes = {

src/victory-primitives/line-segment.js

@@ -8,8 +8,26 @@ import React from "react";
 
-const LineSegment = (props) =>
-  React.cloneElement(props.lineComponent, {
+const evaluateProps = (props) => {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  const desc = Helpers.evaluateProp(props.desc, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const style = Helpers.evaluateStyle(assign({ stroke: "black" }, props.style), props);
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+
+  return assign({}, props, { desc, id, style, tabIndex });
+};
+
+const LineSegment = (props) => {
+  props = evaluateProps(props);
+
+  return React.cloneElement(props.lineComponent, {
     ...props.events,
-    style: Helpers.evaluateStyle(assign({ stroke: "black" }, props.style), props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     className: props.className,
@@ -25,2 +43,3 @@ role: props.role,
   });
+};
 
@@ -27,0 +46,0 @@ LineSegment.propTypes = {

src/victory-primitives/point.js

 import React from "react";
 import PropTypes from "prop-types";
+import { assign } from "lodash";
 import Helpers from "../victory-util/helpers";
@@ -9,4 +10,3 @@ import pathHelpers from "./path-helpers";
 const getPath = (props) => {
-  const { x, y } = props;
-  const size = Helpers.evaluateProp(props.size, props);
+  const { x, y, size, symbol } = props;
   if (props.getPath) {
@@ -25,3 +25,2 @@ return props.getPath(x, y, size);
   };
-  const symbol = Helpers.evaluateProp(props.symbol, props);
   const symbolFunction =
@@ -32,9 +31,31 @@ typeof pathFunctions[symbol] === "function" ? pathFunctions[symbol] : pathFunctions.circle;
 
-const Point = (props) =>
-  React.cloneElement(props.pathComponent, {
+const evaluateProps = (props) => {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `size`
+   * `style`
+   * `symbol`
+   * `tabIndex`
+   */
+  const desc = Helpers.evaluateProp(props.desc, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const size = Helpers.evaluateProp(props.size, props);
+  const style = Helpers.evaluateStyle(props.style, props);
+  const symbol = Helpers.evaluateProp(props.symbol, props);
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+
+  return assign({}, props, { desc, id, size, style, symbol, tabIndex });
+};
+
+const Point = (props) => {
+  props = evaluateProps(props);
+
+  return React.cloneElement(props.pathComponent, {
     ...props.events,
     d: getPath(props),
-    style: Helpers.evaluateStyle(props.style, props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style: props.style,
+    desc: props.desc,
+    tabIndex: props.tabIndex,
     role: props.role,
@@ -46,2 +67,3 @@ shapeRendering: props.shapeRendering,
   });
+};
 
@@ -48,0 +70,0 @@ Point.propTypes = {

src/victory-primitives/whisker.js

 import React from "react";
+import { assign } from "lodash";
 import PropTypes from "prop-types";
@@ -6,5 +7,21 @@ import Helpers from "../victory-util/helpers";
 import Line from "./line";
-import { assign } from "lodash";
 
+const evaluateProps = (props) => {
+  /**
+   * Potential evaluated props are:
+   * `desc`
+   * `id`
+   * `style`
+   * `tabIndex`
+   */
+  const desc = Helpers.evaluateProp(props.desc, props);
+  const id = Helpers.evaluateProp(props.id, props);
+  const style = Helpers.evaluateStyle(props.style, props);
+  const tabIndex = Helpers.evaluateProp(props.tabIndex, props);
+
+  return assign({}, props, { desc, id, style, tabIndex });
+};
+
 const Whisker = (props) => {
+  props = evaluateProps(props);
   const {
@@ -20,9 +37,12 @@ groupComponent,
     role,
-    shapeRendering
+    shapeRendering,
+    style,
+    desc,
+    tabIndex
   } = props;
   const baseProps = {
     ...events,
-    style: Helpers.evaluateStyle(props.style, props),
-    desc: Helpers.evaluateProp(props.desc, props),
-    tabIndex: Helpers.evaluateProp(props.tabIndex, props),
+    style,
+    desc,
+    tabIndex,
     className,
@@ -34,2 +54,3 @@ transform,
   };
+
   return React.cloneElement(groupComponent, {}, [
@@ -36,0 +57,0 @@ React.cloneElement(lineComponent, assign({ key: "major-whisker" }, baseProps, majorWhisker)),

src/victory-util/common-props.js

@@ -154,3 +154,3 @@ import PropTypes from "prop-types";
   events: PropTypes.object,
-  id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  id: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.func]),
   index: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -157,0 +157,0 @@ origin: PropTypes.shape({ x: PropTypes.number, y: PropTypes.number }),

New alerts

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2084926

increased by0.88%

Lines of code

28676

increased by1.85%

No dependency changes