victory-core 14.1.1 → 15.2.0

package/lib/victory-legend/victory-legend.js

@@ -1,6 +1,11 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _maxBy2=require("lodash/maxBy");var _maxBy3=_interopRequireDefault(_maxBy2);var _sumBy2=require("lodash/sumBy");var _sumBy3=_interopRequireDefault(_sumBy2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);var _isEmpty2=require("lodash/isEmpty");var _isEmpty3=_interopRequireDefault(_isEmpty2);var _merge2=require("lodash/merge");var _merge3=_interopRequireDefault(_merge2);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 _react=require("react");var _react2=_interopRequireDefault(_react);
-var _index=require("../victory-util/index");
-
+Object.defineProperty(exports,"__esModule",{value:true});var _maxBy2=require("lodash/maxBy");var _maxBy3=_interopRequireDefault(_maxBy2);var _sumBy2=require("lodash/sumBy");var _sumBy3=_interopRequireDefault(_sumBy2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);var _isEmpty2=require("lodash/isEmpty");var _isEmpty3=_interopRequireDefault(_isEmpty2);var _merge2=require("lodash/merge");var _merge3=_interopRequireDefault(_merge2);var _jsxFileName="src/victory-legend/victory-legend.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 _react=require("react");var _react2=_interopRequireDefault(_react);
+var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
+
+var _propTypes3=require("../victory-util/prop-types");var _propTypes4=_interopRequireDefault(_propTypes3);
+var _style=require("../victory-util/style");var _style2=_interopRequireDefault(_style);
+var _textsize=require("../victory-util/textsize");var _textsize2=_interopRequireDefault(_textsize);
+var _helpers=require("../victory-util/helpers");var _helpers2=_interopRequireDefault(_helpers);
 var _victoryLabel=require("../victory-label/victory-label");var _victoryLabel2=_interopRequireDefault(_victoryLabel);
 var _victoryContainer=require("../victory-container/victory-container");var _victoryContainer2=_interopRequireDefault(_victoryContainer);
 var _victoryTheme=require("../victory-theme/victory-theme");var _victoryTheme2=_interopRequireDefault(_victoryTheme);
