victory-core 36.2.2 → 36.4.0

package/lib/victory-util/textsize.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.approximateTextSize = exports._approximateTextSizeInternal = exports.convertLengthToPixels = void 0;
+exports.convertLengthToPixels = exports.approximateTextSize = exports._approximateTextSizeInternal = void 0;
 
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
 
@@ -11,13 +11,17 @@ var _assign2 = _interopRequireDefault(require("lodash/assign"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 // Based on measuring specific character widths
 // as in the following example https://bl.ocks.org/tophtucker/62f93a4658387bb61e4510c37e2e97cf
@@ -126,10 +130,10 @@ var fonts = {
   Verdana: {
     widths: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.35, 0.39375, 0.459375, 0.81875, 0.6359375, 1.0765625, 0.759375, 0.26875, 0.4546875, 0.4546875, 0.6359375, 0.81875, 0.3640625, 0.4546875, 0.3640625, 0.4703125, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.6359375, 0.4546875, 0.4546875, 0.81875, 0.81875, 0.81875, 0.546875, 1, 0.684375, 0.6859375, 0.6984375, 0.771875, 0.6328125, 0.575, 0.7765625, 0.7515625, 0.421875, 0.4546875, 0.69375, 0.5578125, 0.84375, 0.7484375, 0.7875, 0.603125, 0.7875, 0.7, 0.684375, 0.6171875, 0.7328125, 0.684375, 0.9890625, 0.6859375, 0.615625, 0.6859375, 0.4546875, 0.46875, 0.4546875, 0.81875, 0.6421875, 0.6359375, 0.6015625, 0.6234375, 0.521875, 0.6234375, 0.596875, 0.384375, 0.6234375, 0.6328125, 0.275, 0.3765625, 0.5921875, 0.275, 0.9734375, 0.6328125, 0.6078125, 0.6234375, 0.6234375, 0.43125, 0.521875, 0.3953125, 0.6328125, 0.5921875, 0.81875, 0.5921875, 0.5921875, 0.5265625, 0.6359375, 0.4546875, 0.6359375, 0.81875],
     avg: 0.6171875000000003
-  } //https://developer.mozilla.org/en/docs/Web/CSS/length
-  // Absolute sizes in pixels for obsolete measurement units.
+  }
+}; //https://developer.mozilla.org/en/docs/Web/CSS/length
+// Absolute sizes in pixels for obsolete measurement units.
 
