Skip to content

fix(react-utilities): click scrollbar should invoke callback in useOnClickOutside #28965

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
YuanboXue-Amber merged 4 commits into from
Aug 29, 2023
Merged

fix(react-utilities): click scrollbar should invoke callback in useOnClickOutside #28965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efe0e48
change
YuanboXue-Amber Aug 23, 2023
da005a5
chglog
YuanboXue-Amber Aug 23, 2023
a0ea084
UT
YuanboXue-Amber Aug 23, 2023
e0b2268
Merge branch 'master' into scrollbar
YuanboXue-Amber Aug 29, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-utilities-bdfc2f99-6dbb-4819-8c64-ce9383c3d94d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: `useOnClickOutside` should invoke callback on clicking scrollbar",
"packageName": "@fluentui/react-utilities",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion packages/react-components/react-utilities/src/hooks/useOnClickOutside.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('useOnClickOutside', () => {
jest.useRealTimers();
});

const supportedEvents = ['click', 'touchstart', 'contextmenu', 'fuiframefocus', 'mousedown'];
const supportedEvents = ['mouseup', 'touchstart', 'fuiframefocus', 'mousedown'];

it.each(supportedEvents)('should add %s listener', event => {
// Arrange
Expand Down
6 changes: 2 additions & 4 deletions packages/react-components/react-utilities/src/hooks/useOnClickOutside.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ export const useOnClickOutside = (options: UseOnClickOrScrollOutsideOptions) =>
};

// use capture phase because React can update DOM before the event bubbles to the document
element?.addEventListener('click', conditionalHandler, true);
element?.addEventListener('touchstart', conditionalHandler, true);
element?.addEventListener('contextmenu', conditionalHandler, true);
element?.addEventListener('mouseup', conditionalHandler, true);
element?.addEventListener('mousedown', handleMouseDown, true);

// Garbage collect this event after it's no longer useful to avoid memory leaks
Expand All @@ -104,9 +103,8 @@ export const useOnClickOutside = (options: UseOnClickOrScrollOutsideOptions) =>
}, 1);

return () => {
element?.removeEventListener('click', conditionalHandler, true);
element?.removeEventListener('touchstart', conditionalHandler, true);
element?.removeEventListener('contextmenu', conditionalHandler, true);
element?.removeEventListener('mouseup', conditionalHandler, true);
element?.removeEventListener('mousedown', handleMouseDown, true);

clearTimeout(timeoutId.current);
Expand Down