diff --git a/web/src/features/channel/MobileDrawer.tsx b/web/src/features/channel/MobileDrawer.tsx index 1dfe79f..f1bd0dc 100644 --- a/web/src/features/channel/MobileDrawer.tsx +++ b/web/src/features/channel/MobileDrawer.tsx @@ -8,7 +8,6 @@ import styles from './MobileDrawer.module.css'; interface Props { rail: { id?: string; onCreate: () => void; onJoin: () => void }; - onSettings: () => void; /** 频道列表(ThreadSidebar),由 Workspace 组装 */ threads: React.ReactNode; onFiles: () => void; @@ -25,13 +24,13 @@ function Row({ icon, label, count, onClick }: { icon: IconName; label: string; c } /** 手机侧边栏:空间、频道、本频道的文件与成员;账号与外观在底部 */ -export function MobileDrawer({ rail, onSettings, threads, onFiles, onMembers, onInvite, onShare, onHome }: Props) { +export function MobileDrawer({ rail, threads, onFiles, onMembers, onInvite, onShare, onHome }: Props) { const used = useWorkspace((s) => s.channel?.membersUsed); const max = useWorkspace((s) => s.channel?.maxMembers); const spaces = useChannels((s) => s.list.length); return <> - +
{threads} ; } -/** 频道列表顶部:空间名与加密状态,点击打开空间设置 */ -export function SpaceHeader({ onSettings }: { onSettings: () => void }) { +/** 频道列表顶部:空间名与加密状态。空间设置入口在顶栏 */ +export function SpaceHeader() { const channel = useWorkspace((s) => s.channel); const name = channel?.name || `${channel?.id.slice(0, 8) ?? ''}…`; - return ; +
; } diff --git a/web/src/features/channel/Workspace.tsx b/web/src/features/channel/Workspace.tsx index 338a681..2e67d95 100644 --- a/web/src/features/channel/Workspace.tsx +++ b/web/src/features/channel/Workspace.tsx @@ -128,7 +128,7 @@ export function Workspace({ onCreateChannel }: { onCreateChannel: () => void }) const threadSidebar = { selectThread(id); setDrawerOpen(false); setMobileView('chat'); }} onCreateThread={createThread} onRenameThread={renameThread} onCreateGroup={createGroup} onRenameGroup={renameGroup} onGroupThread={groupThread} />; - const navigation = <> setSettingsOpen(true)} />{threadSidebar}{desktop ? : null}; + const navigation = <>{threadSidebar}{desktop ? : null}; const chat = sendText(text, activeThreadId)} onDelete={deleteItem} onOpenFile={setPreviewId} onFiles={requestFiles} />; const explorer = <> @@ -161,7 +161,7 @@ export function Workspace({ onCreateChannel }: { onCreateChannel: () => void }) {/* 弹层打开时抽屉留在下面:同时关抽屉(history.back)会把刚压入的弹层历史一并弹掉 */} {!desktop && drawerOpen ? setDrawerOpen(false)}> setScanOpen(true) }} - onSettings={() => setSettingsOpen(true)} threads={threadSidebar} onFiles={() => goMobile('files')} onMembers={() => goMobile('members')} + threads={threadSidebar} onFiles={() => goMobile('files')} onMembers={() => goMobile('members')} onInvite={owner ? () => setInviteOpen(true) : undefined} onShare={() => setPanelOpen(true)} onHome={() => navigate('/')} /> : null} {!desktop && moreOpen ? setMoreOpen(false)}>{moreRows.map((row) => )} : null}