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

[Core] Remove style-propable mixin from transition-groups #2909

Merged
merged 1 commit into from
Feb 4, 2016
Merged

[Core] Remove style-propable mixin from transition-groups #2909

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
22 changes: 10 additions & 12 deletions src/transition-groups/scale-in-child.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import React from 'react';
import ReactDOM from 'react-dom';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import StylePropable from '../mixins/style-propable';
import autoPrefix from '../styles/auto-prefix';
import Transitions from '../styles/transitions';
import getMuiTheme from '../styles/getMuiTheme';


const ScaleInChild = React.createClass({

propTypes: {
Expand All @@ -25,14 +23,12 @@ const ScaleInChild = React.createClass({
muiTheme: React.PropTypes.object,
},

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

mixins: [
PureRenderMixin,
StylePropable,
],

getDefaultProps: function() {
Expand All @@ -55,10 +51,8 @@ const ScaleInChild = React.createClass({
};
},

//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;
const newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
this.setState({muiTheme: newMuiTheme});
},

Expand All @@ -79,7 +73,7 @@ const ScaleInChild = React.createClass({
},

componentWillLeave(callback) {
let style = ReactDOM.findDOMNode(this).style;
const style = ReactDOM.findDOMNode(this).style;

style.opacity = '0';
autoPrefix.set(style, 'transform', 'scale(' + this.props.minScale + ')', this.state.muiTheme);
Expand All @@ -90,14 +84,14 @@ const ScaleInChild = React.createClass({
},

_animate() {
let style = ReactDOM.findDOMNode(this).style;
const style = ReactDOM.findDOMNode(this).style;

style.opacity = '1';
autoPrefix.set(style, 'transform', 'scale(' + this.props.maxScale + ')', this.state.muiTheme);
},

_initializeAnimation(callback) {
let style = ReactDOM.findDOMNode(this).style;
const style = ReactDOM.findDOMNode(this).style;

style.opacity = '0';
autoPrefix.set(style, 'transform', 'scale(0)', this.state.muiTheme);
Expand All @@ -115,7 +109,11 @@ const ScaleInChild = React.createClass({
...other,
} = this.props;

const mergedRootStyles = this.mergeStyles({
const {
prepareStyles,
} = this.state.muiTheme;

const mergedRootStyles = Object.assign({}, {
position: 'absolute',
height: '100%',
width: '100%',
Expand All @@ -125,7 +123,7 @@ const ScaleInChild = React.createClass({
}, style);

return (
<div {...other} style={this.prepareStyles(mergedRootStyles)}>
<div {...other} style={prepareStyles(mergedRootStyles)}>
{children}
</div>
);
Expand Down
15 changes: 7 additions & 8 deletions src/transition-groups/scale-in.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import ReactTransitionGroup from 'react-addons-transition-group';
import StylePropable from '../mixins/style-propable';
import ScaleInChild from './scale-in-child';
import getMuiTheme from '../styles/getMuiTheme';

Expand All @@ -24,14 +23,12 @@ const ScaleIn = React.createClass({
muiTheme: React.PropTypes.object,
},

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

mixins: [
PureRenderMixin,
StylePropable,
],

getDefaultProps() {
Expand All @@ -52,10 +49,8 @@ const ScaleIn = React.createClass({
};
},

//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;
const newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
this.setState({muiTheme: newMuiTheme});
},

Expand All @@ -70,7 +65,11 @@ const ScaleIn = React.createClass({
...other,
} = this.props;

const mergedRootStyles = this.mergeStyles({
const {
prepareStyles,
} = this.state.muiTheme;

const mergedRootStyles = Object.assign({}, {
position: 'relative',
overflow: 'hidden',
height: '100%',
Expand All @@ -93,7 +92,7 @@ const ScaleIn = React.createClass({
return (
<ReactTransitionGroup
{...other}
style={this.prepareStyles(mergedRootStyles)}
style={prepareStyles(mergedRootStyles)}
component="div"
>
{newChildren}
Expand Down
35 changes: 16 additions & 19 deletions src/transition-groups/slide-in-child.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
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';


const SlideInChild = React.createClass({

propTypes: {
Expand All @@ -26,13 +24,10 @@ const SlideInChild = React.createClass({
muiTheme: React.PropTypes.object,
},

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

mixins: [StylePropable],

getDefaultProps: function() {
return {
enterDelay: 0,
Expand All @@ -51,18 +46,16 @@ const SlideInChild = React.createClass({
};
},

//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;
const newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
this.setState({muiTheme: newMuiTheme});
},

componentWillEnter(callback) {
let style = ReactDOM.findDOMNode(this).style;
let x = this.props.direction === 'left' ? '100%' :
const style = ReactDOM.findDOMNode(this).style;
const x = this.props.direction === 'left' ? '100%' :
this.props.direction === 'right' ? '-100%' : '0';
let y = this.props.direction === 'up' ? '100%' :
const y = this.props.direction === 'up' ? '100%' :
this.props.direction === 'down' ? '-100%' : '0';

style.opacity = '0';
Expand All @@ -74,17 +67,17 @@ const SlideInChild = React.createClass({
},

componentDidEnter() {
let style = ReactDOM.findDOMNode(this).style;
const style = ReactDOM.findDOMNode(this).style;
style.opacity = '1';
autoPrefix.set(style, 'transform', 'translate3d(0,0,0)', this.state.muiTheme);
},

componentWillLeave(callback) {
let style = ReactDOM.findDOMNode(this).style;
let direction = this.props.getLeaveDirection();
let x = direction === 'left' ? '-100%' :
const style = ReactDOM.findDOMNode(this).style;
const direction = this.props.getLeaveDirection();
const x = direction === 'left' ? '-100%' :
direction === 'right' ? '100%' : '0';
let y = direction === 'up' ? '-100%' :
const y = direction === 'up' ? '-100%' :
direction === 'down' ? '100%' : '0';

style.opacity = '0';
Expand All @@ -96,15 +89,19 @@ const SlideInChild = React.createClass({
},

render() {
let {
const {
children,
enterDelay,
getLeaveDirection,
style,
...other,
} = this.props;

let mergedRootStyles = this.mergeStyles({
const {
prepareStyles,
} = this.state.muiTheme;

const mergedRootStyles = Object.assign({}, {
position: 'absolute',
height: '100%',
width: '100%',
Expand All @@ -114,7 +111,7 @@ const SlideInChild = React.createClass({
}, style);

return (
<div {...other} style={this.prepareStyles(mergedRootStyles)}>
<div {...other} style={prepareStyles(mergedRootStyles)}>
{children}
</div>
);
Expand Down
20 changes: 9 additions & 11 deletions src/transition-groups/slide-in.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import ReactTransitionGroup from 'react-addons-transition-group';
import StylePropable from '../mixins/style-propable';
import SlideInChild from './slide-in-child';
import getMuiTheme from '../styles/getMuiTheme';

Expand All @@ -22,13 +21,10 @@ const SlideIn = React.createClass({
muiTheme: React.PropTypes.object,
},

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

mixins: [StylePropable],

getDefaultProps() {
return {
enterDelay: 0,
Expand All @@ -48,10 +44,8 @@ const SlideIn = React.createClass({
};
},

//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;
const newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
this.setState({muiTheme: newMuiTheme});
},

Expand All @@ -60,7 +54,7 @@ const SlideIn = React.createClass({
},

render() {
let {
const {
enterDelay,
children,
childStyle,
Expand All @@ -69,13 +63,17 @@ const SlideIn = React.createClass({
...other,
} = this.props;

let mergedRootStyles = this.mergeStyles({
const {
prepareStyles,
} = this.state.muiTheme;

const mergedRootStyles = Object.assign({}, {
position: 'relative',
overflow: 'hidden',
height: '100%',
}, style);

let newChildren = React.Children.map(children, (child) => {
const newChildren = React.Children.map(children, (child) => {
return (
<SlideInChild
key={child.key}
Expand All @@ -92,7 +90,7 @@ const SlideIn = React.createClass({
return (
<ReactTransitionGroup
{...other}
style={this.prepareStyles(mergedRootStyles)}
style={prepareStyles(mergedRootStyles)}
component="div"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we keep it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the catch, that was not intentional 👍

>
{newChildren}
Expand Down