Skip to content

Modern UI: Prevent vertical scrolling when dragging connected tabs (revised) #338180

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
na2co3 (na2co3-ftw) wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Modern UI: Prevent vertical scrolling when dragging connected tabs (revised) #338180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
339d539
Modern UI: Prevent vertical scrolling when dragging connected tabs
na2co3-ftw Sep 27, 2026
1d4da99
test: connected tabs do not overflow vertically while dragging
na2co3-ftw Sep 27, 2026
2fbfcd1
test: fix failing editor part test
na2co3-ftw Oct 1, 2026
1f40f93
Merge branch 'main' into fix/modern-ui-connected-tab-vertical-scroll-2
na2co3-ftw Oct 2, 2026
4ca8c4b
Modern UI: Fix connected tab styles after merging main
na2co3-ftw Oct 2, 2026
65ccbb9
Merge branch 'main' into fix/modern-ui-connected-tab-vertical-scroll-2
na2co3-ftw Oct 2, 2026
176474d
Modern UI: Fix connected tab styles after merging main
na2co3-ftw Oct 3, 2026
5396da3
test: Apply floating-panels class in the connected tabs test
na2co3-ftw Oct 3, 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
2 changes: 1 addition & 1 deletion src/vs/sessions/test/browser/editorPart.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ suite('Sessions - EditorPart', () => {
active: true,
laterRow: wrapped,
leadingEdge: wrapped,
backgroundClip: wrapped ? 'border-box' : 'padding-box',
backgroundClip: 'border-box',
leftBorder: wrapped ? 'rgba(0, 0, 0, 0)' : border,
leftCorner: wrapped ? '0px' : '5px',
}, `${theme}, active: ${active}, compact: ${compact}, zoom: ${zoom}, wrapped: ${wrapped}`);
Expand Down
15 changes: 5 additions & 10 deletions src/vs/workbench/contrib/modernUI/browser/media/connectedEditorTabs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,8 @@
--modern-ui-editor-tab-unfocused-active-border-top: var(--modern-ui-connected-tab-border);
--modern-ui-editor-tab-active-border: transparent;
--modern-ui-editor-tab-unfocused-active-border: transparent;
top: 0;
inset-inline: 0;
bottom: calc(-2 * var(--vscode-strokeThickness));
z-index: 1;
background-color: var(--modern-ui-connected-tab-current-background);
background-clip: padding-box;
border: var(--vscode-strokeThickness) solid var(--modern-ui-connected-tab-border);
border-bottom-color: transparent;
border-radius: var(--modern-ui-connected-tab-cap-radius) var(--modern-ui-connected-tab-cap-radius) 0 0;
Expand All @@ -247,7 +243,7 @@

.modern-ui-tabs.modern-ui-connected-editor-tabs.monaco-workbench.floating-panels .monaco-grid-view .part.editor > .content .editor-group-container > .title.tabs .tabs-container > .tab.active:not(.connected-tab-upper-row) > .tab-fill,
.modern-ui-tabs.modern-ui-connected-editor-tabs.monaco-workbench.floating-panels .monaco-grid-view .part.editor > .content .editor-group-container > .title.tabs .tabs-container > .tab.active:not(.connected-tab-upper-row) > .tab-connected-edge {
bottom: calc(-3 * var(--vscode-strokeThickness));
bottom: calc(-2 * var(--vscode-strokeThickness));
}

