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

Reopen #22481 Fixed modal closing issue #22484

Merged
merged 4 commits into from
Oct 2, 2021
Merged

Reopen #22481 Fixed modal closing issue #22484

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3e7086
fixed modal closing
Biki-das Oct 1, 2021
a5d278d
applied changes correctly
Biki-das Oct 1, 2021
5c7d743
removed the unneccesary punctuations
Biki-das Oct 1, 2021
859660a
Deleted whitespace
bvaughn Oct 1, 2021
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-devtools-shared/src/devtools/views/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ export function useModalDismissSignal(
ownerDocument = ((modalRef.current: any): HTMLDivElement).ownerDocument;
ownerDocument.addEventListener('keydown', handleDocumentKeyDown);
if (dismissOnClickOutside) {
ownerDocument.addEventListener('click', handleDocumentClick);
ownerDocument.addEventListener('click', handleDocumentClick, true);
ownerDocument.removeEventListener('click', handleDocumentClick, true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't quite right. You're adding (and then immediately removing) the listener.

Here's what you what:

      // It's important to listen to the ownerDocument to support the browser extension.
      // Here we use portals to render individual tabs (e.g. Profiler),
      // and the root document might belong to a different window.
      ownerDocument = ((modalRef.current: any): HTMLDivElement).ownerDocument;
      ownerDocument.addEventListener('keydown', handleDocumentKeyDown);
      if (dismissOnClickOutside) {
        ownerDocument.addEventListener('click', handleDocumentClick, true);
      }
    }, 0);

    return () => {
      if (timeoutID !== null) {
        clearTimeout(timeoutID);
      }

      if (ownerDocument !== null) {
        ownerDocument.removeEventListener('keydown', handleDocumentKeyDown);
        ownerDocument.removeEventListener('click', handleDocumentClick, true);
      }
    };

}
}, 0);

Expand Down