From 362c5bf4eab2be0c90f0828a3422806d677e7e50 Mon Sep 17 00:00:00 2001
From: SKairinos <skairinos@gmail.com>
Date: Thu, 19 Sep 2024 08:03:42 +0000
Subject: [PATCH] fix: navigate

---
 src/components/router/Navigate.tsx | 33 ++++++++++++++++++++++++++++++
 src/components/router/index.tsx    |  2 ++
 src/hooks/router.tsx               | 14 ++++++++-----
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 src/components/router/Navigate.tsx

diff --git a/src/components/router/Navigate.tsx b/src/components/router/Navigate.tsx
new file mode 100644
index 0000000..b67b2f0
--- /dev/null
+++ b/src/components/router/Navigate.tsx
@@ -0,0 +1,33 @@
+import { useEffect } from "react"
+import { type To } from "react-router-dom"
+
+import { useNavigate, type NavigateOptions } from "../../hooks"
+
+export type NavigateProps<
+  Override extends "delta" | "to",
+  State extends Record<string, any> = Record<string, any>,
+> = Override extends "delta"
+  ? { delta: number; to?: undefined }
+  : { delta?: undefined; to: To } & NavigateOptions<State>
+
+const Navigate: {
+  (props: NavigateProps<"delta">): JSX.Element
+  <State extends Record<string, any> = Record<string, any>>(
+    props: NavigateProps<"to", State>,
+  ): JSX.Element
+} = ({
+  delta,
+  to,
+  ...options
+}: NavigateProps<"delta"> | NavigateProps<"to">) => {
+  const navigate = useNavigate()
+
+  useEffect(() => {
+    if (typeof delta === "number") navigate(delta)
+    else navigate(to, options)
+  }, [navigate, delta, to, options])
+
+  return <></>
+}
+
+export default Navigate
diff --git a/src/components/router/index.tsx b/src/components/router/index.tsx
index 4315bf9..3131ff2 100644
--- a/src/components/router/index.tsx
+++ b/src/components/router/index.tsx
@@ -8,3 +8,5 @@ export * from "./LinkListItem"
 export { default as LinkListItem } from "./LinkListItem"
 export * from "./LinkTab"
 export { default as LinkTab } from "./LinkTab"
+export * from "./Navigate"
+export { default as Navigate } from "./Navigate"
diff --git a/src/hooks/router.tsx b/src/hooks/router.tsx
index 7c1e6e0..f6fc359 100644
--- a/src/hooks/router.tsx
+++ b/src/hooks/router.tsx
@@ -5,7 +5,7 @@ import {
   useParams as _useParams,
   useSearchParams as _useSearchParams,
   type Location,
-  type NavigateOptions,
+  type NavigateOptions as _NavigateOptions,
   type Params,
   type To,
 } from "react-router-dom"
@@ -21,13 +21,17 @@ import {
   type TryValidateSyncRT,
 } from "../utils/schema"
 
+export type NavigateOptions<
+  State extends Record<string, any> = Record<string, any>,
+> = Omit<_NavigateOptions, "state"> & {
+  state?: State & Partial<PageState>
+  next?: boolean
+}
+
 export type Navigate = {
   <State extends Record<string, any> = Record<string, any>>(
     to: To,
-    options?: Omit<NavigateOptions, "state"> & {
-      state?: State & Partial<PageState>
-      next?: boolean
-    },
+    options?: NavigateOptions<State>,
   ): void
   (delta: number): void
 }