mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-09-29 14:15:55 +00:00
aa345c9e0c
- The current implementation for modals is provided by fomantic UI. - This patch introduces a new implementation that relies on the `<dialog>` element to provide modal, whereby the heavy lifting is done by the browser. - This implementation is considerably simpler, accessible (although untested) and lightweight. It is capable of replacing fomantic UI's modal implementation + our dimmer implementation (~2k lines of code and CSS).[^1] As a first step the empty content modal is migrated. - This brings in the CSS needed to display `<dialog>` and a helper function that hides some boilerplate code that's needed to show `<dialog>` as a modal. - Add a E2E test that shows the modal's cancel and approve button works. [^1]: The heavy work has already been done by me in a local branch, but reviewing that gigantic patch in one PR is not doable. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8859 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz>
71 lines
2.4 KiB
TypeScript
71 lines
2.4 KiB
TypeScript
// @watch start
|
|
// templates/shared/user/**
|
|
// web_src/css/modules/dimmer.ts
|
|
// web_src/css/modules/dimmer.css
|
|
// @watch end
|
|
|
|
import {expect} from '@playwright/test';
|
|
import {save_visual, test} from './utils_e2e.ts';
|
|
|
|
test.use({user: 'user2'});
|
|
|
|
test('Dimmed modal', async ({page}) => {
|
|
await page.goto('/user1');
|
|
|
|
await expect(page.locator('#action-block')).toContainText('Block');
|
|
|
|
// Ensure the modal is hidden
|
|
await expect(page.locator('#block-user')).toBeHidden();
|
|
|
|
await page.locator('.actions .dropdown').click();
|
|
await page.locator('#action-block').click();
|
|
|
|
// Modal and dimmer should be visible.
|
|
await expect(page.locator('#block-user')).toBeVisible();
|
|
await expect(page.locator('.ui.dimmer')).toBeVisible();
|
|
await save_visual(page);
|
|
|
|
// After canceling, modal and dimmer should be hidden.
|
|
await page.locator('#block-user .cancel').click();
|
|
await expect(page.locator('.ui.dimmer')).toBeHidden();
|
|
await expect(page.locator('#block-user')).toBeHidden();
|
|
await save_visual(page);
|
|
|
|
// Open the block modal and make the dimmer visible again.
|
|
await page.locator('.actions .dropdown').click();
|
|
await page.locator('#action-block').click();
|
|
await expect(page.locator('#block-user')).toBeVisible();
|
|
await expect(page.locator('.ui.dimmer')).toBeVisible();
|
|
await expect(page.locator('.ui.dimmer')).toHaveCount(1);
|
|
await save_visual(page);
|
|
});
|
|
|
|
test('Dimmed overflow', async ({page}, workerInfo) => {
|
|
test.skip(['Mobile Safari'].includes(workerInfo.project.name), 'Mouse wheel is not supported in mobile WebKit');
|
|
await page.goto('/user2/repo1/_new/master/');
|
|
|
|
// Type in a file name.
|
|
await page.locator('#file-name').click();
|
|
await page.keyboard.type('todo.txt');
|
|
|
|
// Scroll to the bottom.
|
|
const scrollY = await page.evaluate(() => document.body.scrollHeight);
|
|
await page.mouse.wheel(0, scrollY);
|
|
|
|
// Click on 'Commit changes'
|
|
await page.locator('#commit-button').click();
|
|
|
|
// Expect a 'are you sure, this file is empty' modal.
|
|
await expect(page.locator('#edit-empty-content-modal')).toBeVisible();
|
|
await expect(page.locator('#edit-empty-content-modal header')).toContainText('Commit an empty file');
|
|
await save_visual(page);
|
|
|
|
// Trickery to check the page cannot be scrolled.
|
|
const {overflow} = await page.evaluate(() => {
|
|
const s = getComputedStyle(document.body);
|
|
return {
|
|
overflow: s.overflow,
|
|
};
|
|
});
|
|
expect(overflow).toBe('hidden');
|
|
});
|