fix: note set current id in error page if 403

Signed-off-by: Innei <[email protected]>

Author: Innei

src/app/notes/error.tsx

@@ -1,12 +1,14 @@
 'use client'
 
 import { useEffect } from 'react'
+import { useParams } from 'next/navigation'
 
 import { captureException } from '@sentry/nextjs'
 
 import { NotFound404 } from '~/components/common/404'
 import { NotePasswordForm } from '~/components/widgets/note/NotePasswordForm'
 import { isRequestError, pickStatusCode } from '~/lib/is-error'
+import { setCurrentNoteId } from '~/providers/note/CurrentNoteIdProvider'
 
 import { Paper } from './Paper'
 
@@ -26,6 +28,7 @@ export default ({ error, reset }: { error: Error; reset: () => void }) => {
       return (
         <Paper>
           <NotePasswordForm />
+          <NoteSetCurrnetId />
         </Paper>
       )
     }
@@ -60,3 +63,11 @@ export default ({ error, reset }: { error: Error; reset: () => void }) => {
     </Paper>
   )
 }
+
+const NoteSetCurrnetId = () => {
+  const { id } = useParams()
+  useEffect(() => {
+    setCurrentNoteId(id)
+  }, [id])
+  return null
+}

src/components/ui/transition/typings.ts

@@ -5,8 +5,6 @@ import type {
 } from 'framer-motion'
 
 export interface BaseTransitionProps extends HTMLMotionProps<'div'> {
-  in?: boolean
-  onExited?: () => void
   duration?: number
   onEntered?: () => void
   appear?: boolean

src/components/widgets/note/NoteTimeline.tsx

@@ -37,6 +37,9 @@ const NoteTimelineImpl = () => {
       created: note.created,
     }
   })
+  const noteNid = useCurrentNoteId()
+
+  console.log(noteNid, 'noteNid')
   const noteId = note?.id
 
   const { data: timelineData } = useQuery(
@@ -52,7 +55,9 @@ const NoteTimelineImpl = () => {
     },
   )
 
-  if (!noteId) return null
+  if (!timelineData) {
+    return null
+  }
 
   const initialData = note
     ? [
@@ -69,7 +74,7 @@ const NoteTimelineImpl = () => {
     <AnimatePresence>
       <motion.ul className="space-y-1" animate={animateUl}>
         {(timelineData || initialData)?.map((item) => {
-          const isCurrent = item.nid === note.nid
+          const isCurrent = item.nid === parseInt(noteNid || '0')
           return (
             <MemoedItem
               key={item.id}
@@ -116,13 +121,14 @@ const MemoedItem = memo<{
       animate={animateLi}
       exit={initialLi}
     >
-      <LeftToRightTransitionView
-        in={active}
-        as="span"
-        className="inline-flex items-center"
-      >
-        <i className="icon-[material-symbols--arrow-circle-right-outline-rounded] duration-200" />
-      </LeftToRightTransitionView>
+      {active && (
+        <LeftToRightTransitionView
+          as="span"
+          className="inline-flex items-center"
+        >
+          <i className="icon-[material-symbols--arrow-circle-right-outline-rounded] duration-200" />
+        </LeftToRightTransitionView>
+      )}
       <Link
         onClick={springScrollToTop}
         prefetch={false}

src/providers/note/CurrentNoteIdProvider.tsx

@@ -29,4 +29,11 @@ const useCurrentNoteId = () => {
   return useAtomValue(currentNoteIdAtom)
 }
 
-export { useCurrentNoteId, CurrentNoteIdProvider }
+/**
+ * Only used in error page to set current note id
+ */
+const setCurrentNoteId = (noteId: string) => {
+  jotaiStore.set(currentNoteIdAtom, noteId)
+}
+
+export { useCurrentNoteId, CurrentNoteIdProvider, setCurrentNoteId }