From ccf10fc20cadde14868e27f913414b251dbb75f2 Mon Sep 17 00:00:00 2001 From: Ajay Bura <32841439+ajbura@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:29:12 +0530 Subject: [PATCH 1/2] Revert "Fix menus congestion and improve thread reply layout (#2402)" (#2409) This reverts commit d8d4714370fbe6c6ea6f6889ba4a5aae505220b8. --- src/app/components/BackupRestore.tsx | 8 ++++++-- src/app/components/HexColorPickerPopOut.tsx | 2 +- src/app/components/JoinRulesSwitcher.tsx | 2 +- src/app/components/ManualVerification.tsx | 2 +- src/app/components/MemberSortMenu.tsx | 2 +- src/app/components/MembershipFilterMenu.tsx | 2 +- src/app/components/RoomNotificationSwitcher.tsx | 4 ++-- src/app/components/editor/Toolbar.tsx | 2 +- .../components/image-pack-view/UsageSwitcher.tsx | 2 +- src/app/components/message/Reply.css.ts | 6 ++++++ src/app/components/message/Reply.tsx | 15 ++++----------- src/app/components/power/PowerSelector.tsx | 5 ++--- src/app/components/room-card/RoomCard.tsx | 2 +- .../general/RoomHistoryVisibility.tsx | 2 +- .../common-settings/permissions/Powers.tsx | 2 +- src/app/features/lobby/HierarchyItemMenu.tsx | 6 +++--- src/app/features/lobby/LobbyHeader.tsx | 6 +++--- src/app/features/lobby/SpaceItem.tsx | 4 ++-- src/app/features/message-search/SearchFilters.tsx | 5 +++-- src/app/features/room-nav/RoomNavItem.tsx | 8 ++++---- src/app/features/room/RoomInput.tsx | 2 +- src/app/features/room/RoomViewHeader.tsx | 8 ++++---- src/app/features/room/message/Message.tsx | 10 ++++------ src/app/features/room/message/styles.css.ts | 2 +- .../features/settings/devices/Verification.tsx | 2 +- src/app/features/settings/general/General.tsx | 6 +++--- .../notifications/NotificationModeSwitcher.tsx | 2 +- src/app/pages/auth/ServerPicker.tsx | 4 ++-- src/app/pages/auth/login/PasswordLoginForm.tsx | 4 ++-- src/app/pages/client/ClientRoot.tsx | 2 +- src/app/pages/client/direct/Direct.tsx | 4 ++-- src/app/pages/client/explore/Server.tsx | 6 +++--- src/app/pages/client/home/Home.tsx | 4 ++-- src/app/pages/client/sidebar/DirectTab.tsx | 4 ++-- src/app/pages/client/sidebar/HomeTab.tsx | 4 ++-- src/app/pages/client/sidebar/SpaceTabs.tsx | 6 +++--- src/app/pages/client/space/Space.tsx | 8 ++++---- 37 files changed, 83 insertions(+), 82 deletions(-) diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx index 8b3732b1..068f437b 100644 --- a/src/app/components/BackupRestore.tsx +++ b/src/app/components/BackupRestore.tsx @@ -203,8 +203,12 @@ export function BackupRestoreTile({ crypto }: BackupRestoreTileProps) { escapeDeactivates: stopPropagation, }} > - - + + ({ }} > - + {rules.map((rule) => ( - + - + {memberSortMenu.map((menuItem, index) => ( - + {membershipFilterMenu.map((menuItem, index) => ( - + {modes.map((mode) => ( - + } diff --git a/src/app/components/image-pack-view/UsageSwitcher.tsx b/src/app/components/image-pack-view/UsageSwitcher.tsx index 1878beb4..1a1eb432 100644 --- a/src/app/components/image-pack-view/UsageSwitcher.tsx +++ b/src/app/components/image-pack-view/UsageSwitcher.tsx @@ -33,7 +33,7 @@ export function UsageSelector({ selected, onChange }: UsageSelectorProps) { ); return ( - + {allUsages.map((usage) => ( ( ); export const ThreadIndicator = as<'div'>(({ ...props }, ref) => ( - - - Thread + + + Threaded reply )); @@ -104,7 +97,7 @@ export const Reply = as<'div', ReplyProps>( const bodyJSX = body ? scaleSystemEmoji(trimReplyFromBody(body)) : fallbackBody; return ( - + {threadRootId && ( )} diff --git a/src/app/components/power/PowerSelector.tsx b/src/app/components/power/PowerSelector.tsx index 9e7eb81b..2b3b48c3 100644 --- a/src/app/components/power/PowerSelector.tsx +++ b/src/app/components/power/PowerSelector.tsx @@ -16,14 +16,13 @@ export const PowerSelector = forwardRef( ref={ref} style={{ maxHeight: '75vh', - maxWidth: toRem(200), - width: '100vw', + maxWidth: toRem(300), display: 'flex', }} > -
+
{getPowers(powerLevelTags).map((power) => { const selected = value === power; const tag = powerLevelTags[power]; diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx index 8c65f2f3..34a7e24b 100644 --- a/src/app/components/room-card/RoomCard.tsx +++ b/src/app/components/room-card/RoomCard.tsx @@ -273,7 +273,7 @@ export const RoomCard = as<'div', RoomCardProps>( variant="Secondary" size="300" disabled={joining} - before={joining && } + before={joining && } > {joining ? 'Joining' : 'Join'} diff --git a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx index c6313f11..7b329b13 100644 --- a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx +++ b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx @@ -119,7 +119,7 @@ export function RoomHistoryVisibility({ powerLevels }: RoomHistoryVisibilityProp escapeDeactivates: stopPropagation, }} > - + {visibilityMenu.map((visibility) => ( - + {permissionGroups.map((group, groupIndex) => ( {group.name} diff --git a/src/app/features/lobby/HierarchyItemMenu.tsx b/src/app/features/lobby/HierarchyItemMenu.tsx index d13c9133..f126e7cb 100644 --- a/src/app/features/lobby/HierarchyItemMenu.tsx +++ b/src/app/features/lobby/HierarchyItemMenu.tsx @@ -234,9 +234,9 @@ export function HierarchyItemMenu({ escapeDeactivates: stopPropagation, }} > - + {joined && ( - + {onTogglePin && ( )} {canEditChild && ( - + diff --git a/src/app/features/lobby/LobbyHeader.tsx b/src/app/features/lobby/LobbyHeader.tsx index 08f0cc6a..bc4c46fe 100644 --- a/src/app/features/lobby/LobbyHeader.tsx +++ b/src/app/features/lobby/LobbyHeader.tsx @@ -60,8 +60,8 @@ const LobbyMenu = forwardRef( }; return ( - - + + ( - + {(promptLeave, setPromptLeave) => ( <> diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx index dca81b90..0a4d9de5 100644 --- a/src/app/features/lobby/SpaceItem.tsx +++ b/src/app/features/lobby/SpaceItem.tsx @@ -271,7 +271,7 @@ function AddRoomButton({ item }: { item: HierarchyItem }) { escapeDeactivates: stopPropagation, }} > - + - + Sort by -
+ +
setOrder()} variant="Surface" @@ -290,7 +291,7 @@ function SelectRoomButton({ roomList, selectedRooms, onChange }: SelectRoomButto - + diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx index ff26438d..af4164fd 100644 --- a/src/app/pages/client/home/Home.tsx +++ b/src/app/pages/client/home/Home.tsx @@ -75,8 +75,8 @@ const HomeMenu = forwardRef(({ requestClose }, re }; return ( - - + + (({ requestClose } }; return ( - - + + (({ requestClose }, re }; return ( - - + + ( }; return ( - - + + ( )} - + (({ room, requestClo }; return ( - - + + (({ room, requestClo - + (({ room, requestClo )} - + {(promptLeave, setPromptLeave) => ( <> From 6a277207092893f19f21f52c919c1084f31cf865 Mon Sep 17 00:00:00 2001 From: Ajay Bura <32841439+ajbura@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:34:01 +0530 Subject: [PATCH 2/2] Improve thread reply layout (#2410) --- src/app/components/message/Reply.css.ts | 6 ------ src/app/components/message/Reply.tsx | 15 +++++++++++---- src/app/features/room/RoomInput.tsx | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/app/components/message/Reply.css.ts b/src/app/components/message/Reply.css.ts index 06799391..7e5540fd 100644 --- a/src/app/components/message/Reply.css.ts +++ b/src/app/components/message/Reply.css.ts @@ -7,7 +7,6 @@ export const ReplyBend = style({ export const ThreadIndicator = style({ opacity: config.opacity.P300, - gap: toRem(2), selectors: { 'button&': { @@ -19,11 +18,6 @@ export const ThreadIndicator = style({ }, }); -export const ThreadIndicatorIcon = style({ - width: toRem(14), - height: toRem(14), -}); - export const Reply = style({ marginBottom: toRem(1), minWidth: 0, diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index 563d1bf8..dc92bf83 100644 --- a/src/app/components/message/Reply.tsx +++ b/src/app/components/message/Reply.tsx @@ -38,9 +38,16 @@ export const ReplyLayout = as<'div', ReplyLayoutProps>( ); export const ThreadIndicator = as<'div'>(({ ...props }, ref) => ( - - - Threaded reply + + + Thread )); @@ -97,7 +104,7 @@ export const Reply = as<'div', ReplyProps>( const bodyJSX = body ? scaleSystemEmoji(trimReplyFromBody(body)) : fallbackBody; return ( - + {threadRootId && ( )} diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index 501ee0dc..1399ec15 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -543,7 +543,7 @@ export const RoomInput = forwardRef( > - + {replyDraft.relation?.rel_type === RelationType.Thread && }