Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-15 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): should show toolbar after mouse is released (#10698)

Browse Source
This commit is contained in:
fundon
2025-03-08 04:16:02 +00:00
parent 8aedef0a36
commit befb795935
5 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
blocksuite/affine/blocks/block-root/src/widgets/page-dragging-area/page-dragging-area.ts
View File

@@ -205,23 +205,21 @@ export class AffinePageDraggingAreaWidget extends WidgetComponent<
const state = ctx.get('pointerState');
const { button } = state.raw;
if (button !== 0) return;
if (isDragArea(state)) {
if (!this._viewport) {
return;
}
this._dragging = true;
const { scrollLeft, scrollTop } = this._viewport;
this._initialScrollOffset = {
left: scrollLeft,
top: scrollTop,
};
this._initialContainerOffset = {
x: state.containerOffset.x,
y: state.containerOffset.y,
};
return true;
}
return;
if (!isDragArea(state)) return;
if (!this._viewport) return;
this._dragging = true;
const { scrollLeft, scrollTop } = this._viewport;
this._initialScrollOffset = {
left: scrollLeft,
top: scrollTop,
};
this._initialContainerOffset = {
x: state.containerOffset.x,
y: state.containerOffset.y,
};
return true;
},
{ global: true }
);

10
blocksuite/affine/widgets/widget-toolbar/src/toolbar.ts
View File

@@ -274,8 +274,10 @@ export class AffineToolbarWidget extends WidgetComponent {
const dragStart = () => flags.toggle(Flag.Hiding, true);
const dragEnd = () => flags.toggle(Flag.Hiding, false);
const eventOptions = { passive: false };
this.handleEvent('dragStart', dragStart);
this.handleEvent('dragEnd', dragEnd);
this.handleEvent('dragStart', () => {
dragStart();
host.addEventListener('pointerup', dragEnd, { once: true });
});
this.handleEvent('nativeDrop', dragEnd);
disposables.addFromEvent(host, 'dragenter', dragStart, eventOptions);
disposables.addFromEvent(
@@ -288,9 +290,9 @@ export class AffineToolbarWidget extends WidgetComponent {
const rect = host.getBoundingClientRect();
if (
x >= rect.left &&
x <= rect.right &&
y >= rect.top &&
x <= rect.bottom &&
y <= rect.right
y <= rect.bottom
)
return;
dragEnd();