Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix restoring focus to correct element when closing Dialog component #3365

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Fix restoring focus to correct element when closing Dialog component #3365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cc70f6
resolve focusable element when recording elements
RobinMalfait Jul 5, 2024
7a7782e
update changelog
RobinMalfait Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/@headlessui-react/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix hanging tests when using `anchor` prop ([#3357](https://github.com/tailwindlabs/headlessui/pull/3357))
- Fix `transition` and `focus` prop combination for `PopoverPanel` component ([#3361](https://github.com/tailwindlabs/headlessui/pull/3361))
- Fix outside click in nested portalled `Popover` components ([#3362](https://github.com/tailwindlabs/headlessui/pull/3362))
- Fix restoring focus to correct element when closing `Dialog` component ([#3365](https://github.com/tailwindlabs/headlessui/pull/3365))

## [2.1.1] - 2024-06-26

Expand Down
17 changes: 16 additions & 1 deletion packages/@headlessui-react/src/utils/active-element-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { onDocumentReady } from './document-ready'
import { focusableSelector } from './focus-management'

export let history: HTMLElement[] = []
onDocumentReady(() => {
Expand All @@ -7,7 +8,21 @@ onDocumentReady(() => {
if (e.target === document.body) return
if (history[0] === e.target) return

history.unshift(e.target)
let focusableElement = e.target as HTMLElement

// Figure out the closest focusable element, this is needed in a situation
// where you click on a non-focusable element inside a focusable element.
//
// E.g.:
//
// ```html
// <button>
// <span>Click me</span>
// </button>
// ```
focusableElement = focusableElement.closest(focusableSelector) as HTMLElement

history.unshift(focusableElement ?? e.target)

// Filter out DOM Nodes that don't exist anymore
history = history.filter((x) => x != null && x.isConnected)
Expand Down
2 changes: 1 addition & 1 deletion packages/@headlessui-react/src/utils/focus-management.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getOwnerDocument } from './owner'

// Credit:
// - https://stackoverflow.com/a/30753870
let focusableSelector = [
export let focusableSelector = [
'[contentEditable=true]',
'[tabindex]',
'a[href]',
Expand Down
1 change: 1 addition & 0 deletions packages/@headlessui-vue/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Cancel outside click behavior on touch devices when scrolling ([#3266](https://github.com/tailwindlabs/headlessui/pull/3266))
- Fix restoring focus to correct element when closing `Dialog` component ([#3365](https://github.com/tailwindlabs/headlessui/pull/3365))

## [1.7.22] - 2024-05-08

Expand Down
17 changes: 16 additions & 1 deletion packages/@headlessui-vue/src/utils/active-element-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { onDocumentReady } from './document-ready'
import { focusableSelector } from './focus-management'

export let history: HTMLElement[] = []
onDocumentReady(() => {
Expand All @@ -7,7 +8,21 @@ onDocumentReady(() => {
if (e.target === document.body) return
if (history[0] === e.target) return

history.unshift(e.target)
let focusableElement = e.target as HTMLElement

// Figure out the closest focusable element, this is needed in a situation
// where you click on a non-focusable element inside a focusable element.
//
// E.g.:
//
// ```html
// <button>
// <span>Click me</span>
// </button>
// ```
focusableElement = focusableElement.closest(focusableSelector) as HTMLElement

history.unshift(focusableElement ?? e.target)

// Filter out DOM Nodes that don't exist anymore
history = history.filter((x) => x != null && x.isConnected)
Expand Down
2 changes: 1 addition & 1 deletion packages/@headlessui-vue/src/utils/focus-management.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getOwnerDocument } from './owner'

// Credit:
// - https://stackoverflow.com/a/30753870
let focusableSelector = [
export let focusableSelector = [
'[contentEditable=true]',
'[tabindex]',
'a[href]',
Expand Down
Loading