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

Fixed defects with splitter panel #2084

Merged
merged 2 commits into from
Jun 6, 2021
Merged

Fixed defects with splitter panel #2084

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac897a
changed validate resize to account for all tab panels
anudeepreddy Jun 4, 2021
9725c1b
fixed issue with touch events
anudeepreddy Jun 4, 2021
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
14 changes: 9 additions & 5 deletions src/components/splitter/Splitter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ export class Splitter extends Component {
}

validateResize(newPrevPanelSize, newNextPanelSize) {
if (this.props.children[0].props && this.props.children[0].props.minSize && this.props.children[0].props.minSize > newPrevPanelSize) {
if (this.props.children[this.prevPanelIndex].props && this.props.children[this.prevPanelIndex].props.minSize && this.props.children[this.prevPanelIndex].props.minSize > newPrevPanelSize) {
return false;
}

if (this.props.children[1].props && this.props.children[1].props.minSize && this.props.children[1].props.minSize > newNextPanelSize) {
if (this.props.children[this.prevPanelIndex+1].props && this.props.children[this.prevPanelIndex+1].props.minSize && this.props.children[this.prevPanelIndex+1].props.minSize > newNextPanelSize) {
return false;
}

Expand Down Expand Up @@ -134,10 +134,12 @@ export class Splitter extends Component {
}

onResizeStart(event, index) {
let pageX = event.type === 'touchstart' ? event.touches[0].pageX : event.pageX;
let pageY = event.type === 'touchstart' ? event.touches[0].pageY : event.pageY;
this.gutterElement = event.currentTarget;
this.size = this.props.layout === 'horizontal' ? DomHandler.getWidth(this.container) : DomHandler.getHeight(this.container);
this.dragging = true;
this.startPos = this.props.layout === 'horizontal' ? event.pageX : event.pageY;
this.startPos = this.props.layout === 'horizontal' ? pageX : pageY;
this.prevPanelElement = this.gutterElement.previousElementSibling;
this.nextPanelElement = this.gutterElement.nextElementSibling;
this.prevPanelSize = 100 * (this.props.layout === 'horizontal' ? DomHandler.getOuterWidth(this.prevPanelElement, true) : DomHandler.getOuterHeight(this.prevPanelElement, true)) / this.size;
Expand All @@ -149,10 +151,12 @@ export class Splitter extends Component {

onResize(event) {
let newPos;
let pageX = event.type === 'touchmove' ? event.touches[0].pageX : event.pageX;
let pageY = event.type === 'touchmove' ? event.touches[0].pageY : event.pageY;
if (this.props.layout === 'horizontal')
newPos = (event.pageX * 100 / this.size) - (this.startPos * 100 / this.size);
newPos = (pageX * 100 / this.size) - (this.startPos * 100 / this.size);
else
newPos = (event.pageY * 100 / this.size) - (this.startPos * 100 / this.size);
newPos = (pageY * 100 / this.size) - (this.startPos * 100 / this.size);

let newPrevPanelSize = this.prevPanelSize + newPos;
let newNextPanelSize = this.nextPanelSize - newPos;
Expand Down