Create utils file and refactor window handling

skyline-emu · Jan 5, 2023 · 7bd1de7 · 7bd1de7
1 parent 1c34de9
commit 7bd1de7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/src/components/Button.js b/src/components/Button.js
@@ -9,6 +9,7 @@ import { Link } from "gatsby";
 import AnchorLink from 'react-anchor-link-smooth-scroll-v2'
 import rippleFn from "../libs/ripple";
 import classNames from "classnames";
+import { getPathName } from "../libs/utils";
 
 const ButtonInner = ({ icon, text, className }) => (
     <div role="button" tabIndex={0} className={classNames("button relative overflow-hidden", className)} onMouseDown={rippleFn} onTouchStart={rippleFn}>
@@ -17,15 +18,9 @@ const ButtonInner = ({ icon, text, className }) => (
     </div>
 );
 
-const GetPathName = () => {
-    if (typeof window !== "undefined")
-        return window.location.pathname;
-    return "";
-}
-
 const Button = ({ href="", icon, text, onClick, className }) =>  {
-    if (href.startsWith(GetPathName() + "#"))
-        href = href.substring(GetPathName().length);
+    if (href.startsWith(getPathName() + "#"))
+        href = href.substring(getPathName().length);
 
     return href.startsWith("http") ? (
         <a href={href} onClick={onClick} rel="noreferrer" target="_blank" tabIndex={-1}>

diff --git a/src/components/CustomLink.js b/src/components/CustomLink.js
@@ -9,16 +9,11 @@ import { Link } from "gatsby";
 import AnchorLink from 'react-anchor-link-smooth-scroll-v2'
 import rippleFn from "../libs/ripple";
 import classnames from "classnames";
-
-const GetPathName = () => {
-    if (typeof window !== "undefined")
-        return window.location.pathname;
-    return "";
-}
+import { getPathName } from "../libs/utils";
 
 const CustomLink = ({ style, href, children, className, ripple }) =>  {
-    if (href.startsWith(GetPathName() + "#"))
-        href = href.substring(GetPathName().length);
+    if (href.startsWith(getPathName() + "#"))
+        href = href.substring(getPathName().length);
 
     return href.startsWith("http") ? (
         <a

diff --git a/src/libs/configureDarkMode.js b/src/libs/configureDarkMode.js
@@ -5,8 +5,8 @@
  */
 
 
-const colorSchemeMedia = "(prefers-color-scheme: dark)";
-const isBrowser = () => typeof window !== "undefined"
+import { isBrowser } from "./utils";
+import { colorSchemeMedia } from "./utils";
 
 const configureDarkMode = () => {
 

diff --git a/src/libs/utils.js b/src/libs/utils.js
@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+export const colorSchemeMedia = "(prefers-color-scheme: dark)";
+export const isBrowser = () => typeof window !== "undefined"
+export const getPathName = () => {
+
+    if (isBrowser()) {
+        return window.location.pathname; 
+    } else {
+        return "";
+    }
+
+}