.modern-ui-tabs.modern-ui-connected-editor-tabs.monaco-workbench.floating-panels .monaco-grid-view .part.editor > .content .editor-group-container > .title.tabs .tabs-container > .tab.active:not(.connected-tab-upper-row) > .tab-fill,
Expand Down Expand Up @@ -308,7 +304,7 @@
.modern-ui-tabs.modern-ui-connected-editor-tabs.monaco-workbench .modern-ui-editor-tab.active > .modern-ui-editor-tab-fill::after {
content: '';
position: absolute;
bottom: 0;
bottom: calc(-1 * var(--vscode-strokeThickness));
width: var(--modern-ui-connected-tab-shoulder-radius);
height: var(--modern-ui-connected-tab-shoulder-radius);
box-sizing: border-box;
Expand Down Expand Up @@ -341,7 +337,7 @@
position: absolute;
top: 0;
inset-inline: 0;
bottom: calc(-2 * var(--vscode-strokeThickness));
bottom: calc(-1 * var(--vscode-strokeThickness));
z-index: 8;
pointer-events: none;
}
Expand All @@ -353,7 +349,7 @@
position: absolute;
bottom: 0;
width: var(--vscode-strokeThickness);
height: calc(var(--modern-ui-connected-tab-shoulder-radius) - var(--vscode-strokeThickness));
height: calc(var(--modern-ui-connected-tab-shoulder-radius) - var(--vscode-strokeThickness) * 2);
box-sizing: border-box;
background: linear-gradient(to bottom, transparent var(--vscode-strokeThickness), var(--modern-ui-connected-tab-current-background) var(--vscode-strokeThickness));
}
Expand Down Expand Up @@ -596,8 +592,7 @@
.modern-ui-tabs.modern-ui-connected-editor-tabs.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs .connected-tab-right-clipped > .tab-connected-overflow-right,
.modern-ui-tabs.modern-ui-connected-editor-tabs.monaco-workbench .modern-ui-editor-tab-strip .connected-tab-right-clipped > .tab-connected-overflow-right {
position: absolute;
/* Match the ordinary fill's inner border edge, not its reserved bottom stroke. */
inset: 0 0 var(--vscode-strokeThickness);
inset: 0 0;
z-index: 1;
}

Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/modernUI/test/browser/modernUI.contribution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,7 +3074,7 @@ suite('ModernUIContribution', () => {
middleTab: {
shoulders: ['""', '""'],
capRadii: ['7px', '7px'],
backgroundClip: 'padding-box',
backgroundClip: 'border-box',
radii: ['7px', '7px'],
sizes: [['7px', '7px'], ['7px', '7px']],
},
Expand Down Expand Up @@ -3154,8 +3154,8 @@ suite('ModernUIContribution', () => {
wrappedBottom: { tabBorders: ['0px', '0px'], fillInsets: ['0px', '-1px'], fillInlineStart: '0px' },
},
active: {
single: { tabBorders: ['0px', '0px'], fillInsets: ['0px', '-2px'], fillInlineStart: '0px' },
wrappedBottom: { tabBorders: ['0px', '0px'], fillInsets: ['0px', '-2px'], fillInlineStart: '0px' },
single: { tabBorders: ['0px', '0px'], fillInsets: ['0px', '-1px'], fillInlineStart: '0px' },
wrappedBottom: { tabBorders: ['0px', '0px'], fillInsets: ['0px', '-1px'], fillInlineStart: '0px' },
},
});
});
Expand Down
44 changes: 36 additions & 8 deletions src/vs/workbench/test/browser/parts/editor/multiEditorTabsControl.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ suite('MultiEditorTabsControl', () => {
}

function connectedGroup(): HTMLElement {
const root = $('.monaco-workbench.modern-ui.modern-ui-tabs.modern-ui-connected-editor-tabs');
const root = $('.monaco-workbench.modern-ui.modern-ui-tabs.modern-ui-connected-editor-tabs.floating-panels');
root.style.cssText = '--vscode-spacing-size20: 2px; --vscode-spacing-size40: 4px; --vscode-spacing-size60: 6px; --vscode-spacing-size80: 8px; --vscode-spacing-size160: 16px; --vscode-spacing-size200: 20px; --vscode-spacing-size280: 28px; --vscode-strokeThickness: 1px; --vscode-cornerRadius-small: 4px; --vscode-cornerRadius-medium: 6px; --vscode-cornerRadius-large: 8px; --vscode-fontSize-body1: 13px; --vscode-fontWeight-regular: 400;';
mainWindow.document.body.appendChild(root);
disposables.add(toDisposable(() => root.remove()));
Expand Down Expand Up @@ -516,7 +516,7 @@ suite('MultiEditorTabsControl', () => {
actionPadding: measurements.every(measurement => new Set(measurement.padding).size === 1 && measurement.padding[0] === multiple.padding[0]),
}, {
single: { top: true, right: true, left: true, width: true },
horizontal: { clearance: [[6, 6, 6, 6], [6, 6, 6, 6], [3, 4, 3, 5], [4, 4, 4, 4]] },
horizontal: { clearance: [[7, 6, 6, 6], [7, 6, 6, 6], [4, 4, 3, 5], [4, 4, 4, 4]] },
leftAction: { top: true, right: true, left: true, width: true },
balancedActionSurface: true,
balancedActionInsets: true,
Expand Down Expand Up @@ -630,7 +630,7 @@ suite('MultiEditorTabsControl', () => {
const clearance = trailing - (wrapTabs && activeIndex === 1 ? 1 : 0);
expected.push({
tabHeight, tabActionLocation, wrapTabs, activeIndex,
top: clearance, bottom: clearance, trailing,
top: clearance + (!wrapTabs || activeIndex === 1 ? 1 : 0), bottom: clearance, trailing,
leftBorder: rowStart && !upperRow ? 'rgba(0, 0, 0, 0)' : undefined,
});
}
Expand Down Expand Up @@ -1111,7 +1111,7 @@ suite('MultiEditorTabsControl', () => {
});
expected.push({
...context,
insets: [upper ? index === 0 ? 2 : 1 : 0, upper ? rowEnd ? 2 : 1 : 0, 0],
insets: [upper ? index === 0 ? 2 : 1 : 0, upper ? rowEnd ? 2 : 1 : 0, active && !upper ? -1 : 0],
corners: [topLeftRadius, radius, active && !upper ? '0px' : upper ? '6px' : '4px', roundLeft && !(active && !upper) ? upper ? '6px' : '4px' : '0px'],
leftBorder: rowStart ? 'rgba(0, 0, 0, 0)' : undefined,
});
Expand Down Expand Up @@ -1261,8 +1261,8 @@ suite('MultiEditorTabsControl', () => {
});
}
assert.deepStrictEqual(measurements, [
{ tabHeight: 'default', stripHeight: 61, wrapping: true, upperRow: false, gap: -1, clippingGap: 0, bottomRadius: '0px', shoulder: '""', shoulderStroke: ['rgb(34, 211, 238)', 'rgb(34, 211, 238)'], shoulderBaselineOffset: 0, tabFillHeights: [28, 28], rowGap: 2, overflow: ['visible', 'visible'], separatorOffset: 0, connectionOverlap: 1 },
{ tabHeight: 'compact', stripHeight: 53, wrapping: true, upperRow: false, gap: -1, clippingGap: 0, bottomRadius: '0px', shoulder: '""', shoulderStroke: ['rgb(34, 211, 238)', 'rgb(34, 211, 238)'], shoulderBaselineOffset: 0, tabFillHeights: [24, 24], rowGap: 2, overflow: ['visible', 'visible'], separatorOffset: 0, connectionOverlap: 1 },
{ tabHeight: 'default', stripHeight: 61, wrapping: true, upperRow: false, gap: 0, clippingGap: 0, bottomRadius: '0px', shoulder: '""', shoulderStroke: ['rgb(34, 211, 238)', 'rgb(34, 211, 238)'], shoulderBaselineOffset: 0, tabFillHeights: [28, 29], rowGap: 1, overflow: ['visible', 'visible'], separatorOffset: 0, connectionOverlap: 0 },
{ tabHeight: 'compact', stripHeight: 53, wrapping: true, upperRow: false, gap: 0, clippingGap: 0, bottomRadius: '0px', shoulder: '""', shoulderStroke: ['rgb(34, 211, 238)', 'rgb(34, 211, 238)'], shoulderBaselineOffset: 0, tabFillHeights: [24, 25], rowGap: 1, overflow: ['visible', 'visible'], separatorOffset: 0, connectionOverlap: 0 },
]);
});

Expand Down Expand Up @@ -1323,6 +1323,31 @@ suite('MultiEditorTabsControl', () => {
]);
});

