Refactor sidebar initialization in DoubleSidebar and SingleSidebar co…

…mponents
withstudiocms · Dec 22, 2024 · 58edf6d · 58edf6d
1 parent b4202fc
commit 58edf6d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 36 deletions.
diff --git a/packages/studiocms_dashboard/src/components/DoubleSidebar.astro b/packages/studiocms_dashboard/src/components/DoubleSidebar.astro
@@ -72,24 +72,7 @@ const t = useTranslations(lang, '@studiocms/dashboard:sidebar');
 <script>
   import { DoubleSidebarHelper } from "@studiocms/ui/components";
   import { DropdownHelper } from "@studiocms/ui/components";
-
-  function removeTrailingSlash(url: string) {
-    return url.replace(/\/$/, '');
-  }
-
-  function sidebarLinks() {
-    const sidebar = document.querySelector<HTMLElement>('.sidebar')!;
-    const sidebarLinks = sidebar.querySelectorAll<HTMLAnchorElement>('a');
-
-    for (const link of sidebarLinks) {
-      link.classList.remove('active');
-      if (removeTrailingSlash(window.location.pathname) === removeTrailingSlash(new URL(link.href).pathname)) {
-        link.classList.add('active');
-      }
-    }
-  }
-
-  // sidebarLinks();
+  import { sidebarLinks } from "./component-scripts/sidebarLinks";
 
   document.addEventListener('astro:page-load', () => {
     if (document.getElementById('sui-sidebars')) {

diff --git a/packages/studiocms_dashboard/src/components/SingleSidebar.astro b/packages/studiocms_dashboard/src/components/SingleSidebar.astro
@@ -62,24 +62,7 @@ const t = useTranslations(lang, '@studiocms/dashboard:sidebar');
 <script>
   import { SingleSidebarHelper } from "@studiocms/ui/components";
   import { DropdownHelper } from "@studiocms/ui/components";
-
-  function removeTrailingSlash(url: string) {
-    return url.replace(/\/$/, '');
-  }
-
-  function sidebarLinks() {
-    const sidebar = document.querySelector<HTMLElement>('.sidebar')!;
-    const sidebarLinks = sidebar.querySelectorAll<HTMLAnchorElement>('a');
-
-    for (const link of sidebarLinks) {
-      link.classList.remove('active');
-      if (removeTrailingSlash(window.location.pathname) === removeTrailingSlash(new URL(link.href).pathname)) {
-        link.classList.add('active');
-      }
-    }
-  }
-
-  // sidebarLinks();
+  import { sidebarLinks } from "./component-scripts/sidebarLinks";
 
   document.addEventListener('astro:page-load', () => {
     if (document.getElementById('sui-sidebar')) {

diff --git a/packages/studiocms_dashboard/src/components/component-scripts/sidebarLinks.ts b/packages/studiocms_dashboard/src/components/component-scripts/sidebarLinks.ts
@@ -0,0 +1,21 @@
+function removeTrailingSlash(url: string) {
+	return url.replace(/\/$/, '');
+}
+
+export function sidebarLinks() {
+	const sidebar = document.querySelector<HTMLElement>('.sidebar');
+	if (!sidebar) {
+		return;
+	}
+	const sidebarLinks = sidebar.querySelectorAll<HTMLAnchorElement>('a');
+
+	for (const link of sidebarLinks) {
+		link.classList.remove('active');
+		if (
+			removeTrailingSlash(window.location.pathname) ===
+			removeTrailingSlash(new URL(link.href).pathname)
+		) {
+			link.classList.add('active');
+		}
+	}
+}