@aminnairi/react-router 1.0.0 → 1.0.1

package/README.md

@@ -976,10 +976,25 @@ See [`LICENSE`](./LICENSE).
 
 ### Versions
 
+- [`1.0.1`](#101)
 - [`1.0.0`](#100)
 - [`0.1.1`](#011)
 - [`0.1.0`](#010)
 
+### 1.0.1
+
+#### Major changes
+
+None.
+
+#### Minor changes
+
+None.
+
+#### Bug & security fixes
+
+- Fixed an issue when navigating to a page that already starts with a slash
+
 ### 1.0.0
 
 #### Major changes

package/index.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState, FunctionComponent, useMemo, Component, PropsWithChildren, createContext, SetStateAction, Dispatch, ReactNode, useContext } from "react";
+import { useEffect, useState, FunctionComponent, useMemo, Component, PropsWithChildren, createContext, SetStateAction, Dispatch, ReactNode, useContext, useCallback } from "react";
 
 export type AbsolutePath<Path extends string> =
   Path extends `${infer Start}:${string}/${infer Rest}`
@@ -39,11 +39,11 @@ export interface FindPageOptions {
 }
 
 export const sanitizePath = (path: string): string => {
-  return "/" + path
-    .replace(/^\/|\/$/g, "")
-    .replace(/\/+/g, "/");
+  const sanitizedPath = path.replace(/\/+/g, "/").replace(/^\/|\/$/g, "")
+  return "/" + sanitizedPath;
 }
 
+
 export const createPage = <Path extends string>(page: Page<Path>) => {
   return page
 }
@@ -180,10 +180,14 @@ const Context = createContext<ContextInterface>({
 export const useNavigateToPage = <Path extends string>(page: Page<Path>) => {
   const { prefix } = useContext(Context);
 
-  return (parameters: Parameters<Path>, replace: boolean = false) => {
+  return useCallback((parameters: Parameters<Path>, replace: boolean = false) => {
+    const initialPath = sanitizePath(`${prefix ?? ""}/${page.path}`);
+
     const pathWithParameters = Object.entries(parameters).reduce((path, [parameterName, parameterValue]) => {
       return path.replace(`:${parameterName}`, parameterValue);
-    }, sanitizePath(`${prefix ?? ""}/${page.path}`));
+    }, initialPath);
+
+    console.log({ initialPath, pathWithParameters });
 
     if (replace) {
       window.history.replaceState(null, pathWithParameters, pathWithParameters);
@@ -192,7 +196,7 @@ export const useNavigateToPage = <Path extends string>(page: Page<Path>) => {
     }
 
     window.dispatchEvent(new CustomEvent("popstate"));
-  }
+  }, [page]);
 };
 
 export const useIsActivePage = (page: Page<string>) => {

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@aminnairi/react-router",
   "description": "Type-safe router for the React library",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/aminnairi/react-router#readme",
   "license": "MIT",
   "bugs": {