victory-voronoi-container
Advanced tools
Comparing version 32.0.0 to 32.1.0
@@ -34,3 +34,3 @@ import _pick from "lodash/pick"; | ||
import { VictoryTooltip } from "victory-tooltip"; | ||
import { VictoryContainer, Helpers, TextSize } from "victory-core"; | ||
import { VictoryContainer, Helpers, TextSize, PropTypes as CustomPropTypes } from "victory-core"; | ||
import VoronoiHelpers from "./voronoi-helpers"; | ||
@@ -305,3 +305,3 @@ export var voronoiContainerMixin = function (base) { | ||
radius: PropTypes.number, | ||
voronoiBlacklist: PropTypes.arrayOf(PropTypes.string), | ||
voronoiBlacklist: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, CustomPropTypes.regExp])), | ||
voronoiDimension: PropTypes.oneOf(["x", "y"]), | ||
@@ -308,0 +308,0 @@ voronoiPadding: PropTypes.number |
@@ -0,1 +1,3 @@ | ||
import _isRegExp from "lodash/isRegExp"; | ||
import _isString from "lodash/isString"; | ||
import _includes from "lodash/includes"; | ||
@@ -80,4 +82,9 @@ import _keys from "lodash/keys"; | ||
var blacklist = props.voronoiBlacklist || []; | ||
var blacklistStr = blacklist.filter(_isString); | ||
var blacklistRegExp = blacklist.filter(_isRegExp); | ||
var isRegExpMatch = blacklistRegExp.some(function (regExp) { | ||
return regExp.test(name); | ||
}); | ||
if (!Data.isDataComponent(child) || _includes(blacklist, name)) { | ||
if (!Data.isDataComponent(child) || _includes(blacklistStr, name) || isRegExpMatch) { | ||
return null; | ||
@@ -84,0 +91,0 @@ } |
@@ -323,3 +323,3 @@ "use strict"; | ||
radius: _propTypes.default.number, | ||
voronoiBlacklist: _propTypes.default.arrayOf(_propTypes.default.string), | ||
voronoiBlacklist: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _victoryCore.PropTypes.regExp])), | ||
voronoiDimension: _propTypes.default.oneOf(["x", "y"]), | ||
@@ -326,0 +326,0 @@ voronoiPadding: _propTypes.default.number |
@@ -8,2 +8,6 @@ "use strict"; | ||
var _isRegExp2 = _interopRequireDefault(require("lodash/isRegExp")); | ||
var _isString2 = _interopRequireDefault(require("lodash/isString")); | ||
var _includes2 = _interopRequireDefault(require("lodash/includes")); | ||
@@ -101,4 +105,9 @@ | ||
var blacklist = props.voronoiBlacklist || []; | ||
var blacklistStr = blacklist.filter(_isString2.default); | ||
var blacklistRegExp = blacklist.filter(_isRegExp2.default); | ||
var isRegExpMatch = blacklistRegExp.some(function (regExp) { | ||
return regExp.test(name); | ||
}); | ||
if (!_victoryCore.Data.isDataComponent(child) || (0, _includes2.default)(blacklist, name)) { | ||
if (!_victoryCore.Data.isDataComponent(child) || (0, _includes2.default)(blacklistStr, name) || isRegExpMatch) { | ||
return null; | ||
@@ -105,0 +114,0 @@ } |
{ | ||
"name": "victory-voronoi-container", | ||
"version": "32.0.0", | ||
"version": "32.1.0", | ||
"description": "Interactive Voronoi Mouseover Component for Victory", | ||
@@ -25,4 +25,4 @@ "keywords": [ | ||
"prop-types": "^15.5.8", | ||
"victory-core": "^32.0.0", | ||
"victory-tooltip": "^32.0.0" | ||
"victory-core": "^32.1.0", | ||
"victory-tooltip": "^32.1.0" | ||
}, | ||
@@ -29,0 +29,0 @@ "scripts": { |
@@ -108,3 +108,3 @@ # VictoryVoronoiContainer | ||
`type: array[string]` | ||
`type: array[string || regex]` | ||
@@ -111,0 +111,0 @@ The `voronoiBlacklist` prop is used to specify a list of components to ignore when calculating a shared voronoi diagram. Components with a `name` prop matching an element in the `voronoiBlacklist` array will be ignored by `VictoryVoronoiContainer`. Ignored components will never be flagged as active, and will not contribute date to shared tooltips or labels. |
@@ -5,3 +5,3 @@ import PropTypes from "prop-types"; | ||
import { VictoryTooltip } from "victory-tooltip"; | ||
import { VictoryContainer, Helpers, TextSize } from "victory-core"; | ||
import { VictoryContainer, Helpers, TextSize, PropTypes as CustomPropTypes } from "victory-core"; | ||
import VoronoiHelpers from "./voronoi-helpers"; | ||
@@ -22,3 +22,5 @@ | ||
radius: PropTypes.number, | ||
voronoiBlacklist: PropTypes.arrayOf(PropTypes.string), | ||
voronoiBlacklist: PropTypes.arrayOf( | ||
PropTypes.oneOfType([PropTypes.string, CustomPropTypes.regExp]) | ||
), | ||
voronoiDimension: PropTypes.oneOf(["x", "y"]), | ||
@@ -25,0 +27,0 @@ voronoiPadding: PropTypes.number |
import { Selection, Data, Helpers } from "victory-core"; | ||
import { assign, throttle, isFunction, isEmpty, groupBy, keys, includes } from "lodash"; | ||
import { | ||
assign, | ||
throttle, | ||
isFunction, | ||
isEmpty, | ||
groupBy, | ||
keys, | ||
includes, | ||
isString, | ||
isRegExp | ||
} from "lodash"; | ||
import isEqual from "react-fast-compare"; | ||
@@ -57,3 +67,6 @@ import { voronoi as d3Voronoi } from "d3-voronoi"; | ||
const blacklist = props.voronoiBlacklist || []; | ||
if (!Data.isDataComponent(child) || includes(blacklist, name)) { | ||
const blacklistStr = blacklist.filter(isString); | ||
const blacklistRegExp = blacklist.filter(isRegExp); | ||
const isRegExpMatch = blacklistRegExp.some((regExp) => regExp.test(name)); | ||
if (!Data.isDataComponent(child) || includes(blacklistStr, name) || isRegExpMatch) { | ||
return null; | ||
@@ -60,0 +73,0 @@ } |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1338315
24386
Updatedvictory-core@^32.1.0
Updatedvictory-tooltip@^32.1.0