Merge pull request #1339 from VisActor/fix/Event-harmony

Fix/event harmony
VisActor · Aug 5, 2024 · 6a9a9a3 · 6a9a9a3
2 parents 0e8bc88 + 496c024
commit 6a9a9a3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/common/changes/@visactor/vrender-core/fix-Event-harmony_2024-08-05-06-31.json b/common/changes/@visactor/vrender-core/fix-Event-harmony_2024-08-05-06-31.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-core",
+      "comment": "fix: fix issue with Event class in harmony event",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vrender-core"
+}
diff --git a/packages/vrender-core/src/event/federated-event/base-event.ts b/packages/vrender-core/src/event/federated-event/base-event.ts
@@ -1,3 +1,4 @@
+import { isFunction } from '@visactor/vutils';
 import type { IPickEventParams } from '../../interface';
 import type { EventPoint, IEventTarget } from '../../interface/event';
 import type { EventManager } from '../event-manager';
@@ -200,8 +201,14 @@ export class FederatedEvent<N extends Event = Event> implements Event {
   }
 
   preventDefault(): void {
-    if (this.nativeEvent instanceof Event && this.nativeEvent.cancelable) {
-      this.nativeEvent.preventDefault();
+    try {
+      if (this.nativeEvent instanceof Event && this.nativeEvent.cancelable) {
+        this.nativeEvent.preventDefault();
+      }
+    } catch (err) {
+      this.nativeEvent.preventDefault &&
+        isFunction(this.nativeEvent.preventDefault) &&
+        this.nativeEvent.preventDefault();
     }
 
     this.defaultPrevented = true;
@@ -212,8 +219,14 @@ export class FederatedEvent<N extends Event = Event> implements Event {
   }
 
   stopPropagation(): void {
-    if (this.nativeEvent instanceof Event && this.nativeEvent.cancelable) {
-      this.nativeEvent.stopPropagation();
+    try {
+      if (this.nativeEvent instanceof Event && this.nativeEvent.cancelable) {
+        this.nativeEvent.stopPropagation();
+      }
+    } catch (err) {
+      this.nativeEvent.stopPropagation &&
+        isFunction(this.nativeEvent.stopPropagation) &&
+        this.nativeEvent.stopPropagation();
     }
 
     this.propagationStopped = true;