Skip to content

Improving Firefox Popover open with blur on disabled #4670

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 6 commits into from
Jun 21, 2023
Merged

Improving Firefox Popover open with blur on disabled #4670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b10852c
Improving Firefox Popover open with blur on disabled
ktabors Jun 15, 2023
f72263c
comment improvements
ktabors Jun 17, 2023
3833746
Update comment packages/@react-aria/focus/src/FocusScope.tsx
ktabors Jun 20, 2023
69673a0
updated relatedTaget for synthetic blurs
ktabors Jun 20, 2023
ae7f20b
Merge branch 'main' into firefox_datepicker_minValue
ktabors Jun 20, 2023
8e203e8
Merge branch 'main' into firefox_datepicker_minValue
ktabors Jun 21, 2023
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
3 changes: 2 additions & 1 deletion packages/@react-aria/focus/src/FocusScope.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,9 @@ function useFocusContainment(scopeRef: RefObject<Element[]>, contain: boolean) {
};
}, [scopeRef, contain]);

// This is a useLayoutEffect so it is guaranteed to run before our async synthetic blur
// eslint-disable-next-line arrow-body-style
useEffect(() => {
useLayoutEffect(() => {
return () => {
if (raf.current) {
cancelAnimationFrame(raf.current);
Expand Down
5 changes: 3 additions & 2 deletions packages/@react-aria/interactions/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ export function useSyntheticBlurEvent<Target = Element>(onBlur: (e: ReactFocusEv
stateRef.current.observer = new MutationObserver(() => {
if (stateRef.current.isFocused && target.disabled) {
stateRef.current.observer.disconnect();
target.dispatchEvent(new FocusEvent('blur'));
target.dispatchEvent(new FocusEvent('focusout', {bubbles: true}));
let relatedTargetEl = target === document.activeElement ? null : document.activeElement;
target.dispatchEvent(new FocusEvent('blur', {relatedTarget: relatedTargetEl}));
target.dispatchEvent(new FocusEvent('focusout', {bubbles: true, relatedTarget: relatedTargetEl}));
}
});

Expand Down