Skip to content

Commit f695b52

Browse files
authored
fix: window check for Electron (floating-ui#1593)
1 parent 8e045ef commit f695b52

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed
+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import {NodeScroll} from '../types';
2-
import {isWindow} from './window';
2+
import {isElement} from './is';
33

44
export function getNodeScroll(element: Element | Window): NodeScroll {
5-
if (isWindow(element)) {
5+
if (isElement(element)) {
66
return {
7-
scrollLeft: element.pageXOffset,
8-
scrollTop: element.pageYOffset,
7+
scrollLeft: element.scrollLeft,
8+
scrollTop: element.scrollTop,
99
};
1010
}
1111

1212
return {
13-
scrollLeft: element.scrollLeft,
14-
scrollTop: element.scrollTop,
13+
scrollLeft: element.pageXOffset,
14+
scrollTop: element.pageYOffset,
1515
};
1616
}

packages/dom/src/utils/window.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
export function isWindow(value: any): value is Window {
2-
return value?.toString() === '[object Window]';
2+
return (
3+
value &&
4+
value.document &&
5+
value.location &&
6+
value.alert &&
7+
value.setInterval
8+
);
39
}
410

511
export function getWindow(node: Node | Window): Window {

0 commit comments

Comments
 (0)