Skip to content

Splitter: respect maxSize option where it's possible during collapse and visibility change of its panes (T1323187) #32851

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

Open
EugeniyKiyashko wants to merge 2 commits into
base: 26_1
Choose a base branch
from
Open

Splitter: respect maxSize option where it's possible during collapse and visibility change of its panes (T1323187) #32851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2f9e2f
Splitter: respect maxSize option where it's possible during collapse …
EugeniyKiyashko Mar 10, 2026
afa1239
refactoring
pharret31 Mar 10, 2026
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
45 changes: 25 additions & 20 deletions packages/devextreme/js/__internal/ui/splitter/splitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,18 +726,38 @@ class Splitter extends CollectionWidgetLiveUpdate<Properties> {
direction,
);

this._recalculateLayout(collapsedDelta, paneIndex);
}

_recalculateLayout(delta: number, paneIndex: number | undefined): void {
this._itemRestrictions.forEach((pane) => {
pane.maxSize = undefined;
pane.resizable = undefined;
});

this._layout = getNextLayout(
this.getLayout(),
collapsedDelta,
const currentLayout = this.getLayout();

let newLayout = getNextLayout(
currentLayout,
delta,
paneIndex,
this._itemRestrictions,
);

if (newLayout === currentLayout) {
this._itemRestrictions.forEach((pane) => {
pane.maxSize = undefined;
});

newLayout = getNextLayout(
currentLayout,
delta,
paneIndex,
this._itemRestrictions,
);
}

this._layout = newLayout;

this._applyStylesFromLayout(this.getLayout());
this._updateItemSizes();
}
Expand Down Expand Up @@ -846,22 +866,7 @@ class Splitter extends CollectionWidgetLiveUpdate<Properties> {
this._collapseDirection,
);

this._itemRestrictions.forEach((pane) => {
if (item.collapsed) {
pane.maxSize = undefined;
}
pane.resizable = undefined;
});

this._layout = getNextLayout(
this.getLayout(),
collapsedDelta,
this._activeResizeHandleIndex,
this._itemRestrictions,
);

this._applyStylesFromLayout(this.getLayout());
this._updateItemSizes();
this._recalculateLayout(collapsedDelta, this._activeResizeHandleIndex);

this._updateResizeHandlesResizableState();
this._updateResizeHandlesCollapsibleState();
Expand Down
153 changes: 151 additions & 2 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,62 @@ QUnit.module('Pane sizing', moduleConfig, () => {
{ targetButton: 'next', resizeHandleIndex: 1, expectedLayout: ['10.1626', '89.8374', '0'] },
{ targetButton: 'prev', resizeHandleIndex: 1, expectedLayout: ['10.1626', '79.6748', '10.1626'] },
],
},
{
items: [ { resizable: true, collapsed: false, collapsible: true, size: '200px', minSize: '100px', maxSize: '250px' }, { resizable: true, size: '200px', minSize: '100px', maxSize: '200px' }, { }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['0', '20.3252', '79.6748'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['20.3252', '10.1626', '69.5122'] },
],
},
{
items: [{ collapsible: true }, { collapsible: true, maxSize: 300 }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['0', '100'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['69.7581', '30.2419'] },
],
},
{
items: [{ collapsible: true, maxSize: 300 }, { collapsible: true }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['0', '100'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['30.2419', '69.7581'] },
],
},
{
items: [{ collapsible: true, maxSize: 300 }, { collapsible: true }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['0', '100'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['30.2419', '69.7581'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['100', '0'] },
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['30.2419', '69.7581'] },
],
},
{
items: [{ collapsible: true }, { collapsible: true, maxSize: 200 }, { collapsible: true }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['0', '20.3252', '79.6748'] },
],
},
{
items: [{ collapsible: true }, { collapsible: true, maxSize: 200 }, { collapsible: true, maxSize: 200 }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['0', '79.6748', '20.3252'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['59.3496', '20.3252', '20.3252'] },
],
},
{
items: [{ collapsible: true }, { collapsible: true, maxSize: 200 }, { collapsible: true }],
scenarios: [
{ targetButton: 'next', resizeHandleIndex: 1, expectedLayout: ['79.6748', '20.3252', '0'] },
],
},
{
items: [{ collapsible: true, collapsedSize: 100 }, { collapsible: true, maxSize: 300 }],
scenarios: [
{ targetButton: 'prev', resizeHandleIndex: 0, expectedLayout: ['10.0806', '89.9194'] },
{ targetButton: 'next', resizeHandleIndex: 0, expectedLayout: ['69.7581', '30.2419'] },
],
}
].forEach(({ items, scenarios }) => {
QUnit.test(`The pane should restore its size after collapsing and expanding by click, items: ${JSON.stringify(items)}`, function(assert) {
Expand Down Expand Up @@ -1603,11 +1659,104 @@ QUnit.module('Pane visibility', moduleConfig, () => {
paneIndex: 1,
visible: false,
expected: {
layout: ['10.2459', '0', '69.2623', '20.4918'],
itemSizes: [100.812, 0, 681.539, 201.617],
layout: ['10.2459', '0', '25.4065', '64.3476'],
itemSizes: [100.812, 0, 250, 633.18],
handlesCount: 2
}
}]
}, {
dataSource: [{ visible: true }, { size: '300px', maxSize: '300px' }],
scenarios: [{
paneIndex: 0,
visible: false,
expected: {
layout: ['0', '100'],
itemSizes: [0, 1000],
handlesCount: 0
}
}, {
paneIndex: 0,
visible: true,
expected: {
layout: ['69.7581', '30.2419'],
itemSizes: [692, 300],
handlesCount: 1
}
}]
}, {
dataSource: [{ size: '300px', maxSize: '300px' }, { visible: true }],
scenarios: [{
paneIndex: 1,
visible: false,
expected: {
layout: ['100', '0'],
itemSizes: [1000, 0],
handlesCount: 0
}
}, {
paneIndex: 1,
visible: true,
expected: {
layout: ['30.2419', '69.7581'],
itemSizes: [300, 692],
handlesCount: 1
}
}]
}, {
dataSource: [{ visible: true, size: '400px' }, { size: '200px', maxSize: '250px' }, {}],
scenarios: [{
paneIndex: 0,
visible: false,
expected: {
layout: ['0', '25.2016', '74.7984'],
itemSizes: [0, 250, 742],
handlesCount: 1
}
}]
}, {
dataSource: [{ size: 200, maxSize: 250 }, { visible: true }, { size: 200, maxSize: 250 }],
scenarios: [{
paneIndex: 1,
visible: false,
expected: {
layout: ['20.3252', '0', '79.6748'],
itemSizes: [201.625, 0, 790.375],
handlesCount: 1
}
}]
}, {
dataSource: [{}, { size: '200px', maxSize: '250px' }, { visible: true, size: '300px' }],
scenarios: [{
paneIndex: 2,
visible: false,
expected: {
layout: ['74.7984', '25.2016', '0'],
itemSizes: [742, 250, 0],
handlesCount: 1
}
}]
}, {
dataSource: [{ visible: true, size: '300px' }, { size: '100px', minSize: '80px', maxSize: '200px' }, {}],
scenarios: [{
paneIndex: 0,
visible: false,
expected: {
layout: ['0', '20.1613', '79.8387'],
itemSizes: [0, 200, 792],
handlesCount: 1
}
}]
}, {
dataSource: [{ visible: false }, { maxSize: '300px' }],
scenarios: [{
paneIndex: 0,
visible: true,
expected: {
layout: ['69.7581', '30.2419'],
itemSizes: [692, 300],
handlesCount: 1
}
}]
}].forEach(({ dataSource, scenarios }) => {
QUnit.test(`Size distribution after changing pane.visibility at runtime, dataSource: ${JSON.stringify(dataSource)}, ${orientation} orientation`, function(assert) {
this.reinit({
Expand Down
Loading