peezy-tech/jojo
2
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2026-05-12 22:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v14.0/forgejo] fix(ui): tippy menu styles too broad, affecting switch in PR review (#10996)

Browse source 
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/10969

The custom styles for tippy-enabled menus had too broad selectors, conflicting with styles of other .item elements in tippy boxes.

Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10996
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2026-01-25 14:57:38 +01:00 • committed by Gusted
parent 3aaef3b3dd
commit ddf0265b5c
3 changed files with 80 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/e2e/repo-code.test.e2e.ts
View file

@ -6,6 +6,7 @@
// templates/repo/view_file.tmpl
// web_src/css/repo.css
// web_src/css/repo/file-view.css
// web_src/css/modules/tippy.css
// web_src/js/features/repo-code.js
// web_src/js/features/repo-unicode-escape.js
// @watch end
@ -153,3 +154,14 @@ test('Copy line permalink', async ({page}) => {
const clipboardText = await page.evaluate(() => navigator.clipboard.readText());
expect(clipboardText).toContain('README.md?display=source#L1');
});
test('Line menu styles', async ({page}) => {
const response = await page.goto('/user2/repo1/src/branch/master/README.md?display=source#L1');
expect(response?.status()).toBe(200);
await page.locator('.code-line-button').click();
const button = page.locator('.tippy-box .ref-in-new-issue');
await expect(button).toHaveCSS('display', 'flex');
await expect(button).toHaveCSS('padding', '9px 18px');
});

93
tests/e2e/switch.test.e2e.ts
View file

@ -8,29 +8,14 @@
// @watch end
import {expect} from '@playwright/test';
import {test} from './utils_e2e.ts';
test('Switch CSS properties', async ({browser}) => {
// This test doesn't need JS and runs a little faster without it
const context = await browser.newContext({javaScriptEnabled: false});
const page = await context.newPage();
import {test, login_user} from './utils_e2e.ts';
test.describe('Switch CSS properties', () => {
const noBg = 'rgba(0, 0, 0, 0)';
const activeBg = 'rgb(226, 226, 229)';
const normalMargin = '0px';
const normalPadding = '15.75px';
const specialLeftMargin = '-4px';
const specialPadding = '19.75px';
async function evaluateSwitchItem(page, selector, isActive, background, marginLeft, marginRight, paddingLeft, paddingRight) {
async function evaluateSwitchItem(page, selector, isActive, marginLeft, marginRight, paddingLeft, paddingRight, itemHeight) {
const item = page.locator(selector);
if (isActive) {
await expect(item).toHaveClass(/active/);
} else {
await expect(item).not.toHaveClass(/active/);
}
const cs = await item.evaluate((el) => {
// In Firefox getComputedStyle is undefined if returned from evaluate
const s = getComputedStyle(el);
@ -42,33 +27,71 @@ test('Switch CSS properties', async ({browser}) => {
paddingRight: s.paddingRight,
};
});
expect(cs.backgroundColor).toBe(background);
expect(cs.marginLeft).toBe(marginLeft);
expect(cs.marginRight).toBe(marginRight);
expect(cs.paddingLeft).toBe(paddingLeft);
expect(cs.paddingRight).toBe(paddingRight);
if (isActive) {
await expect(item).toHaveClass(/active/);
expect(cs.backgroundColor).toBe(activeBg);
} else {
await expect(item).not.toHaveClass(/active/);
expect(cs.backgroundColor).toBe(noBg);
}
expect((await item.boundingBox()).height).toBeCloseTo(itemHeight);
return true;
}
await page.goto('/user2/repo1/pulls');
const normalMargin = '0px';
const normalPadding = '15.75px';
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(1)', true, activeBg, normalMargin, normalMargin, normalPadding, normalPadding);
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(2)', false, noBg, specialLeftMargin, normalMargin, specialPadding, normalPadding);
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(3)', false, noBg, normalMargin, normalMargin, normalPadding, normalPadding);
const specialLeftMargin = '-4px';
const specialPadding = '19.75px';
await page.goto('/user2/repo1/pulls?state=closed');
// Subtest for areas that can be evaluated without JS
test('No JS', async ({browser}) => {
const context = await browser.newContext({javaScriptEnabled: false});
const page = await context.newPage();
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(1)', false, noBg, normalMargin, specialLeftMargin, normalPadding, specialPadding);
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(2)', true, activeBg, normalMargin, normalMargin, normalPadding, normalPadding);
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(3)', false, noBg, specialLeftMargin, normalMargin, specialPadding, normalPadding);
const itemHeight = await page.evaluate(() => window.matchMedia('(pointer: coarse)').matches) ? 38 : 34;
await page.goto('/user2/repo1/pulls?state=all');
await page.goto('/user2/repo1/pulls');
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(1)', false, noBg, normalMargin, normalMargin, normalPadding, normalPadding);
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(2)', false, noBg, normalMargin, specialLeftMargin, normalPadding, specialPadding);
await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(3)', true, activeBg, normalMargin, normalMargin, normalPadding, normalPadding);
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(1)', true, normalMargin, normalMargin, normalPadding, normalPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(2)', false, specialLeftMargin, normalMargin, specialPadding, normalPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(3)', false, normalMargin, normalMargin, normalPadding, normalPadding, itemHeight)).toBeTruthy();
// E2E already runs clients with both fine and coarse pointer simulated
// This test will verify that coarse-related CSS is working as intended
const itemHeight = await page.evaluate(() => window.matchMedia('(pointer: coarse)').matches) ? 38 : 34;
expect((await page.locator('#issue-filters .switch > .item:nth-child(1)').boundingBox()).height).toBeCloseTo(itemHeight);
await page.goto('/user2/repo1/pulls?state=closed');
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(1)', false, normalMargin, specialLeftMargin, normalPadding, specialPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(2)', true, normalMargin, normalMargin, normalPadding, normalPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(3)', false, specialLeftMargin, normalMargin, specialPadding, normalPadding, itemHeight)).toBeTruthy();
await page.goto('/user2/repo1/pulls?state=all');
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(1)', false, normalMargin, normalMargin, normalPadding, normalPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(2)', false, normalMargin, specialLeftMargin, normalPadding, specialPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '#issue-filters .switch > .item:nth-child(3)', true, normalMargin, normalMargin, normalPadding, normalPadding, itemHeight)).toBeTruthy();
});
// Subtest for areas that can't be reached without JS
test('With JS', async ({browser}, workerInfo) => {
const context = await login_user(browser, workerInfo, 'user2');
const page = await context.newPage();
// Go to files tab of a reviewable pull request
await page.goto('/user2/repo1/pulls/5/files');
// Open review box
await page.locator('#review-box .js-btn-review').click();
// Markdown editor has a special rule for a shorter switch
const itemHeight = 28;
expect(await evaluateSwitchItem(page, '.review-box-panel .switch > .item:nth-child(1)', true, normalMargin, normalMargin, normalPadding, normalPadding, itemHeight)).toBeTruthy();
expect(await evaluateSwitchItem(page, '.review-box-panel .switch > .item:nth-child(2)', false, specialLeftMargin, normalMargin, specialPadding, normalPadding, itemHeight)).toBeTruthy();
});
});

13
web_src/css/modules/tippy.css
View file

@ -1,3 +1,8 @@
/* Copyright 2017-2022 atomiks. All rights reserved.
* Copyright 2022-2024 The Gitea Authors. All rights reserved.
* Copyright 2024 The Forgejo Authors. All rights reserved.
* SPDX-License-Identifier: MIT */
/* styles are based on node_modules/tippy.js/dist/tippy.css */
/* class to hide tippy target elements on page load */
@ -73,7 +78,9 @@
fill: var(--color-menu);
}
.tippy-box[data-theme="menu"] .item {
/* Ellipsis, overflow menus */
.tippy-box[data-theme="menu"] .tippy-target > .item {
display: flex;
align-items: center;
padding: 9px 18px;
@ -82,11 +89,11 @@
gap: 10px;
}
.tippy-box[data-theme="menu"] .item:hover {
.tippy-box[data-theme="menu"] .tippy-target > .item:hover {
background: var(--color-hover);
}
.tippy-box[data-theme="menu"] .item:focus {
.tippy-box[data-theme="menu"] .tippy-target > .item:focus {
background: var(--color-active);
}