@@ -79,63 +84,69 @@ VictoryLegend=function(_React$Component){_inherits(VictoryLegend,_React$Componen
 
 
 
+
 
 
 textSizes,padding,isHorizontal){var _props=
-this.props,data=_props.data,gutter=_props.gutter;
+this.props,gutter=_props.gutter,itemsPerRow=_props.itemsPerRow;
+var itemCount=textSizes.length;
+var rowCount=itemsPerRow?Math.ceil(itemCount/itemsPerRow):1;
 var contentHeight=isHorizontal?
-(0,_maxBy3.default)(textSizes,"height").height:
-(0,_sumBy3.default)(textSizes,"height")+gutter*(data.length-1);
+(0,_maxBy3.default)(textSizes,"height").height*rowCount+gutter*(rowCount-1):
+((0,_sumBy3.default)(textSizes,"height")+gutter*(itemCount-1))/rowCount;
 
 return padding.top+contentHeight+padding.bottom;
 }},{key:"calculateLegendWidth",value:function calculateLegendWidth(
 
-textSizes,padding,isHorizontal){var _props2=
-this.props,data=_props2.data,gutter=_props2.gutter,symbolSpacer=_props2.symbolSpacer;
-var contentWidth=isHorizontal?
-(0,_sumBy3.default)(textSizes,"width")+(gutter+symbolSpacer*3)*(data.length-1):
-(0,_maxBy3.default)(textSizes,"width").width+symbolSpacer*2;
+
+itemCount,padding,isHorizontal,maxTextWidth){var _props2=
+this.props,gutter=_props2.gutter,itemsPerRow=_props2.itemsPerRow,symbolSpacer=_props2.symbolSpacer;
+var rowCount=itemsPerRow?Math.ceil(itemCount/itemsPerRow):1;
+var rowItemCount=itemsPerRow||itemCount;
+var contentWidth=void 0;
+
+if(isHorizontal){
+var gutterWidth=gutter*rowItemCount;
+var symbolWidth=symbolSpacer*3*rowItemCount;
+var textWidth=maxTextWidth*rowItemCount;
+contentWidth=symbolWidth+textWidth+gutterWidth;
+}else{
+contentWidth=(maxTextWidth+symbolSpacer*2+gutter)*rowCount;
+}
 
 return padding.left+contentWidth+padding.right;
 }},{key:"getColorScale",value:function getColorScale(
 
-theme){var
-colorScale=this.props.colorScale;
-var colorScaleOptions=colorScale||theme.colorScale;
-
+theme){
+var colorScaleOptions=this.props.colorScale||theme.colorScale;
 if(typeof colorScaleOptions==="string"){
-colorScaleOptions=_index.Style.getColorScale(colorScaleOptions);
+colorScaleOptions=_style2.default.getColorScale(colorScaleOptions);
 }
-
 return!(0,_isEmpty3.default)(theme)?colorScaleOptions||theme.colorScale:colorScaleOptions||[];
 }},{key:"getCalculatedProps",value:function getCalculatedProps()
 
 {var _this2=this;var
 role=this.constructor.role;var _props3=
-this.props,data=_props3.data,orientation=_props3.orientation,theme=_props3.theme;var _props4=
-this.props,height=_props4.height,padding=_props4.padding,width=_props4.width;
-
+this.props,data=_props3.data,orientation=_props3.orientation,theme=_props3.theme;
 var legendTheme=theme&&theme[role]?theme[role]:{};
 var parentStyles=this.getStyles({},legendTheme,"parent");
 var colorScale=this.getColorScale(legendTheme);
 var isHorizontal=orientation==="horizontal";
 var symbolStyles=[];
-var labelStyles=[];
-var leftOffset=0;
+var labelStyles=[];var _props4=
+this.props,height=_props4.height,padding=_props4.padding,width=_props4.width;
+var maxTextWidth=0;
 
-padding=_index.Helpers.getPadding({padding:padding||theme.padding});
-height=_index.Helpers.evaluateProp(height||theme.height,data);
-width=_index.Helpers.evaluateProp(width||theme.width,data);
+padding=_helpers2.default.getPadding({padding:padding||theme.padding});
+height=_helpers2.default.evaluateProp(height||theme.height,data);
+width=_helpers2.default.evaluateProp(width||theme.width,data);
 
 var textSizes=data.map(function(datum,i){
 var labelStyle=_this2.getStyles(datum,legendTheme,"labels");
+var textSize=_textsize2.default.approximateTextSize(datum.name,labelStyle);
+maxTextWidth=textSize.width>maxTextWidth?textSize.width:maxTextWidth;
 symbolStyles[i]=_this2.getStyles(datum,legendTheme,"symbol",colorScale[i]);
 labelStyles[i]=labelStyle;
-
-var textSize=_index.TextSize.approximateTextSize(datum.name,labelStyle);
-textSize.leftOffset=leftOffset;
-leftOffset+=textSize.width;
-
 return textSize;
 });
 
@@ -143,12 +154,18 @@ if(!height){
 height=this.calculateLegendHeight(textSizes,padding,isHorizontal);
 }
 if(!width){
-width=this.calculateLegendWidth(textSizes,padding,isHorizontal);
+width=this.calculateLegendWidth(textSizes.length,padding,isHorizontal,maxTextWidth);
 }
 
-return _extends({},
-this.props,
-{isHorizontal:isHorizontal,height:height,labelStyles:labelStyles,padding:padding,parentStyles:parentStyles,symbolStyles:symbolStyles,textSizes:textSizes,width:width});
+return _extends({},this.props,{
+isHorizontal:isHorizontal,
+height:height,
+labelStyles:labelStyles,
+maxTextWidth:maxTextWidth,
+padding:padding,
+parentStyles:parentStyles,
+symbolStyles:symbolStyles,
+width:width});
 
 }},{key:"getStyles",value:function getStyles(
 
@@ -157,7 +174,7 @@ style=this.props.style;
 var styleKey=key==="symbol"?"data":key;
 var colorScaleStyle=color?{fill:color}:{};
 var styles=(0,_merge3.default)({},theme.style[styleKey],colorScaleStyle,style[styleKey],datum[key]);
-return _index.Helpers.evaluateStyle(styles,datum);
+return _helpers2.default.evaluateStyle(styles,datum);
 }},{key:"getSymbolSize",value:function getSymbolSize(
 
 datum,fontSize){
@@ -168,57 +185,87 @@ datum,props,i){var
 
 dataComponent=
 
-props.dataComponent,gutter=props.gutter,labelStyles=props.labelStyles,isHorizontal=props.isHorizontal,padding=props.padding,symbolSpacer=props.symbolSpacer,symbolStyles=props.symbolStyles,textSizes=props.textSizes;var
-leftOffset=textSizes[i].leftOffset;var
+
+
+
+
+
+
+
+props.dataComponent,gutter=props.gutter,isHorizontal=props.isHorizontal,itemsPerRow=props.itemsPerRow,labelStyles=props.labelStyles,maxTextWidth=props.maxTextWidth,padding=props.padding,symbolSpacer=props.symbolSpacer,symbolStyles=props.symbolStyles;var
+
 fontSize=labelStyles[i].fontSize;
 var symbolShift=fontSize/2;
 var style=symbolStyles[i];
+var rowHeight=fontSize+gutter;
+var itemIndex=i;
+var rowSpacer=0;
+var rowIndex=0;
+
+if(itemsPerRow){
+rowIndex=Math.floor(i/itemsPerRow);
+rowSpacer=rowHeight*rowIndex;
+itemIndex=i%itemsPerRow;
+}
 
 var symbolCoords=isHorizontal?{
-x:padding.left+leftOffset+symbolShift+(fontSize+symbolSpacer+gutter)*i,
-y:padding.top+symbolShift}:
+x:padding.left+symbolShift+(fontSize+symbolSpacer+maxTextWidth+gutter)*itemIndex,
+y:padding.top+symbolShift+rowSpacer}:
 {
-x:padding.left+symbolShift,
-y:padding.top+symbolShift+(fontSize+gutter)*i};
-
+x:padding.left+symbolShift+(rowHeight+maxTextWidth)*rowIndex,
+y:padding.top+symbolShift+rowHeight*itemIndex};
 
