fix(modal, flyout): ignore observed non inputs for autofocus

lubber-de · web-flow · commit 1d7449f672cb · 2023-03-12T18:22:39.000+01:00
The observer should only retrigger autofocus if an input has changed, not for any kind of tabbable element.
diff --git a/src/definitions/modules/flyout.js b/src/definitions/modules/flyout.js
@@ -525,7 +525,9 @@
                                         $removedInputs = $(collectNodes(mutation.removedNodes)).filter('a[href], [tabindex], :input');
                                     if ($addedInputs.length > 0 || $removedInputs.length > 0) {
                                         shouldRefreshInputs = true;
-                                        ignoreAutofocus = false;
+                                        if ($addedInputs.filter(':input').length > 0 || $removedInputs.filter(':input').length > 0) {
+                                            ignoreAutofocus = false;
+                                        }
                                     }
                                 }
 
diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js
@@ -290,7 +290,9 @@
                                         $removedInputs = $(collectNodes(mutation.removedNodes)).filter('a[href], [tabindex], :input');
                                     if ($addedInputs.length > 0 || $removedInputs.length > 0) {
                                         shouldRefreshInputs = true;
-                                        ignoreAutofocus = false;
+                                        if ($addedInputs.filter(':input').length > 0 || $removedInputs.filter(':input').length > 0) {
+                                            ignoreAutofocus = false;
+                                        }
                                     }
                                 }
 

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,9 @@`
`525`	`525`	`$removedInputs = $(collectNodes(mutation.removedNodes)).filter('a[href], [tabindex], :input');`
`526`	`526`	`if ($addedInputs.length > 0 \|\| $removedInputs.length > 0) {`
`527`	`527`	`shouldRefreshInputs = true;`
`528`		`- ignoreAutofocus = false;`
	`528`	`+ if ($addedInputs.filter(':input').length > 0 \|\| $removedInputs.filter(':input').length > 0) {`
	`529`	`+ ignoreAutofocus = false;`
	`530`	`+ }`
`529`	`531`	`}`
`530`	`532`	`}`
`531`	`533`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,9 @@`
`290`	`290`	`$removedInputs = $(collectNodes(mutation.removedNodes)).filter('a[href], [tabindex], :input');`
`291`	`291`	`if ($addedInputs.length > 0 \|\| $removedInputs.length > 0) {`
`292`	`292`	`shouldRefreshInputs = true;`
`293`		`- ignoreAutofocus = false;`
	`293`	`+ if ($addedInputs.filter(':input').length > 0 \|\| $removedInputs.filter(':input').length > 0) {`
	`294`	`+ ignoreAutofocus = false;`
	`295`	`+ }`
`294`	`296`	`}`
`295`	`297`	`}`
`296`	`298`