Skip to content

fix(SelectToggle): corrected removeEventListener on unmount for v5 #9380

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
Jul 26, 2023
Merged

fix(SelectToggle): corrected removeEventListener on unmount for v5 #9380

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
21 changes: 6 additions & 15 deletions packages/react-core/src/deprecated/components/Select/SelectToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class SelectToggleBase extends React.Component<SelectToggleProps> {
}

componentWillUnmount() {
document.removeEventListener('click', this.onDocClick);
document.removeEventListener('click', this.onDocClick, { capture: true });
document.removeEventListener('touchstart', this.onDocClick);
document.removeEventListener('keydown', this.handleGlobalKeys);
}
Expand All @@ -124,17 +124,8 @@ class SelectToggleBase extends React.Component<SelectToggleProps> {
};

handleGlobalKeys = (event: KeyboardEvent) => {
const {
parentRef,
menuRef,
hasFooter,
footerRef,
isOpen,
variant,
onToggle,
onClose,
moveFocusToLastMenuItem
} = this.props;
const { parentRef, menuRef, hasFooter, footerRef, isOpen, variant, onToggle, onClose, moveFocusToLastMenuItem } =
this.props;
const escFromToggle = parentRef && parentRef.current && parentRef.current.contains(event.target as Node);
const escFromWithinMenu =
menuRef && menuRef.current && menuRef.current.contains && menuRef.current.contains(event.target as Node);
Expand Down Expand Up @@ -307,7 +298,7 @@ class SelectToggleBase extends React.Component<SelectToggleProps> {
aria-label={ariaLabel}
onBlur={onBlur}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
onClick={event => {
onClick={(event) => {
onToggle(event, !isOpen);
if (isOpen) {
onClose();
Expand All @@ -334,7 +325,7 @@ class SelectToggleBase extends React.Component<SelectToggleProps> {
)}
onBlur={onBlur}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
onClick={event => {
onClick={(event) => {
if (!isDisabled) {
onToggle(event, !isOpen);
if (isOpen) {
Expand All @@ -350,7 +341,7 @@ class SelectToggleBase extends React.Component<SelectToggleProps> {
type={type}
className={css(buttonStyles.button, styles.selectToggleButton, styles.modifiers.plain)}
aria-label={ariaLabel}
onClick={event => {
onClick={(event) => {
onToggle(event, !isOpen);
if (isOpen) {
onClose();
Expand Down