-return(0,_defaults3.default)({},
-dataComponent.props,_extends({
 
+return(0,_defaults3.default)({},dataComponent.props,_extends({
 key:"symbol-"+i,
 style:style,
 size:this.getSymbolSize(datum,fontSize),
 symbol:style.type},
 symbolCoords));
 
-
 }},{key:"getLabelProps",value:function getLabelProps(
 
 datum,props,i){var
 
 gutter=
-props.gutter,isHorizontal=props.isHorizontal,symbolSpacer=props.symbolSpacer,labelComponent=props.labelComponent,labelStyles=props.labelStyles,textSizes=props.textSizes,padding=props.padding;
+
+
+
+
+
+
+
+props.gutter,isHorizontal=props.isHorizontal,itemsPerRow=props.itemsPerRow,labelComponent=props.labelComponent,labelStyles=props.labelStyles,maxTextWidth=props.maxTextWidth,padding=props.padding,symbolSpacer=props.symbolSpacer;
+
 var style=labelStyles[i];var
 fontSize=style.fontSize;
 var symbolShift=fontSize/2;
+var rowHeight=fontSize+gutter;
+var symbolWidth=fontSize+symbolSpacer;
+var itemIndex=i;
+var rowSpacer=0;
+var rowIndex=0;
+
+if(itemsPerRow){
+rowIndex=Math.floor(i/itemsPerRow);
+rowSpacer=rowHeight*rowIndex;
+itemIndex=i%itemsPerRow;
+}
 
 var labelCoords=isHorizontal?{
-x:padding.left+textSizes[i].leftOffset+(fontSize+symbolSpacer)*(i+1)+gutter*i,
-y:padding.top+symbolShift}:
+x:padding.left+symbolWidth*(itemIndex+1)+(maxTextWidth+gutter)*itemIndex,
+y:padding.top+symbolShift+rowSpacer}:
 {
-x:padding.left+fontSize+symbolSpacer,
-y:padding.top+symbolShift+(fontSize+gutter)*i};
-
+x:padding.left+symbolWidth+(rowHeight+maxTextWidth)*rowIndex,
+y:padding.top+symbolShift+rowHeight*itemIndex};
 
-return(0,_defaults3.default)({},
-labelComponent.props,_extends({
 
+return(0,_defaults3.default)({},labelComponent.props,_extends({
 key:"label-"+i,
 style:style,
 text:datum.name},
 labelCoords));
 
-
 }},{key:"renderLegendItems",value:function renderLegendItems(
 
 props){var _this3=this;var
@@ -231,7 +278,6 @@ dataComponent,
 _this3.getSymbolProps(datum,props,i));
 
 });
-
 var labelComponents=legendData.map(function(datum,i){
 return _react2.default.cloneElement(
 labelComponent,
@@ -243,23 +289,27 @@ return[].concat(_toConsumableArray(dataComponents),_toConsumableArray(labelCompo
 }},{key:"renderGroup",value:function renderGroup(
 
 props,children){var
-groupComponent=props.groupComponent,height=props.height,standalone=props.standalone,width=props.width,x=props.x,y=props.y;
-var style=props.style||{};
+groupComponent=props.groupComponent,height=props.height,parentStyles=props.parentStyles,standalone=props.standalone,width=props.width,x=props.x,y=props.y;
 var groupProps={role:"presentation"};
-var transform="translate("+x+", "+y+")";
+
 if(!standalone){
-groupProps=_extends(groupProps,{height:height,width:width,transform:transform,style:style.parent});
+groupProps=_extends({
+height:height,
+width:width,
+transform:"translate("+x+", "+y+")",
+style:parentStyles},
+groupProps);
+
 }
 
 return _react2.default.cloneElement(groupComponent,groupProps,children);
 }},{key:"renderContainer",value:function renderContainer(
 
 props,children){var
-containerComponent=props.containerComponent,height=props.height,width=props.width;
-var style=props.style||{};
+containerComponent=props.containerComponent,height=props.height,parentStyles=props.parentStyles,width=props.width;
 return _react2.default.cloneElement(
 containerComponent,
-{height:height,width:width,style:style.parent},
+{height:height,width:width,style:parentStyles},
 children);
 
 }},{key:"render",value:function render()
@@ -268,4 +318,4 @@ children);
 var props=this.getCalculatedProps();
 var group=this.renderGroup(props,this.renderLegendItems(props));
 return props.standalone?this.renderContainer(props,group):group;
-}}]);return VictoryLegend;}(_react2.default.Component);VictoryLegend.displayName="VictoryLegend";VictoryLegend.role="legend";VictoryLegend.propTypes={colorScale:_react.PropTypes.oneOfType([_react.PropTypes.arrayOf(_react.PropTypes.string),_react.PropTypes.oneOf(["grayscale","qualitative","heatmap","warm","cool","red","green","blue"])]),containerComponent:_react.PropTypes.element,data:_react.PropTypes.arrayOf(_react.PropTypes.shape({name:_react.PropTypes.string.isRequired,label:_react.PropTypes.object,symbol:_react.PropTypes.object})),dataComponent:_react.PropTypes.element,groupComponent:_react.PropTypes.element,gutter:_react.PropTypes.number,height:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),labelComponent:_react.PropTypes.element,orientation:_react.PropTypes.oneOf(["horizontal","vertical"]),padding:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.shape({top:_react.PropTypes.number,bottom:_react.PropTypes.number,left:_react.PropTypes.number,right:_react.PropTypes.number})]),standalone:_react.PropTypes.bool,style:_react.PropTypes.shape({data:_react.PropTypes.object,labels:_react.PropTypes.object,parent:_react.PropTypes.object}),symbolSpacer:_react.PropTypes.number,theme:_react.PropTypes.object,width:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),x:_react.PropTypes.number,y:_react.PropTypes.number};VictoryLegend.defaultProps={data:defaultLegendData,containerComponent:_react2.default.createElement(_victoryContainer2.default,null),dataComponent:_react2.default.createElement(_point2.default,null),groupComponent:_react2.default.createElement("g",null),gutter:10,labelComponent:_react2.default.createElement(_victoryLabel2.default,null),orientation:"vertical",standalone:true,style:{},symbolSpacer:8,theme:_victoryTheme2.default.grayscale,x:0,y:0};exports.default=VictoryLegend;
+}}]);return VictoryLegend;}(_react2.default.Component);VictoryLegend.displayName="VictoryLegend";VictoryLegend.role="legend";VictoryLegend.propTypes={colorScale:_propTypes2.default.oneOfType([_propTypes2.default.arrayOf(_propTypes2.default.string),_propTypes2.default.oneOf(["grayscale","qualitative","heatmap","warm","cool","red","green","blue"])]),containerComponent:_propTypes2.default.element,data:_propTypes2.default.arrayOf(_propTypes2.default.shape({name:_propTypes2.default.string.isRequired,label:_propTypes2.default.object,symbol:_propTypes2.default.object})),dataComponent:_propTypes2.default.element,groupComponent:_propTypes2.default.element,gutter:_propTypes2.default.number,height:_propTypes2.default.oneOfType([_propTypes4.default.nonNegative,_propTypes2.default.func]),itemsPerRow:_propTypes2.default.number,labelComponent:_propTypes2.default.element,orientation:_propTypes2.default.oneOf(["horizontal","vertical"]),padding:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.shape({top:_propTypes2.default.number,bottom:_propTypes2.default.number,left:_propTypes2.default.number,right:_propTypes2.default.number})]),standalone:_propTypes2.default.bool,style:_propTypes2.default.shape({data:_propTypes2.default.object,labels:_propTypes2.default.object,parent:_propTypes2.default.object}),symbolSpacer:_propTypes2.default.number,theme:_propTypes2.default.object,width:_propTypes2.default.oneOfType([_propTypes4.default.nonNegative,_propTypes2.default.func]),x:_propTypes2.default.number,y:_propTypes2.default.number};VictoryLegend.defaultProps={data:defaultLegendData,containerComponent:_react2.default.createElement(_victoryContainer2.default,{__source:{fileName:_jsxFileName,lineNumber:76}}),dataComponent:_react2.default.createElement(_point2.default,{__source:{fileName:_jsxFileName,lineNumber:77}}),groupComponent:_react2.default.createElement("g",{__source:{fileName:_jsxFileName,lineNumber:78}}),gutter:10,labelComponent:_react2.default.createElement(_victoryLabel2.default,{__source:{fileName:_jsxFileName,lineNumber:80}}),orientation:"vertical",standalone:true,style:{},symbolSpacer:8,theme:_victoryTheme2.default.grayscale,x:0,y:0};exports.default=VictoryLegend;

