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

[EuiOverlayMask] Fix document is undefined #5422

Merged
merged 9 commits into from
Dec 3, 2021
Merged

[EuiOverlayMask] Fix document is undefined #5422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
056b320
[EuiOverlayMask] Fix document is undefined
jeepers3327 Nov 30, 2021
5e322a8
added PR entry to changelog
jeepers3327 Nov 30, 2021
985633b
fix document is undefined when EuiOverlayMask is visible at start
jeepers3327 Dec 1, 2021
235024a
Merge branch 'main' into main
jeepers3327 Dec 1, 2021
b013c41
Merge branch 'main' of github.com:jeepers3327/eui
jeepers3327 Dec 1, 2021
7cda034
revised code as per suggested
jeepers3327 Dec 2, 2021
7ce4932
added CHANGELOG entry
jeepers3327 Dec 2, 2021
7a49d79
Apply suggestions from code review
thompsongl Dec 2, 2021
12c53d2
Merge branch 'main' into main
thompsongl Dec 2, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
**Bug fixes**

- Fixed scrollbars in `EuiRange` tick labels in Safari ([#5427](https://github.com/elastic/eui/pull/5427))
- Fixed an `EuiOverlayMask` bug where it calls window.document on server side([#5422](https://github.com/elastic/eui/pull/5422))

## [`42.0.0`](https://github.com/elastic/eui/tree/v42.0.0)

Expand Down
18 changes: 15 additions & 3 deletions src/components/overlay_mask/overlay_mask.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const EuiOverlayMask: FunctionComponent<EuiOverlayMaskProps> = ({
headerZindexLocation = 'above',
...rest
}) => {
const overlayMaskNode = useRef<HTMLDivElement>(document.createElement('div'));
const overlayMaskNode = useRef<HTMLDivElement>();
const [isPortalTargetReady, setIsPortalTargetReady] = useState(false);

useEffect(() => {
Expand All @@ -63,9 +63,19 @@ export const EuiOverlayMask: FunctionComponent<EuiOverlayMaskProps> = ({
};
}, []);

useEffect(() => {
if (typeof document !== 'undefined') {
overlayMaskNode.current = document.createElement('div');
}
}, []);

useEffect(() => {
const portalTarget = overlayMaskNode.current;
document.body.appendChild(overlayMaskNode.current);

if (portalTarget) {
document.body.appendChild(portalTarget);
}

setIsPortalTargetReady(true);

return () => {
Expand All @@ -83,7 +93,9 @@ export const EuiOverlayMask: FunctionComponent<EuiOverlayMaskProps> = ({
`Unhandled property type. EuiOverlayMask property ${key} is not a string.`
);
}
overlayMaskNode.current.setAttribute(key, rest[key]!);
if (overlayMaskNode.current) {
overlayMaskNode.current.setAttribute(key, rest[key]!);
}
});
}, []); // eslint-disable-line react-hooks/exhaustive-deps

Expand Down