diff --git a/src/renderer/src/components/entry-column/item-wrapper.tsx b/src/renderer/src/components/entry-column/item-wrapper.tsx
index 74d40b5d0..2a2e52cea 100644
--- a/src/renderer/src/components/entry-column/item-wrapper.tsx
+++ b/src/renderer/src/components/entry-column/item-wrapper.tsx
@@ -20,8 +20,7 @@ export function EntryItemWrapper({
entry,
})
- const { activeEntry, setActiveEntry: setActivedEntry } =
- useMainLayoutContext()
+ const { activeEntry, setActiveEntry } = useMainLayoutContext()
return (
{
e.stopPropagation()
- setActivedEntry(entry.id)
+ setActiveEntry(entry.id)
}}
onContextMenu={(e) => {
e.preventDefault()
diff --git a/src/renderer/src/components/entry-content/index.tsx b/src/renderer/src/components/entry-content/index.tsx
index 3a3bee28e..5b35bb4c0 100644
--- a/src/renderer/src/components/entry-content/index.tsx
+++ b/src/renderer/src/components/entry-content/index.tsx
@@ -1,11 +1,11 @@
import { parseHtml } from "@renderer/lib/parse-html"
-import { ActivedEntry } from "@renderer/lib/types"
+import { ActiveEntry } from "@renderer/lib/types"
import { useEffect, useState } from "react"
import { m } from "framer-motion"
import { EntryShare } from "./share"
import { useEntry } from "@renderer/lib/queries/entries"
-export function EntryContent({ entryId }: { entryId: ActivedEntry }) {
+export function EntryContent({ entryId }: { entryId: ActiveEntry }) {
const entry = useEntry({
id: entryId,
})
diff --git a/src/renderer/src/components/feed-column/category.tsx b/src/renderer/src/components/feed-column/category.tsx
index 92de790ff..49d643085 100644
--- a/src/renderer/src/components/feed-column/category.tsx
+++ b/src/renderer/src/components/feed-column/category.tsx
@@ -25,12 +25,7 @@ export function FeedCategory({
view?: number
expansion: boolean
}) {
- const {
- activeList,
- setActiveEntry: setActivedEntry,
- setActiveList,
- activeEntry,
- } = useMainLayoutContext()
+ const { activeList, setActiveList } = useMainLayoutContext()
const [open, setOpen] = useState(!data.name)
const [dialogOpen, setDialogOpen] = useState(false)
diff --git a/src/renderer/src/components/feed-column/list.tsx b/src/renderer/src/components/feed-column/list.tsx
index eac80058a..a0c500966 100644
--- a/src/renderer/src/components/feed-column/list.tsx
+++ b/src/renderer/src/components/feed-column/list.tsx
@@ -29,7 +29,7 @@ export function FeedList({
onClick={(e) => {
e.stopPropagation()
view !== undefined &&
- setActiveList({
+ setActiveList?.({
level: levels.view,
id: view,
name: views[view].name,
diff --git a/src/renderer/src/contexts/outlet/main-layout.tsx b/src/renderer/src/contexts/outlet/main-layout.tsx
index 549fe9205..979504d6a 100644
--- a/src/renderer/src/contexts/outlet/main-layout.tsx
+++ b/src/renderer/src/contexts/outlet/main-layout.tsx
@@ -1,12 +1,12 @@
-import type { ActiveList, ActivedEntry } from "@renderer/lib/types"
+import type { ActiveList, ActiveEntry } from "@renderer/lib/types"
import { Outlet, useOutletContext } from "react-router-dom"
export interface MainLayoutContextType {
activeList: ActiveList
- setActiveEntry: (value: ActivedEntry) => void
+ setActiveEntry: (value: ActiveEntry) => void
- activeEntry: ActivedEntry
- setActiveList: (value: ActiveList) => void
+ activeEntry: ActiveEntry
+ setActiveList: ((value: ActiveList) => void) | undefined
}
export const useMainLayoutContext = () =>
diff --git a/src/renderer/src/lib/types.ts b/src/renderer/src/lib/types.ts
index f124cad7b..1978309c4 100644
--- a/src/renderer/src/lib/types.ts
+++ b/src/renderer/src/lib/types.ts
@@ -72,4 +72,4 @@ export type DataResponse
= {
data?: T
}
-export type ActivedEntry = string | null
+export type ActiveEntry = string | null
diff --git a/src/renderer/src/pages/(main)/(context)/index.tsx b/src/renderer/src/pages/(main)/(context)/index.tsx
index 611871e51..78e145cd5 100644
--- a/src/renderer/src/pages/(main)/(context)/index.tsx
+++ b/src/renderer/src/pages/(main)/(context)/index.tsx
@@ -8,13 +8,9 @@ import { useEffect } from "react"
const wideMode = [1, 2, 3, 4]
export function Component() {
- const {
- activeList,
- activeEntry,
- setActiveEntry: setActivedEntry,
- } = useMainLayoutContext()
+ const { activeList, activeEntry, setActiveEntry } = useMainLayoutContext()
useEffect(() => {
- setActivedEntry(null)
+ setActiveEntry(null)
}, [activeList])
return (
diff --git a/src/renderer/src/pages/(main)/(context)/layout.tsx b/src/renderer/src/pages/(main)/(context)/layout.tsx
index 5559c9a6a..a75ad29b8 100644
--- a/src/renderer/src/pages/(main)/(context)/layout.tsx
+++ b/src/renderer/src/pages/(main)/(context)/layout.tsx
@@ -5,12 +5,8 @@ import {
} from "@renderer/contexts/outlet/main-layout"
export function Component() {
- const {
- activeEntry,
- activeList,
- setActiveList,
- setActiveEntry: setActivedEntry,
- } = useMainLayoutContext()
+ const { activeEntry, activeList, setActiveList, setActiveEntry } =
+ useMainLayoutContext()
return (
@@ -21,7 +17,7 @@ export function Component() {
activeList,
activeEntry,
setActiveList,
- setActiveEntry: setActivedEntry,
+ setActiveEntry,
}}
/>
diff --git a/src/renderer/src/pages/(main)/(context)/profile/layout.tsx b/src/renderer/src/pages/(main)/(context)/profile/layout.tsx
index d2ef6e3e5..bbc78787c 100644
--- a/src/renderer/src/pages/(main)/(context)/profile/layout.tsx
+++ b/src/renderer/src/pages/(main)/(context)/profile/layout.tsx
@@ -4,10 +4,10 @@ export function Component() {
return (
{},
- setActivedList: null,
+ activeList: null,
+ activeEntry: null,
+ setActiveEntry: () => {},
+ setActiveList: null,
}}
/>
)
diff --git a/src/renderer/src/pages/(main)/layout.tsx b/src/renderer/src/pages/(main)/layout.tsx
index a07d94894..7c57dcee3 100644
--- a/src/renderer/src/pages/(main)/layout.tsx
+++ b/src/renderer/src/pages/(main)/layout.tsx
@@ -1,6 +1,5 @@
import { useEffect, useState } from "react"
-import { ActiveList, ActivedEntry } from "@renderer/lib/types"
-import { Outlet } from "react-router-dom"
+import { ActiveList, ActiveEntry } from "@renderer/lib/types"
import { useNavigate } from "react-router-dom"
import { useSession } from "@hono/auth-js/react"
import { MainLayoutOutlet } from "@renderer/contexts/outlet/main-layout"
@@ -14,7 +13,7 @@ export function Component() {
name: "Articles",
view: 0,
})
- const [activeEntry, setActiveEntry] = useState(null)
+ const [activeEntry, setActiveEntry] = useState(null)
useEffect(() => {
setActiveEntry(null)