fix(sidebar): use pathname to determine sidebar view state during hydration
All checks were successful
Deploy Waveform to VPS / deploy (push) Successful in 5m48s
All checks were successful
Deploy Waveform to VPS / deploy (push) Successful in 5m48s
This commit is contained in:
parent
94fb7285a6
commit
11722ac3e0
1 changed files with 12 additions and 29 deletions
|
|
@ -19,44 +19,23 @@ import {
|
||||||
DirectMessageSidebar,
|
DirectMessageSidebar,
|
||||||
SidebarConversation,
|
SidebarConversation,
|
||||||
} from "../sidebar/DirectMessageSidebar";
|
} from "../sidebar/DirectMessageSidebar";
|
||||||
|
import { usePathname } from "next/navigation";
|
||||||
|
|
||||||
/**
|
/** Properties representing the user in the sidebar. */
|
||||||
* Properties representing the user in the sidebar.
|
|
||||||
*
|
|
||||||
* @interface SidebarUser
|
|
||||||
* @property {string} username - The display name of the user.
|
|
||||||
* @property {string} color - The custom color assigned to the user's avatar or profile.
|
|
||||||
* @property {UserStatus} status - The current online status of the user.
|
|
||||||
*/
|
|
||||||
export interface SidebarUser {
|
export interface SidebarUser {
|
||||||
username: string;
|
username: string;
|
||||||
color: string;
|
color: string;
|
||||||
status: UserStatus;
|
status: UserStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** Properties for the AppSidebar component. */
|
||||||
* Properties for the AppSidebar component.
|
|
||||||
*
|
|
||||||
* @interface AppSidebarProps
|
|
||||||
* @property {ServerWithChannels[]} servers - List of available servers including their channels.
|
|
||||||
* @property {SidebarConversation[]} conversations - List of direct message conversations.
|
|
||||||
* @property {SidebarUser} user - Information about the currently authenticated user.
|
|
||||||
*/
|
|
||||||
interface AppSidebarProps {
|
interface AppSidebarProps {
|
||||||
servers: ServerWithChannels[];
|
servers: ServerWithChannels[];
|
||||||
conversations: SidebarConversation[];
|
conversations: SidebarConversation[];
|
||||||
user: SidebarUser;
|
user: SidebarUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**Renders the responsive application sidebar containing server navigation, channel lists, and user profile. */
|
||||||
* Renders the responsive application sidebar containing server navigation, channel lists, and user profile.
|
|
||||||
*
|
|
||||||
* @param {AppSidebarProps} props - The component props.
|
|
||||||
* @param {ServerWithChannels[]} props.servers - List of available servers including their channels.
|
|
||||||
* @param {SidebarConversation[]} props.conversations - List of direct message conversations.
|
|
||||||
* @param {SidebarUser} props.user - Information about the currently authenticated user.
|
|
||||||
* @returns {JSX.Element} The rendered mobile overlay and responsive sidebar structure.
|
|
||||||
*/
|
|
||||||
export function AppSidebar({
|
export function AppSidebar({
|
||||||
servers,
|
servers,
|
||||||
user,
|
user,
|
||||||
|
|
@ -64,10 +43,14 @@ export function AppSidebar({
|
||||||
}: AppSidebarProps) {
|
}: AppSidebarProps) {
|
||||||
const { isNavOpen, closeAll } = useSidebarStore();
|
const { isNavOpen, closeAll } = useSidebarStore();
|
||||||
const { activeServer } = useActiveServer();
|
const { activeServer } = useActiveServer();
|
||||||
|
const pathname = usePathname();
|
||||||
|
|
||||||
|
const isServerRoute = pathname?.startsWith("/servers");
|
||||||
|
const isDirectMessageView = !isServerRoute && !activeServer;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* 1. DESKTOP VIEW (md:flex) - Collapses flexibly via transition/width */}
|
{/* 1. DESKTOP VIEW (md:flex) */}
|
||||||
<aside
|
<aside
|
||||||
className={clsx(
|
className={clsx(
|
||||||
"hidden md:flex flex-col h-full bg-surface shrink-0 transition-all duration-300 ease-in-out overflow-hidden border-r border-background",
|
"hidden md:flex flex-col h-full bg-surface shrink-0 transition-all duration-300 ease-in-out overflow-hidden border-r border-background",
|
||||||
|
|
@ -76,7 +59,7 @@ export function AppSidebar({
|
||||||
>
|
>
|
||||||
<div className="flex flex-1 min-h-0 w-78">
|
<div className="flex flex-1 min-h-0 w-78">
|
||||||
<ServerSidebar servers={servers} />
|
<ServerSidebar servers={servers} />
|
||||||
{!activeServer ? (
|
{isDirectMessageView ? (
|
||||||
<DirectMessageSidebar conversations={conversations} />
|
<DirectMessageSidebar conversations={conversations} />
|
||||||
) : (
|
) : (
|
||||||
<ChannelSidebar />
|
<ChannelSidebar />
|
||||||
|
|
@ -87,7 +70,7 @@ export function AppSidebar({
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
{/* 2. MOBILE VIEW (md:hidden) - Functions as a slide-out drawer */}
|
{/* 2. MOBILE VIEW (md:hidden) */}
|
||||||
{isNavOpen && (
|
{isNavOpen && (
|
||||||
<div
|
<div
|
||||||
className="fixed inset-0 bg-black/60 z-30 md:hidden"
|
className="fixed inset-0 bg-black/60 z-30 md:hidden"
|
||||||
|
|
@ -103,7 +86,7 @@ export function AppSidebar({
|
||||||
>
|
>
|
||||||
<div className="flex flex-1 min-h-0 w-full">
|
<div className="flex flex-1 min-h-0 w-full">
|
||||||
<ServerSidebar servers={servers} />
|
<ServerSidebar servers={servers} />
|
||||||
{!activeServer ? (
|
{isDirectMessageView ? (
|
||||||
<DirectMessageSidebar conversations={conversations} />
|
<DirectMessageSidebar conversations={conversations} />
|
||||||
) : (
|
) : (
|
||||||
<ChannelSidebar />
|
<ChannelSidebar />
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue