Skip to content

Set max size on drag resize handlers #1691

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 2 commits into from
Apr 2, 2019
Merged

Set max size on drag resize handlers #1691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1a900
Fix issue #1654
samrith-s Apr 1, 2019
e470741
Conditionally set flexShrink to console based on devToolIndex
samrith-s Apr 1, 2019
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
18 changes: 11 additions & 7 deletions packages/app/src/app/components/Preview/DevTools/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,8 @@ export default class DevTools extends React.PureComponent<Props, State> {
});
};

getCurrentPane = () => {
return this.props.viewConfig.views[this.state.currentPaneIndex];
};
getCurrentPane = () =>
this.props.viewConfig.views[this.state.currentPaneIndex];

updateStatus = (id: string) => (
status: 'success' | 'warning' | 'error' | 'info' | 'clear',
Expand Down Expand Up @@ -397,9 +396,7 @@ export default class DevTools extends React.PureComponent<Props, State> {
});
};

getViews = (): IViews => {
return this.allViews;
};
getViews = (): IViews => this.allViews;

node: HTMLElement;
allViews: IViews;
Expand All @@ -425,9 +422,16 @@ export default class DevTools extends React.PureComponent<Props, State> {
}}
style={{
height: primary ? '100%' : height,
minHeight: height,
position: 'relative',
display: 'flex',
maxHeight: '100%',
/**
* Necessary to ensure it drags naturally. Otherwise there's an issue
* where flex tries to allocate equal space to the preview and the terminal,
* resulting in a very jaggy experience. We set flex-shrink to 0 only
* for the console, and not for the preview
*/
flexShrink: devToolIndex === 1 ? 0 : 1,
}}
>
{!hideTabs && (
Expand Down