fix: Comment 拦截点击的问题

This commit is contained in:
AncTe committed 2026-11-15 17:05:22 +08:00
1 parent 93c2c38b5d
commit 35a5056b07
4 files changed
+40 -5

No files matched your search

+4 -4
View File
@@ -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 {
+17
View File
@@ -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);
}
}
+18
View File
@@ -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 }
);
+1 -1
View File
@@ -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;
/**
* 当元素的变换矩阵发生变化时触发