From b754e0cf7994112f21655471d62364f55b3da39c Mon Sep 17 00:00:00 2001 From: weaseldotro <1822852+weaseldotro@users.noreply.github.com> Date: Mon, 9 Nov 2020 11:14:56 +0200 Subject: [PATCH 1/2] feat(ComposedModal): allow using null for selectorPrimaryFocus to disable auto focus --- src/ComposedModal/ComposedModal.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte index f0ea91a2..14203f4d 100644 --- a/src/ComposedModal/ComposedModal.svelte +++ b/src/ComposedModal/ComposedModal.svelte @@ -69,6 +69,9 @@ }); function focus(element) { + if(selectorPrimaryFocus === null) { + return + } const node = (element || innerModal).querySelector(selectorPrimaryFocus) || buttonRef; if (node != null) node.focus(); From c95e1fe99459f3d6cb60d4c1e9e76859dcea4465 Mon Sep 17 00:00:00 2001 From: weaseldotro <1822852+weaseldotro@users.noreply.github.com> Date: Tue, 17 Nov 2020 09:28:53 +0200 Subject: [PATCH 2/2] Use loose equal in ComposedModal Co-authored-by: Eric Liu --- src/ComposedModal/ComposedModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte index 14203f4d..42d041c5 100644 --- a/src/ComposedModal/ComposedModal.svelte +++ b/src/ComposedModal/ComposedModal.svelte @@ -69,7 +69,7 @@ }); function focus(element) { - if(selectorPrimaryFocus === null) { + if(selectorPrimaryFocus == null) { return } const node =