test('connected tabs do not overflow vertically while dragging', async () => {
const group = connectedGroup();
group.style.setProperty('--modern-ui-connected-tab-surface', '#ffffff');
model.openEditor(model.getEditorByIndex(1)!, { active: true });
control.openEditors(model.getEditors(EditorsOrder.SEQUENTIAL));
const measurements = [];
for (const [wrapTabs, width] of [[false, 320], [true, 150]] as const) {
const oldOptions = partOptions;
partOptions = { ...partOptions, wrapTabs, tabSizing: 'fixed', tabSizingFixedMinWidth: 120, tabSizingFixedMaxWidth: 120, editorActionsLocation: 'hidden' };
control.updateOptions(oldOptions, partOptions);
await layoutConnectedGroup(group, width);
const tabs = container.querySelector<HTMLElement>('.tabs-container')!;
tabs.classList.add('scroll');
measurements.push({
wrapTabs,
wrapping: tabs.closest('.tabs-and-actions-container')!.classList.contains('wrapping'),
verticalOverflow: tabs.scrollHeight - tabs.clientHeight,
});
}
assert.deepStrictEqual(measurements, [
{ wrapTabs: false, wrapping: false, verticalOverflow: 0 },
{ wrapTabs: true, wrapping: true, verticalOverflow: 0 },
]);
});

