Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fix-tablet-layout-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Fix tablet layouts having the sidebar fill up the screen.
7 changes: 3 additions & 4 deletions src/app/features/room/MembersDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { formatCompactNumber } from '$utils/formatCompactNumber';
import * as css from './MembersDrawer.css';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { mobileOrTablet } from '$utils/user-agent';
import { useScreenSizeContext, ScreenSize } from '$hooks/useScreenSize';

type MemberDrawerHeaderProps = {
Expand Down Expand Up @@ -317,7 +316,7 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) {
}, [memberSidebarWidth]);

const screenSize = useScreenSizeContext();
const isMobile = mobileOrTablet() || screenSize === ScreenSize.Mobile;
const isMobile = screenSize === ScreenSize.Mobile;
const hideText = curWidth <= 80 && !isMobile;
return (
<Box
Expand All @@ -326,12 +325,12 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) {
direction="Column"
style={{
position: 'relative',
width: !mobileOrTablet() ? toRem(curWidth) : '100%',
width: isMobile ? '100%' : toRem(curWidth),
}}
>
<MemberDrawerHeader room={room} hideText={hideText} />
<Box className={css.MemberDrawerContentBase} grow="Yes">
{!mobileOrTablet() && (
{!isMobile && (
<SidebarResizer
setCurWidth={setCurWidth}
sidebarWidth={memberSidebarWidth}
Expand Down
5 changes: 2 additions & 3 deletions src/app/pages/client/direct/Direct.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ import {
import { useDirectCreateSelected } from '$hooks/router/useDirectSelected';
import { useDirectRooms } from './useDirectRooms';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { mobileOrTablet } from '$utils/user-agent';
import { useScreenSizeContext, ScreenSize } from '$hooks/useScreenSize';

type DirectMenuProps = {
Expand Down Expand Up @@ -256,7 +255,7 @@ export function Direct() {
);

const screenSize = useScreenSizeContext();
const isMobile = mobileOrTablet() || screenSize === ScreenSize.Mobile;
const isMobile = screenSize === ScreenSize.Mobile;
const hideText = curWidth <= 80 && !isMobile;

return (
Expand Down Expand Up @@ -367,7 +366,7 @@ export function Direct() {
</PageNavContent>
)}
</PageNav>
{!mobileOrTablet() && (
{!isMobile && (
<SidebarResizer
setCurWidth={setCurWidth}
sidebarWidth={roomSidebarWidth}
Expand Down
5 changes: 2 additions & 3 deletions src/app/pages/client/explore/Explore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import { stopPropagation } from '$utils/keyboard';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
import { mobileOrTablet } from '$utils/user-agent';
import { getMxIdServer } from '$utils/mxIdHelper';
import { useScreenSizeContext, ScreenSize } from '$hooks/useScreenSize';

Expand Down Expand Up @@ -178,7 +177,7 @@ export function Explore() {
setCurWidth(roomSidebarWidth);
}, [roomSidebarWidth]);
const screenSize = useScreenSizeContext();
const isMobile = mobileOrTablet() || screenSize === ScreenSize.Mobile;
const isMobile = screenSize === ScreenSize.Mobile;
const hideText = curWidth <= 80 && !isMobile;

return (
Expand Down Expand Up @@ -312,7 +311,7 @@ export function Explore() {
</Box>
</PageNavContent>
</PageNav>
{!mobileOrTablet() && (
{!isMobile && (
<SidebarResizer
setCurWidth={setCurWidth}
sidebarWidth={roomSidebarWidth}
Expand Down
5 changes: 2 additions & 3 deletions src/app/pages/client/home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import { UseStateProvider } from '$components/UseStateProvider';
import { JoinAddressPrompt } from '$components/join-address-prompt';
import { useHomeRooms } from './useHomeRooms';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { mobileOrTablet } from '$utils/user-agent';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';

type HomeMenuProps = {
Expand Down Expand Up @@ -263,7 +262,7 @@ export function Home() {
);

const screenSize = useScreenSizeContext();
const isMobile = mobileOrTablet() || screenSize === ScreenSize.Mobile;
const isMobile = screenSize === ScreenSize.Mobile;
const hideText = curWidth <= 80 && !isMobile;

return (
Expand Down Expand Up @@ -454,7 +453,7 @@ export function Home() {
</PageNavContent>
)}
</PageNav>
{!mobileOrTablet() && (
{!isMobile && (
<SidebarResizer
setCurWidth={setCurWidth}
sidebarWidth={roomSidebarWidth}
Expand Down
5 changes: 2 additions & 3 deletions src/app/pages/client/inbox/Inbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useEffect, useState } from 'react';
import { mobileOrTablet } from '$utils/user-agent';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';

function InvitesNavItem({ hideText }: { hideText?: boolean }) {
Expand Down Expand Up @@ -62,7 +61,7 @@ export function Inbox() {
setCurWidth(roomSidebarWidth);
}, [roomSidebarWidth]);
const screenSize = useScreenSizeContext();
const isMobile = mobileOrTablet() || screenSize === ScreenSize.Mobile;
const isMobile = screenSize === ScreenSize.Mobile;
const hideText = curWidth <= 80 && !isMobile;

return (
Expand Down Expand Up @@ -118,7 +117,7 @@ export function Inbox() {
</Box>
</PageNavContent>
</PageNav>
{!mobileOrTablet() && (
{!isMobile && (
<SidebarResizer
setCurWidth={setCurWidth}
sidebarWidth={roomSidebarWidth}
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/client/space/Space.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ export function Space() {
}, [lastRoomId, spaceIdOrAlias, mx, navigate]);

const screenSize = useScreenSizeContext();
const isMobile = mobileOrTablet() || screenSize === ScreenSize.Mobile;
const isMobile = screenSize === ScreenSize.Mobile;
const hideText = curWidth <= 80 && !isMobile;
return (
<Box
Expand Down Expand Up @@ -1048,7 +1048,7 @@ export function Space() {
</PageNavContent>
</SwipeableOverlayWrapper>
</PageNav>
{!mobileOrTablet() && (
{!isMobile && (
<SidebarResizer
setCurWidth={setCurWidth}
sidebarWidth={roomSidebarWidth}
Expand Down
Loading