package/lib/victory-portal/portal.js

@@ -1,4 +1,5 @@
-Object.defineProperty(exports,"__esModule",{value:true});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 _react=require("react");var _react2=_interopRequireDefault(_react);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
+Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName="src/victory-portal/portal.js";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 _react=require("react");var _react2=_interopRequireDefault(_react);
+var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
 
 Portal=function(_React$Component){_inherits(Portal,_React$Component);
 
@@ -43,4 +44,4 @@ var el=_this2.map[key];
 return el?_react2.default.cloneElement(el,{key:key}):el;
 }));
 
-}}]);return Portal;}(_react2.default.Component);Portal.displayName="Portal";Portal.propTypes={groupComponent:_react.PropTypes.element};Portal.defaultProps={groupComponent:_react2.default.createElement("g",null)};exports.default=Portal;
+}}]);return Portal;}(_react2.default.Component);Portal.displayName="Portal";Portal.propTypes={groupComponent:_propTypes2.default.element};Portal.defaultProps={groupComponent:_react2.default.createElement("g",{__source:{fileName:_jsxFileName,lineNumber:12}})};exports.default=Portal;

package/lib/victory-portal/victory-portal.js

@@ -1,5 +1,6 @@
 Object.defineProperty(exports,"__esModule",{value:true});var _omit2=require("lodash/omit");var _omit3=_interopRequireDefault(_omit2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);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 _react=require("react");var _react2=_interopRequireDefault(_react);
