mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-13 21:05:19 +00:00
Close [BS-3507](https://linear.app/affine-design/issue/BS-3507/edgeless-text-颜色无法-undoredo) Close [BS-3426](https://linear.app/affine-design/issue/BS-3426/frame-修改背景色后不能撤销) This PR fixes the issue where the color change of edgeless blocks could not be undone/redone, including notes, edgeless-text, and frames. It also addresses the problem of a tiny shape being unexpectedly retained on the canvas. The key changes are: - Removal of `transact` from the `pop` method of edgeless elements. - Refactoring of `onPickColor` for all edgeless elements and blocks to better control the lifecycle of custom color property changes. - Addition of the missing custom background color feature for notes. - Addition of undo/redo color tests for notes, frames, and edgeless-text. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Added undo and redo support for color changes in frames, notes, and text blocks, allowing users to revert or reapply background and text color modifications. - **Bug Fixes** - Improved reliability of color picker interactions, ensuring consistent state management and transactional updates during color changes. - **Tests** - Introduced new end-to-end tests to verify undo/redo functionality for color changes in frames, notes, and text blocks. - **Refactor** - Streamlined color picker event handling for better maintainability and consistency across toolbars and style panels. - Updated style panel structure and event handling for improved interaction and state management. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
201 lines
5.7 KiB
TypeScript
201 lines
5.7 KiB
TypeScript
import { expect } from '@playwright/test';
|
|
|
|
import {
|
|
activeNoteInEdgeless,
|
|
click,
|
|
copyByKeyboard,
|
|
countBlock,
|
|
dragBetweenCoords,
|
|
enterPlaygroundRoom,
|
|
fillLine,
|
|
focusRichText,
|
|
getNoteRect,
|
|
initEmptyEdgelessState,
|
|
initSixParagraphs,
|
|
pasteByKeyboard,
|
|
pressEscape,
|
|
redoByClick,
|
|
redoByKeyboard,
|
|
selectNoteInEdgeless,
|
|
switchEditorMode,
|
|
triggerComponentToolbarAction,
|
|
type,
|
|
undoByClick,
|
|
undoByKeyboard,
|
|
waitNextFrame,
|
|
zoomResetByKeyboard,
|
|
} from '../../utils/actions/index.js';
|
|
import { assertRectEqual } from '../../utils/asserts.js';
|
|
import { test } from '../../utils/playwright.js';
|
|
|
|
test('undo/redo should work correctly after clipping', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
const { noteId } = await initEmptyEdgelessState(page);
|
|
await initSixParagraphs(page);
|
|
|
|
await switchEditorMode(page);
|
|
await expect(page.locator('affine-edgeless-note')).toHaveCount(1);
|
|
|
|
await selectNoteInEdgeless(page, noteId);
|
|
await triggerComponentToolbarAction(page, 'changeNoteSlicerSetting');
|
|
|
|
const button = page.locator('.note-slicer-button');
|
|
await button.click();
|
|
await expect(page.locator('affine-edgeless-note')).toHaveCount(2);
|
|
|
|
await undoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
await expect(page.locator('affine-edgeless-note')).toHaveCount(1);
|
|
await redoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
await expect(page.locator('affine-edgeless-note')).toHaveCount(2);
|
|
});
|
|
|
|
test('undo/redo should work correctly after resizing', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
const { noteId } = await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
await zoomResetByKeyboard(page);
|
|
await activeNoteInEdgeless(page, noteId);
|
|
await waitNextFrame(page, 600);
|
|
// current implementation may be a little inefficient
|
|
await fillLine(page, true);
|
|
await page.mouse.click(0, 0);
|
|
await waitNextFrame(page, 600);
|
|
await selectNoteInEdgeless(page, noteId);
|
|
|
|
const initRect = await getNoteRect(page, noteId);
|
|
const rightHandle = page.locator('.handle[aria-label="right"] .resize');
|
|
const box = await rightHandle.boundingBox();
|
|
if (box === null) throw new Error();
|
|
await dragBetweenCoords(
|
|
page,
|
|
{ x: box.x + 5, y: box.y + 5 },
|
|
{ x: box.x + 105, y: box.y + 5 }
|
|
);
|
|
const draggedRect = await getNoteRect(page, noteId);
|
|
assertRectEqual(draggedRect, {
|
|
x: initRect.x,
|
|
y: initRect.y,
|
|
w: initRect.w + 100,
|
|
h: draggedRect.h, // not assert `h` here
|
|
});
|
|
expect(draggedRect.h).toBe(initRect.h);
|
|
|
|
await undoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
const undoRect = await getNoteRect(page, noteId);
|
|
assertRectEqual(undoRect, initRect);
|
|
|
|
await redoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
const redoRect = await getNoteRect(page, noteId);
|
|
assertRectEqual(redoRect, draggedRect);
|
|
});
|
|
|
|
test('continuous undo and redo (note block add operation) should work', async ({
|
|
page,
|
|
}) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await focusRichText(page);
|
|
await type(page, 'hello');
|
|
await switchEditorMode(page);
|
|
await click(page, { x: 260, y: 450 });
|
|
await copyByKeyboard(page);
|
|
|
|
let count = await countBlock(page, 'affine-edgeless-note');
|
|
expect(count).toBe(1);
|
|
|
|
await page.mouse.move(100, 100);
|
|
await pasteByKeyboard(page, false);
|
|
await waitNextFrame(page, 1000);
|
|
|
|
await page.mouse.move(200, 200);
|
|
await pasteByKeyboard(page, false);
|
|
await waitNextFrame(page, 1000);
|
|
|
|
await page.mouse.move(300, 300);
|
|
await pasteByKeyboard(page, false);
|
|
await waitNextFrame(page, 1000);
|
|
|
|
count = await countBlock(page, 'affine-edgeless-note');
|
|
expect(count).toBe(4);
|
|
|
|
await undoByClick(page);
|
|
count = await countBlock(page, 'affine-edgeless-note');
|
|
expect(count).toBe(3);
|
|
|
|
await undoByClick(page);
|
|
count = await countBlock(page, 'affine-edgeless-note');
|
|
expect(count).toBe(2);
|
|
|
|
await redoByClick(page);
|
|
count = await countBlock(page, 'affine-edgeless-note');
|
|
expect(count).toBe(3);
|
|
|
|
await redoByClick(page);
|
|
count = await countBlock(page, 'affine-edgeless-note');
|
|
expect(count).toBe(4);
|
|
});
|
|
|
|
test('undo/redo should work when change note custom background', async ({
|
|
page,
|
|
}) => {
|
|
await enterPlaygroundRoom(page);
|
|
const { noteId } = await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
await selectNoteInEdgeless(page, noteId);
|
|
|
|
const getNoteBackground = async () => {
|
|
return page.locator('edgeless-note-background > div').evaluate(el => {
|
|
return getComputedStyle(el).backgroundColor;
|
|
});
|
|
};
|
|
|
|
const stylePanel = page.locator('edgeless-note-style-panel');
|
|
|
|
let prevBackground = await getNoteBackground();
|
|
|
|
// preset color
|
|
{
|
|
await stylePanel.click();
|
|
await stylePanel.getByLabel('Red').click();
|
|
await pressEscape(page);
|
|
|
|
expect(await getNoteBackground()).not.toBe(prevBackground);
|
|
await undoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
expect(await getNoteBackground()).toBe(prevBackground);
|
|
|
|
await redoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
expect(await getNoteBackground()).not.toBe(prevBackground);
|
|
}
|
|
|
|
prevBackground = await getNoteBackground();
|
|
|
|
// custom color
|
|
{
|
|
await selectNoteInEdgeless(page, noteId);
|
|
await stylePanel.click();
|
|
await stylePanel.locator('edgeless-color-custom-button').click();
|
|
await stylePanel.locator('.color-palette').click({
|
|
position: {
|
|
x: 100,
|
|
y: 100,
|
|
},
|
|
});
|
|
await pressEscape(page);
|
|
|
|
expect(await getNoteBackground()).not.toBe(prevBackground);
|
|
await undoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
expect(await getNoteBackground()).toBe(prevBackground);
|
|
|
|
await redoByKeyboard(page);
|
|
await waitNextFrame(page);
|
|
expect(await getNoteBackground()).not.toBe(prevBackground);
|
|
}
|
|
});
|