Skip to content

fix: prevent scroll jump when closing thread in narrow layout #41159

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
sidd19898 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix: prevent scroll jump when closing thread in narrow layout #41159

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16bcf67
fix: prevent scroll jump when closing thread in narrow layout
sidd19898 Jul 3, 2026
c450fce
fix: address review feedback
sidd19898 Jul 3, 2026
0781f57
Merge branch 'develop' into fix/thread-close-scroll-narrow-layout
sidd19898 Jul 3, 2026
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
14 changes: 12 additions & 2 deletions apps/meteor/client/views/room/layout/RoomLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const useBreakpointsElement = () => {
const breakpoints = useMemo(
() =>
breakpointsDefinitions
.filter(({ minViewportWidth }) => minViewportWidth && borderBoxSize.inlineSize && borderBoxSize.inlineSize >= minViewportWidth)
.filter(({ minViewportWidth }) => minViewportWidth && (!borderBoxSize.inlineSize || borderBoxSize.inlineSize >= minViewportWidth))
.map(({ name }) => name),
[borderBoxSize],
);
Expand Down Expand Up @@ -66,7 +66,17 @@ const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps)
</Box>
{footer && <Suspense fallback={null}>{footer}</Suspense>}
</Box>
{aside && <Suspense fallback={null}>{aside}</Suspense>}
{aside && (
<Suspense fallback={null}>
{contextualbarPosition === 'absolute' ? (
<Box position='absolute' insetBlock={0} insetInlineEnd={0} width={contextualbarSize} zIndex={100}>
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
{aside}
</Box>
) : (
aside
)}
</Suspense>
)}
</Box>
</Box>
</LayoutContext.Provider>
Expand Down