fix(home-page): new regex function (#28)

iavofficial · Dec 4, 2024 · f5b5090 · f5b5090
2 parents dedb85f + 5af71b9
commit f5b5090
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/src/Layout.tsx b/example/src/Layout.tsx
@@ -59,7 +59,7 @@ function Layout() {
 
     const views = [
         new BasicContentWrapper(
-            "/example1/",
+            "/",
             simpleNavbarTabFactory({
                 disabled: false,
                 name: "Example without Translation",
@@ -226,7 +226,7 @@ function Layout() {
     return (
         <UILayer
             tabAndContentWrappers={views}
-            startingPoint="/example1/"
+            startingPoint="/"
             authenticationView={BasicAuthenticationView}
             settingsMenuOptions={settingsMenuOptions}
             documentsLabelKey="Legal_documents"

diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
   ],
   "scripts": {
     "devmode": "./scripts/windows/devmode_build.bat",
+    "devmode:windows": ".\\scripts\\windows\\devmode_build.bat",
     "build": "tsc --build --clean && tsc --build && npx babel ./src --out-dir ./build --extensions .ts,.tsx --copy-files",
     "test": "jest --passWithNoTests",
     "run-example": "./scripts/windows/setup_and_run_example.bat",

diff --git a/src/components/navbar/tabs/simpleNavbarTab/simpleNavbarTab.tsx b/src/components/navbar/tabs/simpleNavbarTab/simpleNavbarTab.tsx
@@ -55,13 +55,12 @@ export const SimpleNavbarTab: GroupableNavbarTab = (
   const colorSettingsContext = useContext(ColorSettingsContext);
   const t = useTranslator();
 
-  // Use useMemo to improve performance.
   const regex = useMemo(() => {
     let regexString = path;
-    // Escape all slashes
+    // Escape slashes
     regexString = regexString.replaceAll("/", "\\/");
-    // Add ^ to match the beginning of the path. Add * for allowing other characters.
-    regexString = `^${regexString}.*`;
+    // Add start (^) and boundary condition with trailing /.*
+    regexString = `^${regexString}(\\/.*)?$`;
     return new RegExp(regexString);
   }, [path]);