From 17763e4d93ac1ce881b8098d236163e805114f38 Mon Sep 17 00:00:00 2001
From: Nipun Paradkar <nipun@kiprosh.com>
Date: Sun, 1 May 2022 14:02:31 +0530
Subject: [PATCH 1/2] Remove `elementActionValue` setter

... and modify `actionValue` to accept an element onto which the action
should be set. Defaults to `this.element` when the element isn't
provided.
---
 src/tests/modules/core/event_options_tests.ts | 46 +++++++++----------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/tests/modules/core/event_options_tests.ts b/src/tests/modules/core/event_options_tests.ts
index 0dbd178e..07fb1e34 100644
--- a/src/tests/modules/core/event_options_tests.ts
+++ b/src/tests/modules/core/event_options_tests.ts
@@ -9,7 +9,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
     <div id="outside"></div>
   `
   async "test different syntaxes for once action"() {
-    this.actionValue = "click->c#log:once d#log2:once c#log3:once"
+    this.actionValue = { value: "click->c#log:once d#log2:once c#log3:once", element: this.buttonElement }
 
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
@@ -23,7 +23,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test mix once and standard actions"() {
-    this.actionValue = "c#log:once d#log2 c#log3"
+    this.actionValue = { value: "c#log:once d#log2 c#log3", element: this.buttonElement }
 
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
@@ -39,7 +39,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test stop propagation with once"() {
-    this.actionValue = "c#stop:once c#log"
+    this.actionValue = { value: "c#stop:once c#log", element: this.buttonElement }
 
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
@@ -57,7 +57,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test global once actions"() {
-    this.actionValue = "keydown@window->c#log:once"
+    this.actionValue = { value: "keydown@window->c#log:once", element: this.buttonElement }
 
     await this.nextFrame
     await this.triggerEvent("#outside", "keydown")
@@ -67,13 +67,13 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test edge case when updating action list with setAttribute preserves once history"() {
-    this.actionValue = "c#log:once"
+    this.actionValue = { value: "c#log:once", element: this.buttonElement }
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
     await this.triggerEvent(this.buttonElement, "click")
 
     //modify with a setAttribute and c#log should not be called anyhow
-    this.actionValue = "c#log2 c#log:once d#log"
+    this.actionValue = { value: "c#log2 c#log:once d#log", element: this.buttonElement }
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
 
@@ -85,7 +85,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test default passive action"() {
-    this.actionValue = "scroll->c#logPassive:passive"
+    this.actionValue = { value: "scroll->c#logPassive:passive", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "scroll", { setDefaultPrevented: false })
@@ -93,7 +93,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test global passive actions"() {
-    this.actionValue = "mouseup@window->c#logPassive:passive"
+    this.actionValue = { value: "mouseup@window->c#logPassive:passive", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent("#outside", "mouseup", { setDefaultPrevented: false })
@@ -102,7 +102,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
 
   async "test passive false actions"() {
     // by default touchmove is true in chrome
-    this.actionValue = "touchmove@window->c#logPassive:!passive"
+    this.actionValue = { value: "touchmove@window->c#logPassive:!passive", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent("#outside", "touchmove", { setDefaultPrevented: false })
@@ -111,7 +111,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
 
   async "test multiple options"() {
     // by default touchmove is true in chrome
-    this.actionValue = "touchmove@window->c#logPassive:once:!passive"
+    this.actionValue = { value: "touchmove@window->c#logPassive:once:!passive", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent("#outside", "touchmove", { setDefaultPrevented: false })
@@ -120,7 +120,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test wrong options are silently ignored"() {
-    this.actionValue = "c#log:wrong:verywrong"
+    this.actionValue = { value: "c#log:wrong:verywrong", element: this.buttonElement }
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
     await this.triggerEvent(this.buttonElement, "click")
@@ -132,8 +132,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test stop option with implicit event"() {
-    this.elementActionValue = "click->c#log"
-    this.actionValue = "c#log2:stop"
+    this.actionValue = { value: "click->c#log" }
+    this.actionValue = { value: "c#log2:stop", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "click")
@@ -144,8 +144,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test stop option with explicit event"() {
-    this.elementActionValue = "keydown->c#log"
-    this.actionValue = "keydown->c#log2:stop"
+    this.actionValue = { value: "keydown->c#log" }
+    this.actionValue = { value: "keydown->c#log2:stop", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "keydown")
@@ -156,8 +156,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test event propagation without stop option"() {
-    this.elementActionValue = "click->c#log"
-    this.actionValue = "c#log2"
+    this.actionValue = { value: "click->c#log" }
+    this.actionValue = { value: "c#log2", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "click")
@@ -169,7 +169,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test prevent option with implicit event"() {
-    this.actionValue = "c#log:prevent"
+    this.actionValue = { value: "c#log:prevent", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "click")
@@ -180,7 +180,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test prevent option with explicit event"() {
-    this.actionValue = "keyup->c#log:prevent"
+    this.actionValue = { value: "keyup->c#log:prevent", element: this.buttonElement }
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "keyup")
@@ -190,12 +190,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
     )
   }
 
-  set actionValue(value: string) {
-    this.buttonElement.setAttribute("data-action", value)
-  }
-
-  set elementActionValue(value: string) {
-    this.element.setAttribute("data-action", value)
+  set actionValue(config: { value: string, element?: Element }) {
+    (config.element || this.element).setAttribute("data-action", config.value)
   }
 
   get element() {

From 14601f14021b56b8cb08a2605c2efe92548fca4a Mon Sep 17 00:00:00 2001
From: Nipun Paradkar <nipun@kiprosh.com>
Date: Sun, 1 May 2022 14:10:35 +0530
Subject: [PATCH 2/2] Replace `actionValue` setter with `setAction` method

... that has the same method signature as the `triggerEvent` method.
---
 src/tests/modules/core/event_options_tests.ts | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/tests/modules/core/event_options_tests.ts b/src/tests/modules/core/event_options_tests.ts
index 07fb1e34..9e87cece 100644
--- a/src/tests/modules/core/event_options_tests.ts
+++ b/src/tests/modules/core/event_options_tests.ts
@@ -9,7 +9,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
     <div id="outside"></div>
   `
   async "test different syntaxes for once action"() {
-    this.actionValue = { value: "click->c#log:once d#log2:once c#log3:once", element: this.buttonElement }
+    this.setAction(this.buttonElement, "click->c#log:once d#log2:once c#log3:once")
 
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
@@ -23,7 +23,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test mix once and standard actions"() {
-    this.actionValue = { value: "c#log:once d#log2 c#log3", element: this.buttonElement }
+    this.setAction(this.buttonElement, "c#log:once d#log2 c#log3")
 
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
@@ -39,7 +39,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test stop propagation with once"() {
-    this.actionValue = { value: "c#stop:once c#log", element: this.buttonElement }
+    this.setAction(this.buttonElement, "c#stop:once c#log")
 
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
@@ -57,7 +57,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test global once actions"() {
-    this.actionValue = { value: "keydown@window->c#log:once", element: this.buttonElement }
+    this.setAction(this.buttonElement, "keydown@window->c#log:once")
 
     await this.nextFrame
     await this.triggerEvent("#outside", "keydown")
@@ -67,13 +67,13 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test edge case when updating action list with setAttribute preserves once history"() {
-    this.actionValue = { value: "c#log:once", element: this.buttonElement }
+    this.setAction(this.buttonElement, "c#log:once")
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
     await this.triggerEvent(this.buttonElement, "click")
 
     //modify with a setAttribute and c#log should not be called anyhow
-    this.actionValue = { value: "c#log2 c#log:once d#log", element: this.buttonElement }
+    this.setAction(this.buttonElement, "c#log2 c#log:once d#log")
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
 
@@ -85,7 +85,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test default passive action"() {
-    this.actionValue = { value: "scroll->c#logPassive:passive", element: this.buttonElement }
+    this.setAction(this.buttonElement, "scroll->c#logPassive:passive")
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "scroll", { setDefaultPrevented: false })
@@ -93,7 +93,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test global passive actions"() {
-    this.actionValue = { value: "mouseup@window->c#logPassive:passive", element: this.buttonElement }
+    this.setAction(this.buttonElement, "mouseup@window->c#logPassive:passive")
     await this.nextFrame
 
     await this.triggerEvent("#outside", "mouseup", { setDefaultPrevented: false })