-var _index=require("../victory-util/index");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
+var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
+var _log=require("../victory-util/log");var _log2=_interopRequireDefault(_log);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
 
 
 VictoryPortal=function(_React$Component){_inherits(VictoryPortal,_React$Component);function VictoryPortal(){_classCallCheck(this,VictoryPortal);return _possibleConstructorReturn(this,(VictoryPortal.__proto__||Object.getPrototypeOf(VictoryPortal)).apply(this,arguments));}_createClass(VictoryPortal,[{key:"componentDidMount",value:function componentDidMount()
@@ -18,7 +19,7 @@ if(!this.checkedContext){
 if(typeof this.context.portalUpdate!=="function"){
 var msg="`renderInPortal` is not supported outside of `VictoryContainer`. "+
 "Component will be rendered in place";
-_index.Log.warn(msg);
+_log2.default.warn(msg);
 this.renderInPlace=true;
 }
 this.checkedContext=true;
@@ -55,4 +56,4 @@ var child=children&&_react2.default.cloneElement(
 children,(0,_defaults3.default)({},childProps,(0,_omit3.default)(this.props,"children")));
 
 return this.renderPortal(child);
-}}]);return VictoryPortal;}(_react2.default.Component);VictoryPortal.propTypes={children:_react2.default.PropTypes.node};VictoryPortal.contextTypes={portalUpdate:_react2.default.PropTypes.func,portalRegister:_react2.default.PropTypes.func,portalDeregister:_react2.default.PropTypes.func};exports.default=VictoryPortal;
+}}]);return VictoryPortal;}(_react2.default.Component);VictoryPortal.propTypes={children:_propTypes2.default.node};VictoryPortal.contextTypes={portalDeregister:_propTypes2.default.func,portalRegister:_propTypes2.default.func,portalUpdate:_propTypes2.default.func};exports.default=VictoryPortal;

