Fix SHIFT + TAB issue on last element in focusTrap (#780)

JaZo · web-flow · commit 2dcc67984a65 · 2022-12-01T10:19:56.000Z
This will prevent a jump from the last to the first element when you press SHIFT + TAB on the last element, which isn't the first element.
diff --git a/src/utils/focusTrap.js b/src/utils/focusTrap.js
@@ -65,7 +65,7 @@ class FocusTrap {
     }
 
     // TAB
-    if (isNothingFocused() || isFocused(this.lastElement())) {
+    if (isNothingFocused() || (!event.shiftKey && isFocused(this.lastElement()))) {
       this.firstElement().focus()
       event.preventDefault()
       return

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class FocusTrap {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// TAB`
`68`		`- if (isNothingFocused() \|\| isFocused(this.lastElement())) {`
	`68`	`+ if (isNothingFocused() \|\| (!event.shiftKey && isFocused(this.lastElement()))) {`
`69`	`69`	`this.firstElement().focus()`
`70`	`70`	`event.preventDefault()`
`71`	`71`	`return`