-};
 var absoluteMeasurementUnitsToPixels = {
   mm: 3.8,
   sm: 38,

package/lib/victory-util/timer-context.js

@@ -15,7 +15,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * The React context object consumers may use to access or override the global
  * timer.
  */
-var TimerContext = _react.default.createContext({
+var TimerContext = /*#__PURE__*/_react.default.createContext({
   transitionTimer: new _timer.default(),
   animationTimer: new _timer.default()
 });

package/lib/victory-util/timer.js

@@ -5,17 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _d3Timer = require("d3-timer");
+var _d3Timer = require("victory-vendor/d3-timer");
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-var Timer =
-/*#__PURE__*/
-function () {
+var Timer = /*#__PURE__*/function () {
   function Timer() {
     _classCallCheck(this, Timer);
 

package/lib/victory-util/user-props.js

@@ -0,0 +1,119 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSafeUserProps = void 0;
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+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; }
+
+/*
+  USER_PROPS_SAFELIST is to contain any string deemed safe for user props.
+  The startsWidth array will contain the start of any accepted user-prop that 
+  starts with these characters.
+  The exactMatch will contain a list of exact prop names that are accepted.
+*/
+var USER_PROPS_SAFELIST = {
+  startsWith: ["data-", "aria-"],
+  exactMatch: []
+};
+/**
+ * doesPropStartWith: Function that takes a prop's key and runs it against all
+ * options in the USER_PROPS_SAFELIST and checks to see if it starts with any
+ * of those options.
+ * @param {string} key: prop key to be tested against whitelist
+ * @returns {Boolean}: returns true if the key starts with an option or false if
+ * otherwise
+ */
+
+var doesPropStartWith = function (key) {
+  var startsWith = false;
+  USER_PROPS_SAFELIST.startsWith.forEach(function (starterString) {
+    var regex = new RegExp("\\b(".concat(starterString, ")(\\w|-)+"), "g");
+    if (regex.test(key)) startsWith = true;
+  });
+  return startsWith;
+};
+/**
+ * isExactMatch: checks to see if the given key matches any of the 'exactMatch'
+ * items in the whitelist
+ * @param {String} key: prop key to be tested against the whitelist-exact match
+ * array.
+ * @returns {Boolean}: return true if whitelist contains that key, otherwise
+ * returns false.
+ */
+
+
+var isExactMatch = function (key) {
+  return USER_PROPS_SAFELIST.exactMatch.includes(key);
+};
+/**
+ * testIfSafeProp: tests prop's key against both startsWith and exactMatch values
+ * @param {String} key: prop key to be tested against the whitelist
+ * @returns {Boolean}: returns true if found in whitelist, otherwise returns false
+ */
+
+
+var testIfSafeProp = function (key) {
+  if (doesPropStartWith(key) || isExactMatch(key)) return true;
+  return false;
+};
+/**
+ * Gets the value from props if a function value is provided
+ * @param {any} value: maybe function value
+ * @param {Object} props: props object
+ * @returns {any} newValue
+ */
+
+
+var getValue = function (value, props) {
+  if (typeof value === "function") {
+    return value(props);
+  }
+
+  return value;
+};
+/**
+ * getSafeUserProps - function that takes in a props object and removes any
+ * key-value entries that do not match filter strings in the USER_PROPS_SAFELIST
+ * object.
+ *
+ * @param {Object} props: props to be filtered against USER_PROPS_SAFELIST
+ * @returns {Object}: object containing remaining acceptable props
+ */
+
+
+var getSafeUserProps = function (props) {
+  var propsToFilter = _objectSpread({}, props);
+
+  return Object.fromEntries(Object.entries(propsToFilter).filter(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 1),
+        key = _ref2[0];
+
+    return testIfSafeProp(key);
+  }).map(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+        key = _ref4[0],
+        value = _ref4[1];
+
+    return [key, getValue(value, props)];
+  }));
+};
+
+exports.getSafeUserProps = getSafeUserProps;

package/lib/victory-util/wrapper.js

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addBinsToParentPropsIfHistogram = addBinsToParentPropsIfHistogram;
-exports.getDataFromChildren = getDataFromChildren;
+exports.getAllEvents = getAllEvents;
+exports.getCategories = getCategories;
+exports.getCategoryAndAxisStringsFromChildren = getCategoryAndAxisStringsFromChildren;
+exports.getChildStyle = getChildStyle;
+exports.getColor = getColor;
 exports.getData = getData;
-exports.getWidth = getWidth;
+exports.getDataFromChildren = getDataFromChildren;
 exports.getDefaultDomainPadding = getDefaultDomainPadding;
-exports.getDomainFromChildren = getDomainFromChildren;
 exports.getDomain = getDomain;
+exports.getDomainFromChildren = getDomainFromChildren;
 exports.getScale = getScale;
-exports.getAllEvents = getAllEvents;
-exports.getColor = getColor;
-exports.getStyle = getStyle;
-exports.getChildStyle = getChildStyle;
 exports.getStringsFromCategories = getStringsFromCategories;
-exports.getStringsFromData = getStringsFromData;
-exports.getCategoryAndAxisStringsFromChildren = getCategoryAndAxisStringsFromChildren;
 exports.getStringsFromChildren = getStringsFromChildren;
-exports.getCategories = getCategories;
+exports.getStringsFromData = getStringsFromData;
+exports.getStyle = getStyle;
+exports.getWidth = getWidth;
 
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
 
@@ -59,19 +59,27 @@ var Scale = _interopRequireWildcard(require("./scale"));
 
 var Log = _interopRequireWildcard(require("./log"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+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 = 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; }
+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; }
 
@@ -121,7 +129,7 @@ function addBinsToParentPropsIfHistogram(_ref) {
     }, []);
   }
 
