Merge branch 'lotus' into fix/dialog-enter-closes

Several dialogs are <Box as="form"> with the header ✕ (folds IconButton,
no type attribute, so a submit button) as the form's first button. On
implicit submission, Enter in a text field "clicked" ✕, closing the dialog
and throwing away what was typed (a poll's question and answers, a
schedule, a report reason).

The header close/cancel IconButtons now have type="button": Create Poll,
Schedule Message, Report User, Report Room, Account Data editor, State
Event editor, device verification setup, and the message delete/report
dialogs.

Verified headless: in Create Poll, typing a question and pressing Enter
used to close the dialog; now it stays open with the question kept.

Fixes #315

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5

src/app/components/AccountDataEditor.tsx

@@ -297,7 +297,7 @@ export function AccountDataEditor({
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
               <Icon src={Icons.Cross} />
             </IconButton>
           </Box>

src/app/components/DeviceVerificationSetup.tsx

@@ -315,7 +315,7 @@ export const DeviceVerificationSetup = forwardRef<HTMLDivElement, DeviceVerifica
               Setup Device Verification
             </Text>
           </Box>
-          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>
@@ -361,7 +361,7 @@ export const DeviceVerificationReset = forwardRef<HTMLDivElement, DeviceVerifica
               Reset Device Verification
             </Text>
           </Box>
-          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>

src/app/features/common-settings/developer-tools/StateEventEditor.tsx

@@ -275,7 +275,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
               <Icon src={Icons.Cross} />
             </IconButton>
           </Box>

src/app/features/room/PollCreator.tsx

@@ -143,7 +143,7 @@ export function PollCreator({ roomId, threadRootId, onClose }: PollCreatorProps)
                   Create Poll
                 </Text>
               </Box>
-              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ReportRoomModal.tsx

@@ -118,7 +118,7 @@ export function ReportRoomModal({ roomId, onClose }: ReportRoomModalProps) {
                   Report Room
                 </Text>
               </Box>
-              <IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ReportUserModal.tsx

@@ -124,7 +124,7 @@ export function ReportUserModal({ userId, onClose }: ReportUserModalProps) {
                   Report User
                 </Text>
               </Box>
-              <IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ScheduleMessageModal.tsx

@@ -202,7 +202,7 @@ export function ScheduleMessageModal({
                   {title}
                 </Text>
               </Box>
-              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/message/Message.tsx

@@ -725,7 +725,13 @@ export const MessageDeleteItem = as<
                     Delete Message
                   </Text>
                 </Box>
-                <IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
+                <IconButton
+                  type="button"
+                  size="300"
+                  onClick={handleClose}
+                  radii="300"
+                  aria-label="Close"
+                >
                   <Icon src={Icons.Cross} />
                 </IconButton>
               </Header>
@@ -865,7 +871,13 @@ export const MessageReportItem = as<
                     Report Message
                   </Text>
                 </Box>
-                <IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
+                <IconButton
+                  type="button"
+                  size="300"
+                  onClick={handleClose}
+                  radii="300"
+                  aria-label="Close"
+                >
                   <Icon src={Icons.Cross} />
                 </IconButton>
               </Header>

src/app/pages/client/home/Home.tsx

@@ -255,8 +255,6 @@ function HomeCustomSection({
       return (localName ?? matrixName).toLowerCase().includes(query);
     });
   }, [mx, section.rooms, closed, roomsWithUnreadSet, selectedRoomId, filterQuery]);
-  // [Gitea #289] While filtering, a section with no matches is hidden.
-  if (filterQuery.trim() && items.length === 0) return null;
   // Sections are user-curated and small, so they render plainly — no
   // virtualizer per section (a late-mounted one never measured its scroller).
   return (
@@ -445,26 +443,6 @@ export function Home() {
     });
   }, [mx, sortedRooms, filterQuery]);
 
-  // [Gitea #289] While filtering, hide empty sections; with no match at all,
-  // say so instead of leaving bare headers.
-  const filtering = filterQuery.trim().length > 0;
-  const customSectionMatch = useMemo(() => {
-    if (!filtering) return true;
-    const query = filterQuery.toLowerCase();
-    const localNames = getLocalRoomNamesContent(mx);
-    return customSections.some((section) =>
-      section.rooms.some((rId) =>
-        (localNames.rooms[rId] ?? mx.getRoom(rId)?.name ?? '').toLowerCase().includes(query),
-      ),
-    );
-  }, [mx, customSections, filtering, filterQuery]);
-  const noFilterMatch =
-    filtering &&
-    !customSectionMatch &&
-    filteredFavoriteRooms.length === 0 &&
-    filteredRooms.length === 0 &&
-    filteredLowPriorityRooms.length === 0;
-
   const favVirtualizer = useVirtualizer({
     count: filteredFavoriteRooms.length,
     getScrollElement: () => scrollRef.current,
@@ -602,7 +580,7 @@ export function Home() {
                 />
               </Box>
             </NavCategory>
-            {favoriteRooms.length > 0 && (!filtering || filteredFavoriteRooms.length > 0) && (
+            {favoriteRooms.length > 0 && (
               <NavCategory>
                 <NavCategoryHeader>
                   <RoomNavCategoryButton
@@ -651,171 +629,142 @@ export function Home() {
                 notificationPreferences={notificationPreferences}
               />
             ))}
-            {noFilterMatch && (
-              <NavCategory>
-                <Box
-                  direction="Column"
-                  alignItems="Center"
-                  gap="200"
-                  style={{ padding: config.space.S400 }}
+            <NavCategory>
+              <NavCategoryHeader>
+                <RoomNavCategoryButton
+                  closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
+                  data-category-id={DEFAULT_CATEGORY_ID}
+                  onClick={handleCategoryClick}
                 >
-                  <Text size="T300" priority="300" align="Center">
-                    No rooms match &ldquo;{filterQuery.trim()}&rdquo;
-                  </Text>
-                  <Button
-                    size="300"
-                    variant="Secondary"
-                    fill="Soft"
-                    radii="300"
-                    onClick={() => setFilterQuery('')}
-                  >
-                    <Text size="B300">Clear filter</Text>
-                  </Button>
-                </Box>
-              </NavCategory>
-            )}
-            {(!filtering || filteredRooms.length > 0) && (
-              <NavCategory>
-                <NavCategoryHeader>
-                  <RoomNavCategoryButton
-                    closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
-                    data-category-id={DEFAULT_CATEGORY_ID}
-                    onClick={handleCategoryClick}
-                  >
-                    Rooms
-                  </RoomNavCategoryButton>
-                  {!closedCategories.has(DEFAULT_CATEGORY_ID) && (
-                    <>
-                      <IconButton
-                        aria-expanded={!!sortMenuAnchor}
-                        aria-haspopup="menu"
-                        variant="Background"
-                        fill="None"
-                        size="300"
-                        radii="300"
-                        onClick={(evt: React.MouseEvent<HTMLButtonElement>) => {
-                          const cords = evt.currentTarget.getBoundingClientRect();
-                          setSortMenuAnchor((current) => (current ? undefined : cords));
-                        }}
-                        aria-label="Sort rooms"
-                      >
-                        <Icon src={Icons.Sort} size="100" />
-                      </IconButton>
-                      <PopOut
-                        anchor={sortMenuAnchor}
-                        position="Bottom"
-                        align="End"
-                        offset={6}
-                        content={
-                          <FocusTrap
-                            focusTrapOptions={{
-                              initialFocus: false,
-                              onDeactivate: () => setSortMenuAnchor(undefined),
-                              clickOutsideDeactivates: true,
-                              isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
-                              isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
-                              escapeDeactivates: stopPropagation,
-                            }}
-                          >
-                            <Menu style={{ maxWidth: toRem(180), width: '100vw' }}>
-                              <Box
-                                direction="Column"
-                                gap="100"
-                                style={{ padding: config.space.S100 }}
+                  Rooms
+                </RoomNavCategoryButton>
+                {!closedCategories.has(DEFAULT_CATEGORY_ID) && (
+                  <>
+                    <IconButton
+                      aria-expanded={!!sortMenuAnchor}
+                      aria-haspopup="menu"
+                      variant="Background"
+                      fill="None"
+                      size="300"
+                      radii="300"
+                      onClick={(evt: React.MouseEvent<HTMLButtonElement>) => {
+                        const cords = evt.currentTarget.getBoundingClientRect();
+                        setSortMenuAnchor((current) => (current ? undefined : cords));
+                      }}
+                      aria-label="Sort rooms"
+                    >
+                      <Icon src={Icons.Sort} size="100" />
+                    </IconButton>
+                    <PopOut
+                      anchor={sortMenuAnchor}
+                      position="Bottom"
+                      align="End"
+                      offset={6}
+                      content={
+                        <FocusTrap
+                          focusTrapOptions={{
+                            initialFocus: false,
+                            onDeactivate: () => setSortMenuAnchor(undefined),
+                            clickOutsideDeactivates: true,
+                            isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
+                            isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
+                            escapeDeactivates: stopPropagation,
+                          }}
+                        >
+                          <Menu style={{ maxWidth: toRem(180), width: '100vw' }}>
+                            <Box
+                              direction="Column"
+                              gap="100"
+                              style={{ padding: config.space.S100 }}
+                            >
+                              <MenuItem
+                                onClick={() => {
+                                  setHomeRoomSort('recent');
+                                  setSortMenuAnchor(undefined);
+                                }}
+                                size="300"
+                                after={
+                                  homeRoomSort === 'recent' ? (
+                                    <Icon size="100" src={Icons.Check} />
+                                  ) : undefined
+                                }
+                                radii="300"
                               >
-                                <MenuItem
-                                  onClick={() => {
-                                    setHomeRoomSort('recent');
-                                    setSortMenuAnchor(undefined);
-                                  }}
-                                  size="300"
-                                  after={
-                                    homeRoomSort === 'recent' ? (
-                                      <Icon size="100" src={Icons.Check} />
-                                    ) : undefined
-                                  }
-                                  radii="300"
-                                >
-                                  <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-                                    Recent Activity
-                                  </Text>
-                                </MenuItem>
-                                <MenuItem
-                                  onClick={() => {
-                                    setHomeRoomSort('alpha');
-                                    setSortMenuAnchor(undefined);
-                                  }}
-                                  size="300"
-                                  after={
-                                    homeRoomSort === 'alpha' ? (
-                                      <Icon size="100" src={Icons.Check} />
-                                    ) : undefined
-                                  }
-                                  radii="300"
-                                >
-                                  <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-                                    A → Z
-                                  </Text>
-                                </MenuItem>
-                                <MenuItem
-                                  onClick={() => {
-                                    setHomeRoomSort('unread');
-                                    setSortMenuAnchor(undefined);
-                                  }}
-                                  size="300"
-                                  after={
-                                    homeRoomSort === 'unread' ? (
-                                      <Icon size="100" src={Icons.Check} />
-                                    ) : undefined
-                                  }
-                                  radii="300"
-                                >
-                                  <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-                                    Unread First
-                                  </Text>
-                                </MenuItem>
-                              </Box>
-                            </Menu>
-                          </FocusTrap>
-                        }
-                      />
-                    </>
-                  )}
-                </NavCategoryHeader>
-                <div
-                  style={{
-                    position: 'relative',
-                    height: virtualizer.getTotalSize(),
-                  }}
-                >
-                  {virtualizer.getVirtualItems().map((vItem) => {
-                    const roomId = filteredRooms[vItem.index];
-                    const room = mx.getRoom(roomId);
-                    if (!room) return null;
-                    const selected = selectedRoomId === roomId;
+                                <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                                  Recent Activity
+                                </Text>
+                              </MenuItem>
+                              <MenuItem
+                                onClick={() => {
+                                  setHomeRoomSort('alpha');
+                                  setSortMenuAnchor(undefined);
+                                }}
+                                size="300"
+                                after={
+                                  homeRoomSort === 'alpha' ? (
+                                    <Icon size="100" src={Icons.Check} />
+                                  ) : undefined
+                                }
+                                radii="300"
+                              >
+                                <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                                  A → Z
+                                </Text>
+                              </MenuItem>
+                              <MenuItem
+                                onClick={() => {
+                                  setHomeRoomSort('unread');
+                                  setSortMenuAnchor(undefined);
+                                }}
+                                size="300"
+                                after={
+                                  homeRoomSort === 'unread' ? (
+                                    <Icon size="100" src={Icons.Check} />
+                                  ) : undefined
+                                }
+                                radii="300"
+                              >
+                                <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                                  Unread First
+                                </Text>
+                              </MenuItem>
+                            </Box>
+                          </Menu>
+                        </FocusTrap>
+                      }
+                    />
+                  </>
+                )}
+              </NavCategoryHeader>
+              <div
+                style={{
+                  position: 'relative',
+                  height: virtualizer.getTotalSize(),
+                }}
+              >
+                {virtualizer.getVirtualItems().map((vItem) => {
+                  const roomId = filteredRooms[vItem.index];
+                  const room = mx.getRoom(roomId);
+                  if (!room) return null;
+                  const selected = selectedRoomId === roomId;
 
-                    return (
-                      <VirtualTile
-                        virtualItem={vItem}
-                        key={roomId}
-                        ref={virtualizer.measureElement}
-                      >
-                        <RoomNavItem
-                          room={room}
-                          selected={selected}
-                          linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
-                          notificationMode={getRoomNotificationMode(
-                            notificationPreferences,
-                            room.roomId,
-                          )}
-                        />
-                      </VirtualTile>
-                    );
-                  })}
-                </div>
-              </NavCategory>
-            )}
-            {lowPriorityRooms.length > 0 && (!filtering || filteredLowPriorityRooms.length > 0) && (
+                  return (
+                    <VirtualTile virtualItem={vItem} key={roomId} ref={virtualizer.measureElement}>
+                      <RoomNavItem
+                        room={room}
+                        selected={selected}
+                        linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
+                        notificationMode={getRoomNotificationMode(
+                          notificationPreferences,
+                          room.roomId,
+                        )}
+                      />
+                    </VirtualTile>
+                  );
+                })}
+              </div>
+            </NavCategory>
+            {lowPriorityRooms.length > 0 && (
               <NavCategory>
                 <NavCategoryHeader>
                   <RoomNavCategoryButton