fix(web): adds newly-needed null guards due to new pattern

keymanapp · Apr 8, 2024 · 786c480 · 786c480
1 parent eebf3e5
commit 786c480
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
@@ -71,7 +71,9 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     // Scrolls the document-body to ensure that a focused element remains visible after the OSK appears.
     this.contextManager.on('targetchange', (target: OutputTarget<any>) => {
       const e = target?.getElement();
-      (this.osk.activationModel as TwoStateActivator<HTMLElement>).activationTrigger = e;
+      if(this.osk) {
+        (this.osk.activationModel as TwoStateActivator<HTMLElement>).activationTrigger = e;
+      }
 
       if(this.config.hostDevice.touchable) {
         if(!e || !target || !this.osk) {

diff --git a/web/src/engine/osk/src/views/floatingOskView.ts b/web/src/engine/osk/src/views/floatingOskView.ts
@@ -31,7 +31,7 @@ export default class FloatingOSKView extends OSKView {
   dfltX: string;
   dfltY: string;
 
-  layoutSerializer = new FloatingOSKCookieSerializer();
+  private layoutSerializer = new FloatingOSKCookieSerializer();
 
   private titleBar: TitleBar;
   private resizeBar: ResizeBar;
@@ -220,6 +220,15 @@ export default class FloatingOSKView extends OSKView {
    *  @return {boolean}
    */
   private loadPersistedLayout(): void {
+    /*
+      If a keyboard is available during OSK construction, it is possible
+      for this field to be `undefined`.  `loadPersistedLayout` will be called
+      later in construction, so it's safe to skip.
+    */
+    if(!this.layoutSerializer) {
+      return;
+    }
+
     let c = this.layoutSerializer.loadWithDefaults({
       visible: 1,
       userSet: 0,