victory-tooltip 36.3.2 → 36.5.0

package/lib/victory-tooltip.js

@@ -25,25 +25,37 @@ var _flyout = _interopRequireDefault(require("./flyout"));
 
 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; }
 
 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; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var fallbackProps = {
   cornerRadius: 5,
@@ -51,17 +63,17 @@ var fallbackProps = {
   pointerWidth: 10
 };
 
-var VictoryTooltip =
-/*#__PURE__*/
-function (_React$Component) {
+var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
   _inherits(VictoryTooltip, _React$Component);
 
+  var _super = _createSuper(VictoryTooltip);
+
   function VictoryTooltip(props) {
     var _this;
 
     _classCallCheck(this, VictoryTooltip);
 
-    _this = _possibleConstructorReturn(this, (VictoryTooltip.__proto__ || Object.getPrototypeOf(VictoryTooltip)).call(this, props));
+    _this = _super.call(this, props);
     _this.id = props.id === undefined ? (0, _uniqueId2.default)("tooltip-") : props.id;
     return _this;
   }
@@ -147,12 +159,12 @@ function (_React$Component) {
         active: active
       }));
 
-      var _getStyles = this.getStyles((0, _assign2.default)({}, props, {
+      var _this$getStyles = this.getStyles((0, _assign2.default)({}, props, {
         active: active,
         text: text
       })),
-          style = _getStyles.style,
-          flyoutStyle = _getStyles.flyoutStyle;
+          style = _this$getStyles.style,
+          flyoutStyle = _this$getStyles.flyoutStyle;
 
       var orientation = _victoryCore.Helpers.evaluateProp(props.orientation, (0, _assign2.default)({}, props, {
         active: active,
@@ -190,7 +202,7 @@ function (_React$Component) {
 
       var labelSize = _victoryCore.TextSize.approximateTextSize(text, style);
 
-      var _getDimensions = this.getDimensions((0, _assign2.default)({}, props, {
+      var _this$getDimensions = this.getDimensions((0, _assign2.default)({}, props, {
         style: style,
         flyoutStyle: flyoutStyle,
         active: active,
@@ -200,8 +212,8 @@ function (_React$Component) {
         pointerWidth: pointerWidth,
         pointerLength: pointerLength
       }), labelSize),
-          flyoutHeight = _getDimensions.flyoutHeight,
-          flyoutWidth = _getDimensions.flyoutWidth;
+          flyoutHeight = _this$getDimensions.flyoutHeight,
+          flyoutWidth = _this$getDimensions.flyoutWidth;
 
       var evaluatedProps = (0, _assign2.default)({}, props, {
         active: active,
@@ -506,7 +518,7 @@ function (_React$Component) {
       var renderInPortal = props.renderInPortal;
 
       if (!active) {
-        return renderInPortal ? _react.default.createElement(_victoryCore.VictoryPortal, null, null) : null;
+        return renderInPortal ? /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryPortal, null, null) : null;
       }
 
       var evaluatedProps = this.getEvaluatedProps(props);
@@ -514,14 +526,14 @@ function (_React$Component) {
           labelComponent = evaluatedProps.labelComponent,
           groupComponent = evaluatedProps.groupComponent;
       var calculatedValues = this.getCalculatedValues(evaluatedProps);
-      var children = [_react.default.cloneElement(flyoutComponent, this.getFlyoutProps(evaluatedProps, calculatedValues)), _react.default.cloneElement(labelComponent, this.getLabelProps(evaluatedProps, calculatedValues))];
+      var children = [/*#__PURE__*/_react.default.cloneElement(flyoutComponent, this.getFlyoutProps(evaluatedProps, calculatedValues)), /*#__PURE__*/_react.default.cloneElement(labelComponent, this.getLabelProps(evaluatedProps, calculatedValues))];
 
-      var tooltip = _react.default.cloneElement(groupComponent, {
+      var tooltip = /*#__PURE__*/_react.default.cloneElement(groupComponent, {
         role: "presentation",
         transform: calculatedValues.transform
       }, children);
 
-      return renderInPortal ? _react.default.createElement(_victoryCore.VictoryPortal, null, tooltip) : tooltip;
+      return renderInPortal ? /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryPortal, null, tooltip) : tooltip;
     }
   }, {
     key: "render",
@@ -536,159 +548,135 @@ function (_React$Component) {
 }(_react.default.Component);
 
 exports.default = VictoryTooltip;
-Object.defineProperty(VictoryTooltip, "displayName", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "VictoryTooltip"
-});
-Object.defineProperty(VictoryTooltip, "role", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "tooltip"
-});
-Object.defineProperty(VictoryTooltip, "propTypes", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    activateData: _propTypes.default.bool,
-    active: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.func]),
-    activePoints: _propTypes.default.array,
-    angle: _propTypes.default.number,
-    center: _propTypes.default.shape({
-      x: _victoryCore.PropTypes.nonNegative,
-      y: _victoryCore.PropTypes.nonNegative
-    }),
-    centerOffset: _propTypes.default.shape({
-      x: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-      y: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func])
-    }),
-    constrainToVisibleArea: _propTypes.default.bool,
-    cornerRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    data: _propTypes.default.array,
-    datum: _propTypes.default.object,
-    dx: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-    dy: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-    events: _propTypes.default.object,
-    flyoutComponent: _propTypes.default.element,
-    flyoutHeight: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    flyoutPadding: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.number, _propTypes.default.shape({
-      top: _propTypes.default.number,
-      bottom: _propTypes.default.number,
-      left: _propTypes.default.number,
-      right: _propTypes.default.number
-    })]),
-    flyoutStyle: _propTypes.default.object,
-    flyoutWidth: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    groupComponent: _propTypes.default.element,
-    height: _propTypes.default.number,
-    horizontal: _propTypes.default.bool,
-    id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-    index: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-    labelComponent: _propTypes.default.element,
-    orientation: _propTypes.default.oneOfType([_propTypes.default.oneOf(["top", "bottom", "left", "right"]), _propTypes.default.func]),
-    pointerLength: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    pointerOrientation: _propTypes.default.oneOfType([_propTypes.default.oneOf(["top", "bottom", "left", "right"]), _propTypes.default.func]),
-    pointerWidth: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    polar: _propTypes.default.bool,
-    renderInPortal: _propTypes.default.bool,
-    scale: _propTypes.default.shape({
-      x: _victoryCore.PropTypes.scale,
-      y: _victoryCore.PropTypes.scale
-    }),
-    style: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.array]),
-    text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.func, _propTypes.default.array]),
-    theme: _propTypes.default.object,
-    width: _propTypes.default.number,
-    x: _propTypes.default.number,
-    y: _propTypes.default.number
-  }
-});
-Object.defineProperty(VictoryTooltip, "defaultProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    active: false,
-    renderInPortal: true,
-    labelComponent: _react.default.createElement(_victoryCore.VictoryLabel, null),
-    flyoutComponent: _react.default.createElement(_flyout.default, null),
-    groupComponent: _react.default.createElement("g", null)
-  }
-});
-Object.defineProperty(VictoryTooltip, "defaultEvents", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: function (props) {
-    var activate = props.activateData ? [{
-      target: "labels",
-      mutation: function () {
-        return {
-          active: true
-        };
-      }
-    }, {
-      target: "data",
-      mutation: function () {
-        return {
-          active: true
-        };
-      }
-    }] : [{
-      target: "labels",
-      mutation: function () {
-        return {
-          active: true
-        };
-      }
-    }];
-    var deactivate = props.activateData ? [{
-      target: "labels",
-      mutation: function () {
-        return {
-          active: undefined
-        };
-      }
-    }, {
-      target: "data",
-      mutation: function () {
-        return {
-          active: undefined
-        };
-      }
-    }] : [{
-      target: "labels",
-      mutation: function () {
-        return {
-          active: undefined
-        };
-      }
-    }];
-    return [{
-      target: "data",
-      eventHandlers: {
-        onMouseOver: function () {
-          return activate;
-        },
-        onFocus: function () {
-          return activate;
-        },
-        onTouchStart: function () {
-          return activate;
-        },
-        onMouseOut: function () {
-          return deactivate;
-        },
-        onBlur: function () {
-          return deactivate;
-        },
-        onTouchEnd: function () {
-          return deactivate;
-        }
+VictoryTooltip.displayName = "VictoryTooltip";
+VictoryTooltip.role = "tooltip";
+VictoryTooltip.propTypes = {
+  activateData: _propTypes.default.bool,
+  active: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.func]),
+  activePoints: _propTypes.default.array,
+  angle: _propTypes.default.number,
+  center: _propTypes.default.shape({
+    x: _victoryCore.PropTypes.nonNegative,
+    y: _victoryCore.PropTypes.nonNegative
+  }),
+  centerOffset: _propTypes.default.shape({
+    x: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+    y: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func])
+  }),
+  constrainToVisibleArea: _propTypes.default.bool,
+  cornerRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  data: _propTypes.default.array,
+  datum: _propTypes.default.object,
+  dx: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+  dy: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+  events: _propTypes.default.object,
+  flyoutComponent: _propTypes.default.element,
+  flyoutHeight: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  flyoutPadding: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.number, _propTypes.default.shape({
+    top: _propTypes.default.number,
+    bottom: _propTypes.default.number,
+    left: _propTypes.default.number,
+    right: _propTypes.default.number
+  })]),
+  flyoutStyle: _propTypes.default.object,
+  flyoutWidth: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  groupComponent: _propTypes.default.element,
+  height: _propTypes.default.number,
+  horizontal: _propTypes.default.bool,
+  id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+  index: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+  labelComponent: _propTypes.default.element,
+  orientation: _propTypes.default.oneOfType([_propTypes.default.oneOf(["top", "bottom", "left", "right"]), _propTypes.default.func]),
+  pointerLength: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  pointerOrientation: _propTypes.default.oneOfType([_propTypes.default.oneOf(["top", "bottom", "left", "right"]), _propTypes.default.func]),
+  pointerWidth: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  polar: _propTypes.default.bool,
+  renderInPortal: _propTypes.default.bool,
+  scale: _propTypes.default.shape({
+    x: _victoryCore.PropTypes.scale,
+    y: _victoryCore.PropTypes.scale
+  }),
+  style: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.array]),
+  text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.func, _propTypes.default.array]),
+  theme: _propTypes.default.object,
+  width: _propTypes.default.number,
+  x: _propTypes.default.number,
+  y: _propTypes.default.number
+};
+VictoryTooltip.defaultProps = {
+  active: false,
+  renderInPortal: true,
+  labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
+  flyoutComponent: /*#__PURE__*/_react.default.createElement(_flyout.default, null),
+  groupComponent: /*#__PURE__*/_react.default.createElement("g", null)
+};
+
+VictoryTooltip.defaultEvents = function (props) {
+  var activate = props.activateData ? [{
+    target: "labels",
+    mutation: function () {
+      return {
+        active: true
+      };
+    }
+  }, {
+    target: "data",
+    mutation: function () {
+      return {
+        active: true
+      };
+    }
+  }] : [{
+    target: "labels",
+    mutation: function () {
+      return {
+        active: true
+      };
+    }
+  }];
+  var deactivate = props.activateData ? [{
+    target: "labels",
+    mutation: function () {
+      return {
+        active: undefined
+      };
+    }
+  }, {
+    target: "data",
+    mutation: function () {
+      return {
+        active: undefined
+      };
+    }
+  }] : [{
+    target: "labels",
+    mutation: function () {
+      return {
+        active: undefined
+      };
+    }
+  }];
+  return [{
+    target: "data",
+    eventHandlers: {
+      onMouseOver: function () {
+        return activate;
+      },
+      onFocus: function () {
+        return activate;
+      },
+      onTouchStart: function () {
+        return activate;
+      },
+      onMouseOut: function () {
+        return deactivate;
+      },
+      onBlur: function () {
+        return deactivate;
+      },
+      onTouchEnd: function () {
+        return deactivate;
       }
-    }];
-  }
-});
+    }
+  }];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-tooltip",
-  "version": "36.3.2",
+  "version": "36.5.0",
   "description": "Tooltip Component for Victory",
   "keywords": [
     "data visualization",
@@ -20,15 +20,15 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.19",
-    "prop-types": "^15.5.8",
-    "victory-core": "^36.3.2"
+    "prop-types": "^15.8.1",
+    "victory-core": "^36.5.0"
   },
   "peerDependencies": {
-    "react": "^16.6.0 || ^17.0.0"
+    "react": ">=16.6.0"
   },
   "scripts": {
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "18895d1290245732d14332bbbda10336032c9aab"
+  "gitHead": "7cecba921f751c3decc8215f7e866f51d11203c1"
 }

package/src/flyout.js

@@ -1,7 +1,7 @@
 /*eslint no-magic-numbers: ["error", { "ignore": [-1, 0, 1, 2] }]*/
 import React from "react";
 import PropTypes from "prop-types";
-import { Helpers, CommonProps, Path } from "victory-core";
+import { Helpers, CommonProps, Path, UserProps } from "victory-core";
 import { isPlainObject, assign } from "lodash";
 
 const getVerticalPath = (props) => {
@@ -87,9 +87,11 @@ const evaluateProps = (props) => {
 
 const Flyout = (props) => {
   props = evaluateProps(props);
+  const userProps = UserProps.getSafeUserProps(props);
 
   return React.cloneElement(props.pathComponent, {
     ...props.events,
+    ...userProps,
     style: props.style,
     d: getFlyoutPath(props),
     className: props.className,