victory-core
Advanced tools
Comparing version 14.0.7 to 14.1.0
VictoryCore Changelog | ||
===================== | ||
## 14.1.0 (2017-04-04) | ||
- Remove default container theme | ||
- Fix clipWidth bug | ||
- Support `victory-native` upgrade | ||
## 14.0.7 (2017-03-21) | ||
@@ -5,0 +11,0 @@ |
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); | ||
var _portal=require("../victory-portal/portal");var _portal2=_interopRequireDefault(_portal); | ||
var _index=require("../victory-util/index"); | ||
var _victoryTheme=require("../victory-theme/victory-theme");var _victoryTheme2=_interopRequireDefault(_victoryTheme);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 _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 | ||
@@ -44,3 +43,2 @@ VictoryContainer=function(_React$Component){_inherits(VictoryContainer,_React$Component); | ||
function VictoryContainer(props){_classCallCheck(this,VictoryContainer);var _this=_possibleConstructorReturn(this,(VictoryContainer.__proto__||Object.getPrototypeOf(VictoryContainer)).call(this, | ||
@@ -120,2 +118,2 @@ props)); | ||
return this.renderContainer(this.props,svgProps,style); | ||
}}]);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; | ||
}}]);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};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; |
@@ -73,29 +73,23 @@ 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); | ||
path,style,events,index){ | ||
if(!path){ | ||
return null; | ||
}var _props= | ||
paths,style,events){var _props= | ||
this.props,role=_props.role,shapeRendering=_props.shapeRendering,className=_props.className; | ||
return paths.map(function(path,index){ | ||
return( | ||
_react2.default.createElement("path",_extends({ | ||
key:index, | ||
className:className, | ||
key:"area-stroke-"+index, | ||
style:style, | ||
shapeRendering:shapeRendering||"auto", | ||
role:role||"presentation", | ||
d:path, | ||
role:role||"presentation"}, | ||
events,{ | ||
vectorEffect:"non-scaling-stroke"}))); | ||
className:className}, | ||
events))); | ||
}); | ||
}},{key:"render",value:function render() | ||
{var _this2=this;var _props2= | ||
this.props,groupComponent=_props2.groupComponent,events=_props2.events; | ||
return this.paths.length>1? | ||
_react2.default.cloneElement( | ||
groupComponent,{}, | ||
this.paths.map(function(path,index){return _this2.renderLine(path,_this2.style,events,index);})): | ||
this.renderLine(this.paths[0],this.style,events); | ||
{var _props2= | ||
this.props,events=_props2.events,groupComponent=_props2.groupComponent; | ||
var children=this.renderLine(this.paths,this.style,events); | ||
return children.length===1?children[0]:_react2.default.cloneElement(groupComponent,{},children); | ||
}}]);return Curve;}(_react2.default.Component);Curve.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,interpolation:_react.PropTypes.string,role:_react.PropTypes.string,scale:_react.PropTypes.object,shapeRendering:_react.PropTypes.string,style:_react.PropTypes.object,groupComponent:_react.PropTypes.element};Curve.defaultProps={groupComponent:_react2.default.createElement("g",null)};exports.default=Curve; |
@@ -64,14 +64,14 @@ Object.defineProperty(exports,"__esModule",{value:true});var _isEqual2=require("lodash/isEqual");var _isEqual3=_interopRequireDefault(_isEqual2);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 direction=orientation==="top"?"0 0 0":"0 0 1"; | ||
var arc=cornerRadius+" "+cornerRadius+" "+direction; | ||
return"M "+(x-pointerWidth/2)+", "+pointerEdge+"\n L "+ | ||
x+", "+y+"\n L "+( | ||
x+pointerWidth/2)+", "+pointerEdge+"\n L "+( | ||
rightEdge-cornerRadius)+", "+pointerEdge+"\n A "+ | ||
arc+" "+rightEdge+", "+(pointerEdge-sign*cornerRadius)+"\n L "+ | ||
rightEdge+", "+(oppositeEdge+sign*cornerRadius)+"\n A "+ | ||
arc+" "+(rightEdge-cornerRadius)+", "+oppositeEdge+"\n L "+( | ||
leftEdge+cornerRadius)+", "+oppositeEdge+"\n A "+ | ||
arc+" "+leftEdge+", "+(oppositeEdge+sign*cornerRadius)+"\n L "+ | ||
leftEdge+", "+(pointerEdge-sign*cornerRadius)+"\n A "+ | ||
arc+" "+(leftEdge+cornerRadius)+", "+pointerEdge+"\n z"; | ||
var arc=Math.round(cornerRadius)+" "+Math.round(cornerRadius)+" "+direction; | ||
return"M "+Math.round(x-pointerWidth/2)+", "+Math.round(pointerEdge)+"\n L "+ | ||
Math.round(x)+", "+Math.round(y)+"\n L "+ | ||
Math.round(x+pointerWidth/2)+", "+Math.round(pointerEdge)+"\n L "+ | ||
Math.round(rightEdge-cornerRadius)+", "+Math.round(pointerEdge)+"\n A "+ | ||
arc+" "+Math.round(rightEdge)+", "+Math.round(pointerEdge-sign*cornerRadius)+"\n L "+ | ||
Math.round(rightEdge)+", "+Math.round(oppositeEdge+sign*cornerRadius)+"\n A "+ | ||
arc+" "+Math.round(rightEdge-cornerRadius)+", "+Math.round(oppositeEdge)+"\n L "+ | ||
Math.round(leftEdge+cornerRadius)+", "+Math.round(oppositeEdge)+"\n A "+ | ||
arc+" "+Math.round(leftEdge)+", "+Math.round(oppositeEdge+sign*cornerRadius)+"\n L "+ | ||
Math.round(leftEdge)+", "+Math.round(pointerEdge-sign*cornerRadius)+"\n A "+ | ||
arc+" "+Math.round(leftEdge+cornerRadius)+", "+Math.round(pointerEdge)+"\n z"; | ||
@@ -90,14 +90,14 @@ }},{key:"getHorizontalPath",value:function getHorizontalPath( | ||
var direction=orientation==="right"?"0 0 0":"0 0 1"; | ||
var arc=cornerRadius+" "+cornerRadius+" "+direction; | ||
return"M "+pointerEdge+", "+(y-pointerWidth/2)+"\n L "+ | ||
x+", "+y+"\n L "+ | ||
pointerEdge+", "+(y+pointerWidth/2)+"\n L "+ | ||
pointerEdge+", "+(bottomEdge-cornerRadius)+"\n A "+ | ||
arc+" "+(pointerEdge+sign*cornerRadius)+", "+bottomEdge+"\n L "+( | ||
var arc=Math.round(cornerRadius)+" "+Math.round(cornerRadius)+" "+direction; | ||
return"M "+Math.round(pointerEdge)+", "+Math.round(y-pointerWidth/2)+"\n L "+ | ||
Math.round(x)+", "+Math.round(y)+"\n L "+ | ||
Math.round(pointerEdge)+", "+Math.round(y+pointerWidth/2)+"\n L "+ | ||
Math.round(pointerEdge)+", "+Math.round(bottomEdge-cornerRadius)+"\n A "+ | ||
arc+" "+Math.round(pointerEdge+sign*cornerRadius)+", "+Math.round(bottomEdge)+"\n L "+( | ||
oppositeEdge-sign*cornerRadius)+", "+bottomEdge+"\n A "+ | ||
arc+" "+oppositeEdge+", "+(bottomEdge-cornerRadius)+"\n L "+ | ||
arc+" "+Math.round(oppositeEdge)+", "+Math.round(bottomEdge-cornerRadius)+"\n L "+ | ||
oppositeEdge+", "+(topEdge+cornerRadius)+"\n A "+ | ||
arc+" "+(oppositeEdge-sign*cornerRadius)+", "+topEdge+"\n L "+( | ||
pointerEdge+sign*cornerRadius)+", "+topEdge+"\n A "+ | ||
arc+" "+pointerEdge+", "+(topEdge+cornerRadius)+"\n z"; | ||
arc+" "+Math.round(oppositeEdge-sign*cornerRadius)+", "+Math.round(topEdge)+"\n L "+ | ||
Math.round(pointerEdge+sign*cornerRadius)+", "+Math.round(topEdge)+"\n A "+ | ||
arc+" "+Math.round(pointerEdge)+", "+Math.round(topEdge+cornerRadius)+"\n z"; | ||
@@ -104,0 +104,0 @@ }},{key:"getFlyoutPath",value:function getFlyoutPath( |
@@ -218,3 +218,3 @@ Object.defineProperty(exports,"__esModule",{value:true});var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);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); | ||
props,calculatedValues){var | ||
flyoutCenter=calculatedValues.flyoutCenter,labelStyle=calculatedValues.labelStyle,labelSize=calculatedValues.labelSize,flyoutDimensions=calculatedValues.flyoutDimensions;var | ||
flyoutCenter=calculatedValues.flyoutCenter,labelStyle=calculatedValues.labelStyle,labelSize=calculatedValues.labelSize,flyoutDimensions=calculatedValues.flyoutDimensions,dy=calculatedValues.dy,dx=calculatedValues.dx;var | ||
text=props.text,datum=props.datum,labelComponent=props.labelComponent,index=props.index; | ||
@@ -231,3 +231,3 @@ var textAnchor=labelStyle.textAnchor||"middle"; | ||
key:"label-"+index, | ||
text:text,datum:datum,textAnchor:textAnchor, | ||
text:text,datum:datum,textAnchor:textAnchor,dy:dy,dx:dx, | ||
style:labelStyle, | ||
@@ -262,5 +262,11 @@ x:!labelStyle.textAnchor||labelStyle.textAnchor==="middle"? | ||
props){ | ||
var evaluatedProps=this.getEvaluatedProps(props);var | ||
flyoutComponent=evaluatedProps.flyoutComponent,labelComponent=evaluatedProps.labelComponent,groupComponent=evaluatedProps.groupComponent; | ||
flyoutComponent= | ||
evaluatedProps.flyoutComponent,labelComponent=evaluatedProps.labelComponent,groupComponent=evaluatedProps.groupComponent,active=evaluatedProps.active,renderInPortal=evaluatedProps.renderInPortal; | ||
if(!active){ | ||
return null; | ||
} | ||
var calculatedValues=this.getCalculatedValues(evaluatedProps); | ||
@@ -271,11 +277,9 @@ var children=[ | ||
return _react2.default.cloneElement(groupComponent,{role:"presentation"},children); | ||
var tooltip=_react2.default.cloneElement(groupComponent,{role:"presentation"},children); | ||
return renderInPortal?_react2.default.createElement(_victoryPortal2.default,null,tooltip):tooltip; | ||
}},{key:"render",value:function render() | ||
{ | ||
var props=_index.Helpers.modifyProps(this.props,fallbackProps,"tooltip");var | ||
active=props.active,renderInPortal=props.renderInPortal; | ||
var tooltip=active?this.renderTooltip(props):null; | ||
return renderInPortal?_react2.default.createElement(_victoryPortal2.default,null,tooltip):tooltip; | ||
var props=_index.Helpers.modifyProps(this.props,fallbackProps,"tooltip"); | ||
return this.renderTooltip(props); | ||
}}]);return VictoryTooltip;}(_react2.default.Component);VictoryTooltip.displayName="VictoryTooltip";VictoryTooltip.propTypes={active:_react.PropTypes.oneOfType([_react.PropTypes.bool,_react.PropTypes.func]),activateData:_react.PropTypes.bool,datum:_react.PropTypes.object,data:_react.PropTypes.array,events:_react.PropTypes.object,text:_react.PropTypes.oneOfType([_react.PropTypes.string,_react.PropTypes.number,_react.PropTypes.func,_react.PropTypes.array]),style:_react.PropTypes.oneOfType([_react.PropTypes.object,_react.PropTypes.array]),flyoutStyle:_react.PropTypes.object,x:_react.PropTypes.number,y:_react.PropTypes.number,dx:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.func]),dy:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.func]),width:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),height:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),orientation:_react.PropTypes.oneOfType([_react.PropTypes.oneOf(["top","bottom","left","right"]),_react.PropTypes.func]),pointerLength:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),pointerWidth:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),cornerRadius:_react.PropTypes.oneOfType([_index.PropTypes.nonNegative,_react.PropTypes.func]),horizontal:_react.PropTypes.bool,labelComponent:_react.PropTypes.element,flyoutComponent:_react.PropTypes.element,groupComponent:_react.PropTypes.element,index:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),renderInPortal:_react.PropTypes.bool,theme:_react.PropTypes.object};VictoryTooltip.defaultProps={theme:_victoryTheme2.default.grayscale,active:false,renderInPortal:true,labelComponent:_react2.default.createElement(_victoryLabel2.default,null),flyoutComponent:_react2.default.createElement(_index2.Flyout,null),groupComponent:_react2.default.createElement("g",null)};VictoryTooltip.defaultEvents=[{target:"data",eventHandlers:{onMouseOver:function onMouseOver(targetProps){return[{target:"labels",mutation:function mutation(){return{active:true};}},{target:"data",mutation:function mutation(){return targetProps.activateData?{active:true}:{active:undefined};}}];},onMouseOut:function onMouseOut(){return[{target:"labels",mutation:function mutation(){return{active:undefined};}},{target:"data",mutation:function mutation(){return{active:undefined};}}];}}}];exports.default=VictoryTooltip; |
@@ -156,7 +156,8 @@ 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( | ||
var groupComponent=_this3.continuous? | ||
_react2.default.cloneElement( | ||
child.props.groupComponent, | ||
{clipWidth:newClipWidth}); | ||
{clipWidth:newProps.clipWidth||0}): | ||
child.props.groupComponent; | ||
return _react2.default.cloneElement( | ||
@@ -163,0 +164,0 @@ child,(0,_defaults3.default)({animate:null,groupComponent:groupComponent},newProps,combinedProps)); |
@@ -73,4 +73,3 @@ Object.defineProperty(exports,"__esModule",{value:true});var _reduce2=require("lodash/reduce");var _reduce3=_interopRequireDefault(_reduce2);var _omit2=require("lodash/omit");var _omit3=_interopRequireDefault(_omit2);var _property2=require("lodash/property");var _property3=_interopRequireDefault(_property2);var _isFunction2=require("lodash/isFunction");var _isFunction3=_interopRequireDefault(_isFunction2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2); | ||
var themeProps=(0,_omit3.default)(theme,["style"]); | ||
var baseProps=(0,_defaults3.default)({},props,themeProps,fallbackProps); | ||
return(0,_defaults3.default)({},baseProps,{clipWidth:baseProps.width,clipHeight:baseProps.height}); | ||
return(0,_defaults3.default)({},props,themeProps,fallbackProps); | ||
}, | ||
@@ -77,0 +76,0 @@ |
{ | ||
"name": "victory-core", | ||
"version": "14.0.7", | ||
"version": "14.1.0", | ||
"description": "Victory Core", | ||
@@ -24,3 +24,3 @@ "main": "lib/index.js", | ||
"postpublish": "builder run npm:postpublish", | ||
"start": "builder run hot", | ||
"start": "builder run dev", | ||
"test": "builder run check", | ||
@@ -27,0 +27,0 @@ "version": "builder run npm:version" |
@@ -5,3 +5,2 @@ import React, { PropTypes } from "react"; | ||
import { Timer } from "../victory-util/index"; | ||
import { default as VictoryTheme } from "../victory-theme/victory-theme"; | ||
@@ -31,4 +30,3 @@ export default class VictoryContainer extends React.Component { | ||
portalComponent: <Portal/>, | ||
responsive: true, | ||
theme: VictoryTheme.grayscale | ||
responsive: true | ||
} | ||
@@ -35,0 +33,0 @@ |
@@ -73,30 +73,24 @@ import React, { PropTypes } from "react"; | ||
// Overridden in victory-core-native | ||
renderLine(path, style, events, index) { // eslint-disable-line max-params | ||
if (!path) { | ||
return null; | ||
} | ||
renderLine(paths, style, events) { | ||
const { role, shapeRendering, className } = this.props; | ||
return ( | ||
<path | ||
key={index} | ||
className={className} | ||
style={style} | ||
shapeRendering={shapeRendering || "auto"} | ||
d={path} | ||
role={role || "presentation"} | ||
{...events} | ||
vectorEffect="non-scaling-stroke" | ||
/> | ||
); | ||
return paths.map((path, index) => { | ||
return ( | ||
<path | ||
key={`area-stroke-${index}`} | ||
style={style} | ||
shapeRendering={shapeRendering || "auto"} | ||
role={role || "presentation"} | ||
d={path} | ||
className={className} | ||
{...events} | ||
/> | ||
); | ||
}); | ||
} | ||
render() { | ||
const {groupComponent, events} = this.props; | ||
return this.paths.length > 1 ? | ||
React.cloneElement( | ||
groupComponent, {}, | ||
this.paths.map((path, index) => this.renderLine(path, this.style, events, index)) | ||
) : | ||
this.renderLine(this.paths[0], this.style, events); | ||
const { events, groupComponent } = this.props; | ||
const children = this.renderLine(this.paths, this.style, events); | ||
return children.length === 1 ? children[0] : React.cloneElement(groupComponent, {}, children); | ||
} | ||
} |
@@ -64,14 +64,14 @@ import React, { PropTypes } from "react"; | ||
const direction = orientation === "top" ? "0 0 0" : "0 0 1"; | ||
const arc = `${cornerRadius} ${cornerRadius} ${direction}`; | ||
return `M ${x - pointerWidth / 2}, ${pointerEdge} | ||
L ${x}, ${y} | ||
L ${x + pointerWidth / 2}, ${pointerEdge} | ||
L ${rightEdge - cornerRadius}, ${pointerEdge} | ||
A ${arc} ${rightEdge}, ${pointerEdge - sign * cornerRadius} | ||
L ${rightEdge}, ${oppositeEdge + sign * cornerRadius} | ||
A ${arc} ${rightEdge - cornerRadius}, ${oppositeEdge} | ||
L ${leftEdge + cornerRadius}, ${oppositeEdge} | ||
A ${arc} ${leftEdge}, ${oppositeEdge + sign * cornerRadius} | ||
L ${leftEdge}, ${pointerEdge - sign * cornerRadius} | ||
A ${arc} ${leftEdge + cornerRadius}, ${pointerEdge} | ||
const arc = `${Math.round(cornerRadius)} ${Math.round(cornerRadius)} ${direction}`; | ||
return `M ${Math.round(x - pointerWidth / 2)}, ${Math.round(pointerEdge)} | ||
L ${Math.round(x)}, ${Math.round(y)} | ||
L ${Math.round(x + pointerWidth / 2)}, ${Math.round(pointerEdge)} | ||
L ${Math.round(rightEdge - cornerRadius)}, ${Math.round(pointerEdge)} | ||
A ${arc} ${Math.round(rightEdge)}, ${Math.round(pointerEdge - sign * cornerRadius)} | ||
L ${Math.round(rightEdge)}, ${Math.round(oppositeEdge + sign * cornerRadius)} | ||
A ${arc} ${Math.round(rightEdge - cornerRadius)}, ${Math.round(oppositeEdge)} | ||
L ${Math.round(leftEdge + cornerRadius)}, ${Math.round(oppositeEdge)} | ||
A ${arc} ${Math.round(leftEdge)}, ${Math.round(oppositeEdge + sign * cornerRadius)} | ||
L ${Math.round(leftEdge)}, ${Math.round(pointerEdge - sign * cornerRadius)} | ||
A ${arc} ${Math.round(leftEdge + cornerRadius)}, ${Math.round(pointerEdge)} | ||
z`; | ||
@@ -90,14 +90,14 @@ } | ||
const direction = orientation === "right" ? "0 0 0" : "0 0 1"; | ||
const arc = `${cornerRadius} ${cornerRadius} ${direction}`; | ||
return `M ${pointerEdge}, ${y - pointerWidth / 2} | ||
L ${x}, ${y} | ||
L ${pointerEdge}, ${y + pointerWidth / 2} | ||
L ${pointerEdge}, ${bottomEdge - cornerRadius} | ||
A ${arc} ${pointerEdge + sign * cornerRadius}, ${bottomEdge} | ||
const arc = `${Math.round(cornerRadius)} ${Math.round(cornerRadius)} ${direction}`; | ||
return `M ${Math.round(pointerEdge)}, ${Math.round(y - pointerWidth / 2)} | ||
L ${Math.round(x)}, ${Math.round(y)} | ||
L ${Math.round(pointerEdge)}, ${Math.round(y + pointerWidth / 2)} | ||
L ${Math.round(pointerEdge)}, ${Math.round(bottomEdge - cornerRadius)} | ||
A ${arc} ${Math.round(pointerEdge + sign * cornerRadius)}, ${Math.round(bottomEdge)} | ||
L ${oppositeEdge - sign * cornerRadius}, ${bottomEdge} | ||
A ${arc} ${oppositeEdge}, ${bottomEdge - cornerRadius} | ||
A ${arc} ${Math.round(oppositeEdge)}, ${Math.round(bottomEdge - cornerRadius)} | ||
L ${oppositeEdge}, ${topEdge + cornerRadius} | ||
A ${arc} ${oppositeEdge - sign * cornerRadius}, ${topEdge} | ||
L ${pointerEdge + sign * cornerRadius}, ${topEdge} | ||
A ${arc} ${pointerEdge}, ${topEdge + cornerRadius} | ||
A ${arc} ${Math.round(oppositeEdge - sign * cornerRadius)}, ${Math.round(topEdge)} | ||
L ${Math.round(pointerEdge + sign * cornerRadius)}, ${Math.round(topEdge)} | ||
A ${arc} ${Math.round(pointerEdge)}, ${Math.round(topEdge + cornerRadius)} | ||
z`; | ||
@@ -104,0 +104,0 @@ } |
@@ -218,3 +218,3 @@ import React, { PropTypes } from "react"; | ||
getLabelProps(props, calculatedValues) { | ||
const { flyoutCenter, labelStyle, labelSize, flyoutDimensions } = calculatedValues; | ||
const { flyoutCenter, labelStyle, labelSize, flyoutDimensions, dy, dx } = calculatedValues; | ||
const { text, datum, labelComponent, index } = props; | ||
@@ -231,3 +231,3 @@ const textAnchor = labelStyle.textAnchor || "middle"; | ||
key: `label-${index}`, | ||
text, datum, textAnchor, | ||
text, datum, textAnchor, dy, dx, | ||
style: labelStyle, | ||
@@ -262,5 +262,11 @@ x: !labelStyle.textAnchor || labelStyle.textAnchor === "middle" ? | ||
// Overridden in victory-core-native | ||
renderTooltip(props) { | ||
const evaluatedProps = this.getEvaluatedProps(props); | ||
const { flyoutComponent, labelComponent, groupComponent } = evaluatedProps; | ||
const { | ||
flyoutComponent, labelComponent, groupComponent, active, renderInPortal | ||
} = evaluatedProps; | ||
if (!active) { | ||
return null; | ||
} | ||
const calculatedValues = this.getCalculatedValues(evaluatedProps); | ||
@@ -271,12 +277,10 @@ const children = [ | ||
]; | ||
return React.cloneElement(groupComponent, { role: "presentation" }, children); | ||
const tooltip = React.cloneElement(groupComponent, { role: "presentation" }, children); | ||
return renderInPortal ? <VictoryPortal>{tooltip}</VictoryPortal> : tooltip; | ||
} | ||
// Overridden in victory-core-native | ||
render() { | ||
const props = Helpers.modifyProps((this.props), fallbackProps, "tooltip"); | ||
const { active, renderInPortal } = props; | ||
const tooltip = active ? this.renderTooltip(props) : null; | ||
return renderInPortal ? <VictoryPortal>{tooltip}</VictoryPortal> : tooltip; | ||
return this.renderTooltip(props); | ||
} | ||
} |
@@ -156,7 +156,8 @@ import React from "react"; | ||
if (child.props.groupComponent) { | ||
const newClipWidth = this.continuous ? newProps.clipWidth : undefined; | ||
const groupComponent = React.cloneElement( | ||
child.props.groupComponent, | ||
{ clipWidth: newClipWidth } | ||
); | ||
const groupComponent = this.continuous ? | ||
React.cloneElement( | ||
child.props.groupComponent, | ||
{ clipWidth: newProps.clipWidth || 0 } | ||
) : | ||
child.props.groupComponent; | ||
return React.cloneElement( | ||
@@ -163,0 +164,0 @@ child, defaults({animate: null, groupComponent}, newProps, combinedProps) |
@@ -73,4 +73,3 @@ import { defaults, isFunction, property, omit, reduce } from "lodash"; | ||
const themeProps = omit(theme, ["style"]); | ||
const baseProps = defaults({}, props, themeProps, fallbackProps); | ||
return defaults({}, baseProps, {clipWidth: baseProps.width, clipHeight: baseProps.height}); | ||
return defaults({}, props, themeProps, fallbackProps); | ||
}, | ||
@@ -77,0 +76,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1302097
25779