fix(editor): drag handle disappeard when hover on the extra area between note and its background (#12536)
Close [BS-3391](https://linear.app/affine-design/issue/BS-3391/无法从note中拖出embed-synced-doc到白板) ### Before can not hover on drag handle https://github.com/user-attachments/assets/5596538e-e922-4d7f-8188-b719b234f3ee ### After can hover on drag handle https://github.com/user-attachments/assets/855743ec-7601-48a8-8453-cd5aa395bd06 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Bug Fixes** - Improved detection of hovering over notes in edgeless mode, ensuring the drag handle appears correctly when hovering on the background of a selected note. - Enhanced background style updates for edgeless notes, providing more accurate visual feedback. - **Tests** - Added a test to verify that the drag handle is visible when hovering over the background of a selected edgeless note. - Updated undo/redo tests to improve accuracy of background color evaluation. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
@@ -26,10 +26,9 @@ import {
|
|||||||
import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
|
import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
|
||||||
import type { BlockModel } from '@blocksuite/store';
|
import type { BlockModel } from '@blocksuite/store';
|
||||||
import { consume } from '@lit/context';
|
import { consume } from '@lit/context';
|
||||||
import { computed } from '@preact/signals-core';
|
import { computed, effect } from '@preact/signals-core';
|
||||||
import { html, nothing } from 'lit';
|
import { nothing } from 'lit';
|
||||||
import { property } from 'lit/decorators.js';
|
import { property } from 'lit/decorators.js';
|
||||||
import { styleMap } from 'lit/directives/style-map.js';
|
|
||||||
|
|
||||||
import { NoteConfigExtension } from '../config';
|
import { NoteConfigExtension } from '../config';
|
||||||
import * as styles from './edgeless-note-background.css';
|
import * as styles from './edgeless-note-background.css';
|
||||||
@@ -150,15 +149,20 @@ export class EdgelessNoteBackground extends SignalWatcher(
|
|||||||
return header;
|
return header;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override connectedCallback() {
|
||||||
|
super.connectedCallback();
|
||||||
|
this.classList.add(styles.background);
|
||||||
|
this.disposables.add(
|
||||||
|
effect(() => {
|
||||||
|
Object.assign(this.style, this.backgroundStyle$.value);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
this.disposables.addFromEvent(this, 'pointerdown', stopPropagation);
|
||||||
|
this.disposables.addFromEvent(this, 'click', this._handleClickAtBackground);
|
||||||
|
}
|
||||||
|
|
||||||
override render() {
|
override render() {
|
||||||
return html`<div
|
return this.note.isPageBlock() ? this._renderHeader() : nothing;
|
||||||
class=${styles.background}
|
|
||||||
style=${styleMap(this.backgroundStyle$.value)}
|
|
||||||
@pointerdown=${stopPropagation}
|
|
||||||
@click=${this._handleClickAtBackground}
|
|
||||||
>
|
|
||||||
${this.note.isPageBlock() ? this._renderHeader() : nothing}
|
|
||||||
</div>`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@consume({ context: stdContext })
|
@consume({ context: stdContext })
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { type CalloutBlockComponent } from '@blocksuite/affine-block-callout';
|
import { type CalloutBlockComponent } from '@blocksuite/affine-block-callout';
|
||||||
import {
|
import {
|
||||||
AFFINE_EDGELESS_NOTE,
|
AFFINE_EDGELESS_NOTE,
|
||||||
type EdgelessNoteBlockComponent,
|
EdgelessNoteBackground,
|
||||||
|
EdgelessNoteBlockComponent,
|
||||||
} from '@blocksuite/affine-block-note';
|
} from '@blocksuite/affine-block-note';
|
||||||
import { ParagraphBlockComponent } from '@blocksuite/affine-block-paragraph';
|
import { ParagraphBlockComponent } from '@blocksuite/affine-block-paragraph';
|
||||||
import {
|
import {
|
||||||
@@ -282,14 +283,21 @@ export function getDuplicateBlocks(blocks: BlockModel[]) {
|
|||||||
* Get hovering note with given a point in edgeless mode.
|
* Get hovering note with given a point in edgeless mode.
|
||||||
*/
|
*/
|
||||||
function getHoveringNote(point: Point) {
|
function getHoveringNote(point: Point) {
|
||||||
return (
|
const elements = document.elementsFromPoint(point.x, point.y);
|
||||||
document
|
for (const el of elements) {
|
||||||
.elementsFromPoint(point.x, point.y)
|
if (el instanceof EdgelessNoteBlockComponent) {
|
||||||
.find(
|
return el;
|
||||||
(e): e is EdgelessNoteBlockComponent =>
|
}
|
||||||
e.tagName.toLowerCase() === AFFINE_EDGELESS_NOTE
|
|
||||||
) || null
|
// When in edit mode for edgeless-note, the rect of note-background is larger than
|
||||||
);
|
// that of edgeless-note. Therefore, when the point is located in the area between
|
||||||
|
// note-background and edgeless-note, using elementsFromPoint alone cannot correctly
|
||||||
|
// retrieve the edgeless-note.
|
||||||
|
if (el instanceof EdgelessNoteBackground) {
|
||||||
|
return el.closest(AFFINE_EDGELESS_NOTE) ?? null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getSnapshotRect(snapshot: SliceSnapshot): Bound | null {
|
export function getSnapshotRect(snapshot: SliceSnapshot): Bound | null {
|
||||||
|
|||||||
@@ -216,3 +216,33 @@ test('should keep relative order of new note when a block is dragged from note t
|
|||||||
await waitNextFrame(page);
|
await waitNextFrame(page);
|
||||||
await assertRichTexts(page, ['3', '5', '6', '7', '9']);
|
await assertRichTexts(page, ['3', '5', '6', '7', '9']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('drag handle should work when hover on the background of a selected edgeless note', async ({
|
||||||
|
page,
|
||||||
|
}) => {
|
||||||
|
await enterPlaygroundRoom(page);
|
||||||
|
await initEmptyEdgelessState(page);
|
||||||
|
await focusRichText(page);
|
||||||
|
await type(page, 'hello');
|
||||||
|
await switchEditorMode(page);
|
||||||
|
await page.mouse.dblclick(CENTER_X, CENTER_Y);
|
||||||
|
// wait for the note animation
|
||||||
|
await waitNextFrame(page, 400);
|
||||||
|
|
||||||
|
const noteRect = await page.locator('affine-edgeless-note').boundingBox();
|
||||||
|
assertRectExist(noteRect);
|
||||||
|
|
||||||
|
const noteBackgroundRect = await page
|
||||||
|
.locator('edgeless-note-background')
|
||||||
|
.boundingBox();
|
||||||
|
assertRectExist(noteBackgroundRect);
|
||||||
|
|
||||||
|
const paragraphRect = await page.locator('affine-paragraph').boundingBox();
|
||||||
|
assertRectExist(paragraphRect);
|
||||||
|
|
||||||
|
// move to the area between note background and note block and before the paragraph
|
||||||
|
const x = (noteRect.x + noteBackgroundRect.x) / 2;
|
||||||
|
const y = paragraphRect.y + paragraphRect.height / 2;
|
||||||
|
await page.mouse.move(x, y, { steps: 2 });
|
||||||
|
await expect(page.locator('.affine-drag-handle-container')).toBeVisible();
|
||||||
|
});
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ test('undo/redo should work when change note custom background', async ({
|
|||||||
await selectNoteInEdgeless(page, noteId);
|
await selectNoteInEdgeless(page, noteId);
|
||||||
|
|
||||||
const getNoteBackground = async () => {
|
const getNoteBackground = async () => {
|
||||||
return page.locator('edgeless-note-background > div').evaluate(el => {
|
return page.locator('edgeless-note-background').evaluate(el => {
|
||||||
return getComputedStyle(el).backgroundColor;
|
return getComputedStyle(el).backgroundColor;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user