From 1db66efa30fe71c48250174042cd34803729eb84 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 15 Sep 2026 14:41:39 +0200
Subject: [PATCH] =?UTF-8?q?refactor(web):=20rename=20`Activator.activate`?=
 =?UTF-8?q?=20=E2=86=92=20`Activator.canActivate`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change tries to improve the naming of the property since it denotes
a state and doesn't cause an action to happen. Naming it `canActivate`
might make this clearer.

Build-bot: skip build:web
Test-bot: skip
---
 web/src/engine/src/osk/views/activator.ts        |  6 +++---
 web/src/engine/src/osk/views/floatingOskView.ts  |  2 +-
 web/src/engine/src/osk/views/oskView.ts          |  2 +-
 web/src/engine/src/osk/views/simpleActivator.ts  |  6 +++---
 .../engine/src/osk/views/twoStateActivator.ts    | 10 +++++-----
 .../auto/headless/engine/osk/activation.tests.ts | 16 ++++++++--------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/web/src/engine/src/osk/views/activator.ts b/web/src/engine/src/osk/views/activator.ts
index 796b3632d4f..d3c196343a3 100644
--- a/web/src/engine/src/osk/views/activator.ts
+++ b/web/src/engine/src/osk/views/activator.ts
@@ -23,10 +23,10 @@ export abstract class Activator<ExtraEvents = void> extends EventEmitter<EventMa
   /**
    * When `true`, indicates that the listener should activate / become visible.
    */
-  abstract get activate(): boolean;
+  abstract get canActivate(): boolean;
 
   /**
-   * When `true` and `activate` is `false`, indicates that changing the value of `enabled`
+   * When `true` and `canActivate` is `false`, indicates that changing the value of `enabled`
    * will result in activation.
    */
   abstract get conditionsMet(): boolean;
@@ -41,7 +41,7 @@ export class StaticActivator extends Activator {
     // does nothing; it's static.
   }
 
-  get activate(): boolean {
+  get canActivate(): boolean {
     return true;
   }
 
diff --git a/web/src/engine/src/osk/views/floatingOskView.ts b/web/src/engine/src/osk/views/floatingOskView.ts
index 136c424896b..291105b49bc 100644
--- a/web/src/engine/src/osk/views/floatingOskView.ts
+++ b/web/src/engine/src/osk/views/floatingOskView.ts
@@ -508,7 +508,7 @@ export class FloatingOSKView extends OSKView {
 
     Ls.position='absolute';
     // Keep it hidden if not currently displayed.
-    if(this.activationModel.activate) {
+    if(this.activationModel.canActivate) {
       Ls.display='block'; //Ls.visibility='visible';
     }
     Ls.left='0px';
diff --git a/web/src/engine/src/osk/views/oskView.ts b/web/src/engine/src/osk/views/oskView.ts
index b4bd3855dcb..d6250373d95 100644
--- a/web/src/engine/src/osk/views/oskView.ts
+++ b/web/src/engine/src/osk/views/oskView.ts
@@ -450,7 +450,7 @@ export abstract class OSKView
    * they rely on this function to manage presentation (showing / hiding) of the OSK.
    */
   private commonCheckAndDisplay() {
-    if(this.activationModel.activate && this.activeKeyboard) {
+    if(this.activationModel.canActivate && this.activeKeyboard) {
       this.present();
     } else {
       this.startHide(false);
diff --git a/web/src/engine/src/osk/views/simpleActivator.ts b/web/src/engine/src/osk/views/simpleActivator.ts
index 0b1d1009d22..212f6a899d4 100644
--- a/web/src/engine/src/osk/views/simpleActivator.ts
+++ b/web/src/engine/src/osk/views/simpleActivator.ts
@@ -12,14 +12,14 @@ export class SimpleActivator extends Activator {
 
   set enabled(value: boolean) {
     // Enabled + activated are the same thing for this class.
-    this.activate = value;
+    this.canActivate = value;
   }
 
-  get activate(): boolean {
+  get canActivate(): boolean {
     return this.flag;
   }
 
-  set activate(value: boolean) {
+  set canActivate(value: boolean) {
     if(this.flag != value) {
       this.flag = value;
       this.emit('activate', value);
diff --git a/web/src/engine/src/osk/views/twoStateActivator.ts b/web/src/engine/src/osk/views/twoStateActivator.ts
index 260c0cd0c07..f17a03a76ab 100644
--- a/web/src/engine/src/osk/views/twoStateActivator.ts
+++ b/web/src/engine/src/osk/views/twoStateActivator.ts
@@ -11,13 +11,13 @@ export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   private _enabled: boolean = true;
   private actValue: Type = null;
 
-  get activate(): boolean {
+  get canActivate(): boolean {
     return this._enabled && !!this.actValue;
   }
 
   private checkState(oldValue: boolean) {
-    if(this.activate != oldValue) {
-      this.emit('activate', this.activate);
+    if(this.canActivate != oldValue) {
+      this.emit('activate', this.canActivate);
     }
   }
 
@@ -26,7 +26,7 @@ export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   }
 
   set enabled(flag: boolean) {
-    const oldState = this.activate;
+    const oldState = this.canActivate;
     this._enabled = flag; // may change this.value!
 
     this.checkState(oldState);
@@ -37,7 +37,7 @@ export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   }
 
   set activationTrigger(value: Type) {
-    const oldState = this.activate;
+    const oldState = this.canActivate;
     const oldValue = this.actValue;
     this.actValue = value; // may change this.value!
 
diff --git a/web/src/test/auto/headless/engine/osk/activation.tests.ts b/web/src/test/auto/headless/engine/osk/activation.tests.ts
index 0b74d0bd922..604c432ffcd 100644
--- a/web/src/test/auto/headless/engine/osk/activation.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/activation.tests.ts
@@ -12,7 +12,7 @@ describe("Activators", () => {
 
       assert.isTrue(activator.enabled);
       assert.isTrue(activator.conditionsMet);
-      assert.isTrue(activator.activate);
+      assert.isTrue(activator.canActivate);
     });
 
     it("set to 'off'", () => {
@@ -21,19 +21,19 @@ describe("Activators", () => {
 
       assert.isFalse(activator.enabled);
       assert.isTrue(activator.conditionsMet);
-      assert.isFalse(activator.activate);
+      assert.isFalse(activator.canActivate);
     });
 
     it('activate and enabled act as aliases', () => {
       const activator = new SimpleActivator();
 
       assert.isTrue(activator.enabled);
-      assert.isTrue(activator.activate);
+      assert.isTrue(activator.canActivate);
 
       activator.enabled = false;
-      assert.isFalse(activator.activate);
+      assert.isFalse(activator.canActivate);
 
-      activator.activate = true;
+      activator.canActivate = true;
       assert.isTrue(activator.enabled);
     });
 
@@ -86,7 +86,7 @@ describe("Activators", () => {
 
       assert.isTrue(activator.enabled);
       assert.isFalse(activator.conditionsMet);
-      assert.isFalse(activator.activate);
+      assert.isFalse(activator.canActivate);
       assert.isNotOk(activator.activationTrigger);
     });
 
@@ -101,7 +101,7 @@ describe("Activators", () => {
 
       assert.isTrue(activator.enabled);
       assert.isTrue(activator.conditionsMet);
-      assert.isTrue(activator.activate);
+      assert.isTrue(activator.canActivate);
       assert.isOk(activator.activationTrigger);
 
       assert.isTrue(activateStub.called);
@@ -230,4 +230,4 @@ describe("Activators", () => {
       assert.deepStrictEqual(stub.firstCall.args[0], object);
     });
   });
-});
\ No newline at end of file
+});