package/lib/victory-primitives/area.js

@@ -1,7 +1,10 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _isEqual2=require("lodash/isEqual");var _isEqual3=_interopRequireDefault(_isEqual2);var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);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 _react=require("react");var _react2=_interopRequireDefault(_react);
-var _victoryUtil=require("../victory-util");
+Object.defineProperty(exports,"__esModule",{value:true});var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);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 _jsxFileName="src/victory-primitives/area.js";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 _react=require("react");var _react2=_interopRequireDefault(_react);
+var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
+var _collection=require("../victory-util/collection");var _collection2=_interopRequireDefault(_collection);
+var _helpers=require("../victory-util/helpers");var _helpers2=_interopRequireDefault(_helpers);
 
-var _d3Shape=require("d3-shape");var d3Shape=_interopRequireWildcard(_d3Shape);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))newObj[key]=obj[key];}}newObj.default=obj;return newObj;}}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _toConsumableArray(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i];}return arr2;}else{return Array.from(arr);}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
+var _d3Shape=require("d3-shape");var d3Shape=_interopRequireWildcard(_d3Shape);
+var _commonProps=require("./common-props");var _commonProps2=_interopRequireDefault(_commonProps);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))newObj[key]=obj[key];}}newObj.default=obj;return newObj;}}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _toConsumableArray(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i];}return arr2;}else{return Array.from(arr);}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
 
 Area=function(_React$Component){_inherits(Area,_React$Component);function Area(){_classCallCheck(this,Area);return _possibleConstructorReturn(this,(Area.__proto__||Object.getPrototypeOf(Area)).apply(this,arguments));}_createClass(Area,[{key:"componentWillMount",value:function componentWillMount()
 
@@ -14,14 +17,6 @@ Area=function(_React$Component){_inherits(Area,_React$Component);function Area()
 
 
 
-
-
-
-
-
-
-
-
 {var _calculateAttributes=
 this.calculateAttributes(this.props),style=_calculateAttributes.style,areaPaths=_calculateAttributes.areaPaths,linePaths=_calculateAttributes.linePaths;
 this.style=style;
@@ -30,8 +25,15 @@ this.linePaths=linePaths;
 }},{key:"shouldComponentUpdate",value:function shouldComponentUpdate(
 
 nextProps){var _calculateAttributes2=
-this.calculateAttributes(nextProps),style=_calculateAttributes2.style,areaPaths=_calculateAttributes2.areaPaths,linePaths=_calculateAttributes2.linePaths;
-if(!(0,_isEqual3.default)(linePaths,this.linePaths)||!(0,_isEqual3.default)(style,this.style)){
+this.calculateAttributes(nextProps),style=_calculateAttributes2.style,areaPaths=_calculateAttributes2.areaPaths,linePaths=_calculateAttributes2.linePaths;var _props=
+this.props,className=_props.className,interpolation=_props.interpolation;
+if(!_collection2.default.allSetsEqual([
+[className,nextProps.className],
+[interpolation,nextProps.interpolation],
+[linePaths,this.linePaths],
+[areaPaths,this.areaPaths],
+[style,this.style]]))
+{
 this.style=style;
 this.areaPaths=areaPaths;
 this.linePaths=linePaths;
@@ -56,14 +58,14 @@ curve(d3Shape[interpolation]).
 x(function(d){return xScale(d._x1!==undefined?d._x1:d._x);}).
 y(function(d){return yScale(d._y1);});
 return{
-style:_victoryUtil.Helpers.evaluateStyle((0,_assign3.default)({fill:"black"},style),data,active),
+style:_helpers2.default.evaluateStyle((0,_assign3.default)({fill:"black"},style),data,active),
 areaPaths:dataSegments.map(function(segment){return areaFunction(segment);}),
 linePaths:dataSegments.map(function(segment){return lineFunction(segment);})};
 
 }},{key:"getDataSegments",value:function getDataSegments(
 
 data){
-return _victoryUtil.Collection.splitArray(data,function(datum){
+return _collection2.default.splitArray(data,function(datum){
 var yDatum=datum.y1!==undefined?datum._y1:datum._y;
 
 return yDatum===null||typeof yDatum==="undefined";
@@ -79,8 +81,8 @@ return"curve"+capitalize(interpolation);
 
 paths,style,events){
 var areaStroke=style.stroke?"none":style.fill;
-var areaStyle=(0,_assign3.default)({},style,{stroke:areaStroke});var _props=
-this.props,role=_props.role,shapeRendering=_props.shapeRendering,className=_props.className;
+var areaStyle=(0,_assign3.default)({},style,{stroke:areaStroke});var _props2=
+this.props,role=_props2.role,shapeRendering=_props2.shapeRendering,className=_props2.className;
 return paths.map(function(path,index){
 return(
 _react2.default.createElement("path",_extends({
@@ -90,7 +92,7 @@ shapeRendering:shapeRendering||"auto",
 role:role||"presentation",
 d:path,
 className:className},
-events)));
+events,{__source:{fileName:_jsxFileName,lineNumber:88}})));
 
 
 });
@@ -100,8 +102,8 @@ events)));
 paths,style,events){
 if(!style.stroke||style.stroke==="none"||style.stroke==="transparent"){
 return[];
-}var _props2=
-this.props,role=_props2.role,shapeRendering=_props2.shapeRendering,className=_props2.className;
+}var _props3=
+this.props,role=_props3.role,shapeRendering=_props3.shapeRendering,className=_props3.className;
 var lineStyle=(0,_assign3.default)({},style,{fill:"none"});
 return paths.map(function(path,index){
 return(
@@ -112,16 +114,16 @@ shapeRendering:shapeRendering||"auto",
 role:role||"presentation",
 d:path,
 className:className},
-events)));
+events,{__source:{fileName:_jsxFileName,lineNumber:110}})));
 
 
 });
 }},{key:"render",value:function render()
 
-{var _props3=
-this.props,events=_props3.events,groupComponent=_props3.groupComponent;
+{var _props4=
+this.props,events=_props4.events,groupComponent=_props4.groupComponent;
 var areas=this.renderArea(this.areaPaths,this.style,events);
 var lines=this.renderLine(this.linePaths,this.style,events);
 var children=[].concat(_toConsumableArray(lines),_toConsumableArray(areas));
 return children.length===1?children[0]:_react2.default.cloneElement(groupComponent,{},children);
-}}]);return Area;}(_react2.default.Component);Area.propTypes={active:_react.PropTypes.bool,index:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),className:_react.PropTypes.string,data:_react.PropTypes.array,events:_react.PropTypes.object,groupComponent:_react.PropTypes.element,interpolation:_react.PropTypes.string,shapeRendering:_react.PropTypes.string,role:_react.PropTypes.string,scale:_react.PropTypes.object,style:_react.PropTypes.object};Area.defaultProps={groupComponent:_react2.default.createElement("g",null)};exports.default=Area;
+}}]);return Area;}(_react2.default.Component);Area.propTypes=_extends({},_commonProps2.default,{groupComponent:_propTypes2.default.element,interpolation:_propTypes2.default.string});Area.defaultProps={groupComponent:_react2.default.createElement("g",{__source:{fileName:_jsxFileName,lineNumber:17}})};exports.default=Area;

