From 137e9980c362cc189876f9d0b75cba6a13f055a4 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Tue, 14 Feb 2023 09:41:21 -0500
Subject: [PATCH] add safety checks for focus after close

---
 .../aca-content/src/lib/services/content-management.service.ts  | 2 +-
 projects/aca-content/src/lib/services/node-actions.service.ts   | 2 +-
 projects/aca-content/src/lib/store/effects/download.effects.ts  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/aca-content/src/lib/services/content-management.service.ts b/projects/aca-content/src/lib/services/content-management.service.ts
index 30980083c..cebd5a1f0 100644
--- a/projects/aca-content/src/lib/services/content-management.service.ts
+++ b/projects/aca-content/src/lib/services/content-management.service.ts
@@ -1089,7 +1089,7 @@ export class ContentManagementService {
 
   private focusAfterClose(focusedElementSelector: string): void {
     if (focusedElementSelector) {
-      document.querySelector<HTMLElement>(focusedElementSelector).focus();
+      document.querySelector<HTMLElement>(focusedElementSelector)?.focus();
     }
   }
 }
diff --git a/projects/aca-content/src/lib/services/node-actions.service.ts b/projects/aca-content/src/lib/services/node-actions.service.ts
index aeac3a76c..98bd1a19f 100644
--- a/projects/aca-content/src/lib/services/node-actions.service.ts
+++ b/projects/aca-content/src/lib/services/node-actions.service.ts
@@ -700,7 +700,7 @@ export class NodeActionsService {
 
   private focusAfterClose(focusedElementSelector: string): void {
     if (focusedElementSelector) {
-      document.querySelector<HTMLElement>(focusedElementSelector).focus();
+      document.querySelector<HTMLElement>(focusedElementSelector)?.focus();
     }
   }
 }
diff --git a/projects/aca-content/src/lib/store/effects/download.effects.ts b/projects/aca-content/src/lib/store/effects/download.effects.ts
index 782217bd2..a16e55945 100644
--- a/projects/aca-content/src/lib/store/effects/download.effects.ts
+++ b/projects/aca-content/src/lib/store/effects/download.effects.ts
@@ -165,7 +165,7 @@ export class DownloadEffects {
 
   private focusAfterClose(focusedElementSelector: string): void {
     if (focusedElementSelector) {
-      document.querySelector<HTMLElement>(focusedElementSelector).focus();
+      document.querySelector<HTMLElement>(focusedElementSelector)?.focus();
     }
   }
 }