Skip to content

fix(Popper): add null & connected checks for document #12284

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

Open
kmcfaul wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −1
Open

fix(Popper): add null & connected checks for document #12284

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...ages/react-core/src/helpers/Popper/thirdparty/popper-core/dom-utils/getDocumentElement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import { Window } from '../types';
*/
export default function getDocumentElement(element: Element | Window): HTMLElement {
// $FlowFixMe: assume body is always available
return (isElement(element) ? element.ownerDocument : element.document).documentElement;
return ((isElement(element) ? element.ownerDocument : element.document) || window.document).documentElement;
}
15 changes: 15 additions & 0 deletions packages/react-core/src/helpers/Popper/thirdparty/react-popper/usePopper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ type State = {

const EMPTY_MODIFIERS: any = [];

function isReferenceConnected(reference: Element | VirtualElement): boolean {
if (reference instanceof Element) {
return reference.isConnected;
}
const { contextElement } = reference;
if (contextElement instanceof Element) {
return contextElement.isConnected;
}
return true;
}

export const usePopper = (
referenceElement: (Element | VirtualElement) | null | undefined,
popperElement: HTMLElement | null | undefined,
Expand Down Expand Up @@ -114,6 +125,10 @@ export const usePopper = (
return;
}

if (!isReferenceConnected(referenceElement) || !popperElement.isConnected) {
return;
}

const createPopper = options.createPopper || defaultCreatePopper;
const popperInstance = createPopper(referenceElement, popperElement, popperOptions);

Expand Down
Loading