mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-13 21:05:19 +00:00
Close [BS-3500](https://linear.app/affine-design/issue/BS-3500/剪刀没问题了,通过拖动形成的段落能不能也有同样的表现?) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Bug Fixes** - Improved the behavior when dragging blocks between notes, ensuring that new note blocks are inserted as siblings when appropriate, instead of always creating them at the root level. - **Tests** - Enhanced and enabled tests to verify correct drag-and-drop behavior across multiple notes and to ensure the relative order of note content is preserved during drag operations. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
211 lines
6.1 KiB
TypeScript
211 lines
6.1 KiB
TypeScript
import { expect } from '@playwright/test';
|
|
|
|
import {
|
|
addNote,
|
|
changeNoteDisplayModeWithId,
|
|
createNote,
|
|
dragBlockToPoint,
|
|
dragHandleFromBlockToBlockBottomById,
|
|
enterPlaygroundRoom,
|
|
focusRichText,
|
|
initEmptyEdgelessState,
|
|
initThreeParagraphs,
|
|
pressEnter,
|
|
pressEscape,
|
|
setEdgelessTool,
|
|
switchEditorMode,
|
|
type,
|
|
waitNextFrame,
|
|
} from '../../utils/actions/index.js';
|
|
import { assertRectExist, assertRichTexts } from '../../utils/asserts.js';
|
|
import { NoteDisplayMode } from '../../utils/bs-alternative.js';
|
|
import { test } from '../../utils/playwright.js';
|
|
|
|
const CENTER_X = 450;
|
|
const CENTER_Y = 450;
|
|
|
|
test('drag handle should be shown when a note is activated in default mode or hidden in other modes', async ({
|
|
page,
|
|
}) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await focusRichText(page);
|
|
await type(page, 'hello');
|
|
await assertRichTexts(page, ['hello']);
|
|
|
|
await switchEditorMode(page);
|
|
const noteBox = await page.locator('affine-edgeless-note').boundingBox();
|
|
if (!noteBox) {
|
|
throw new Error('Missing edgeless affine-note');
|
|
}
|
|
|
|
const [x, y] = [noteBox.x + 26, noteBox.y + noteBox.height / 2];
|
|
|
|
await page.mouse.move(x, y);
|
|
await expect(page.locator('.affine-drag-handle-container')).toBeHidden();
|
|
await page.mouse.dblclick(x, y);
|
|
await waitNextFrame(page);
|
|
await page.mouse.move(x, y);
|
|
|
|
await expect(page.locator('.affine-drag-handle-container')).toBeVisible();
|
|
|
|
await page.mouse.move(0, 0);
|
|
await setEdgelessTool(page, 'shape');
|
|
await page.mouse.move(x, y);
|
|
await expect(page.locator('.affine-drag-handle-container')).toBeHidden();
|
|
|
|
await page.mouse.move(0, 0);
|
|
await setEdgelessTool(page, 'default');
|
|
await page.mouse.move(x, y);
|
|
await page.mouse.click(x, y);
|
|
await expect(page.locator('.affine-drag-handle-container')).toBeVisible();
|
|
});
|
|
|
|
test('drag handle can drag note into another note', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
const { noteId } = await initEmptyEdgelessState(page);
|
|
await focusRichText(page);
|
|
await type(page, 'hello');
|
|
await assertRichTexts(page, ['hello']);
|
|
|
|
await switchEditorMode(page);
|
|
const noteRect = await page
|
|
.locator(`[data-block-id="${noteId}"]`)
|
|
.boundingBox();
|
|
assertRectExist(noteRect);
|
|
|
|
const secondNoteId = await addNote(page, 'hello world', 100, 100);
|
|
await waitNextFrame(page);
|
|
const secondNoteRect = await page
|
|
.locator(`[data-block-id="${secondNoteId}"]`)
|
|
.boundingBox();
|
|
assertRectExist(secondNoteRect);
|
|
|
|
{
|
|
const [x, y] = [
|
|
noteRect.x + noteRect.width / 2,
|
|
noteRect.y + noteRect.height / 2,
|
|
];
|
|
await page.mouse.click(noteRect.x, noteRect.y + noteRect.height + 100);
|
|
await page.mouse.move(x, y);
|
|
await page.mouse.click(x, y);
|
|
|
|
const handlerRect = await page
|
|
.locator('.affine-drag-handle-container')
|
|
.boundingBox();
|
|
assertRectExist(handlerRect);
|
|
|
|
await page.mouse.move(
|
|
handlerRect.x + handlerRect.width / 2,
|
|
handlerRect.y + handlerRect.height / 2
|
|
);
|
|
await page.mouse.down();
|
|
|
|
const [targetX, targetY] = [
|
|
secondNoteRect.x + 10,
|
|
secondNoteRect.y + secondNoteRect.height / 2,
|
|
];
|
|
await page.mouse.move(targetX, targetY);
|
|
await page.mouse.up();
|
|
|
|
await waitNextFrame(page);
|
|
}
|
|
});
|
|
|
|
test('drag handle should work inside one note', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await initThreeParagraphs(page);
|
|
|
|
await switchEditorMode(page);
|
|
|
|
await page.mouse.dblclick(CENTER_X, CENTER_Y);
|
|
await dragHandleFromBlockToBlockBottomById(page, '3', '5');
|
|
await waitNextFrame(page);
|
|
await expect(page.locator('affine-drag-handle-container')).toBeHidden();
|
|
await assertRichTexts(page, ['456', '789', '123']);
|
|
});
|
|
|
|
test('drag handle should work across multiple notes', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await initThreeParagraphs(page);
|
|
await assertRichTexts(page, ['123', '456', '789']);
|
|
|
|
await switchEditorMode(page);
|
|
|
|
await setEdgelessTool(page, 'note');
|
|
|
|
await page.mouse.click(200, 200);
|
|
await focusRichText(page, 3);
|
|
await waitNextFrame(page);
|
|
|
|
// block id 7
|
|
await type(page, '000');
|
|
|
|
await page.mouse.dblclick(CENTER_X, CENTER_Y - 20);
|
|
await dragHandleFromBlockToBlockBottomById(page, '3', '7');
|
|
await expect(page.locator('.affine-drag-handle-container')).toBeHidden();
|
|
await waitNextFrame(page);
|
|
await assertRichTexts(page, ['456', '789', '000', '123']);
|
|
|
|
await page
|
|
.locator('affine-edgeless-note')
|
|
.nth(1)
|
|
.locator('affine-paragraph')
|
|
.nth(1)
|
|
.click({ clickCount: 3 });
|
|
await dragHandleFromBlockToBlockBottomById(page, '3', '4');
|
|
await waitNextFrame(page);
|
|
await expect(page.locator('.affine-drag-handle-container')).toBeHidden();
|
|
await assertRichTexts(page, ['456', '123', '789', '000']);
|
|
|
|
await expect(page.locator('selected > *')).toHaveCount(0);
|
|
});
|
|
|
|
test('should keep relative order of new note when a block is dragged from note to canvas', async ({
|
|
page,
|
|
}) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await focusRichText(page);
|
|
await type(page, '3');
|
|
await switchEditorMode(page);
|
|
|
|
const note2 = await createNote(page, [0, -200], '5');
|
|
await pressEnter(page);
|
|
await type(page, '6');
|
|
await pressEnter(page);
|
|
await type(page, '7');
|
|
await pressEscape(page, 3);
|
|
await changeNoteDisplayModeWithId(
|
|
page,
|
|
note2,
|
|
NoteDisplayMode.DocAndEdgeless
|
|
);
|
|
await pressEscape(page);
|
|
|
|
const note3 = await createNote(page, [0, 200], '9');
|
|
await pressEscape(page, 3);
|
|
await changeNoteDisplayModeWithId(
|
|
page,
|
|
note3,
|
|
NoteDisplayMode.DocAndEdgeless
|
|
);
|
|
await pressEscape(page);
|
|
|
|
await assertRichTexts(page, ['3', '5', '6', '7', '9']);
|
|
|
|
const notes = page.locator('affine-edgeless-note');
|
|
|
|
await notes.nth(1).dblclick();
|
|
await dragBlockToPoint(page, '5', { x: 50, y: 100 });
|
|
await waitNextFrame(page);
|
|
await assertRichTexts(page, ['3', '5', '6', '7', '9']);
|
|
|
|
await notes.nth(2).dblclick();
|
|
await dragBlockToPoint(page, '7', { x: 50, y: 200 });
|
|
await waitNextFrame(page);
|
|
await assertRichTexts(page, ['3', '5', '6', '7', '9']);
|
|
});
|