victory-chart - npm Package Compare versions

Comparing version 21.1.3 to 21.1.4

CHANGELOG.md

 # VictoryChart Changelog
 
+## 21.1.4 (2017-06-22)
+
+[482](https://github.com/FormidableLabs/victory-chart/pull/482) Add `minBubbleSize` prop to `VictoryScatter`
+
 ## 21.1.3 (2017-06-21)
@@ -4,0 +8,0 @@

lib/components/victory-scatter/helper-methods.js

@@ -74,3 +74,3 @@ Object.defineProperty(exports,"__esModule",{value:true});var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);var _omit2=require("lodash/omit");var _omit3=_interopRequireDefault(_omit2);var _values2=require("lodash/values");var _values3=_interopRequireDefault(_values2);var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);
 getBubbleSize:function getBubbleSize(datum,props){var
-data=props.data,z=props.z,maxBubbleSize=props.maxBubbleSize;
+data=props.data,z=props.z,maxBubbleSize=props.maxBubbleSize,minBubbleSize=props.minBubbleSize;
 var getMaxRadius=function getMaxRadius(){
@@ -84,4 +84,7 @@ var minPadding=Math.min.apply(Math,_toConsumableArray((0,_values3.default)(_victoryCore.Helpers.getPadding(props))));
 var maxRadius=maxBubbleSize||getMaxRadius();
+var minRadius=minBubbleSize||maxRadius*0.1;
 var maxArea=Math.PI*Math.pow(maxRadius,2);
-var area=(datum[z]-zMin)/(zMax-zMin)*maxArea;
+var minArea=Math.PI*Math.pow(minRadius,2);
+var pointArea=(datum[z]-zMin)/(zMax-zMin)*maxArea;
+var area=Math.max(pointArea,minArea);
 var radius=Math.sqrt(area/Math.PI);
@@ -88,0 +91,0 @@ return Math.max(radius,1);

lib/components/victory-scatter/victory-scatter.js

@@ -62,2 +62,3 @@ Object.defineProperty(exports,"__esModule",{value:true});var _partialRight2=require("lodash/partialRight");var _partialRight3=_interopRequireDefault(_partialRight2);var _jsxFileName="src/components/victory-scatter/victory-scatter.js";var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=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);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
 
+
 {
@@ -75,5 +76,5 @@ return!!this.props.animate;
 return props.standalone?this.renderContainer(props.containerComponent,children):children;
-}}]);return VictoryScatter;}(_react2.default.Component);VictoryScatter.displayName="VictoryScatter";VictoryScatter.role="scatter";VictoryScatter.defaultTransitions=_victoryCore.DefaultTransitions.discreteTransitions();VictoryScatter.propTypes=_extends({},_commonProps.BaseProps,_commonProps.DataProps,{bubbleProperty:_propTypes2.default.string,maxBubbleSize:_victoryCore.PropTypes.nonNegative,size:_propTypes2.default.oneOfType([_victoryCore.PropTypes.nonNegative,_propTypes2.default.func]),symbol:_propTypes2.default.oneOfType([_propTypes2.default.oneOf(["circle","diamond","plus","square","star","triangleDown","triangleUp"]),_propTypes2.default.func])});VictoryScatter.defaultProps={samples:50,scale:"linear",standalone:true,dataComponent:_react2.default.createElement(_victoryCore.Point,{__source:{fileName:_jsxFileName,lineNumber:46}}),labelComponent:_react2.default.createElement(_victoryCore.VictoryLabel,{__source:{fileName:_jsxFileName,lineNumber:47}}),containerComponent:_react2.default.createElement(_victoryCore.VictoryContainer,{__source:{fileName:_jsxFileName,lineNumber:48}}),groupComponent:_react2.default.createElement("g",{__source:{fileName:_jsxFileName,lineNumber:49}}),theme:_victoryCore.VictoryTheme.grayscale};VictoryScatter.getDomain=_victoryCore.Domain.getDomain.bind(_victoryCore.Domain);VictoryScatter.getData=_victoryCore.Data.getData.bind(_victoryCore.Data);VictoryScatter.getBaseProps=(0,_partialRight3.default)(_helperMethods2.default.getBaseProps.bind(_helperMethods2.default),fallbackProps);VictoryScatter.expectedComponents=["dataComponent","labelComponent","groupComponent","containerComponent"];exports.default=
+}}]);return VictoryScatter;}(_react2.default.Component);VictoryScatter.displayName="VictoryScatter";VictoryScatter.role="scatter";VictoryScatter.defaultTransitions=_victoryCore.DefaultTransitions.discreteTransitions();VictoryScatter.propTypes=_extends({},_commonProps.BaseProps,_commonProps.DataProps,{bubbleProperty:_propTypes2.default.string,maxBubbleSize:_victoryCore.PropTypes.nonNegative,minBubbleSize:_victoryCore.PropTypes.nonNegative,size:_propTypes2.default.oneOfType([_victoryCore.PropTypes.nonNegative,_propTypes2.default.func]),symbol:_propTypes2.default.oneOfType([_propTypes2.default.oneOf(["circle","diamond","plus","square","star","triangleDown","triangleUp"]),_propTypes2.default.func])});VictoryScatter.defaultProps={samples:50,scale:"linear",standalone:true,dataComponent:_react2.default.createElement(_victoryCore.Point,{__source:{fileName:_jsxFileName,lineNumber:47}}),labelComponent:_react2.default.createElement(_victoryCore.VictoryLabel,{__source:{fileName:_jsxFileName,lineNumber:48}}),containerComponent:_react2.default.createElement(_victoryCore.VictoryContainer,{__source:{fileName:_jsxFileName,lineNumber:49}}),groupComponent:_react2.default.createElement("g",{__source:{fileName:_jsxFileName,lineNumber:50}}),theme:_victoryCore.VictoryTheme.grayscale};VictoryScatter.getDomain=_victoryCore.Domain.getDomain.bind(_victoryCore.Domain);VictoryScatter.getData=_victoryCore.Data.getData.bind(_victoryCore.Data);VictoryScatter.getBaseProps=(0,_partialRight3.default)(_helperMethods2.default.getBaseProps.bind(_helperMethods2.default),fallbackProps);VictoryScatter.expectedComponents=["dataComponent","labelComponent","groupComponent","containerComponent"];exports.default=
 
 
 (0,_victoryCore.addEvents)(VictoryScatter);

