mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-12 04:18:54 +00:00
### Changed
This pr split the old `edgeless-selected-rect` into four focused modules:
- `edgeless-selected-rect`: Provide an entry point for user operation on view layer only, no further logic here.
- `GfxViewInteractionExtension`: Allow you to plug in custom resize/rotate behaviors for block or canvas element. If you don’t register an extension, it falls back to the default behaviours.
- `InteractivityManager`: Provide the API that accepts resize/rotate requests, invokes any custom behaviors you’ve registered, tracks the lifecycle and intermediate state, then hands off to the math engine.
- `ResizeController`: A pure math engine that listens for pointer moves and pointer ups and calculates new sizes, positions, and angles. It doesn’t call any business APIs.
### Customizing an element’s resize/rotate behavior
Call `GfxViewInteractionExtension` with the element’s flavour or type plus a config object. In the config you can define:
- `resizeConstraint` (min/max width & height, lock ratio)
- `handleResize(context)` method that returns an object containing `beforeResize`、`onResizeStart`、`onResizeMove`、`onResizeEnd`
- `handleRotate(context)` method that returns an object containing `beforeRotate`、`onRotateStart`、`onRotateMove`、`onRotateEnd`
```typescript
import { GfxViewInteractionExtension } from '@blocksuite/std/gfx';
GfxViewInteractionExtension(
flavourOrElementType,
{
resizeConstraint: {
minWidth,
maxWidth,
lockRatio,
minHeight,
maxHeight
},
handleResize(context) {
return {
beforeResize(context) {},
onResizeStart(context) {},
onResizeMove(context) {},
onResizeEnd(context) {}
};
},
handleRotate(context) {
return {
beforeRotate(context) {},
onRotateStart(context) {},
onRotateMove(context) {},
onRotateEnd(context) {}
};
}
}
);
```
<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit
- **New Features**
- Added interaction extensions for edgeless variants of attachment, bookmark, edgeless text, embedded docs, images, notes, frames, AI chat blocks, and various embed blocks (Figma, GitHub, HTML, iframe, Loom, YouTube).
- Introduced interaction extensions for graphical elements including connectors, groups, mind maps, shapes, and text, supporting constrained resizing and rotation disabling where applicable.
- Implemented a unified interaction extension framework enabling configurable resize and rotate lifecycle handlers.
- Enhanced autocomplete overlay behavior based on selection context.
- **Refactor**
- Removed legacy resize manager and element-specific resize/rotate logic, replacing with a centralized, extensible interaction system.
- Simplified resize handle rendering to a data-driven approach with improved cursor management.
- Replaced complex cursor rotation calculations with fixed-angle mappings for resize handles.
- Streamlined selection rectangle component to use interactivity services for resize and rotate handling.
- **Bug Fixes**
- Fixed connector update triggers to reduce unnecessary updates.
- Improved resize constraints enforcement and interaction state tracking.
- **Tests**
- Refined end-to-end tests to use higher-level resize utilities and added finer-grained assertions on element dimensions.
- Enhanced mouse movement granularity in drag tests for better simulation fidelity.
- **Chores**
- Added new workspace dependencies and project references for the interaction framework modules.
- Extended public API exports to include new interaction types and extensions.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
304 lines
9.8 KiB
TypeScript
304 lines
9.8 KiB
TypeScript
import { expect, type Page } from '@playwright/test';
|
|
|
|
import {
|
|
assertEdgelessTool,
|
|
enterPlaygroundRoom,
|
|
getEdgelessSelectedRect,
|
|
initEmptyEdgelessState,
|
|
pressArrowLeft,
|
|
pressEnter,
|
|
resizeElementByHandle,
|
|
setEdgelessTool,
|
|
SHORT_KEY,
|
|
switchEditorMode,
|
|
type,
|
|
waitForInlineEditorStateUpdated,
|
|
waitNextFrame,
|
|
zoomResetByKeyboard,
|
|
} from '../utils/actions/index.js';
|
|
import { getLinkedDocPopover } from '../utils/actions/linked-doc.js';
|
|
import { assertEdgelessCanvasText } from '../utils/asserts.js';
|
|
import { test } from '../utils/playwright.js';
|
|
|
|
async function assertTextFont(page: Page, font: string) {
|
|
const fontButton = page.getByRole('button', {
|
|
name: /^Font$/,
|
|
});
|
|
const fontPanel = page.locator('edgeless-font-family-panel');
|
|
const isFontPanelShow = await fontPanel.isVisible();
|
|
if (!isFontPanelShow) {
|
|
if (!(await fontButton.isVisible()))
|
|
throw new Error('edgeless change text toolbar is not visible');
|
|
|
|
await fontButton.click();
|
|
}
|
|
|
|
const button = fontPanel.locator(`[data-font="${font}"]`);
|
|
await expect(button.locator('.active-mode-color[active]')).toBeVisible();
|
|
}
|
|
|
|
test.describe('edgeless canvas text', () => {
|
|
test.beforeEach(async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await page.evaluate(() => {
|
|
window.doc
|
|
.get(window.$blocksuite.services.FeatureFlagService)
|
|
.setFlag('enable_edgeless_text', false);
|
|
});
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
});
|
|
|
|
test('add text element in default mode', async ({ page }) => {
|
|
await setEdgelessTool(page, 'default');
|
|
await page.mouse.dblclick(130, 140);
|
|
await waitForInlineEditorStateUpdated(page);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, 'hello');
|
|
await assertEdgelessCanvasText(page, 'hello');
|
|
await assertEdgelessTool(page, 'default');
|
|
|
|
await page.mouse.click(120, 140);
|
|
|
|
expect(await page.locator('edgeless-text-editor').count()).toBe(0);
|
|
|
|
await page.mouse.dblclick(145, 155);
|
|
await waitNextFrame(page);
|
|
await page.locator('edgeless-text-editor').waitFor({
|
|
state: 'attached',
|
|
});
|
|
await type(page, 'hello');
|
|
await assertEdgelessCanvasText(page, 'hhelloello');
|
|
|
|
await pressArrowLeft(page, 5);
|
|
await type(page, 'ddd\n');
|
|
await assertEdgelessCanvasText(page, 'hddd\nhelloello');
|
|
});
|
|
|
|
test('should not trigger linked doc popover in canvas text', async ({
|
|
page,
|
|
}) => {
|
|
await setEdgelessTool(page, 'default');
|
|
await page.mouse.dblclick(130, 140);
|
|
await waitForInlineEditorStateUpdated(page);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, '@');
|
|
const { linkedDocPopover } = getLinkedDocPopover(page);
|
|
await expect(linkedDocPopover).not.toBeVisible();
|
|
await pressEnter(page);
|
|
await assertEdgelessCanvasText(page, '@\n');
|
|
});
|
|
|
|
// it's also a little flaky
|
|
test('add text element in text mode', async ({ page }) => {
|
|
await page.mouse.dblclick(130, 140);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, 'hello');
|
|
await assertEdgelessCanvasText(page, 'hello');
|
|
await assertEdgelessTool(page, 'default');
|
|
|
|
await page.mouse.click(120, 140);
|
|
|
|
expect(await page.locator('edgeless-text-editor').count()).toBe(0);
|
|
|
|
await page.mouse.dblclick(145, 145);
|
|
|
|
await page.locator('edgeless-text-editor').waitFor({
|
|
state: 'attached',
|
|
});
|
|
await type(page, 'hello');
|
|
await page.waitForTimeout(100);
|
|
await assertEdgelessCanvasText(page, 'hhelloello');
|
|
|
|
await page.mouse.click(145, 155);
|
|
await type(page, 'ddd\n');
|
|
await assertEdgelessCanvasText(page, 'hddd\nhelloello');
|
|
});
|
|
|
|
test('copy and paste', async ({ page }) => {
|
|
await setEdgelessTool(page, 'default');
|
|
await page.mouse.dblclick(130, 140);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, 'hello');
|
|
await assertEdgelessCanvasText(page, 'hello');
|
|
await assertEdgelessTool(page, 'default');
|
|
|
|
await page.mouse.move(145, 155);
|
|
await page.mouse.down();
|
|
await page.mouse.move(170, 155, {
|
|
steps: 10,
|
|
});
|
|
await page.mouse.up();
|
|
// h|ell|o
|
|
await waitNextFrame(page, 200);
|
|
await page.keyboard.press(`${SHORT_KEY}+c`);
|
|
|
|
await waitNextFrame(page, 200);
|
|
await type(page, 'ddd', 100);
|
|
await waitNextFrame(page, 200);
|
|
await assertEdgelessCanvasText(page, 'hdddo');
|
|
|
|
await page.keyboard.press(`${SHORT_KEY}+v`);
|
|
await assertEdgelessCanvasText(page, 'hdddello');
|
|
});
|
|
|
|
test('normalize text element rect after change its font', async ({
|
|
page,
|
|
}) => {
|
|
await page.mouse.dblclick(200, 200);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, 'aaa\nbbbbbbbb\n\ncc');
|
|
await assertEdgelessCanvasText(page, 'aaa\nbbbbbbbb\n\ncc');
|
|
await assertEdgelessTool(page, 'default');
|
|
await page.mouse.click(10, 100);
|
|
|
|
await page.mouse.click(220, 210);
|
|
await waitNextFrame(page);
|
|
let { width: lastWidth, height: lastHeight } =
|
|
await getEdgelessSelectedRect(page);
|
|
const fontButton = page.getByRole('button', { name: /^Font$/ });
|
|
await fontButton.click();
|
|
|
|
// Default is Inter
|
|
await assertTextFont(page, 'Inter');
|
|
const kalamTextFont = page.getByText('Kalam');
|
|
await kalamTextFont.click();
|
|
await waitNextFrame(page);
|
|
let selectedRect = await getEdgelessSelectedRect(page);
|
|
expect(selectedRect.width).not.toEqual(lastWidth);
|
|
expect(selectedRect.height).not.toEqual(lastHeight);
|
|
|
|
lastWidth = selectedRect.width;
|
|
lastHeight = selectedRect.height;
|
|
await fontButton.click();
|
|
await assertTextFont(page, 'Kalam');
|
|
const InterTextFont = page.getByText('Inter');
|
|
await InterTextFont.click();
|
|
await waitNextFrame(page);
|
|
selectedRect = await getEdgelessSelectedRect(page);
|
|
expect(selectedRect.width).not.toEqual(lastWidth);
|
|
expect(selectedRect.height).not.toEqual(lastHeight);
|
|
});
|
|
|
|
test('auto wrap text by dragging left and right edge', async ({ page }) => {
|
|
await zoomResetByKeyboard(page);
|
|
await setEdgelessTool(page, 'default');
|
|
await page.mouse.dblclick(130, 140);
|
|
await waitForInlineEditorStateUpdated(page);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, 'hellohello');
|
|
await assertEdgelessCanvasText(page, 'hellohello');
|
|
await assertEdgelessTool(page, 'default');
|
|
|
|
// quit edit mode
|
|
await page.mouse.click(120, 140);
|
|
|
|
// select text element
|
|
await page.mouse.click(150, 140);
|
|
await waitNextFrame(page);
|
|
|
|
// should exit selected rect and record last width and height, then compare them
|
|
let selectedRect = await getEdgelessSelectedRect(page);
|
|
let lastWidth = selectedRect.width;
|
|
let lastHeight = selectedRect.height;
|
|
|
|
// move cursor to the right edge and drag it to resize the width of text element
|
|
await resizeElementByHandle(page, { x: -20, y: 0 }, 'right', 10);
|
|
|
|
// the text should be wrapped, so check the width and height of text element
|
|
selectedRect = await getEdgelessSelectedRect(page);
|
|
expect(selectedRect.width).toBeLessThan(lastWidth);
|
|
expect(selectedRect.height).toBeGreaterThan(lastHeight);
|
|
|
|
await page.mouse.dblclick(140, 160);
|
|
await waitForInlineEditorStateUpdated(page);
|
|
await waitNextFrame(page);
|
|
await assertEdgelessCanvasText(page, 'hellohello');
|
|
|
|
// quit edit mode
|
|
await page.mouse.click(120, 140);
|
|
|
|
// select text element
|
|
await page.mouse.click(150, 140);
|
|
await waitNextFrame(page);
|
|
|
|
// check selected rect and record the last width and height
|
|
selectedRect = await getEdgelessSelectedRect(page);
|
|
lastWidth = selectedRect.width;
|
|
lastHeight = selectedRect.height;
|
|
|
|
await resizeElementByHandle(page, { x: 80, y: 0 }, 'right', 10);
|
|
|
|
// the text should be unwrapped, check the width and height of text element
|
|
selectedRect = await getEdgelessSelectedRect(page);
|
|
expect(selectedRect.width).toBeGreaterThan(lastWidth);
|
|
expect(selectedRect.height).toBeLessThan(lastHeight);
|
|
});
|
|
|
|
test('text element should have maxWidth after adjusting width by dragging left or right edge', async ({
|
|
page,
|
|
}) => {
|
|
await zoomResetByKeyboard(page);
|
|
await setEdgelessTool(page, 'default');
|
|
await page.mouse.dblclick(130, 140);
|
|
await waitForInlineEditorStateUpdated(page);
|
|
await waitNextFrame(page);
|
|
|
|
await type(page, 'hellohello');
|
|
await assertEdgelessCanvasText(page, 'hellohello');
|
|
await assertEdgelessTool(page, 'default');
|
|
|
|
// quit edit mode
|
|
await page.mouse.click(120, 140);
|
|
|
|
// select text element
|
|
await page.mouse.click(150, 140);
|
|
await waitNextFrame(page);
|
|
|
|
let selectedRect = await getEdgelessSelectedRect(page);
|
|
let lastWidth = selectedRect.width;
|
|
let lastHeight = selectedRect.height;
|
|
|
|
// move cursor to the right edge and drag it to resize the width of text element
|
|
await page.mouse.move(130 + lastWidth, 160);
|
|
await page.mouse.down();
|
|
await page.mouse.move(130 + lastWidth / 2, 160, {
|
|
steps: 10,
|
|
});
|
|
await page.mouse.up();
|
|
|
|
// the text should be wrapped, so check the width and height of text element
|
|
selectedRect = await getEdgelessSelectedRect(page);
|
|
expect(selectedRect.width).toBeLessThan(lastWidth);
|
|
expect(selectedRect.height).toBeGreaterThan(lastHeight);
|
|
lastWidth = selectedRect.width;
|
|
lastHeight = selectedRect.height;
|
|
|
|
// enter edit mode
|
|
await waitNextFrame(page);
|
|
await page.mouse.dblclick(140, 180);
|
|
await waitForInlineEditorStateUpdated(page);
|
|
await waitNextFrame(page);
|
|
await type(page, 'hello');
|
|
await assertEdgelessCanvasText(page, 'hellohellohello');
|
|
|
|
// quit edit mode
|
|
await page.mouse.click(120, 140);
|
|
|
|
// select text element
|
|
await page.mouse.click(150, 140);
|
|
await waitNextFrame(page);
|
|
|
|
// after input, the width of the text element should be the same as before, but the height should be changed
|
|
selectedRect = await getEdgelessSelectedRect(page);
|
|
expect(selectedRect.width).toBeCloseTo(Math.round(lastWidth));
|
|
expect(selectedRect.height).toBeGreaterThan(lastHeight);
|
|
});
|
|
});
|