mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-13 21:05:19 +00:00
08d6c5a97c
### 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 -->
228 lines
6.5 KiB
TypeScript
228 lines
6.5 KiB
TypeScript
import {
|
|
addBasicRectShapeElement,
|
|
dragBetweenCoords,
|
|
enterPlaygroundRoom,
|
|
initEmptyEdgelessState,
|
|
resizeElementByHandle,
|
|
rotateElementByHandle,
|
|
switchEditorMode,
|
|
} from '../utils/actions/index.js';
|
|
import {
|
|
assertEdgelessSelectedReactCursor,
|
|
assertEdgelessSelectedRect,
|
|
assertEdgelessSelectedRectRotation,
|
|
} from '../utils/asserts.js';
|
|
import { test } from '../utils/playwright.js';
|
|
|
|
test.describe('rotation', () => {
|
|
test('angle adjustment by four corners', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
|
|
await rotateElementByHandle(page, 45, 'top-left');
|
|
await assertEdgelessSelectedRectRotation(page, 45);
|
|
|
|
await rotateElementByHandle(page, 45, 'top-right');
|
|
await assertEdgelessSelectedRectRotation(page, 90);
|
|
|
|
await rotateElementByHandle(page, 45, 'bottom-right');
|
|
await assertEdgelessSelectedRectRotation(page, 135);
|
|
|
|
await rotateElementByHandle(page, 45, 'bottom-left');
|
|
await assertEdgelessSelectedRectRotation(page, 180);
|
|
});
|
|
|
|
test('angle snap', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
|
|
await page.keyboard.down('Shift');
|
|
|
|
await rotateElementByHandle(page, 5);
|
|
await assertEdgelessSelectedRectRotation(page, 0);
|
|
|
|
await rotateElementByHandle(page, 10);
|
|
await assertEdgelessSelectedRectRotation(page, 15);
|
|
|
|
await rotateElementByHandle(page, 10);
|
|
await assertEdgelessSelectedRectRotation(page, 30);
|
|
|
|
await rotateElementByHandle(page, 10);
|
|
await assertEdgelessSelectedRectRotation(page, 45);
|
|
|
|
await rotateElementByHandle(page, 5);
|
|
await assertEdgelessSelectedRectRotation(page, 45);
|
|
|
|
await page.keyboard.up('Shift');
|
|
});
|
|
|
|
test('single shape', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
await assertEdgelessSelectedRect(page, [100, 100, 100, 100]);
|
|
|
|
await rotateElementByHandle(page, 45, 'top-right');
|
|
await assertEdgelessSelectedRectRotation(page, 45);
|
|
});
|
|
|
|
test('multiple shapes', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 200, y: 100 },
|
|
{ x: 300, y: 200 }
|
|
);
|
|
|
|
await dragBetweenCoords(page, { x: 90, y: 90 }, { x: 310, y: 110 });
|
|
await assertEdgelessSelectedRect(page, [100, 100, 200, 100]);
|
|
|
|
await rotateElementByHandle(page, 90, 'bottom-right');
|
|
await assertEdgelessSelectedRectRotation(page, 0);
|
|
await assertEdgelessSelectedRect(page, [150, 50, 100, 200]);
|
|
});
|
|
|
|
test('combination with resizing', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
await rotateElementByHandle(page, 90, 'bottom-left', 10);
|
|
await assertEdgelessSelectedRectRotation(page, 90);
|
|
|
|
await resizeElementByHandle(page, { x: 10, y: -10 }, 'bottom-right');
|
|
await assertEdgelessSelectedRect(page, [110, 100, 90, 90]);
|
|
|
|
await rotateElementByHandle(page, -90, 'bottom-right');
|
|
await assertEdgelessSelectedRectRotation(page, 0);
|
|
|
|
await resizeElementByHandle(page, { x: 10, y: 10 }, 'bottom-right');
|
|
await assertEdgelessSelectedRect(page, [110, 100, 100, 100]);
|
|
});
|
|
|
|
test('combination with resizing for multiple shapes', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 200, y: 100 },
|
|
{ x: 300, y: 200 }
|
|
);
|
|
|
|
await dragBetweenCoords(page, { x: 90, y: 90 }, { x: 310, y: 110 });
|
|
await assertEdgelessSelectedRect(page, [100, 100, 200, 100]);
|
|
|
|
await rotateElementByHandle(page, 90, 'bottom-left');
|
|
await assertEdgelessSelectedRectRotation(page, 0);
|
|
await assertEdgelessSelectedRect(page, [150, 50, 100, 200]);
|
|
|
|
await resizeElementByHandle(page, { x: -10, y: -20 }, 'bottom-right');
|
|
await assertEdgelessSelectedRect(page, [150, 50, 90, 180]);
|
|
|
|
await rotateElementByHandle(page, -90, 'bottom-right');
|
|
await assertEdgelessSelectedRectRotation(page, 0);
|
|
await assertEdgelessSelectedRect(page, [105, 95, 180, 90]);
|
|
|
|
await resizeElementByHandle(page, { x: 20, y: 10 }, 'bottom-right');
|
|
await assertEdgelessSelectedRect(page, [105, 95, 200, 100]);
|
|
});
|
|
});
|
|
|
|
test.describe('cursor style', () => {
|
|
test('update resize cursor direction after rotating', async ({ page }) => {
|
|
await enterPlaygroundRoom(page);
|
|
await initEmptyEdgelessState(page);
|
|
await switchEditorMode(page);
|
|
|
|
await addBasicRectShapeElement(
|
|
page,
|
|
{ x: 100, y: 100 },
|
|
{ x: 200, y: 200 }
|
|
);
|
|
|
|
await rotateElementByHandle(page, 45, 'top-left');
|
|
await assertEdgelessSelectedRectRotation(page, 45);
|
|
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'top',
|
|
cursor: 'nesw-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'right',
|
|
cursor: 'nwse-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'bottom',
|
|
cursor: 'nesw-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'left',
|
|
cursor: 'nwse-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'top-right',
|
|
cursor: 'ew-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'top-left',
|
|
cursor: 'ns-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'bottom-right',
|
|
cursor: 'ns-resize',
|
|
});
|
|
await assertEdgelessSelectedReactCursor(page, {
|
|
mode: 'resize',
|
|
handle: 'bottom-left',
|
|
cursor: 'ew-resize',
|
|
});
|
|
});
|
|
});
|