fix(example): add isCurrentPath function comparing current url to loc…

…alized path
jeffwcx · Aug 21, 2022 · ee90afb · ee90afb
1 parent 6884c7c
commit ee90afb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 45 deletions.
diff --git a/example/src/components/molecules/Navigation.astro b/example/src/components/molecules/Navigation.astro
@@ -3,7 +3,16 @@ import i18next, { t } from "i18next";
 import { localizePath } from "astro-i18next";
 
 const { ...attributes } = Astro.props;
-const { pathname } = Astro.url;
+
+// TODO: add as a utility function for astro-i18next. (out of scope?)
+const isCurrentPath = (path: string) => {
+  const { pathname } = Astro.url;
+
+  const currentNormalizedPath = pathname.replace(/\/$/, "");
+  path = path.replace(/\/$/, "");
+
+  return currentNormalizedPath === path;
+};
 
 const navigationItems = {
   "/": t("navigation.home"),
@@ -15,7 +24,7 @@ const navigationItems = {
   {Object.keys(navigationItems).map((key) => {
     let className =
       "py-2 px-4 uppercase text-sm underline-offset-2 tracking-wider decoration-4 font-semibold";
-    if (localizePath(key, i18next.language) === pathname) {
+    if (isCurrentPath(localizePath(key, i18next.language))) {
       className += " underline decoration-cyan-500";
     } else {
       className +=

diff --git a/example/src/pages/en/about.astro b/example/src/pages/en/about.astro
diff --git a/example/src/pages/en/index.astro b/example/src/pages/en/index.astro
diff --git a/src/utils.ts b/src/utils.ts
@@ -8,6 +8,7 @@ import typescript from "@proload/plugin-typescript";
  * Adapted from astro's tailwind integration:
  * https://github.com/withastro/astro/tree/main/packages/integrations/tailwind
  */
+/* istanbul ignore next */
 export const getUserConfig = async (
   root: URL,
   configPath?: string