Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Progress] Remove style propable mixin #3233

Merged
merged 1 commit into from
Feb 8, 2016
Merged

[Progress] Remove style propable mixin #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 79 additions & 82 deletions src/circular-progress.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,74 @@
import React from 'react';
import ReactDOM from 'react-dom';
import StylePropable from './mixins/style-propable';
import autoPrefix from './styles/auto-prefix';
import Transitions from './styles/transitions';
import getMuiTheme from './styles/getMuiTheme';

function getRelativeValue(value, min, max) {
const clampedValue = Math.min(Math.max(min, value), max);
const rangeValue = max - min;
const relValue = Math.round(clampedValue / rangeValue * 10000) / 10000;
return relValue * 100;
}

function getStyles(props, state) {
const {
max,
min,
size,
value,
} = props;

const {
baseTheme: {
palette,
},
} = state.muiTheme;

const zoom = size * 1.4 ;
const baseSize = 50;
let margin = Math.round( ((50 * zoom) - 50) / 2 );

if (margin < 0) margin = 0;

let styles = {
root: {
position: 'relative',
margin: margin,
display: 'inline-block',
width: baseSize,
height: baseSize,
},
wrapper: {
width: baseSize,
height: baseSize,
display: 'inline-block',
transition: Transitions.create('transform', '20s', null, 'linear'),
transitionTimingFunction: 'linear',
},
svg: {
height: baseSize,
position: 'relative',
transform: `scale(${zoom})`,
width: baseSize,
},
path: {
strokeDasharray: '89,200',
strokeDashoffset: 0,
stroke: props.color || palette.primary1Color,
strokeLinecap: 'round',
transition: Transitions.create('all', '1.5s', null, 'ease-in-out'),
},
};

if (props.mode === 'determinate') {
const relVal = getRelativeValue(value, min, max);
styles.path.transition = Transitions.create('all', '0.3s', null, 'linear');
styles.path.strokeDasharray = `${Math.round(relVal * 1.25)},200`;
}

return styles;
}

const CircularProgress = React.createClass({

propTypes: {
Expand Down Expand Up @@ -54,13 +118,10 @@ const CircularProgress = React.createClass({
muiTheme: React.PropTypes.object,
},

//for passing default theme context to children
childContextTypes: {
muiTheme: React.PropTypes.object,
},

mixins: [StylePropable],

getDefaultProps() {
return {
mode: 'indeterminate',
Expand All @@ -84,36 +145,21 @@ const CircularProgress = React.createClass({
},

componentDidMount() {
let wrapper = ReactDOM.findDOMNode(this.refs.wrapper);
let path = ReactDOM.findDOMNode(this.refs.path);

this._scalePath(path);
this._rotateWrapper(wrapper);
this._scalePath(this.refs.path);
this._rotateWrapper(this.refs.wrapper);
},

//to update theme inside state whenever a new theme is passed down
//from the parent / owner using context
componentWillReceiveProps(nextProps, nextContext) {
let newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
this.setState({muiTheme: newMuiTheme});
this.setState({
muiTheme: nextContext.muiTheme || this.state.muiTheme,
});
},

componentWillUnmount() {
clearTimeout(this.scalePathTimer);
clearTimeout(this.rotateWrapperTimer);
},

_getRelativeValue() {
let value = this.props.value;
let min = this.props.min;
let max = this.props.max;

let clampedValue = Math.min(Math.max(min, value), max);
let rangeValue = max - min;
let relValue = Math.round(clampedValue / rangeValue * 10000) / 10000;
return relValue * 100;
},

scalePathTimer: undefined,
rotateWrapperTimer: undefined,

Expand Down Expand Up @@ -155,58 +201,6 @@ const CircularProgress = React.createClass({
this.rotateWrapperTimer = setTimeout(() => this._rotateWrapper(wrapper), 10050);
},

getTheme() {
return this.state.muiTheme.rawTheme.palette;
},

getStyles(zoom) {
zoom *= 1.4;
let size = '50px';

let margin = Math.round( ((50 * zoom) - 50) / 2 );

if (margin < 0) margin = 0;

let styles = {
root: {
position: 'relative',
margin: margin,
display: 'inline-block',
width: size,
height: size,
},
wrapper: {
width: size,
height: size,
display: 'inline-block',
transition: Transitions.create('transform', '20s', null, 'linear'),
},
svg: {
height: size,
position: 'relative',
transform: `scale(${zoom})`,
width: size,
},
path: {
strokeDasharray: '89,200',
strokeDashoffset: 0,
stroke: this.props.color || this.getTheme().primary1Color,
strokeLinecap: 'round',
transition: Transitions.create('all', '1.5s', null, 'ease-in-out'),
},
};

autoPrefix.set(styles.wrapper, 'transitionTimingFunction', 'linear', this.state.muiTheme);

if (this.props.mode === 'determinate') {
let relVal = this._getRelativeValue();
styles.path.transition = Transitions.create('all', '0.3s', null, 'linear');
styles.path.strokeDasharray = `${Math.round(relVal * 1.25)},200`;
}

return styles;
},

render() {
let {
style,
Expand All @@ -215,15 +209,18 @@ const CircularProgress = React.createClass({
...other,
} = this.props;

const {
prepareStyles,
} = this.state.muiTheme;

let styles = this.getStyles(size || 1);
const styles = getStyles(this.props, this.state);

return (
<div {...other} style={this.prepareStyles(styles.root, style)} >
<div ref="wrapper" style={this.prepareStyles(styles.wrapper, innerStyle)} >
<svg style={this.prepareStyles(styles.svg)} >
<div {...other} style={prepareStyles(Object.assign(styles.root, style))} >
<div ref="wrapper" style={prepareStyles(Object.assign(styles.wrapper, innerStyle))} >
<svg style={prepareStyles(styles.svg)} >
<circle
ref="path" style={this.prepareStyles(styles.path)} cx="25"
ref="path" style={prepareStyles(styles.path)} cx="25"
cy="25" r="20" fill="none"
strokeWidth="2.5" strokeMiterlimit="10"
/>
Expand Down
Loading