save sidebar width in local storage (#1093)

This commit is contained in:
Athou
2023-12-30 21:43:48 +01:00
parent 7e02380858
commit 96212afd27
3 changed files with 9 additions and 19 deletions

View File

@@ -71,7 +71,6 @@ function Providers(props: { children: React.ReactNode }) {
const ApiDocumentationPage = React.lazy(async () => await import("pages/app/ApiDocumentationPage"))
function AppRoutes() {
const sidebarWidth = useAppSelector(state => state.tree.sidebarWidth)
const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
return (
@@ -82,10 +81,7 @@ function AppRoutes() {
<Route path="register" element={<RegistrationPage />} />
<Route path="passwordRecovery" element={<PasswordRecoveryPage />} />
<Route path="api" element={<ApiDocumentationPage />} />
<Route
path="app"
element={<Layout header={<Header />} sidebar={<Tree />} sidebarWidth={sidebarWidth} sidebarVisible={sidebarVisible} />}
>
<Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} sidebarVisible={sidebarVisible} />}>
<Route path="category">
<Route path=":id" element={<FeedEntriesPage sourceType="category" />} />
<Route path=":id/details" element={<CategoryDetailsPage />} />

View File

@@ -8,13 +8,11 @@ import { visitCategoryTree } from "app/utils"
interface TreeState {
rootCategory?: Category
mobileMenuOpen: boolean
sidebarWidth: number
sidebarVisible: boolean
}
const initialState: TreeState = {
mobileMenuOpen: false,
sidebarWidth: 350,
sidebarVisible: true,
}
@@ -25,9 +23,6 @@ export const treeSlice = createSlice({
setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
state.mobileMenuOpen = action.payload
},
setSidebarWidth: (state, action: PayloadAction<number>) => {
state.sidebarWidth = action.payload
},
toggleSidebar: state => {
state.sidebarVisible = !state.sidebarVisible
},
@@ -58,4 +53,4 @@ export const treeSlice = createSlice({
},
})
export const { setMobileMenuOpen, setSidebarWidth, toggleSidebar } = treeSlice.actions
export const { setMobileMenuOpen, toggleSidebar } = treeSlice.actions

View File

@@ -3,7 +3,7 @@ import { ActionIcon, AppShell, Box, Center, Group, ScrollArea, Title, useMantine
import { Constants } from "app/constants"
import { redirectToAdd, redirectToRootCategory } from "app/redirect/thunks"
import { useAppDispatch, useAppSelector } from "app/store"
import { setMobileMenuOpen, setSidebarWidth } from "app/tree/slice"
import { setMobileMenuOpen } from "app/tree/slice"
import { reloadTree } from "app/tree/thunks"
import { reloadProfile, reloadSettings, reloadTags } from "app/user/thunks"
import { ActionButton } from "components/ActionButton"
@@ -19,10 +19,10 @@ import { type ReactNode, Suspense, useEffect } from "react"
import Draggable from "react-draggable"
import { TbMenu2, TbPlus, TbX } from "react-icons/tb"
import { Outlet } from "react-router-dom"
import useLocalStorage from "use-local-storage"
interface LayoutProps {
sidebar: ReactNode
sidebarWidth: number
sidebarVisible: boolean
header: ReactNode
}
@@ -45,6 +45,7 @@ export default function Layout(props: LayoutProps) {
const mobileMenuOpen = useAppSelector(state => state.tree.mobileMenuOpen)
const webSocketConnected = useAppSelector(state => state.server.webSocketConnected)
const treeReloadInterval = useAppSelector(state => state.server.serverInfos?.treeReloadInterval)
const [sidebarWidth, setSidebarWidth] = useLocalStorage("sidebar-width", 350)
const dispatch = useAppDispatch()
useWebSocket()
@@ -91,7 +92,7 @@ export default function Layout(props: LayoutProps) {
<AppShell
header={{ height: Constants.layout.headerHeight }}
navbar={{
width: props.sidebarWidth,
width: sidebarWidth,
breakpoint: Constants.layout.mobileBreakpoint,
collapsed: { mobile: !mobileMenuOpen, desktop: !props.sidebarVisible },
}}
@@ -117,7 +118,7 @@ export default function Layout(props: LayoutProps) {
</OnMobile>
<OnDesktop>
<Group p="md">
<Group justify="space-between" style={{ width: props.sidebarWidth - 16 }}>
<Group justify="space-between" style={{ width: sidebarWidth - 16 }}>
<Box>
<LogoAndTitle />
</Box>
@@ -135,7 +136,7 @@ export default function Layout(props: LayoutProps) {
<Draggable
axis="x"
defaultPosition={{
x: props.sidebarWidth,
x: sidebarWidth,
y: Constants.layout.headerHeight,
}}
bounds={{
@@ -143,9 +144,7 @@ export default function Layout(props: LayoutProps) {
right: 1000,
}}
grid={[30, 30]}
onDrag={(_e, data) => {
dispatch(setSidebarWidth(data.x))
}}
onDrag={(_e, data) => setSidebarWidth(data.x)}
>
<Box
style={{