victory-core
Advanced tools
Comparing version 14.0.6 to 14.0.7
VictoryCore Changelog | ||
===================== | ||
## 14.0.7 (2017-03-21) | ||
- Fixes a bug in s`houldComponentUpdate` logic in `Candle` | ||
- Adds static roles for `VictoryContainer`, `VictoryClipContainer`, and `VictoryLabel` | ||
- Fixes a bug in `VictoryClipContainer` | ||
- Prevents unknown prop `clipWidth` on `<g>` tags | ||
## 14.0.6 (2017-03-15) | ||
@@ -5,0 +12,0 @@ |
@@ -34,11 +34,2 @@ Object.defineProperty(exports,"__esModule",{value:true});var _isFunction2=require("lodash/isFunction");var _isFunction3=_interopRequireDefault(_isFunction2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);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); | ||
function VictoryClipContainer(props){_classCallCheck(this,VictoryClipContainer);var _this=_possibleConstructorReturn(this,(VictoryClipContainer.__proto__||Object.getPrototypeOf(VictoryClipContainer)).call(this, | ||
@@ -86,7 +77,7 @@ props)); | ||
padding= | ||
props.padding,clipPadding=props.clipPadding,translateX=props.translateX,translateY=props.translateY,clipHeight=props.clipHeight,clipWidth=props.clipWidth,clipPathComponent=props.clipPathComponent; | ||
clipPadding= | ||
props.clipPadding,translateX=props.translateX,translateY=props.translateY,clipHeight=props.clipHeight,clipWidth=props.clipWidth,clipPathComponent=props.clipPathComponent; | ||
return _react2.default.cloneElement( | ||
clipPathComponent, | ||
{padding:padding,clipPadding:clipPadding,clipId:clipId,translateX:translateX,translateY:translateY,clipWidth:clipWidth,clipHeight:clipHeight}); | ||
{clipPadding:clipPadding,clipId:clipId,translateX:translateX,translateY:translateY,clipWidth:clipWidth,clipHeight:clipHeight}); | ||
@@ -101,3 +92,3 @@ }},{key:"getClipValue",value:function getClipValue( | ||
var range=this.getRange(props,axis); | ||
return range?Math.abs(range[0]-range[1]):undefined; | ||
return range?Math.abs(range[0]-range[1])||undefined:undefined; | ||
}},{key:"getTranslateValue",value:function getTranslateValue( | ||
@@ -132,2 +123,2 @@ | ||
return this.renderClippedGroup(clipProps,this.clipId); | ||
}}]);return VictoryClipContainer;}(_react2.default.Component);VictoryClipContainer.displayName="VictoryClipContainer";VictoryClipContainer.propTypes={className:_react.PropTypes.string,style:_react.PropTypes.object,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})]),clipPadding:_react.PropTypes.shape({top:_react.PropTypes.number,bottom:_react.PropTypes.number,left:_react.PropTypes.number,right:_react.PropTypes.number}),clipHeight:_react.PropTypes.number,clipWidth:_react.PropTypes.number,events:_react.PropTypes.object,children:_react2.default.PropTypes.oneOfType([_react2.default.PropTypes.arrayOf(_react2.default.PropTypes.node),_react2.default.PropTypes.node]),clipPathComponent:_react.PropTypes.element,translateX:_react.PropTypes.number,translateY:_react.PropTypes.number,transform:_react.PropTypes.string};VictoryClipContainer.defaultProps={clipPathComponent:_react2.default.createElement(_index.ClipPath,null)};exports.default=VictoryClipContainer; | ||
}}]);return VictoryClipContainer;}(_react2.default.Component);VictoryClipContainer.displayName="VictoryClipContainer";VictoryClipContainer.role="container";VictoryClipContainer.propTypes={className:_react.PropTypes.string,style:_react.PropTypes.object,clipPadding:_react.PropTypes.shape({top:_react.PropTypes.number,bottom:_react.PropTypes.number,left:_react.PropTypes.number,right:_react.PropTypes.number}),clipHeight:_react.PropTypes.number,clipWidth:_react.PropTypes.number,events:_react.PropTypes.object,children:_react2.default.PropTypes.oneOfType([_react2.default.PropTypes.arrayOf(_react2.default.PropTypes.node),_react2.default.PropTypes.node]),clipPathComponent:_react.PropTypes.element,translateX:_react.PropTypes.number,translateY:_react.PropTypes.number,transform:_react.PropTypes.string};VictoryClipContainer.defaultProps={clipPathComponent:_react2.default.createElement(_index.ClipPath,null)};exports.default=VictoryClipContainer; |
@@ -119,2 +119,2 @@ 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 _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);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); | ||
return this.renderContainer(this.props,svgProps,style); | ||
}}]);return VictoryContainer;}(_react2.default.Component);VictoryContainer.displayName="VictoryContainer";VictoryContainer.propTypes={className:_react.PropTypes.string,style:_react.PropTypes.object,height:_react.PropTypes.number,width:_react.PropTypes.number,events:_react.PropTypes.object,children:_react2.default.PropTypes.oneOfType([_react2.default.PropTypes.arrayOf(_react2.default.PropTypes.node),_react2.default.PropTypes.node]),title:_react.PropTypes.string,desc:_react.PropTypes.string,portalComponent:_react.PropTypes.element,responsive:_react.PropTypes.bool,standalone:_react.PropTypes.bool,theme:_react.PropTypes.object};VictoryContainer.defaultProps={portalComponent:_react2.default.createElement(_portal2.default,null),responsive:true,theme:_victoryTheme2.default.grayscale};VictoryContainer.contextTypes={getTimer:_react2.default.PropTypes.func};VictoryContainer.childContextTypes={portalUpdate:_react2.default.PropTypes.func,portalRegister:_react2.default.PropTypes.func,portalDeregister:_react2.default.PropTypes.func,getTimer:_react2.default.PropTypes.func};exports.default=VictoryContainer; | ||
}}]);return VictoryContainer;}(_react2.default.Component);VictoryContainer.displayName="VictoryContainer";VictoryContainer.role="container";VictoryContainer.propTypes={className:_react.PropTypes.string,style:_react.PropTypes.object,height:_react.PropTypes.number,width:_react.PropTypes.number,events:_react.PropTypes.object,children:_react2.default.PropTypes.oneOfType([_react2.default.PropTypes.arrayOf(_react2.default.PropTypes.node),_react2.default.PropTypes.node]),title:_react.PropTypes.string,desc:_react.PropTypes.string,portalComponent:_react.PropTypes.element,responsive:_react.PropTypes.bool,standalone:_react.PropTypes.bool,theme:_react.PropTypes.object};VictoryContainer.defaultProps={portalComponent:_react2.default.createElement(_portal2.default,null),responsive:true,theme:_victoryTheme2.default.grayscale};VictoryContainer.contextTypes={getTimer:_react2.default.PropTypes.func};VictoryContainer.childContextTypes={portalUpdate:_react2.default.PropTypes.func,portalRegister:_react2.default.PropTypes.func,portalDeregister:_react2.default.PropTypes.func,getTimer:_react2.default.PropTypes.func};exports.default=VictoryContainer; |
@@ -241,2 +241,2 @@ Object.defineProperty(exports,"__esModule",{value:true});var _isEqual2=require("lodash/isEqual");var _isEqual3=_interopRequireDefault(_isEqual2);var _merge2=require("lodash/merge");var _merge3=_interopRequireDefault(_merge2);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); | ||
return this.renderElements(this.props); | ||
}}]);return VictoryLabel;}(_react2.default.Component);VictoryLabel.displayName="VictoryLabel";VictoryLabel.propTypes={active:_react.PropTypes.bool,className:_react.PropTypes.string,angle:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.number]),capHeight:_react.PropTypes.oneOfType([_react.PropTypes.string,_index.PropTypes.nonNegative,_react.PropTypes.func]),datum:_react.PropTypes.any,data:_react.PropTypes.array,index:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),events:_react.PropTypes.object,text:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.number,_react.PropTypes.func,_react.PropTypes.array]),lineHeight:_react.PropTypes.oneOfType([_react.PropTypes.string,_index.PropTypes.nonNegative,_react.PropTypes.func]),style:_react.PropTypes.oneOfType([_react.PropTypes.object,_react.PropTypes.array]),textAnchor:_react.PropTypes.oneOfType([_react.PropTypes.oneOf(["start","middle","end","inherit"]),_react.PropTypes.func]),verticalAnchor:_react.PropTypes.oneOfType([_react.PropTypes.oneOf(["start","middle","end"]),_react.PropTypes.func]),transform:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.object,_react.PropTypes.func]),x:_react.PropTypes.number,y:_react.PropTypes.number,dx:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string,_react.PropTypes.func]),dy:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string,_react.PropTypes.func])};VictoryLabel.defaultProps={capHeight:0.71,lineHeight:1};exports.default=VictoryLabel; | ||
}}]);return VictoryLabel;}(_react2.default.Component);VictoryLabel.displayName="VictoryLabel";VictoryLabel.role="label";VictoryLabel.propTypes={active:_react.PropTypes.bool,className:_react.PropTypes.string,angle:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.number]),capHeight:_react.PropTypes.oneOfType([_react.PropTypes.string,_index.PropTypes.nonNegative,_react.PropTypes.func]),datum:_react.PropTypes.any,data:_react.PropTypes.array,index:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),events:_react.PropTypes.object,text:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.number,_react.PropTypes.func,_react.PropTypes.array]),lineHeight:_react.PropTypes.oneOfType([_react.PropTypes.string,_index.PropTypes.nonNegative,_react.PropTypes.func]),style:_react.PropTypes.oneOfType([_react.PropTypes.object,_react.PropTypes.array]),textAnchor:_react.PropTypes.oneOfType([_react.PropTypes.oneOf(["start","middle","end","inherit"]),_react.PropTypes.func]),verticalAnchor:_react.PropTypes.oneOfType([_react.PropTypes.oneOf(["start","middle","end"]),_react.PropTypes.func]),transform:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.object,_react.PropTypes.func]),x:_react.PropTypes.number,y:_react.PropTypes.number,dx:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string,_react.PropTypes.func]),dy:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string,_react.PropTypes.func])};VictoryLabel.defaultProps={capHeight:0.71,lineHeight:1};exports.default=VictoryLabel; |
@@ -44,3 +44,3 @@ Object.defineProperty(exports,"__esModule",{value:true});var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);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); | ||
if(!_victoryUtil.Collection.allEqual([ | ||
if(!_victoryUtil.Collection.allSetsEqual([ | ||
[x,nextProps.x], | ||
@@ -47,0 +47,0 @@ [y,nextProps.y], |
@@ -1,3 +0,3 @@ | ||
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); | ||
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 | ||
Object.defineProperty(exports,"__esModule",{value:true});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");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 | ||
@@ -25,30 +25,16 @@ | ||
{var _calculateAttributes= | ||
this.calculateAttributes(this.props),x=_calculateAttributes.x,y=_calculateAttributes.y,width=_calculateAttributes.width,height=_calculateAttributes.height; | ||
this.x=x; | ||
this.y=y; | ||
this.width=width; | ||
this.height=height; | ||
{ | ||
_extends(this,this.calculateAttributes(this.props)); | ||
}},{key:"shouldComponentUpdate",value:function shouldComponentUpdate( | ||
nextProps){var _calculateAttributes2= | ||
this.calculateAttributes(nextProps),x=_calculateAttributes2.x,y=_calculateAttributes2.y,width=_calculateAttributes2.width,height=_calculateAttributes2.height;var | ||
clipId=this.props.clipId; | ||
if( | ||
x!==this.x|| | ||
y!==this.y|| | ||
width!==this.width|| | ||
height!==this.height|| | ||
clipId!==nextProps.clipId) | ||
nextProps){ | ||
var calculatedAttributes=this.calculateAttributes(nextProps); | ||
if(!_victoryUtil.Collection.allSetsEqual([ | ||
[this.props.clipId,nextProps.clipId], | ||
[this.x,calculatedAttributes.x], | ||
[this.y,calculatedAttributes.y], | ||
[this.height,calculatedAttributes.height], | ||
[this.width,calculatedAttributes.width]])) | ||
{ | ||
this.x=x; | ||
this.y=y; | ||
this.width=width; | ||
this.height=height; | ||
_extends(this,calculatedAttributes); | ||
return true; | ||
@@ -59,15 +45,11 @@ } | ||
props){var | ||
clipWidth=props.clipWidth,clipHeight=props.clipHeight,translateX=props.translateX,translateY=props.translateY; | ||
var padding=_index.Helpers.getPadding(props); | ||
var clipPadding=props.clipPadding||{}; | ||
var totalPadding=function totalPadding(side){ | ||
var total=+padding[side]-(clipPadding[side]||0); | ||
return typeof total==="number"?total:0; | ||
}; | ||
props){var _props$clipWidth= | ||
props.clipWidth,clipWidth=_props$clipWidth===undefined?0:_props$clipWidth,_props$clipHeight=props.clipHeight,clipHeight=_props$clipHeight===undefined?0:_props$clipHeight,_props$translateX=props.translateX,translateX=_props$translateX===undefined?0:_props$translateX,_props$translateY=props.translateY,translateY=_props$translateY===undefined?0:_props$translateY; | ||
var clipPadding=_victoryUtil.Helpers.getPadding({padding:props.clipPadding}); | ||
return{ | ||
x:totalPadding("left")+(translateX||0), | ||
y:totalPadding("top")+(translateY||0), | ||
width:Math.max(+clipWidth-totalPadding("left")-totalPadding("right"),0), | ||
height:Math.max(+clipHeight-totalPadding("top")-totalPadding("bottom"),0)}; | ||
x:translateX-clipPadding.left, | ||
y:translateY-clipPadding.top, | ||
width:Math.max(clipWidth+clipPadding.left+clipPadding.right,0), | ||
height:Math.max(clipHeight+clipPadding.top+clipPadding.bottom,0)}; | ||
@@ -91,2 +73,2 @@ }},{key:"renderClipPath",value:function renderClipPath( | ||
return this.renderClipPath(clipProps,clipId); | ||
}}]);return ClipPath;}(_react2.default.Component);ClipPath.propTypes={className:_react.PropTypes.string,clipId:_react.PropTypes.number,clipPadding:_react.PropTypes.shape({top:_react.PropTypes.number,bottom:_react.PropTypes.number,left:_react.PropTypes.number,right:_react.PropTypes.number}),clipHeight:_index.PropTypes.nonNegative,clipWidth:_index.PropTypes.nonNegative,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})]),translateX:_react.PropTypes.number,translateY:_react.PropTypes.number};exports.default=ClipPath; | ||
}}]);return ClipPath;}(_react2.default.Component);ClipPath.propTypes={className:_react.PropTypes.string,clipId:_react.PropTypes.number,clipHeight:_victoryUtil.PropTypes.nonNegative,clipWidth:_victoryUtil.PropTypes.nonNegative,clipPadding:_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})]),translateX:_react.PropTypes.number,translateY:_react.PropTypes.number};exports.default=ClipPath; |
@@ -1,4 +0,4 @@ | ||
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;};}(); | ||
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 _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 | ||
var _victoryUtil=require("../victory-util");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 | ||
@@ -42,2 +42,3 @@ | ||
{ | ||
@@ -49,18 +50,16 @@ this.style=this.getStyle(this.props); | ||
this.props,x=_props.x,y=_props.y,errorX=_props.errorX,errorY=_props.errorY; | ||
var style=this.getStyle(nextProps); | ||
if( | ||
x!==nextProps.x|| | ||
y!==nextProps.y|| | ||
!(0,_isEqual3.default)(errorX,nextProps.errorX)|| | ||
!(0,_isEqual3.default)(errorY,nextProps.errorY)) | ||
var nextStyle=this.getStyle(nextProps); | ||
if(!_victoryUtil.Collection.allSetsEqual([ | ||
[x,nextProps.x], | ||
[y,nextProps.y], | ||
[errorX,nextProps.errorX], | ||
[errorY,nextProps.errorY], | ||
[this.style,nextStyle]])) | ||
{ | ||
this.style=style; | ||
this.style=nextStyle; | ||
return true; | ||
} | ||
if((0,_isEqual3.default)(style,this.style)){ | ||
return false; | ||
}else{ | ||
this.style=style; | ||
return true; | ||
} | ||
}},{key:"getStyle",value:function getStyle( | ||
@@ -70,3 +69,3 @@ | ||
style=props.style,datum=props.datum,active=props.active; | ||
return _helpers2.default.evaluateStyle((0,_assign3.default)({stroke:"black"},style),datum,active); | ||
return _victoryUtil.Helpers.evaluateStyle((0,_assign3.default)({stroke:"black"},style),datum,active); | ||
}},{key:"renderLine",value:function renderLine( | ||
@@ -79,13 +78,13 @@ | ||
props,errors,type){var | ||
props,error,type){var | ||
x=props.x,y=props.y,borderWidth=props.borderWidth,events=props.events,style=props.style,role=props.role,shapeRendering=props.shapeRendering,className=props.className; | ||
var vertical=type==="Right"||type==="Left"; | ||
var error=errors["error"+type]; | ||
var errorPortion=error["error"+type]; | ||
var borderProps={ | ||
role:role,shapeRendering:shapeRendering,className:className, | ||
key:"border"+type, | ||
x1:vertical?error:x-borderWidth, | ||
x2:vertical?error:x+borderWidth, | ||
y1:vertical?y-borderWidth:error, | ||
y2:vertical?y+borderWidth:error}; | ||
x1:vertical?errorPortion:x-borderWidth, | ||
x2:vertical?errorPortion:x+borderWidth, | ||
y1:vertical?y-borderWidth:errorPortion, | ||
y2:vertical?y+borderWidth:errorPortion}; | ||
@@ -95,6 +94,6 @@ return this.renderLine(borderProps,style,events); | ||
props,errors,type){var | ||
props,error,type){var | ||
x=props.x,y=props.y,events=props.events,style=props.style,role=props.role,shapeRendering=props.shapeRendering,className=props.className; | ||
var vertical=type==="Top"||type==="Bottom"; | ||
var error=errors["error"+type]; | ||
var errorPortion=error["error"+type]; | ||
var borderProps={ | ||
@@ -104,5 +103,5 @@ role:role,shapeRendering:shapeRendering,className:className, | ||
x1:x, | ||
x2:vertical?x:error, | ||
x2:vertical?x:errorPortion, | ||
y1:y, | ||
y2:vertical?error:y}; | ||
y2:vertical?errorPortion:y}; | ||
@@ -168,2 +167,2 @@ return this.renderLine(borderProps,style,events); | ||
}}]);return ErrorBar;}(_react2.default.Component);ErrorBar.propTypes={active:_react.PropTypes.bool,className:_react.PropTypes.string,index:_react.PropTypes.number,datum:_react.PropTypes.object,data:_react.PropTypes.array,events:_react.PropTypes.object,scale:_react.PropTypes.object,shapeRendering:_react.PropTypes.string,role:_react.PropTypes.string,style:_react.PropTypes.object,x:_react.PropTypes.number,y:_react.PropTypes.number,errorX:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.array,_react.PropTypes.bool]),errorY:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.array,_react.PropTypes.bool]),borderWidth:_react.PropTypes.number,groupComponent:_react.PropTypes.element};ErrorBar.defaultProps={borderWidth:10};exports.default=ErrorBar; | ||
}}]);return ErrorBar;}(_react2.default.Component);ErrorBar.propTypes={active:_react.PropTypes.bool,className:_react.PropTypes.string,index:_react.PropTypes.number,datum:_react.PropTypes.object,data:_react.PropTypes.array,events:_react.PropTypes.object,scale:_react.PropTypes.object,shapeRendering:_react.PropTypes.string,role:_react.PropTypes.string,style:_react.PropTypes.object,x:_react.PropTypes.number,y:_react.PropTypes.number,errorX:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.array,_react.PropTypes.bool]),errorY:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.array,_react.PropTypes.bool]),borderWidth:_react.PropTypes.number,groupComponent:_react.PropTypes.element};ErrorBar.defaultProps={borderWidth:10,groupComponent:_react2.default.createElement("g",null)};exports.default=ErrorBar; |
@@ -156,5 +156,6 @@ Object.defineProperty(exports,"__esModule",{value:true});var _pick2=require("lodash/pick");var _pick3=_interopRequireDefault(_pick2);var _isFunction2=require("lodash/isFunction");var _isFunction3=_interopRequireDefault(_isFunction2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);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); | ||
if(child.props.groupComponent){ | ||
var newClipWidth=_this3.continuous?newProps.clipWidth:undefined; | ||
var groupComponent=_react2.default.cloneElement( | ||
child.props.groupComponent, | ||
{clipWidth:newProps.clipWidth}); | ||
{clipWidth:newClipWidth}); | ||
@@ -161,0 +162,0 @@ return _react2.default.cloneElement( |
{ | ||
"name": "victory-core", | ||
"version": "14.0.6", | ||
"version": "14.0.7", | ||
"description": "Victory Core", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
@@ -7,15 +7,6 @@ import React, { PropTypes } from "react"; | ||
static displayName = "VictoryClipContainer"; | ||
static role = "container"; | ||
static propTypes = { | ||
className: PropTypes.string, | ||
style: PropTypes.object, | ||
padding: PropTypes.oneOfType([ | ||
PropTypes.number, | ||
PropTypes.shape({ | ||
top: PropTypes.number, | ||
bottom: PropTypes.number, | ||
left: PropTypes.number, | ||
right: PropTypes.number | ||
}) | ||
]), | ||
clipPadding: PropTypes.shape({ | ||
@@ -86,7 +77,7 @@ top: PropTypes.number, | ||
const { | ||
padding, clipPadding, translateX, translateY, clipHeight, clipWidth, clipPathComponent | ||
clipPadding, translateX, translateY, clipHeight, clipWidth, clipPathComponent | ||
} = props; | ||
return React.cloneElement( | ||
clipPathComponent, | ||
{ padding, clipPadding, clipId, translateX, translateY, clipWidth, clipHeight } | ||
{ clipPadding, clipId, translateX, translateY, clipWidth, clipHeight } | ||
); | ||
@@ -101,3 +92,3 @@ } | ||
const range = this.getRange(props, axis); | ||
return range ? Math.abs(range[0] - range[1]) : undefined; | ||
return range ? Math.abs(range[0] - range[1]) || undefined : undefined; | ||
} | ||
@@ -104,0 +95,0 @@ |
@@ -9,3 +9,3 @@ import React, { PropTypes } from "react"; | ||
static displayName = "VictoryContainer"; | ||
static role = "container"; | ||
static propTypes = { | ||
@@ -12,0 +12,0 @@ className: PropTypes.string, |
@@ -14,3 +14,3 @@ import React, { PropTypes } from "react"; | ||
static displayName = "VictoryLabel"; | ||
static role = "label"; | ||
static propTypes = { | ||
@@ -17,0 +17,0 @@ active: PropTypes.bool, |
@@ -44,3 +44,3 @@ import React, { PropTypes } from "react"; | ||
if (!Collection.allEqual([ | ||
if (!Collection.allSetsEqual([ | ||
[x, nextProps.x], | ||
@@ -47,0 +47,0 @@ [y, nextProps.y], |
import React, { PropTypes } from "react"; | ||
import { | ||
PropTypes as CustomPropTypes, Helpers | ||
} from "../victory-util/index"; | ||
PropTypes as CustomPropTypes, Helpers, Collection | ||
} from "../victory-util"; | ||
@@ -10,11 +10,5 @@ export default class ClipPath extends React.Component { | ||
clipId: PropTypes.number, | ||
clipPadding: PropTypes.shape({ | ||
top: PropTypes.number, | ||
bottom: PropTypes.number, | ||
left: PropTypes.number, | ||
right: PropTypes.number | ||
}), | ||
clipHeight: CustomPropTypes.nonNegative, | ||
clipWidth: CustomPropTypes.nonNegative, | ||
padding: PropTypes.oneOfType([ | ||
clipPadding: PropTypes.oneOfType([ | ||
PropTypes.number, | ||
@@ -33,23 +27,15 @@ PropTypes.shape({ | ||
componentWillMount() { | ||
const { x, y, width, height } = this.calculateAttributes(this.props); | ||
this.x = x; | ||
this.y = y; | ||
this.width = width; | ||
this.height = height; | ||
Object.assign(this, this.calculateAttributes(this.props)); | ||
} | ||
shouldComponentUpdate(nextProps) { | ||
const { x, y, width, height } = this.calculateAttributes(nextProps); | ||
const { clipId } = this.props; | ||
if ( | ||
x !== this.x || | ||
y !== this.y || | ||
width !== this.width || | ||
height !== this.height || | ||
clipId !== nextProps.clipId | ||
) { | ||
this.x = x; | ||
this.y = y; | ||
this.width = width; | ||
this.height = height; | ||
const calculatedAttributes = this.calculateAttributes(nextProps); | ||
if (!Collection.allSetsEqual([ | ||
[this.props.clipId, nextProps.clipId], | ||
[this.x, calculatedAttributes.x], | ||
[this.y, calculatedAttributes.y], | ||
[this.height, calculatedAttributes.height], | ||
[this.width, calculatedAttributes.width] | ||
])) { | ||
Object.assign(this, calculatedAttributes); | ||
return true; | ||
@@ -61,14 +47,10 @@ } | ||
calculateAttributes(props) { | ||
const { clipWidth, clipHeight, translateX, translateY } = props; | ||
const padding = Helpers.getPadding(props); | ||
const clipPadding = props.clipPadding || {}; | ||
const totalPadding = (side) => { | ||
const total = +padding[side] - (clipPadding[side] || 0); | ||
return typeof total === "number" ? total : 0; | ||
}; | ||
const { clipWidth = 0, clipHeight = 0, translateX = 0, translateY = 0 } = props; | ||
const clipPadding = Helpers.getPadding({ padding: props.clipPadding }); | ||
return { | ||
x: totalPadding("left") + (translateX || 0), | ||
y: totalPadding("top") + (translateY || 0), | ||
width: Math.max(+clipWidth - totalPadding("left") - totalPadding("right"), 0), | ||
height: Math.max(+clipHeight - totalPadding("top") - totalPadding("bottom"), 0) | ||
x: translateX - clipPadding.left, | ||
y: translateY - clipPadding.top, | ||
width: Math.max(clipWidth + clipPadding.left + clipPadding.right, 0), | ||
height: Math.max(clipHeight + clipPadding.top + clipPadding.bottom, 0) | ||
}; | ||
@@ -75,0 +57,0 @@ } |
/* eslint-disable max-statements */ | ||
import React, { PropTypes } from "react"; | ||
import Helpers from "../victory-util/helpers"; | ||
import { assign, isEqual } from "lodash"; | ||
import { Helpers, Collection } from "../victory-util"; | ||
import { assign } from "lodash"; | ||
@@ -39,3 +39,4 @@ export default class ErrorBar extends React.Component { | ||
static defaultProps = { | ||
borderWidth: 10 | ||
borderWidth: 10, | ||
groupComponent: <g/> | ||
} | ||
@@ -49,18 +50,16 @@ | ||
const {x, y, errorX, errorY} = this.props; | ||
const style = this.getStyle(nextProps); | ||
if ( | ||
x !== nextProps.x || | ||
y !== nextProps.y || | ||
!isEqual(errorX, nextProps.errorX) || | ||
!isEqual(errorY, nextProps.errorY) | ||
) { | ||
this.style = style; | ||
const nextStyle = this.getStyle(nextProps); | ||
if (!Collection.allSetsEqual([ | ||
[x, nextProps.x], | ||
[y, nextProps.y], | ||
[errorX, nextProps.errorX], | ||
[errorY, nextProps.errorY], | ||
[this.style, nextStyle] | ||
])) { | ||
this.style = nextStyle; | ||
return true; | ||
} | ||
if (isEqual(style, this.style)) { | ||
return false; | ||
} else { | ||
this.style = style; | ||
return true; | ||
} | ||
return false; | ||
} | ||
@@ -78,13 +77,13 @@ | ||
renderBorder(props, errors, type) { | ||
renderBorder(props, error, type) { | ||
const {x, y, borderWidth, events, style, role, shapeRendering, className} = props; | ||
const vertical = type === "Right" || type === "Left"; | ||
const error = errors[`error${type}`]; | ||
const errorPortion = error[`error${type}`]; | ||
const borderProps = { | ||
role, shapeRendering, className, | ||
key: `border${type}`, | ||
x1: vertical ? error : x - borderWidth, | ||
x2: vertical ? error : x + borderWidth, | ||
y1: vertical ? y - borderWidth : error, | ||
y2: vertical ? y + borderWidth : error | ||
x1: vertical ? errorPortion : x - borderWidth, | ||
x2: vertical ? errorPortion : x + borderWidth, | ||
y1: vertical ? y - borderWidth : errorPortion, | ||
y2: vertical ? y + borderWidth : errorPortion | ||
}; | ||
@@ -94,6 +93,6 @@ return this.renderLine(borderProps, style, events); | ||
renderCross(props, errors, type) { | ||
renderCross(props, error, type) { | ||
const {x, y, events, style, role, shapeRendering, className} = props; | ||
const vertical = type === "Top" || type === "Bottom"; | ||
const error = errors[`error${type}`]; | ||
const errorPortion = error[`error${type}`]; | ||
const borderProps = { | ||
@@ -103,5 +102,5 @@ role, shapeRendering, className, | ||
x1: x, | ||
x2: vertical ? x : error, | ||
x2: vertical ? x : errorPortion, | ||
y1: y, | ||
y2: vertical ? error : y | ||
y2: vertical ? errorPortion : y | ||
}; | ||
@@ -108,0 +107,0 @@ return this.renderLine(borderProps, style, events); |
@@ -156,5 +156,6 @@ import React from "react"; | ||
if (child.props.groupComponent) { | ||
const newClipWidth = this.continuous ? newProps.clipWidth : undefined; | ||
const groupComponent = React.cloneElement( | ||
child.props.groupComponent, | ||
{ clipWidth: newProps.clipWidth } | ||
{ clipWidth: newClipWidth } | ||
); | ||
@@ -161,0 +162,0 @@ return React.cloneElement( |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1300951
25787