From 25e188793955e43e808e71d5e90e94beb3ea52d5 Mon Sep 17 00:00:00 2001
From: Ben <45583362+ben-basten@users.noreply.github.com>
Date: Sun, 14 Apr 2024 13:57:45 +0000
Subject: [PATCH] fix(web): focus escaping from modals (#8730)

* fix(web): focus escaping modals

* fix: exclusion pattern modal should initially load with the "Add" button disabled

* fix: simplify conditional statement
---
 .../components/forms/library-exclusion-pattern-form.svelte    | 2 +-
 web/src/lib/components/shared-components/focus-trap.svelte    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/components/forms/library-exclusion-pattern-form.svelte b/web/src/lib/components/forms/library-exclusion-pattern-form.svelte
index 8ee603979b..b637673d54 100644
--- a/web/src/lib/components/forms/library-exclusion-pattern-form.svelte
+++ b/web/src/lib/components/forms/library-exclusion-pattern-form.svelte
@@ -17,7 +17,7 @@
   });
 
   $: isDuplicate = exclusionPattern !== null && exclusionPatterns.includes(exclusionPattern);
-  $: canSubmit = exclusionPattern !== '' && exclusionPattern !== null && !exclusionPatterns.includes(exclusionPattern);
+  $: canSubmit = exclusionPattern && !exclusionPatterns.includes(exclusionPattern);
 
   const dispatch = createEventDispatcher<{
     cancel: void;
diff --git a/web/src/lib/components/shared-components/focus-trap.svelte b/web/src/lib/components/shared-components/focus-trap.svelte
index 084123506c..d1c01825de 100644
--- a/web/src/lib/components/shared-components/focus-trap.svelte
+++ b/web/src/lib/components/shared-components/focus-trap.svelte
@@ -17,7 +17,9 @@
 
   const getFocusableElements = () => {
     return Array.from(
-      container.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'),
+      container.querySelectorAll(
+        'button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])',
+      ),
     ) as HTMLElement[];
   };