package/lib/victory-primitives/bar.js

@@ -1,6 +1,10 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _isEqual2=require("lodash/isEqual");var _isEqual3=_interopRequireDefault(_isEqual2);var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);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 _react=require("react");var _react2=_interopRequireDefault(_react);
-var _helpers=require("../victory-util/helpers");var _helpers2=_interopRequireDefault(_helpers);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
+Object.defineProperty(exports,"__esModule",{value:true});var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);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 _jsxFileName="src/victory-primitives/bar.js";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 _react=require("react");var _react2=_interopRequireDefault(_react);
+var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
+var _helpers=require("../victory-util/helpers");var _helpers2=_interopRequireDefault(_helpers);
+var _collection=require("../victory-util/collection");var _collection2=_interopRequireDefault(_collection);
 
+var _commonProps=require("./common-props");var _commonProps2=_interopRequireDefault(_commonProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}var
 
 Bar=function(_React$Component){_inherits(Bar,_React$Component);function Bar(){_classCallCheck(this,Bar);return _possibleConstructorReturn(this,(Bar.__proto__||Object.getPrototypeOf(Bar)).apply(this,arguments));}_createClass(Bar,[{key:"componentWillMount",value:function componentWillMount()
 
@@ -15,14 +19,6 @@ Bar=function(_React$Component){_inherits(Bar,_React$Component);function Bar(){_c
 
 
 
-
-
-
-
-
-
-
-
 
 
 
@@ -33,8 +29,18 @@ this.path=path;
 }},{key:"shouldComponentUpdate",value:function shouldComponentUpdate(
 
 nextProps){var _calculateAttributes2=
-this.calculateAttributes(nextProps),style=_calculateAttributes2.style,path=_calculateAttributes2.path;
-if(path!==this.path||!(0,_isEqual3.default)(style,this.style)){
+this.calculateAttributes(nextProps),style=_calculateAttributes2.style,path=_calculateAttributes2.path;var _props=
+this.props,className=_props.className,datum=_props.datum,horizontal=_props.horizontal,x=_props.x,y=_props.y,y0=_props.y0;
+if(!_collection2.default.allSetsEqual([
+[className,nextProps.className],
+[x,nextProps.x],
+[y,nextProps.y],
+[y0,nextProps.y0],
+[horizontal,nextProps.horizontal],
+[path,this.path],
+[style,this.style],
+[datum,nextProps.datum]]))
+{
 this.style=style;
 this.path=path;
 return true;
@@ -93,13 +99,14 @@ return style.width;
 
 width=props.width,data=props.data;
 var padding=props.padding.left||props.padding;
+
 var defaultWidth=data.length===0?8:(width-2*padding)/data.length;
 return defaultWidth;
 }},{key:"renderBar",value:function renderBar(
 
 
-path,style,events){var _props=
-this.props,role=_props.role,shapeRendering=_props.shapeRendering,className=_props.className;
+path,style,events){var _props2=
+this.props,role=_props2.role,shapeRendering=_props2.shapeRendering,className=_props2.className;
 return(
 _react2.default.createElement("path",_extends({
 d:path,
@@ -107,11 +114,11 @@ className:className,
 style:style,
 role:role||"presentation",
 shapeRendering:shapeRendering||"auto"},
-events)));
+events,{__source:{fileName:_jsxFileName,lineNumber:111}})));
 
 
 }},{key:"render",value:function render()
 
 {
 return this.renderBar(this.path,this.style,this.props.events);
-}}]);return Bar;}(_react2.default.Component);Bar.propTypes={active:_react.PropTypes.bool,className:_react.PropTypes.string,datum:_react.PropTypes.object,events:_react.PropTypes.object,horizontal:_react.PropTypes.bool,index:_react.PropTypes.number,role:_react.PropTypes.string,scale:_react.PropTypes.object,shapeRendering:_react.PropTypes.string,style:_react.PropTypes.object,x:_react.PropTypes.number,y:_react.PropTypes.number,y0:_react.PropTypes.number,width:_react.PropTypes.number,padding:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.object]),data:_react.PropTypes.array};exports.default=Bar;
+}}]);return Bar;}(_react2.default.Component);Bar.propTypes=_extends({},_commonProps2.default,{datum:_propTypes2.default.object,horizontal:_propTypes2.default.bool,padding:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.object]),width:_propTypes2.default.number,x:_propTypes2.default.number,y:_propTypes2.default.number,y0:_propTypes2.default.number});exports.default=Bar;