@@ -600,7 +600,7 @@ export function AppSidebar({
600600 </ SidebarMenu >
601601 </ SidebarHeader >
602602
603- < div className = "relative flex min-h-0 flex-1 flex-col" >
603+ < div className = "relative flex min-h-0 flex-1 flex-col overflow-hidden " >
604604 { unreadAboveCount > 0 ? (
605605 < MoreUnreadButton
606606 count = { unreadAboveCount }
@@ -610,7 +610,7 @@ export function AppSidebar({
610610 testId = "sidebar-more-unread-above"
611611 />
612612 ) : null }
613- < SidebarContent ref = { scrollRef } >
613+ < SidebarContent className = "pb-32" ref = { scrollRef } >
614614 { isLoading ? (
615615 < SidebarGroup >
616616 < SidebarGroupLabel > Channels</ SidebarGroupLabel >
@@ -713,95 +713,96 @@ export function AppSidebar({
713713
714714 { unreadBelowCount > 0 ? (
715715 < MoreUnreadButton
716+ bottomClassName = "bottom-28"
716717 count = { unreadBelowCount }
717718 icon = { < ArrowDown /> }
718719 onClick = { scrollToNextBelow }
719720 position = "bottom"
720721 testId = "sidebar-more-unread-below"
721722 />
722723 ) : null }
723- </ div >
724724
725- < SidebarFooter >
726- < SidebarMenu >
727- < SidebarMenuItem >
728- < div
729- className = "rounded-xl px-2 py-2 transition-colors hover:bg-sidebar-accent/70 focus-within:bg-sidebar-accent/70"
730- data-testid = "sidebar-profile-card"
731- >
732- < div className = "flex min-w-0 items-center gap-3" >
733- < div className = "relative shrink-0" >
734- < ProfileAvatar
735- avatarUrl = { profile ?. avatarUrl ?? null }
736- className = "h-10 w-10 rounded-2xl text-sm"
737- iconClassName = "h-5 w-5"
738- label = { resolvedDisplayName }
739- testId = "sidebar-profile-avatar"
740- />
741- < span
742- aria-label = { getPresenceLabel ( selfPresenceStatus ) }
743- className = "absolute -bottom-0.5 -right-0.5 flex h-4 w-4 items-center justify-center rounded-full bg-sidebar"
744- data-testid = "self-presence-badge"
745- role = "img"
746- >
747- < PresenceDot
748- className = "h-2.5 w-2.5"
749- status = { selfPresenceStatus }
725+ < SidebarFooter className = "absolute inset-x-0 bottom-0 z-30 bg-sidebar/55 shadow-[0_-16px_40px_hsl(var(--sidebar)/0.55)] backdrop-blur-xl supports-[backdrop-filter]:bg-sidebar/45 dark:bg-sidebar/45 dark:shadow-[0_-16px_44px_rgba(0,0,0,0.42)] dark:supports-[backdrop-filter]:bg-sidebar/35" >
726+ < SidebarMenu >
727+ < SidebarMenuItem >
728+ < div
729+ className = "rounded-xl px-2 py-2 transition-colors hover:bg-sidebar-accent/35 focus-within:bg-sidebar-accent/35 dark:hover:bg-sidebar-accent/25 dark:focus-within:bg-sidebar-accent/25"
730+ data-testid = "sidebar-profile-card"
731+ >
732+ < div className = "flex min-w-0 items-center gap-3" >
733+ < div className = "relative shrink-0" >
734+ < ProfileAvatar
735+ avatarUrl = { profile ?. avatarUrl ?? null }
736+ className = "h-10 w-10 rounded-2xl text-sm"
737+ iconClassName = "h-5 w-5"
738+ label = { resolvedDisplayName }
739+ testId = "sidebar-profile-avatar"
750740 />
751- </ span >
752- </ div >
753- < div className = "min-w-0 flex-1" >
754- < ProfilePopover
755- open = { profilePopoverOpen }
756- onOpenChange = { setProfilePopoverOpen }
757- displayName = { resolvedDisplayName }
758- nip05 = { profile ?. nip05Handle }
759- avatarUrl = { profile ?. avatarUrl ?? null }
760- currentStatus = { selfPresenceStatus }
761- isStatusPending = { isPresencePending }
762- userStatusText = { selfUserStatus ?. text }
763- userStatusEmoji = { selfUserStatus ?. emoji }
764- onSetStatus = { onSetPresenceStatus ?? ( ( ) => { } ) }
765- onSetUserStatus = { onSetUserStatus }
766- onClearUserStatus = { onClearUserStatus }
767- onOpenSettings = { onSelectSettings }
768- >
769- < button
770- className = "block w-full min-w-0 text-left text-sidebar-foreground"
771- data-testid = "open-settings"
772- type = "button"
741+ < span
742+ aria-label = { getPresenceLabel ( selfPresenceStatus ) }
743+ className = "absolute -bottom-0.5 -right-0.5 flex h-4 w-4 items-center justify-center rounded-full bg-sidebar"
744+ data-testid = "self-presence-badge"
745+ role = "img"
773746 >
774- < p
775- className = "truncate text-sm font-semibold text-current"
776- data-testid = "sidebar-profile-name"
747+ < PresenceDot
748+ className = "h-2.5 w-2.5"
749+ status = { selfPresenceStatus }
750+ />
751+ </ span >
752+ </ div >
753+ < div className = "min-w-0 flex-1" >
754+ < ProfilePopover
755+ open = { profilePopoverOpen }
756+ onOpenChange = { setProfilePopoverOpen }
757+ displayName = { resolvedDisplayName }
758+ nip05 = { profile ?. nip05Handle }
759+ avatarUrl = { profile ?. avatarUrl ?? null }
760+ currentStatus = { selfPresenceStatus }
761+ isStatusPending = { isPresencePending }
762+ userStatusText = { selfUserStatus ?. text }
763+ userStatusEmoji = { selfUserStatus ?. emoji }
764+ onSetStatus = { onSetPresenceStatus ?? ( ( ) => { } ) }
765+ onSetUserStatus = { onSetUserStatus }
766+ onClearUserStatus = { onClearUserStatus }
767+ onOpenSettings = { onSelectSettings }
768+ >
769+ < button
770+ className = "block w-full min-w-0 text-left text-sidebar-foreground"
771+ data-testid = "open-settings"
772+ type = "button"
777773 >
778- { resolvedDisplayName }
774+ < p
775+ className = "truncate text-sm font-semibold text-current"
776+ data-testid = "sidebar-profile-name"
777+ >
778+ { resolvedDisplayName }
779+ </ p >
780+ </ button >
781+ </ ProfilePopover >
782+ < WorkspaceSwitcher
783+ activeWorkspace = { activeWorkspace }
784+ onAddWorkspace = { onOpenAddWorkspace }
785+ onRemoveWorkspace = { onRemoveWorkspace }
786+ onSwitchWorkspace = { onSwitchWorkspace }
787+ onUpdateWorkspace = { onUpdateWorkspace }
788+ variant = "profile"
789+ workspaces = { workspaces }
790+ />
791+ { selfUserStatus ?. text || selfUserStatus ?. emoji ? (
792+ < p className = "mt-0.5 truncate text-xs text-sidebar-foreground/50" >
793+ { selfUserStatus . emoji ? (
794+ < span className = "mr-1" > { selfUserStatus . emoji } </ span >
795+ ) : null }
796+ { selfUserStatus . text }
779797 </ p >
780- </ button >
781- </ ProfilePopover >
782- < WorkspaceSwitcher
783- activeWorkspace = { activeWorkspace }
784- onAddWorkspace = { onOpenAddWorkspace }
785- onRemoveWorkspace = { onRemoveWorkspace }
786- onSwitchWorkspace = { onSwitchWorkspace }
787- onUpdateWorkspace = { onUpdateWorkspace }
788- variant = "profile"
789- workspaces = { workspaces }
790- />
791- { selfUserStatus ?. text || selfUserStatus ?. emoji ? (
792- < p className = "mt-0.5 truncate text-xs text-sidebar-foreground/50" >
793- { selfUserStatus . emoji ? (
794- < span className = "mr-1" > { selfUserStatus . emoji } </ span >
795- ) : null }
796- { selfUserStatus . text }
797- </ p >
798- ) : null }
798+ ) : null }
799+ </ div >
799800 </ div >
800801 </ div >
801- </ div >
802- </ SidebarMenuItem >
803- </ SidebarMenu >
804- </ SidebarFooter >
802+ </ SidebarMenuItem >
803+ </ SidebarMenu >
804+ </ SidebarFooter >
805+ </ div >
805806
806807 < CreateChannelDialog
807808 channelKind = { createDialogKind }
0 commit comments