Skip to content

Commit

Permalink
[FocusRipple] Fixed overflow problem caused by #978
Browse files Browse the repository at this point in the history
  • Loading branch information
Hai Nguyen committed Jun 29, 2015
1 parent 2b67c6e commit 2565bfd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/ripples/focus-ripple.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ let FocusRipple = React.createClass({
position: 'absolute',
top: 0,
left: 0,
transition: Transitions.easeOut(),
transition: Transitions.easeOut(null, 'opacity'),
transform: this.props.show ? 'scale(1)' : 'scale(0)',
opacity: this.props.show ? 1 : 0
opacity: this.props.show ? 1 : 0,
overflow: 'hidden'
}, this.props.style);

let innerStyles = this.mergeAndPrefix({
Expand Down Expand Up @@ -77,7 +78,7 @@ let FocusRipple = React.createClass({
},

_setRippleSize() {
let el = React.findDOMNode(this);
let el = React.findDOMNode(this.refs.innerCircle);
let height = el.offsetHeight;
let width = el.offsetWidth;
let size = Math.max(height, width);
Expand Down

0 comments on commit 2565bfd

Please sign in to comment.