fix(client): if no awaited event target, return

ulixee · Dec 8, 2022 · 920f843 · 920f843
1 parent 677ef1b
commit 920f843
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/client/lib/AwaitedEventTarget.ts b/client/lib/AwaitedEventTarget.ts
@@ -14,15 +14,19 @@ export default class AwaitedEventTarget<T> implements IAwaitedEventTarget<T> {
     options?,
   ): Promise<void> {
     const { target, jsPath } = await this.getEventTarget();
-    return (await target).addEventListener(jsPath, eventType as string, listenerFn as any, options);
+    const awaitedTarget = await target;
+    if (!awaitedTarget) return;
+    return awaitedTarget.addEventListener(jsPath, eventType as string, listenerFn as any, options);
   }
 
   public async removeEventListener<K extends keyof T>(
     eventType: K,
     listenerFn: T[K] & Function,
   ): Promise<void> {
     const { target, jsPath } = await this.getEventTarget();
-    return (await target).removeEventListener(jsPath, eventType as string, listenerFn as any);
+    const awaitedTarget = await target;
+    if (!awaitedTarget) return;
+    return awaitedTarget.removeEventListener(jsPath, eventType as string, listenerFn as any);
   }
 
   // aliases