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

[RenderToLayout] Remove the debounce #2362

Merged
merged 1 commit into from
Dec 3, 2015
Merged

[RenderToLayout] Remove the debounce #2362

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
6 changes: 1 addition & 5 deletions src/dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ const Dialog = React.createClass({

render() {
return (
<RenderToLayer render={this.renderLayer} open={this.state.open} />
<RenderToLayer render={this.renderLayer} open={true} useLayerForClickAway={false} />
);
},

Expand Down Expand Up @@ -523,10 +523,6 @@ const Dialog = React.createClass({
}, this._onDismiss);
},

layerWillUnmount() {
if (this.props.onDismiss) this.props.onDismiss();
},

isOpen() {
return this.state.openImmediately;
},
Expand Down
103 changes: 52 additions & 51 deletions src/popover/popover.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const Popover = React.createClass({
vertical: 'top',
horizontal: 'left',
},
useLayerForClickAway:true,
useLayerForClickAway: true,
zDepth: 1,
};
},
Expand All @@ -70,6 +70,7 @@ const Popover = React.createClass({

getChildContext() {
return {
muiTheme: this.state.muiTheme,
};
},

Expand All @@ -80,20 +81,35 @@ const Popover = React.createClass({

componentWillReceiveProps(nextProps, nextContext) {
let newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
if (nextProps.open !== this.state.open) {

if (this._isAnimating === true || nextProps.open !== this.state.open) {
if (nextProps.open) {
this.anchorEl = nextProps.anchorEl || this.props.anchorEl;
this.setState({
open: true,
muiTheme: newMuiTheme,
});
} else {
this.setState({
open: false,
muiTheme: newMuiTheme,
}, () => {
this._animateClose();
this._animate(true);
});
} else {
if (nextProps.animated) {
this._animate(false);
this._isAnimating = true;
this._timeout = setTimeout(() => {
if (this.isMounted()) {
this._isAnimating = false;
this.setState({
open: false,
muiTheme: newMuiTheme,
});
}
}, 500);
} else {
this.setState({
open: false,
muiTheme: newMuiTheme,
});
}
}
}
},
Expand All @@ -102,58 +118,53 @@ const Popover = React.createClass({
this.setPlacement();
},

componentWillUnmount() {
if (this.state.open) {
this._animateClose();
}
},

render() {
return <RenderToLayer
ref="layer"
{...this.props}
componentClickAway={this.componentClickAway}
render={this.renderLayer} />;
return (
<RenderToLayer
ref="layer"
open={this.state.open}
componentClickAway={this.componentClickAway}
render={this.renderLayer} />
);
},

renderLayer() {
let {
const {
animated,
targetOrigin,
className,
zDepth,
} = this.props;

const anchorEl = this.props.anchorEl || this.anchorEl;
let anchor = this.getAnchorPosition(anchorEl);
let horizontal = targetOrigin.horizontal.replace('middle', 'vertical');
const anchor = this.getAnchorPosition(anchorEl);
const horizontal = targetOrigin.horizontal.replace('middle', 'vertical');

let wrapperStyle = {
const wrapperStyle = this.mergeAndPrefix({
position: 'fixed',
top: anchor.top,
left: anchor.left,
zIndex: this.state.muiTheme.zIndex.popover,
opacity:1,
overflow:'auto',
maxHeight:'100%',
transform:'scale(0,0)',
opacity: 1,
overflow: 'auto',
maxHeight: '100%',
transform: 'scale(0,0)',
transformOrigin: `${horizontal} ${targetOrigin.vertical}`,
transition: animated ? Transitions.easeOut('500ms', ['transform', 'opacity']) : null,
};
wrapperStyle = this.mergeAndPrefix(wrapperStyle, this.props.style);
}, this.props.style);

let horizontalAnimation = {
maxHeight:'100%',
overflowY:'auto',
transform:'scaleX(0)',
opacity:1,
const horizontalAnimation = {
maxHeight: '100%',
overflowY: 'auto',
transform: 'scaleX(0)',
opacity: 1,
transition: animated ? Transitions.easeOut('250ms', ['transform', 'opacity']) : null,
transformOrigin: `${horizontal} ${targetOrigin.vertical}`,
};

let verticalAnimation = {
opacity:1,
transform:'scaleY(0)',
const verticalAnimation = {
opacity: 1,
transform: 'scaleY(0)',
transformOrigin: `${horizontal} ${targetOrigin.vertical}`,
transition: animated ? Transitions.easeOut('500ms', ['transform', 'opacity']) : null,
};
Expand All @@ -177,36 +188,28 @@ const Popover = React.createClass({
}
},

componentClickAway(event) {
if (event.defaultPrevented) {
return;
}

componentClickAway() {
this.requestClose('clickAway');
},

_resizeAutoPosition() {
this.setPlacement();
},

_animateClose() {
_animate(open) {
if (!this.refs.layer || !this.refs.layer.getLayer()) {
return;
}

const el = this.refs.layer.getLayer().children[0];
this._animate(el, false);
},

_animate(el) {
let value = '0';
const inner = el.children[0];
const innerInner = inner.children[0];
const innerInnerInner = innerInner.children[0];
const rootStyle = inner.style;
const innerStyle = innerInner.style;

if (this.state.open) {
if (open) {
value = '1';
}

Expand Down Expand Up @@ -264,7 +267,7 @@ const Popover = React.createClass({

const targetEl = this.refs.layer.getLayer().children[0];
if (!targetEl) {
return {};
return;
}

let {targetOrigin, anchorOrigin} = this.props;
Expand All @@ -289,8 +292,6 @@ const Popover = React.createClass({

targetEl.style.top = targetPosition.top + 'px';
targetEl.style.left = targetPosition.left + 'px';

this._animate(targetEl, true);
},

autoCloseWhenOffScreen(anchorPosition) {
Expand Down
Loading