Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion packages/diffs/src/editor/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3943,7 +3943,11 @@ export class Editor<LAnnotation> implements DiffsEditor<LAnnotation> {
// absent (context lines) the CSS falls back to the editor base bg.
const lineElement = this.#getLineElement(line);
let cornerBg = 'initial';
if (this.#isDiff && lineElement?.dataset.lineType === 'change-addition') {
if (
lineElement !== undefined &&
(lineElement.dataset.lineType === 'change-addition' ||
lineElement.dataset.selectedLine !== undefined)
) {
cornerBg =
getComputedStyle(lineElement).getPropertyValue('--diffs-line-bg');
}
Expand Down
51 changes: 51 additions & 0 deletions packages/diffs/test/e2e/theme.pw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,57 @@ test.describe('theme line highlights', () => {
expect(both.painted).not.toEqual(selected.painted);
});

test('rounded selection corners match a selected line background', async ({
page,
}) => {
await openFixture(page, { name: 'pierre-light', type: 'light' });
await setLineHighlightState(page, 'selected');
await page.evaluate(() => {
window.__editor?.setSelections([
{
start: { line: 0, character: 10 },
end: { line: 2, character: 10 },
direction: 'forward',
},
]);
});
await expect(page.locator('[data-selection-corner]')).not.toHaveCount(0);

const colors = await page.evaluate(() => {
const root = document.querySelector('diffs-container')?.shadowRoot;
const row = root?.querySelector<HTMLElement>(
'[data-content] > [data-line="2"]'
);
const corner = [
...(root?.querySelectorAll<HTMLElement>('[data-selection-corner]') ??
[]),
].find(
(element) =>
Math.abs(
element.getBoundingClientRect().top -
(row?.getBoundingClientRect().top ?? Number.NaN)
) < 0.5
);
if (row == null || corner == null) {
throw new Error('Missing selected row corner.');
}

const probe = document.createElement('span');
probe.style.backgroundColor = 'var(--diffs-bg)';
row.append(probe);
const base = getComputedStyle(probe).backgroundColor;
probe.remove();
return {
base,
corner: getComputedStyle(corner).backgroundColor,
line: getComputedStyle(row, '::after').backgroundColor,
};
});

expect(colors.line).not.toBe(colors.base);
expect(colors.corner).toBe(colors.line);
});

test('a missing active background preserves the resolved line color', async ({
page,
}) => {
Expand Down