Skip to content

fix(web): remove chat gutter leak #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kilockok wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(web): remove chat gutter leak #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/apps/web/src/layouts/AppLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,29 @@ const MainViewport = memo(function MainViewport({
notificationsOpen,
closeNotifications,
markNotificationRead,
contentOwnsScroll,
}: {
accessToken: string
notificationsOpen: boolean
closeNotifications: () => void
markNotificationRead: () => void
contentOwnsScroll: boolean
}) {
useEffect(() => {
if (!isPerfDebugEnabled()) return
recordPerfValue('layout_main_viewport_render_count', 1, 'count', {
notificationsOpen,
contentOwnsScroll,
})
})

const className = [
'relative flex min-h-0 min-w-0 flex-1 flex-col',
contentOwnsScroll ? 'overflow-hidden' : 'overflow-y-auto',
].join(' ')

return (
<main className="relative flex min-w-0 flex-1 flex-col overflow-y-auto" style={{ scrollbarGutter: 'stable' }}>
<main className={className} style={contentOwnsScroll ? undefined : { scrollbarGutter: 'stable' }}>
<Outlet />
{notificationsOpen && (
<NotificationsPanel accessToken={accessToken} onClose={closeNotifications} onMarkedRead={markNotificationRead} />
Expand Down Expand Up @@ -158,6 +166,8 @@ const LayoutMain = memo(function LayoutMain({
})
})

const contentOwnsScroll = pathname === '/' || pathname === '/search' || pathname.startsWith('/t/')

return (
<>
{settingsOpen && !desktop && (
Expand Down Expand Up @@ -196,6 +206,7 @@ const LayoutMain = memo(function LayoutMain({
notificationsOpen={notificationsOpen}
closeNotifications={closeNotifications}
markNotificationRead={markNotificationRead}
contentOwnsScroll={contentOwnsScroll}
/>
</div>
)}
Expand Down
Loading