Skip to content

Fixes a nasty bug where all Panes could end up sharing the same static style #44

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

Merged
merged 3 commits into from
May 24, 2016
Merged

Fixes a nasty bug where all Panes could end up sharing the same static style #44

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbdecf1
Fix nasty bug where all Panes could end up sharing the same static style
ara4n May 24, 2016
1714e70
fix indentation
ara4n May 24, 2016
465a583
fix lint
ara4n May 24, 2016
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
29 changes: 18 additions & 11 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ class SortablePane extends Component {
y: !this.isHorizontal() ? mouse : 0,
}
: {
scale: spring(1, springConfig),
shadow: spring(0, springConfig),
scale: disableEffect ? 1 : spring(1, springConfig),
shadow: disableEffect ? 0 : spring(0, springConfig),
x: this.isHorizontal() ? springPosition : 0,
y: !this.isHorizontal() ? springPosition : 0,
};
Expand All @@ -376,6 +376,21 @@ class SortablePane extends Component {
const onTouchStart = this.handleTouchStart.bind(this, i, x, y);
const onResizeStart = this.handleResizeStart.bind(this, i);
const onResizeStop = this.handleResizeStop.bind(this, i);

// take a copy rather than direct-manipulating the child's prop, which violates React
// and causes problems if the child's prop is a static default {}, which then will be
// shared across all children!
const customStyle = Object.assign({}, child.props.style);
Object.assign(customStyle, {
boxShadow: `rgba(0, 0, 0, 0.2) 0px ${shadow}px ${2 * shadow}px 0px`,
transform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
WebkitTransform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
MozTransform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
MsTransform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
zIndex: i === lastPressed ? 99 : i, // TODO: Add this.props.zIndex
position: 'absolute',
});

return (
<Resizable
customClass={child.props.className}
Expand All @@ -396,15 +411,7 @@ class SortablePane extends Component {
minHeight={child.props.minHeight}
maxWidth={child.props.maxWidth}
maxHeight={child.props.maxHeight}
customStyle={Object.assign(child.props.style, {
boxShadow: `rgba(0, 0, 0, 0.2) 0px ${shadow}px ${2 * shadow}px 0px`,
transform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
WebkitTransform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
MozTransform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
MsTransform: `translate3d(${x}px, ${y}px, 0px) scale(${scale})`,
zIndex: i === lastPressed ? 99 : i, // TODO: Add this.props.zIndex
position: 'absolute',
})}
customStyle={customStyle}
onMouseDown={onMouseDown}
onTouchStart={onTouchStart}
onResizeStart={onResizeStart}
Expand Down