chore: update document type check

ccontrols · Oct 21, 2020 · 19fc530 · 19fc530
1 parent 86d2da3
commit 19fc530
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 36 deletions.
diff --git a/examples/custom-pages-storybook-5/src/index.js b/examples/custom-pages-storybook-5/src/index.js
@@ -2,7 +2,4 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Person } from './components/Person';
 
-ReactDOM.render(
-  <Person />, 
-  document.getElementById("root")
-);
+ReactDOM.render(<Person />, document.getElementById('root'));
diff --git a/examples/custom-pages-storybook-6/src/index.js b/examples/custom-pages-storybook-6/src/index.js
@@ -2,7 +2,4 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Person } from './components/Person';
 
-ReactDOM.render(
-  <Person />, 
-  document.getElementById("root")
-);
+ReactDOM.render(<Person />, document.getElementById('root'));
diff --git a/examples/simple/package.json b/examples/simple/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@component-controls/gatsby-theme-stories": "^1.34.0",
-    "gatsby": "^2.22.10",
+    "gatsby": "^2.23.11",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   }

diff --git a/ui/blocks/src/PageContainer/PageContainer.tsx b/ui/blocks/src/PageContainer/PageContainer.tsx
@@ -50,7 +50,9 @@ export const PageContainer: FC<PageContainerProps> = forwardRef(
           if (url) {
             const scrollId = url.hash ? url.hash.substring(1) : undefined;
             if (scrollId) {
-              const element = document.getElementById(scrollId);
+              const element =
+                typeof document !== 'undefined' &&
+                document.getElementById(scrollId);
               if (element) {
                 setTimeout(() => {
                   element.scrollIntoView({

diff --git a/ui/blocks/src/utils/url.ts b/ui/blocks/src/utils/url.ts
@@ -1,11 +1,11 @@
 export const getURL = () => {
-  const pageURL =
-    (typeof window !== 'undefined' &&
-    window.location !== window.parent.location &&
-    window.parent.location
-      ? window.parent.location.href
-      : typeof document !== 'undefined'
-      ? document.location.href
-      : undefined) || undefined;
+  let pageURL = undefined;
+  if (typeof window !== 'undefined') {
+    if (window.location !== window.parent.location && window.parent.location) {
+      pageURL = window.parent.location.href;
+    } else {
+      pageURL = document.location.href;
+    }
+  }
   return pageURL ? new URL(pageURL) : undefined;
 };
diff --git a/ui/components/src/Keyboard/Keyboard.tsx b/ui/components/src/Keyboard/Keyboard.tsx
@@ -60,24 +60,16 @@ export const Keyboard: FC<KeyboardProps> = ({
   );
 
   useEffect(() => {
-    if (target === 'document' && typeof document !== 'undefined' && document) {
+    if (target === 'document' && typeof document !== 'undefined') {
       document.addEventListener('keydown', onKeyDownFn);
-    } else if (target === 'window' && typeof window !== 'undefined' && window) {
+    } else if (target === 'window' && typeof window !== 'undefined') {
       window.addEventListener('keydown', onKeyDownFn);
     }
 
     return () => {
-      if (
-        target === 'document' &&
-        typeof document !== 'undefined' &&
-        document
-      ) {
+      if (target === 'document' && typeof document !== 'undefined') {
         document.removeEventListener('keydown', onKeyDownFn);
-      } else if (
-        target === 'window' &&
-        typeof window !== 'undefined' &&
-        window
-      ) {
+      } else if (target === 'window' && typeof window !== 'undefined') {
         window.removeEventListener('keydown', onKeyDownFn);
       }
     };

diff --git a/ui/components/src/LinkHeading/pageLink.ts b/ui/components/src/LinkHeading/pageLink.ts
@@ -3,9 +3,13 @@ export const titleToId = (id: any) => {
   return strId.replace(/\W/g, '-').toLowerCase();
 };
 export const pageLink = (id: string) => {
-  const url =
-    (typeof window !== 'undefined' && window.location !== window.parent.location
-      ? document.referrer
-      : typeof document !== 'undefined' && document.location.href) || '';
+  let url = '';
+  if (typeof window !== 'undefined') {
+    if (window.location !== window.parent.location) {
+      url = document.referrer;
+    } else {
+      url = document.location.href || '';
+    }
+  }
   return `${url.split('#')[0]}#${id}`;
 };
diff --git a/ui/components/src/SearchInput/SearchInput.tsx b/ui/components/src/SearchInput/SearchInput.tsx
@@ -112,7 +112,9 @@ export const SearchInput = <ItemType extends SearchInputItemType>({
         const downIndex = Math.min((selected || -1) + 1, items.length - 1);
         if (downIndex >= 0) {
           selectItem(items[downIndex], downIndex, false);
-          const itemEl = document.getElementById(`search_item_${downIndex}`);
+          const itemEl =
+            typeof document !== 'undefined' &&
+            document.getElementById(`search_item_${downIndex}`);
           if (itemEl) {
             scrollIntoView(itemEl, { block: 'end', scrollMode: 'if-needed' });
           }
@@ -122,7 +124,9 @@ export const SearchInput = <ItemType extends SearchInputItemType>({
         const upIndex = Math.max((selected || items.length) - 1, 0);
         if (upIndex < items.length) {
           selectItem(items[upIndex], upIndex, false);
-          const itemEl = document.getElementById(`search_item_${upIndex}`);
+          const itemEl =
+            typeof document !== 'undefined' &&
+            document.getElementById(`search_item_${upIndex}`);
           if (itemEl) {
             scrollIntoView(itemEl, { block: 'start', scrollMode: 'if-needed' });
           }