account dor document.defaultView being null

KingSora · Apr 12, 2024 · 3fc6823 · 3fc6823
1 parent 3399587
commit 3fc6823
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts b/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts
@@ -22,6 +22,7 @@ import {
   stopPropagation,
   isBodyElement,
   getFocusedElement,
+  wnd,
 } from '~/support';
 import {
   dataAttributeHost,
@@ -63,10 +64,10 @@ export interface StructureSetupElementsObj {
   // ctx ----
   _isTextarea: boolean;
   _isBody: boolean;
-  _windowElm: Window;
   _documentElm: Document;
   _targetIsElm: boolean;
   _viewportIsTarget: boolean;
+  _windowElm: () => Window;
   _viewportHasClass: (viewportAttributeClassName: string) => boolean;
   _viewportAddRemoveClass: (viewportAttributeClassName: string, add?: boolean) => void;
 }
@@ -98,7 +99,7 @@ export const createStructureSetupElements = (
   const isTextarea = is(targetElement, 'textarea');
   const ownerDocument = targetElement.ownerDocument;
   const docElement = ownerDocument.documentElement;
-  const docWnd = ownerDocument.defaultView as Window;
+  const getDocumentWindow = () => ownerDocument.defaultView || wnd;
   const focusElm = (customActiveElm: Element | null) => {
     if (customActiveElm && (customActiveElm as HTMLElement).focus) {
       (customActiveElm as HTMLElement).focus();
@@ -151,12 +152,12 @@ export const createStructureSetupElements = (
     _scrollOffsetElement: viewportIsTargetBody ? docElement : viewportElement,
     _scrollEventElement: viewportIsTargetBody ? ownerDocument : viewportElement,
     _originalScrollOffsetElement: isBody ? docElement : originalNonBodyScrollOffsetElement,
-    _windowElm: docWnd,
     _documentElm: ownerDocument,
     _isTextarea: isTextarea,
     _isBody: isBody,
     _targetIsElm: targetIsElm,
     _viewportIsTarget: viewportIsTarget,
+    _windowElm: getDocumentWindow,
     _viewportHasClass: (viewportAttributeClassName: string) =>
       hasAttrClass(
         viewportElement,
@@ -193,6 +194,7 @@ export const createStructureSetupElements = (
   const contentSlot = viewportIsTargetBody ? _target : _content || _viewport;
   const destroy = bind(runEachAndClear, destroyFns);
   const appendElements = () => {
+    const docWnd = getDocumentWindow();
     const initActiveElm = getFocusedElement();
     const unwrap = (elm: HTMLElement | false | null | undefined) => {
       appendChildren(parent(elm), contents(elm));
@@ -273,7 +275,9 @@ export const createStructureSetupElements = (
 
     // focus viewport if previously focused element was target, otherwise focus previously focused element
     focusElm(
-      !viewportIsTarget && docWnd.top === docWnd && initActiveElm === targetElement
+      !viewportIsTarget &&
+        initActiveElm === targetElement &&
+        (!docWnd || (docWnd && docWnd.top === docWnd))
         ? _viewport
         : initActiveElm
     );

diff --git a/packages/overlayscrollbars/src/setups/structureSetup/updateSegments/overflowUpdateSegment.ts b/packages/overlayscrollbars/src/setups/structureSetup/updateSegments/overflowUpdateSegment.ts
@@ -57,8 +57,8 @@ export const createOverflowUpdateSegment: CreateStructureUpdateSegment = (
     _padding,
     _viewport,
     _viewportIsTarget,
-    _viewportAddRemoveClass,
     _isBody,
+    _viewportAddRemoveClass,
     _windowElm,
   } = structureSetupElements;
   const { _nativeScrollbarsHiding } = env;
@@ -177,7 +177,7 @@ export const createOverflowUpdateSegment: CreateStructureUpdateSegment = (
         // arrangedViewportScrollSize = scrollSize(_viewport);
       }
 
-      const windowInnerSize = windowSize(_windowElm);
+      const windowInnerSize = windowSize(_windowElm());
       const overflowAmountScrollSize = {
         w: max0(mathMax(viewportScrollSize.w, arrangedViewportScrollSize.w) + sizeFraction.w),
         h: max0(mathMax(viewportScrollSize.h, arrangedViewportScrollSize.h) + sizeFraction.h),

diff --git a/...s/overlayscrollbars/test/jest-jsdom/setups/structureSetup/structureSetup.elements.test.ts b/...s/overlayscrollbars/test/jest-jsdom/setups/structureSetup/structureSetup.elements.test.ts
@@ -249,7 +249,7 @@ const assertCorrectSetupElements = (
 
   expect(_isTextarea).toBe(isTextarea);
   expect(_isBody).toBe(isBody);
-  expect(_windowElm).toBe(document.defaultView);
+  expect(_windowElm()).toBe(document.defaultView);
   expect(_documentElm).toBe(document);
 
   expect(typeof destroy).toBe('function');