test('connected tabs reserve separator height without changing classic or shared modern tabs', async () => {
const readHeight = async () => {
control.layout({ container: Dimension.None, available: Dimension.None });
Expand Down Expand Up @@ -1366,6 +1391,7 @@ suite('MultiEditorTabsControl', () => {

const [activeTab, inactiveTab] = container.querySelectorAll<HTMLElement>('.tabs-container > .tab');
const activeFillStyle = mainWindow.getComputedStyle(activeTab.querySelector<HTMLElement>('.tab-fill')!);
const activeEdgeStyle = mainWindow.getComputedStyle(activeTab.querySelector<HTMLElement>('.tab-connected-edge')!);
const inactiveFillStyle = mainWindow.getComputedStyle(inactiveTab.querySelector<HTMLElement>('.tab-fill')!);
const row = container.querySelector<HTMLElement>('.tabs-and-actions-container')!;
const rowStyle = mainWindow.getComputedStyle(row);
Expand All @@ -1375,13 +1401,15 @@ suite('MultiEditorTabsControl', () => {

assert.deepStrictEqual({
active: { top: activeFillStyle.top, left: activeFillStyle.left, right: activeFillStyle.right, bottom: activeFillStyle.bottom },
activeEdgeBottom: activeEdgeStyle.bottom,
inactive: { top: inactiveFillStyle.top, left: inactiveFillStyle.left, right: inactiveFillStyle.right, bottom: inactiveFillStyle.bottom },
alignItems: rowStyle.alignItems,
editorActionsHeight: editorActionsStyle.height,
rowPaddingLeft: rowStyle.paddingLeft,
rowPaddingTop: rowStyle.paddingTop,
}, {
active: { top: '0px', left: '0px', right: '0px', bottom: '-2px' },
active: { top: '0px', left: '0px', right: '0px', bottom: '-1px' },
activeEdgeBottom: '-1px',
inactive: { top: '0px', left: '0px', right: '0px', bottom: '-1px' },
alignItems: 'flex-start',
editorActionsHeight: '32px',
Expand Down Expand Up @@ -1621,7 +1649,7 @@ suite('MultiEditorTabsControl', () => {
multiSelected: { clipping: '0px', edge: 'block', radius: '0px 5px 0px 0px', connectedClass: true },
singleSelected: { clipping: '0px', connectedClass: true },
terminalOutline: { right: '1px', rightShoulder: '""', rightMask: '""' },
normalOutline: { left: '1px', right: '1px', leftShoulder: '""', rightShoulder: '""', edge: 'block', overflowEdge: 'none', leftMaskHeight: '4px', leftMaskTop: '0px', rightMaskHeight: '4px', rightMaskTop: '0px' },
normalOutline: { left: '1px', right: '1px', leftShoulder: '""', rightShoulder: '""', edge: 'block', overflowEdge: 'none', leftMaskHeight: '3px', leftMaskTop: '0px', rightMaskHeight: '3px', rightMaskTop: '0px' },
rightShoulderAtViewport: { edge: true, clipped: false, right: '1px', rightShoulder: '""', rightMask: '""', overflowEdge: 'block' },
rightShoulderRevealed: { edge: false, clipped: false, rightShoulder: '""', rightMask: '""' },
leftShoulderAtViewport: { edge: true, clipped: false, left: '1px', leftShoulder: 'none', leftMask: 'none', overflowEdge: 'none' },
Expand Down