Skip to content

fix: widen diff scrollbar #394

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
levivilet merged 1 commit into from
Jul 9, 2026
Merged

fix: widen diff scrollbar #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion packages/diff-view/src/parts/RenderCss/RenderCss.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import * as CursorConstants from '../CursorConstants/CursorConstants.ts'
import { getSashWidth } from '../GetPaneWidths/GetPaneWidths.ts'
import { getScrollBarThumbTop } from '../GetScrollBarThumbTop/GetScrollBarThumbTop.ts'

const ScrollBarWidth = 44

const getEmptyLineNumberHeights = (visibleLines: readonly VisibleLine[], itemHeight: number): readonly number[] => {
const heights: number[] = []
let emptyLineCount = 0
Expand Down Expand Up @@ -86,6 +88,7 @@ export const renderCss = (oldState: DiffViewState, newState: DiffViewState): any
--ScrollBarHeight: ${scrollBarHeight}px;
--ScrollBarBackgroundImage: ${scrollBarBackgroundImage};
--ScrollBarThumbTop: ${scrollBarThumbTop}px;
--ScrollBarWidth: ${ScrollBarWidth}px;
--DiffFontFamily: ${newState.fontFamily};
}

Expand Down Expand Up @@ -452,7 +455,7 @@ ${getEmptyLineNumberCss(newState.visibleLinesLeft, newState.visibleLinesRight, i
position: absolute;
right: 2px;
top: 0;
width: 8px;
width: var(--ScrollBarWidth);
}

.DiffScrollBarThumb {
Expand Down
2 changes: 2 additions & 0 deletions packages/diff-view/test/RenderCss.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ test('renderCss renders left and right widths as css variables', (): void => {
expect(result[2]).not.toContain('--DiffEditorSashLeft')
expect(result[2]).not.toContain('left: var(--DiffEditorSashLeft);')
expect(result[2]).toContain('--ScrollBarHeight: 40px;')
expect(result[2]).toContain('--ScrollBarWidth: 44px;')
expect(result[2]).toContain('.DiffEditorHorizontal {')
expect(result[2]).toContain('.DiffEditorVertical {')
expect(result[2]).toContain('.DiffEditorWithSearch.DiffEditorHorizontal,\n.DiffEditorWithSearch.DiffEditorVertical {\n flex-direction: column;\n}')
Expand Down Expand Up @@ -79,6 +80,7 @@ test('renderCss renders left and right widths as css variables', (): void => {
expect(result[2]).toContain('overflow: auto;')
expect(result[2]).toContain('text-underline-offset: 2px;')
expect(result[2]).toContain('.DiffScrollBarThumb {')
expect(result[2]).toContain('width: var(--ScrollBarWidth);')
expect(result[2]).toContain('background-image: var(--ScrollBarBackgroundImage);')
})

Expand Down
1 change: 1 addition & 0 deletions packages/e2e/src/diff.package-lock-json-thousand-lines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
await expect(beforePane).toContainText('"version": "1.0.0"')
await expect(afterPane).toContainText('"version": "1.0.1"')
await expect(scrollBar).toHaveCount(1)
await expect(scrollBar).toHaveCSS('width', '44px')

// await Command.execute('DiffView.handleWheel', 0, 999_999)

Expand Down