package.json

 {
   "name": "victory-chart",
-  "version": "21.1.3",
+  "version": "21.1.4",
   "description": "Chart Component for Victory",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

src/components/victory-scatter/helper-methods.js

@@ -74,3 +74,3 @@ import { assign, values, omit, defaults } from "lodash";
   getBubbleSize(datum, props) {
-    const { data, z, maxBubbleSize } = props;
+    const { data, z, maxBubbleSize, minBubbleSize } = props;
     const getMaxRadius = () => {
@@ -84,4 +84,7 @@ const minPadding = Math.min(...values(Helpers.getPadding(props)));
     const maxRadius = maxBubbleSize || getMaxRadius();
-    const maxArea = Math.PI * Math.pow(maxRadius, 2); // eslint-disable-line no-magic-numbers
-    const area = ((datum[z] - zMin) / (zMax - zMin)) * maxArea;
+    const minRadius = minBubbleSize || maxRadius * 0.1; // eslint-disable-line no-magic-numbers
+    const maxArea = Math.PI * Math.pow(maxRadius, 2);
+    const minArea = Math.PI * Math.pow(minRadius, 2);
+    const pointArea = ((datum[z] - zMin) / (zMax - zMin)) * maxArea;
+    const area = Math.max(pointArea, minArea);
     const radius = Math.sqrt(area / Math.PI);
@@ -88,0 +91,0 @@ return Math.max(radius, 1);

src/components/victory-scatter/victory-scatter.js

@@ -33,2 +33,3 @@ import PropTypes from "prop-types";
     maxBubbleSize: CustomPropTypes.nonNegative,
+    minBubbleSize: CustomPropTypes.nonNegative,
     size: PropTypes.oneOfType([ CustomPropTypes.nonNegative, PropTypes.func ]),
@@ -35,0 +36,0 @@ symbol: PropTypes.oneOfType([

No alert changes

Improved metrics

Total package byte prevSize

1928586

increased by0.05%

Lines of code

34350

increased by0.03%

No dependency changes