From 82529888e18e857a0fe86ff4fdd4faf4c746f26b Mon Sep 17 00:00:00 2001
From: "ala'n (Alexey Stsefanovich)" <astsefanovich@exadel.com>
Date: Fri, 10 Mar 2023 00:13:21 +0100
Subject: [PATCH] fix(esl-event-listener): fix `ESLEventTargetDecorator`
 dispatched event `target`

---
 .../esl-event-listener/core/targets/decorated.target.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/esl-event-listener/core/targets/decorated.target.ts b/src/modules/esl-event-listener/core/targets/decorated.target.ts
index 717743912..782243dc8 100644
--- a/src/modules/esl-event-listener/core/targets/decorated.target.ts
+++ b/src/modules/esl-event-listener/core/targets/decorated.target.ts
@@ -53,7 +53,7 @@ export class ESLEventTargetDecorator<Args extends any[]> extends SyntheticEventT
 
     if (!this.hasEventListener(event, 1)) {
       const {target} = this;
-      ESLEventListener.subscribe(this, this.onEventDecorated, {event, target});
+      ESLEventListener.subscribe(this, this.createHandler(), {event, target});
     }
   }
 
@@ -71,8 +71,8 @@ export class ESLEventTargetDecorator<Args extends any[]> extends SyntheticEventT
   }
 
   /** @returns decorated handler */
-  protected get onEventDecorated(): EventListener {
-    return this.decorator(this.dispatchEvent.bind(this), ...this.params);
+  protected createHandler(): EventListener {
+    return this.decorator((event: Event) => this.dispatchEvent(event, this.target), ...this.params);
   }
 }