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

Jump to bottom

NavigatorScreen: satisfy exhaustive-deps eslint rule #45648

Merged
merged 2 commits into from
Nov 9, 2022
Merged

NavigatorScreen: satisfy exhaustive-deps eslint rule #45648

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
7369c01
`NavigatorScreen`: satisfy `exhaustive-deps` eslint rule
flootr Nov 9, 2022
77a9613
CHANGELOG
ciampo Nov 9, 2022
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/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- `Flex`: Update to pass `exhaustive-deps` eslint rule ([#45528](https://github.com/WordPress/gutenberg/pull/45528)).
- `withNotices`: Update to pass `exhaustive-deps` eslint rule ([#45530](https://github.com/WordPress/gutenberg/pull/45530)).
- `ItemGroup`: Update to pass `exhaustive-deps` eslint rule ([#45531](https://github.com/WordPress/gutenberg/pull/45531)).
- `NavigatorScreen`: Update to pass `exhaustive-deps` eslint rule ([#45648](https://github.com/WordPress/gutenberg/pull/45648)).
- `Draggable`: Convert to TypeScript ([#45471](https://github.com/WordPress/gutenberg/pull/45471)).

### Experimental
Expand Down
11 changes: 8 additions & 3 deletions packages/components/src/navigator/navigator-screen/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ function UnconnectedNavigatorScreen(
[ className, cx ]
);

const locationRef = useRef( location );

useEffect( () => {
locationRef.current = location;
}, [ location ] );

// Focus restoration
const isInitialLocation = location.isInitial && ! location.isBack;
useEffect( () => {
Expand All @@ -87,7 +93,7 @@ function UnconnectedNavigatorScreen(
isInitialLocation ||
! isMatch ||
! wrapperRef.current ||
location.hasRestoredFocus
locationRef.current.hasRestoredFocus
) {
return;
}
Expand Down Expand Up @@ -119,12 +125,11 @@ function UnconnectedNavigatorScreen(
elementToFocus = firstTabbable ?? wrapperRef.current;
}

location.hasRestoredFocus = true;
locationRef.current.hasRestoredFocus = true;
elementToFocus.focus();
}, [
isInitialLocation,
isMatch,
location.hasRestoredFocus,
location.isBack,
previousLocation?.focusTargetSelector,
] );
Expand Down