From ea7fe5d776a2a22bc4cf24771002078bb0d9de40 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Sat, 9 May 2026 01:05:35 +0300 Subject: [PATCH] actually done with the spaces i think --- src/app/features/room/CallChatView.tsx | 2 ++ src/app/features/room/MembersDrawer.tsx | 2 ++ src/app/features/room/ThreadBrowser.tsx | 2 ++ src/app/features/room/ThreadDrawer.tsx | 4 ++++ src/app/features/widgets/WidgetsDrawer.tsx | 2 ++ src/app/pages/client/direct/Direct.tsx | 2 ++ src/app/pages/client/explore/Explore.tsx | 2 ++ src/app/pages/client/home/Home.tsx | 2 ++ src/app/pages/client/inbox/Inbox.tsx | 2 ++ .../pages/client/sidebar/SidebarResizer.tsx | 19 +++++++++++++++++-- src/app/pages/client/space/Space.tsx | 16 +++++++++++++--- 11 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/app/features/room/CallChatView.tsx b/src/app/features/room/CallChatView.tsx index d979a144c..edfd08841 100644 --- a/src/app/features/room/CallChatView.tsx +++ b/src/app/features/room/CallChatView.tsx @@ -30,6 +30,8 @@ export function CallChatView() { setCurWidth={setCurWidth} sidebarWidth={threadSidebarWidth} setSidebarWidth={setThreadSidebarWidth} + minValue={50} + maxValue={1200} rightSided /> )} diff --git a/src/app/features/room/MembersDrawer.tsx b/src/app/features/room/MembersDrawer.tsx index 82e831c41..3b8096858 100644 --- a/src/app/features/room/MembersDrawer.tsx +++ b/src/app/features/room/MembersDrawer.tsx @@ -303,6 +303,8 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) { setCurWidth={setCurWidth} sidebarWidth={memberSidebarWidth} setSidebarWidth={setMemberSidebarWidth} + minValue={50} + maxValue={1200} rightSided /> )} diff --git a/src/app/features/room/ThreadBrowser.tsx b/src/app/features/room/ThreadBrowser.tsx index 391d0514e..5237ed77f 100644 --- a/src/app/features/room/ThreadBrowser.tsx +++ b/src/app/features/room/ThreadBrowser.tsx @@ -454,6 +454,8 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr setCurWidth={setCurWidth} sidebarWidth={threadSidebarWidth} setSidebarWidth={setThreadSidebarWidth} + minValue={50} + maxValue={1200} rightSided /> )} diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx index dba1067ac..188ff4f5d 100644 --- a/src/app/features/room/ThreadDrawer.tsx +++ b/src/app/features/room/ThreadDrawer.tsx @@ -761,6 +761,8 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra setCurWidth={setCurWidth} sidebarWidth={threadSidebarWidth} setSidebarWidth={setThreadSidebarWidth} + minValue={50} + maxValue={1200} rightSided /> )} @@ -827,6 +829,8 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra setCurWidth={setCurHeight} sidebarWidth={threadRootHeight} setSidebarWidth={setThreadRootHeight} + minValue={50} + maxValue={1200} topSided />
)} diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx index f262df9af..d6f03f35b 100644 --- a/src/app/pages/client/direct/Direct.tsx +++ b/src/app/pages/client/direct/Direct.tsx @@ -351,6 +351,8 @@ export function Direct() { setCurWidth={setCurWidth} sidebarWidth={roomSidebarWidth} setSidebarWidth={setRoomSidebarWidth} + minValue={50} + maxValue={1200} /> )} diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx index 904d7251e..0031af3f2 100644 --- a/src/app/pages/client/explore/Explore.tsx +++ b/src/app/pages/client/explore/Explore.tsx @@ -285,6 +285,8 @@ export function Explore() { setCurWidth={setCurWidth} sidebarWidth={roomSidebarWidth} setSidebarWidth={setRoomSidebarWidth} + minValue={50} + maxValue={1200} /> )} diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx index f25b984b7..5ce61470a 100644 --- a/src/app/pages/client/home/Home.tsx +++ b/src/app/pages/client/home/Home.tsx @@ -391,6 +391,8 @@ export function Home() { setCurWidth={setCurWidth} sidebarWidth={roomSidebarWidth} setSidebarWidth={setRoomSidebarWidth} + minValue={50} + maxValue={1200} /> )} diff --git a/src/app/pages/client/inbox/Inbox.tsx b/src/app/pages/client/inbox/Inbox.tsx index 8b343527c..b86349e04 100644 --- a/src/app/pages/client/inbox/Inbox.tsx +++ b/src/app/pages/client/inbox/Inbox.tsx @@ -109,6 +109,8 @@ export function Inbox() { setCurWidth={setCurWidth} sidebarWidth={roomSidebarWidth} setSidebarWidth={setRoomSidebarWidth} + minValue={50} + maxValue={1200} /> )} diff --git a/src/app/pages/client/sidebar/SidebarResizer.tsx b/src/app/pages/client/sidebar/SidebarResizer.tsx index 48f8fe361..d7b29f6d3 100644 --- a/src/app/pages/client/sidebar/SidebarResizer.tsx +++ b/src/app/pages/client/sidebar/SidebarResizer.tsx @@ -9,12 +9,20 @@ export function SidebarResizer({ sidebarWidth, setSidebarWidth, setCurWidth, + minValue, + maxValue, + instep, + outstep, rightSided, topSided, }: { sidebarWidth: number; setSidebarWidth: (arg0: number) => void; setCurWidth?: Dispatch>; + minValue: number; + maxValue: number; + instep?: number; + outstep?: number; rightSided?: boolean; topSided?: boolean; }) { @@ -26,12 +34,19 @@ export function SidebarResizer({ useEffect(() => { const change = rightSided ? -(oldX - newX) : oldX - newX; - if (change) setSidebarWidth(Math.min(Math.max(sidebarWidth - change, 50), 1200)); + let newValue = Math.min(Math.max(sidebarWidth - change, minValue), maxValue); + if (instep && outstep && newValue > instep && newValue < outstep) + newValue = newValue > (instep + outstep) / 2 ? outstep : instep; + + if (change) setSidebarWidth(newValue); }, [newX]); useEffect(() => { const change = rightSided ? -(oldX - interimX) : oldX - interimX; - if (change && setCurWidth) setCurWidth(Math.min(Math.max(sidebarWidth - change, 50), 1200)); + let newValue = Math.min(Math.max(sidebarWidth - change, minValue), maxValue); + if (instep && outstep && newValue > instep && newValue < outstep) + newValue = newValue > (instep + outstep) / 2 ? outstep : instep; + if (change && setCurWidth) setCurWidth(newValue); }, [interimX]); const onPointerMove = useCallback((e: PointerEvent) => { diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index 8c1bc658c..455e6076c 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -270,8 +270,13 @@ function SpaceHeader({ hideText, mx }: { hideText?: boolean; mx: MatrixClient }) return ( <> - - + + {hideText ? ( {virtualizedItems.map((vItem) => { @@ -932,6 +938,10 @@ export function Space() { setCurWidth={setCurWidth} sidebarWidth={roomSidebarWidth} setSidebarWidth={setRoomSidebarWidth} + instep={80} + outstep={180} + minValue={50} + maxValue={1200} /> )}