@@ -102,7 +102,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
 
   async "test passive false actions"() {
     // by default touchmove is true in chrome
-    this.actionValue = { value: "touchmove@window->c#logPassive:!passive", element: this.buttonElement }
+    this.setAction(this.buttonElement, "touchmove@window->c#logPassive:!passive")
     await this.nextFrame
 
     await this.triggerEvent("#outside", "touchmove", { setDefaultPrevented: false })
@@ -111,7 +111,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
 
   async "test multiple options"() {
     // by default touchmove is true in chrome
-    this.actionValue = { value: "touchmove@window->c#logPassive:once:!passive", element: this.buttonElement }
+    this.setAction(this.buttonElement, "touchmove@window->c#logPassive:once:!passive")
     await this.nextFrame
 
     await this.triggerEvent("#outside", "touchmove", { setDefaultPrevented: false })
@@ -120,7 +120,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test wrong options are silently ignored"() {
-    this.actionValue = { value: "c#log:wrong:verywrong", element: this.buttonElement }
+    this.setAction(this.buttonElement, "c#log:wrong:verywrong")
     await this.nextFrame
     await this.triggerEvent(this.buttonElement, "click")
     await this.triggerEvent(this.buttonElement, "click")
@@ -132,8 +132,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test stop option with implicit event"() {
-    this.actionValue = { value: "click->c#log" }
-    this.actionValue = { value: "c#log2:stop", element: this.buttonElement }
+    this.setAction(this.element, "click->c#log")
+    this.setAction(this.buttonElement, "c#log2:stop")
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "click")
@@ -144,8 +144,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test stop option with explicit event"() {
-    this.actionValue = { value: "keydown->c#log" }
-    this.actionValue = { value: "keydown->c#log2:stop", element: this.buttonElement }
+    this.setAction(this.element, "keydown->c#log")
+    this.setAction(this.buttonElement, "keydown->c#log2:stop")
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "keydown")
@@ -156,8 +156,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test event propagation without stop option"() {
-    this.actionValue = { value: "click->c#log" }
-    this.actionValue = { value: "c#log2", element: this.buttonElement }
+    this.setAction(this.element, "click->c#log")
+    this.setAction(this.buttonElement, "c#log2")
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "click")
@@ -169,7 +169,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test prevent option with implicit event"() {
-    this.actionValue = { value: "c#log:prevent", element: this.buttonElement }
+    this.setAction(this.buttonElement, "c#log:prevent")
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "click")
@@ -180,7 +180,7 @@ export default class EventOptionsTests extends LogControllerTestCase {
   }
 
   async "test prevent option with explicit event"() {
-    this.actionValue = { value: "keyup->c#log:prevent", element: this.buttonElement }
+    this.setAction(this.buttonElement, "keyup->c#log:prevent")
     await this.nextFrame
 
     await this.triggerEvent(this.buttonElement, "keyup")
@@ -190,8 +190,8 @@ export default class EventOptionsTests extends LogControllerTestCase {
     )
   }
 
-  set actionValue(config: { value: string, element?: Element }) {
-    (config.element || this.element).setAttribute("data-action", config.value)
+  setAction(element: Element, value: string) {
+    element.setAttribute("data-action", value)
   }
 
   get element() {