Skip to content

fix(useFocusZone): handle add/remove nodes that have focusable children #1185

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

Merged
merged 1 commit into from
Apr 28, 2021
Merged

fix(useFocusZone): handle add/remove nodes that have focusable children #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/behaviors/focusZone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {isFocusable, iterateFocusableElements} from '../utils/iterateFocusableElements'
import {iterateFocusableElements} from '../utils/iterateFocusableElements'
import {polyfill as eventListenerSignalPolyfill} from '../polyfills/eventListenerSignal'
import {isMacOS} from '../utils/userAgent'
import {uniqueId} from '../utils/uniqueId'
Expand Down Expand Up @@ -442,12 +442,12 @@ export function focusZone(container: HTMLElement, settings?: FocusZoneSettings):
const observer = new MutationObserver(mutations => {
for (const mutation of mutations) {
for (const addedNode of mutation.addedNodes) {
if (addedNode instanceof HTMLElement && isFocusable(addedNode)) {
if (addedNode instanceof HTMLElement) {
beginFocusManagement(...iterateFocusableElements(addedNode))
}
}
for (const removedNode of mutation.removedNodes) {
if (removedNode instanceof HTMLElement && savedTabIndex.has(removedNode)) {
if (removedNode instanceof HTMLElement) {
endFocusManagement(...iterateFocusableElements(removedNode))
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/stories/useFocusZone.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,11 @@ export const ChangingSubtree = () => {

const buttons: JSX.Element[] = []
for (let i = 0; i < buttonCount; ++i) {
buttons.push(<MarginButton key={`button${i}`}>{i + 1}</MarginButton>)
buttons.push(
<div>
<MarginButton key={`button${i}`}>{i + 1}</MarginButton>
</div>
)
}

return (
Expand Down