diff --git a/apps/meteor/client/views/room/layout/RoomLayout.tsx b/apps/meteor/client/views/room/layout/RoomLayout.tsx index 21478ffc35ea0..20e068deac702 100644 --- a/apps/meteor/client/views/room/layout/RoomLayout.tsx +++ b/apps/meteor/client/views/room/layout/RoomLayout.tsx @@ -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], ); @@ -66,7 +66,17 @@ const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps) {footer && {footer}} - {aside && {aside}} + {aside && ( + + {contextualbarPosition === 'absolute' ? ( + + {aside} + + ) : ( + aside + )} + + )}