-  return _objectSpread({}, parentProps, {
+  return _objectSpread(_objectSpread({}, parentProps), {}, {
     bins: childBins
   });
 }
@@ -157,7 +165,7 @@ function getDataFromChildren(props, childComponents) {
     if (!Data.isDataComponent(child)) {
       return null;
     } else if (child.type && (0, _isFunction2.default)(child.type.getData)) {
-      child = parent ? _react.default.cloneElement(child, parent.props) : child;
+      child = parent ? /*#__PURE__*/_react.default.cloneElement(child, parent.props) : child;
       childData = child.type.getData(childProps);
     } else {
       childData = Data.getData(childProps);
@@ -309,8 +317,8 @@ function getDomain(props, axis, childComponents) {
     var dataset = (props.data || props.y) && Data.getData(props);
     var dataDomain = dataset ? Domain.getDomainFromData(props, axis, dataset) : [];
     var childDomain = getDomainFromChildren(props, axis, childComponents);
-    var min = minDomain || Collection.getMinValue(_toConsumableArray(dataDomain).concat(_toConsumableArray(childDomain)));
-    var max = maxDomain || Collection.getMaxValue(_toConsumableArray(dataDomain).concat(_toConsumableArray(childDomain)));
+    var min = minDomain || Collection.getMinValue([].concat(_toConsumableArray(dataDomain), _toConsumableArray(childDomain)));
+    var max = maxDomain || Collection.getMaxValue([].concat(_toConsumableArray(dataDomain), _toConsumableArray(childDomain)));
     domain = Domain.getDomainFromMinMax(min, max);
   }
 
@@ -470,7 +478,7 @@ function getCategoryAndAxisStringsFromChildren(props, axis, childComponents) {
   var axisComponent = Axis.getAxisComponent(childComponents, axis);
   var axisStrings = axisComponent ? Data.getStringsFromAxes(axisComponent.props, axis) : [];
   var categoryStrings = categories || getStringsFromCategories(childComponents, axis);
-  return (0, _uniq2.default)((0, _flatten2.default)(_toConsumableArray(categoryStrings).concat(_toConsumableArray(axisStrings))));
+  return (0, _uniq2.default)((0, _flatten2.default)([].concat(_toConsumableArray(categoryStrings), _toConsumableArray(axisStrings))));
 }
 
 function getStringsFromChildren(props, childComponents) {
@@ -479,8 +487,8 @@ function getStringsFromChildren(props, childComponents) {
   var yStrings = getCategoryAndAxisStringsFromChildren(props, "y", childComponents);
   var dataStrings = getStringsFromData(childComponents);
   return {
-    x: (0, _uniq2.default)((0, _flatten2.default)(_toConsumableArray(xStrings).concat(_toConsumableArray(dataStrings.x)))),
-    y: (0, _uniq2.default)((0, _flatten2.default)(_toConsumableArray(yStrings).concat(_toConsumableArray(dataStrings.y))))
+    x: (0, _uniq2.default)((0, _flatten2.default)([].concat(_toConsumableArray(xStrings), _toConsumableArray(dataStrings.x)))),
+    y: (0, _uniq2.default)((0, _flatten2.default)([].concat(_toConsumableArray(yStrings), _toConsumableArray(dataStrings.y))))
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.2.2",
+  "version": "36.4.0",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -19,17 +19,10 @@
   "author": "Formidable",
   "license": "MIT",
   "dependencies": {
-    "d3-ease": "^1.0.0",
-    "d3-interpolate": "^1.1.1",
-    "d3-scale": "^1.0.0",
-    "d3-shape": "^1.2.0",
-    "d3-timer": "^1.0.0",
     "lodash": "^4.17.21",
     "prop-types": "^15.5.8",
-    "react-fast-compare": "^2.0.0"
-  },
-  "resolutions": {
-    "d3-interpolate/d3-color": "^3.0.0"
+    "react-fast-compare": "^2.0.0",
+    "victory-vendor": "^36.4.0"
   },
   "peerDependencies": {
     "react": "^16.6.0 || ^17.0.0"
@@ -38,5 +31,5 @@
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "e09146d4bede80e27ed095fcd7e1167c00fba864"
+  "gitHead": "2e05481eeb34f9801a90023a131a21aa7deff082"
 }

package/src/index.d.ts

@@ -248,6 +248,7 @@ export interface VictoryLabelProps {
   style?: VictoryLabelStyleObject | VictoryLabelStyleObject[];
   tabIndex?: NumberOrCallback;
   text?: string[] | StringOrNumberOrCallback;
+  textComponent?: React.ReactElement;
   textAnchor?: TextAnchorType | { (): TextAnchorType };
   title?: string;
   transform?: string | {} | { (): string | {} };

package/src/index.js

@@ -39,6 +39,7 @@ export * as Style from "./victory-util/style";
 export * as TextSize from "./victory-util/textsize";
 export { default as Timer } from "./victory-util/timer";
 export * as Transitions from "./victory-util/transitions";
+export * as UserProps from "./victory-util/user-props";
 export * as CommonProps from "./victory-util/common-props";
 export * as Wrapper from "./victory-util/wrapper";
 export * as Axis from "./victory-util/axis";

package/src/victory-animation/util.js

@@ -1,4 +1,4 @@
-import { interpolate } from "d3-interpolate";
+import { interpolate } from "victory-vendor/d3-interpolate";
 import { isPlainObject, orderBy } from "lodash";
 
 export const isInterpolatable = function (obj) {

package/src/victory-animation/victory-animation.js

@@ -1,7 +1,7 @@
 /*global setTimeout:false */
 import React from "react";
 import PropTypes from "prop-types";
-import * as d3Ease from "d3-ease";
+import * as d3Ease from "victory-vendor/d3-ease";
 import { victoryInterpolator } from "./util";
 import TimerContext from "../victory-util/timer-context";
 import isEqual from "react-fast-compare";

package/src/victory-container/victory-container.js

@@ -6,6 +6,7 @@ import Portal from "../victory-portal/portal";
 import PortalContext from "../victory-portal/portal-context";
 import TimerContext from "../victory-util/timer-context";
 import * as Helpers from "../victory-util/helpers";
+import * as UserProps from "../victory-util/user-props";
 
 export default class VictoryContainer extends React.Component {
   static displayName = "VictoryContainer";
@@ -192,9 +193,13 @@ export default class VictoryContainer extends React.Component {
       preserveAspectRatio,
       role
     } = this.props;
+
     const style = responsive
       ? this.props.style
       : Helpers.omit(this.props.style, ["height", "width"]);
+
+    const userProps = UserProps.getSafeUserProps(this.props);
+
     const svgProps = assign(
       {
         width,
@@ -213,7 +218,8 @@ export default class VictoryContainer extends React.Component {
             .filter(Boolean)
             .join(" ") || undefined,
         viewBox: responsive ? `0 0 ${width} ${height}` : undefined,
-        preserveAspectRatio: responsive ? preserveAspectRatio : undefined
+        preserveAspectRatio: responsive ? preserveAspectRatio : undefined,
+        ...userProps
       },
       events
     );

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

@@ -1,17 +1,17 @@
 /*eslint no-magic-numbers: ["error", { "ignore": [-0.5, 0.5, 0, 1, 2] }]*/
-import React from "react";
+import { assign, defaults, isEmpty } from "lodash";
 import PropTypes from "prop-types";
+import React from "react";
 import VictoryPortal from "../victory-portal/victory-portal";
 import Rect from "../victory-primitives/rect";
-import * as CustomPropTypes from "../victory-util/prop-types";
+import Text from "../victory-primitives/text";
+import TSpan from "../victory-primitives/tspan";
 import * as Helpers from "../victory-util/helpers";
 import * as LabelHelpers from "../victory-util/label-helpers";
-import * as Style from "../victory-util/style";
 import * as Log from "../victory-util/log";
+import * as CustomPropTypes from "../victory-util/prop-types";
+import * as Style from "../victory-util/style";
 import * as TextSize from "../victory-util/textsize";
-import TSpan from "../victory-primitives/tspan";
-import Text from "../victory-primitives/text";
-import { assign, defaults, isEmpty } from "lodash";
 
 const defaultStyles = {
   fill: "#252525",

package/src/victory-util/add-events.js

@@ -14,6 +14,7 @@ import {
 import * as Events from "./events";
 import isEqual from "react-fast-compare";
 import VictoryTransition from "../victory-transition/victory-transition";
+import * as UserProps from "../victory-util/user-props";
 
 const datumHasXandY = (datum) => {
   return !isNil(datum._x) && !isNil(datum._y);
@@ -274,10 +275,12 @@ export default (WrappedComponent, options) => {
       const parentProps = isContainer
         ? this.getComponentProps(component, "parent", "parent")
         : {};
+
       if (parentProps.events) {
         this.globalEvents = Events.getGlobalEvents(parentProps.events);
         parentProps.events = Events.omitGlobalEvents(parentProps.events);
       }
+
       return React.cloneElement(component, parentProps, children);
     }
 
@@ -327,7 +330,7 @@ export default (WrappedComponent, options) => {
 
     renderData(props, shouldRenderDatum = datumHasXandY) {
       const { dataComponent, labelComponent, groupComponent } = props;
-
+      const userProps = UserProps.getSafeUserProps(props);
       const dataComponents = this.dataKeys.reduce(
         (validDataComponents, _dataKey, index) => {
           const dataProps = this.getComponentProps(
@@ -360,7 +363,8 @@ export default (WrappedComponent, options) => {
         .filter(Boolean);
 
       const children = [...dataComponents, ...labelComponents];
-      return this.renderContainer(groupComponent, children);
+      const group = React.cloneElement(groupComponent, userProps, children);
+      return this.renderContainer(group, children);
     }
   };
 };

package/src/victory-util/axis.js

@@ -239,6 +239,9 @@ export function getTickFormat(props, scale) {
   const stringMap = props.stringMap && props.stringMap[axis];
   if (!tickFormat) {
     const defaultTickFormat = getDefaultTickFormat(props);
+    // If there is no user-provided tick format, we use d3's tickFormat function
+    // by default. This changed the default formatting for some scale types when
+    // we upgraded to d3-scale@4..
     const scaleTickFormat =
       scale.tickFormat && isFunction(scale.tickFormat)
         ? scale.tickFormat()

package/src/victory-util/line-helpers.js

@@ -1,4 +1,4 @@
-import * as d3Shape from "d3-shape";
+import * as d3Shape from "victory-vendor/d3-shape";
 
 const defined = (d) => {
   const y = d._y1 !== undefined ? d._y1 : d._y;

package/src/victory-util/scale.js

@@ -3,7 +3,7 @@
 import { includes, isFunction, isPlainObject } from "lodash";
 import * as Helpers from "./helpers";
 import * as Collection from "./collection";
-import * as d3Scale from "d3-scale";
+import * as d3Scale from "victory-vendor/d3-scale";
 
 const supportedScaleStrings = ["linear", "time", "log", "sqrt"];
 
@@ -110,19 +110,28 @@ export function getScaleType(props, axis) {
   );
 }
 
+// Ordered type inference off of function fields.
+// **Note**: Brittle because reliant on d3 internals.
+const DUCK_TYPES = [
+  { name: "quantile", method: "quantiles" },
+  { name: "log", method: "base" }
+  // TODO(2214): Re-evaluate (1) duck typing approach, and (2) if duck typing,
+  //   do we need a different approach? (Multiple keys? Stringifying functions?)
+  // https://github.com/FormidableLabs/victory/issues/2214
+  // Below are matches that don't seem to otherwise occur in Victory code base.
+  // { name: "ordinal", method: "unknown" },
+  // { name: "pow-sqrt", method: "exponent" },
+  // { name: "quantize-threshold", method: "invertExtent" }
+];
+
 export function getType(scale) {
   if (typeof scale === "string") {
     return scale;
   }
-  const duckTypes = [
-    { name: "log", method: "base" },
-    { name: "ordinal", method: "unknown" },
-    { name: "pow-sqrt", method: "exponent" },
-    { name: "quantile", method: "quantiles" },
-    { name: "quantize-threshold", method: "invertExtent" }
-  ];
-  const scaleType = duckTypes.filter((type) => {
+
+  const scaleType = DUCK_TYPES.filter((type) => {
     return scale[type.method] !== undefined;
   })[0];
+
   return scaleType ? scaleType.name : undefined;
 }

package/src/victory-util/timer.js

@@ -1,4 +1,4 @@
-import { timer, now } from "d3-timer";
+import { timer, now } from "victory-vendor/d3-timer";
 
 export default class Timer {
   constructor() {

package/src/victory-util/user-props.js

@@ -0,0 +1,81 @@
+/*
+  USER_PROPS_SAFELIST is to contain any string deemed safe for user props.
+  The startsWidth array will contain the start of any accepted user-prop that 
+  starts with these characters.
+  The exactMatch will contain a list of exact prop names that are accepted.
+*/
+const USER_PROPS_SAFELIST = {
+  startsWith: ["data-", "aria-"],
+  exactMatch: []
+};
+
+/**
+ * doesPropStartWith: Function that takes a prop's key and runs it against all
+ * options in the USER_PROPS_SAFELIST and checks to see if it starts with any
+ * of those options.
+ * @param {string} key: prop key to be tested against whitelist
+ * @returns {Boolean}: returns true if the key starts with an option or false if
+ * otherwise
+ */
+const doesPropStartWith = (key) => {
+  let startsWith = false;
+
+  USER_PROPS_SAFELIST.startsWith.forEach((starterString) => {
+    const regex = new RegExp(`\\b(${starterString})(\\w|-)+`, "g");
+    if (regex.test(key)) startsWith = true;
+  });
+
+  return startsWith;
+};
+
+/**
+ * isExactMatch: checks to see if the given key matches any of the 'exactMatch'
+ * items in the whitelist
+ * @param {String} key: prop key to be tested against the whitelist-exact match
+ * array.
+ * @returns {Boolean}: return true if whitelist contains that key, otherwise
+ * returns false.
+ */
+const isExactMatch = (key) => USER_PROPS_SAFELIST.exactMatch.includes(key);
+
+/**
+ * testIfSafeProp: tests prop's key against both startsWith and exactMatch values
+ * @param {String} key: prop key to be tested against the whitelist
+ * @returns {Boolean}: returns true if found in whitelist, otherwise returns false
+ */
+const testIfSafeProp = (key) => {
+  if (doesPropStartWith(key) || isExactMatch(key)) return true;
+  return false;
+};
+
+/**
+ * Gets the value from props if a function value is provided
+ * @param {any} value: maybe function value
+ * @param {Object} props: props object
+ * @returns {any} newValue
+ */
+const getValue = (value, props) => {
+  if (typeof value === "function") {
+    return value(props);
+  }
+  return value;
+};
+
+/**
+ * getSafeUserProps - function that takes in a props object and removes any
+ * key-value entries that do not match filter strings in the USER_PROPS_SAFELIST
+ * object.
+ *
+ * @param {Object} props: props to be filtered against USER_PROPS_SAFELIST
+ * @returns {Object}: object containing remaining acceptable props
+ */
+export const getSafeUserProps = (props) => {
+  const propsToFilter = { ...props };
+  return Object.fromEntries(
+    Object.entries(propsToFilter)
+      .filter(([key]) => testIfSafeProp(key))
+      .map(([key, value]) => {
+        return [key, getValue(value, props)];
+      })
+  );
+};