From 35a5056b0792fe6dc18530d3fddbe01ed181a4d8 Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Sun, 15 Nov 2026 17:05:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Comment=20=E6=8B=A6=E6=88=AA=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/render/src/core/item.ts | 8 ++++---- packages/render/src/core/misc.ts | 17 +++++++++++++++++ packages/render/src/core/render.ts | 18 ++++++++++++++++++ packages/render/src/core/types.ts | 2 +- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/packages/render/src/core/item.ts b/packages/render/src/core/item.ts index 80de719..a938af9 100644 --- a/packages/render/src/core/item.ts +++ b/packages/render/src/core/item.ts @@ -366,7 +366,7 @@ export abstract class RenderItem this.cache!.size(width, height); } this.update(); - this.forEachHook(hook => hook.onResize?.(width, height)); + this.forEachHook(hook => hook.onResize?.(this, width, height)); } pos(x: number, y: number) { @@ -577,7 +577,7 @@ export abstract class RenderItem el.parent = this; el.transform.bind(el); el.onResize(this.scale); - el.forEachHook(hook => hook.onResize?.(el.width, el.height)); + el.forEachHook(hook => hook.onResize?.(this, el.width, el.height)); // 还需要深度遍历每个元素,给每个元素都设置根元素 el.setRoot(this.root); el.update(); @@ -1211,8 +1211,8 @@ export class RenderItemDefaultHooks implements IRenderItemBaseHooks { this.list.get('onWheelCapture')?.(ev); } - onResize(width: number, height: number): void { - this.list.get('onResize')?.(width, height); + onResize(item: IRenderItem, width: number, height: number): void { + this.list.get('onResize')?.(item, width, height); } onTransform(item: IRenderItem, transform: Transform): void { diff --git a/packages/render/src/core/misc.ts b/packages/render/src/core/misc.ts index 85e4edc..f6d7f69 100644 --- a/packages/render/src/core/misc.ts +++ b/packages/render/src/core/misc.ts @@ -314,6 +314,10 @@ export class Comment extends RenderItem { constructor() { super(); this.hide(); + this.size(1, 1); + this.pos(-1, -1); + this.setZIndex(-Infinity); + this.ignoreEvent(true); } protected getDefaultCache(): boolean { @@ -325,4 +329,17 @@ export class Comment extends RenderItem { } protected render(): void {} + + show(): void { + this.hide(); + } + + patchProp(): void { + this.hide(); + this.setCacheEnabled(false); + this.size(1, 1); + this.pos(-1, -1); + this.ignoreEvent(true); + this.setZIndex(-Infinity); + } } diff --git a/packages/render/src/core/render.ts b/packages/render/src/core/render.ts index d7f02f4..05a9b93 100644 --- a/packages/render/src/core/render.ts +++ b/packages/render/src/core/render.ts @@ -303,11 +303,15 @@ export class MotaRenderer ActionType.Down, this.createMouseAction(ev, ActionType.Down, mouse) ); + ev.stopPropagation(); + ev.preventDefault(); }); canvas.addEventListener('mouseup', ev => { const event = this.createMouseAction(ev, ActionType.Up); this.captureEvent(ActionType.Up, event); this.captureEvent(ActionType.Click, event); + ev.stopPropagation(); + ev.preventDefault(); }); canvas.addEventListener('mousemove', ev => { const event = this.createMouseAction( @@ -330,6 +334,8 @@ export class MotaRenderer this.beforeHovered, this.hoveredElement ); + ev.stopPropagation(); + ev.preventDefault(); }); canvas.addEventListener('mouseleave', ev => { const id = this.getMouseIdentifier( @@ -342,12 +348,16 @@ export class MotaRenderer }); this.hoveredElement.clear(); this.beforeHovered.clear(); + ev.stopPropagation(); + ev.preventDefault(); }); canvas.addEventListener('wheel', ev => { this.captureEvent( ActionType.Wheel, this.createWheelAction(ev, ActionType.Wheel) ); + ev.stopPropagation(); + ev.preventDefault(); }); // 文档监听 const abort = new AbortController(); @@ -377,6 +387,8 @@ export class MotaRenderer this.createTouchAction(ev, ActionType.Down).forEach(v => { this.captureEvent(ActionType.Down, v); }); + ev.stopPropagation(); + ev.preventDefault(); }, { signal } ); @@ -390,6 +402,8 @@ export class MotaRenderer [...ev.touches].forEach(v => { this.touchInfo.delete(v.identifier); }); + ev.stopPropagation(); + ev.preventDefault(); }, { signal } ); @@ -402,6 +416,8 @@ export class MotaRenderer [...ev.touches].forEach(v => { this.touchInfo.delete(v.identifier); }); + ev.stopPropagation(); + ev.preventDefault(); }, { signal } ); @@ -425,6 +441,8 @@ export class MotaRenderer this.hoveredElement ); }); + ev.stopPropagation(); + ev.preventDefault(); }, { signal } ); diff --git a/packages/render/src/core/types.ts b/packages/render/src/core/types.ts index 05aff40..2a7a646 100644 --- a/packages/render/src/core/types.ts +++ b/packages/render/src/core/types.ts @@ -140,7 +140,7 @@ export interface IRenderItemBaseHooks extends IHookBase { * @param width 元素宽度 * @param height 元素高度 */ - onResize?(width: number, height: number): void; + onResize?(item: IRenderItem, width: number, height: number): void; /** * 当元素的变换矩阵发生变化时触发