fix(composer): Escape closes the emoji and sticker boards (#304)

The board opens with focus in its search field, and its FocusTrap used
the shared stopPropagation helper, which ignores Escape while an input
is focused, so Escape never closed it (Chromium, Firefox, WebKit).
Always close on Escape here, still stopping the key from closing the
room or modal underneath. The GIF picker already uses the default.

Fixes #304

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

package-lock.json

@@ -81,7 +81,7 @@
       },
       "devDependencies": {
         "@axe-core/playwright": "4.13.0",
-        "@lotusguild/element-call-embedded": "0.25.0-lotus.23",
+        "@lotusguild/element-call-embedded": "0.25.0-lotus.22",
         "@playwright/test": "1.63.0",
         "@rollup/plugin-inject": "5.0.5",
         "@rollup/plugin-wasm": "6.2.2",
@@ -2695,9 +2695,9 @@
       "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
     },
     "node_modules/@lotusguild/element-call-embedded": {
-      "version": "0.25.0-lotus.23",
-      "resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.23/element-call-embedded-0.25.0-lotus.23.tgz",
-      "integrity": "sha512-vRmcWeJcU0Accyl2x3mqNEzrIe8djE5BekyYbYOSCsMflC98rZgD1mO7KOe7bA1cX7gparRf6sAt1fotHoU+bA==",
+      "version": "0.25.0-lotus.22",
+      "resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.22/element-call-embedded-0.25.0-lotus.22.tgz",
+      "integrity": "sha512-AimDKZA4xUKEEyl2XUFUSUDl03tBKFv88T/3igKyH2VqNSPMGnqcQJC5HXIkHLTWrOmg8kLcJ//FFbqlUZiLcA==",
       "dev": true
     },
     "node_modules/@matrix-org/matrix-sdk-crypto-wasm": {

package.json

@@ -108,7 +108,7 @@
   },
   "devDependencies": {
     "@axe-core/playwright": "4.13.0",
-    "@lotusguild/element-call-embedded": "0.25.0-lotus.23",
+    "@lotusguild/element-call-embedded": "0.25.0-lotus.22",
     "@playwright/test": "1.63.0",
     "@rollup/plugin-inject": "5.0.5",
     "@rollup/plugin-wasm": "6.2.2",

src/app/components/AccountDataEditor.tsx

@@ -297,7 +297,7 @@ export function AccountDataEditor({
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton 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 type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton 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 type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>

src/app/components/create-room/utils.ts

@@ -139,11 +139,8 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
       data.allowFederation,
       data.additionalCreators,
     ),
-    // [Gitea #328] Every non-space room gets call.member at user level, not just
-    // voice rooms: the call button is shown in private group rooms too, and with
-    // Synapse's state_default (50) only admins could start or join a call there
-    // ("You don't have permission to join!").
-    power_level_content_override: createVoiceRoomPowerLevelsOverride(),
+    power_level_content_override:
+      data.type === RoomType.Call ? createVoiceRoomPowerLevelsOverride() : undefined,
     initial_state: initialState,
   };
 

src/app/components/emoji-board/EmojiBoard.tsx

@@ -19,7 +19,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
 import { EmojiData, IEmoji, emojiGroups, emojis, loadEmojiData } from '../../plugins/emoji';
 import { useEmojiGroupLabels } from './useEmojiGroupLabels';
 import { useEmojiGroupIcons } from './useEmojiGroupIcons';
-import { preventScrollWithArrowKey, stopPropagation } from '../../utils/keyboard';
+import { preventScrollWithArrowKey } from '../../utils/keyboard';
 import { useRelevantImagePacks } from '../../hooks/useImagePacks';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { useRecentEmoji } from '../../hooks/useRecentEmoji';
@@ -612,7 +612,13 @@ export function EmojiBoard({
           !editableActiveElement() && isKeyHotkey(['arrowdown', 'arrowright'], evt),
         isKeyBackward: (evt: KeyboardEvent) =>
           !editableActiveElement() && isKeyHotkey(['arrowup', 'arrowleft'], evt),
-        escapeDeactivates: stopPropagation,
+        // [Gitea #304] The board opens with focus in its search field, where
+        // the shared stopPropagation helper ignores Escape. Always close here,
+        // without letting the key also close the room/modal underneath.
+        escapeDeactivates: (evt: KeyboardEvent) => {
+          evt.stopPropagation();
+          return true;
+        },
       }}
     >
       <EmojiBoardLayout

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 type="button" onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton 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 type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton 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 type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton 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 type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton 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 type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

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

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

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

@@ -69,15 +69,8 @@ export const Reactions = as<'div', ReactionsProps>(
     const measure = useCallback(() => {
       const container = containerRef.current;
       if (!container) return;
-      // [Gitea #305] The width the chips actually get (content box). The border
-      // box grows by 4 px while collapsed (margin -2 / padding 2), and measuring
-      // it made a row within 4 px of fitting flip collapsed↔expanded every frame.
-      const cs = getComputedStyle(container);
-      const rowWidth =
-        container.clientWidth -
-        (parseFloat(cs.paddingLeft) || 0) -
-        (parseFloat(cs.paddingRight) || 0);
-      const gap = parseFloat(cs.columnGap) || 8;
+      const rowWidth = container.getBoundingClientRect().width;
+      const gap = parseFloat(getComputedStyle(container).columnGap) || 8;
       const chips = keys ? keys.split('\u0000').map((k) => chipRefs.current.get(k)) : [];
       const widths = chips.map((el) => el?.getBoundingClientRect().width ?? 0);
       const moreWidth = moreRef.current?.getBoundingClientRect().width ?? 48;
@@ -117,21 +110,8 @@ export const Reactions = as<'div', ReactionsProps>(
         style={{
           ...props.style,
           ...(collapsed && rowHeight
-            ? // 2px breathing room so row-1 focus outlines are not clipped. Longhand
-              // margins so the timeline's marginTop survives (Gitea #305: the
-              // `margin` shorthand overrode it and, once removed, cleared it).
-              {
-                maxHeight: rowHeight + 4,
-                overflow: 'hidden',
-                padding: 2,
-                marginLeft: -2,
-                marginRight: -2,
-                marginBottom: -2,
-                marginTop:
-                  props.style?.marginTop !== undefined
-                    ? `calc(${typeof props.style.marginTop === 'number' ? `${props.style.marginTop}px` : props.style.marginTop} - 2px)`
-                    : -2,
-              }
+            ? // 2px breathing room so row-1 focus outlines are not clipped.
+              { maxHeight: rowHeight + 4, overflow: 'hidden', padding: 2, margin: -2 }
             : {}),
         }}
         ref={(el) => {

src/app/plugins/call/CallEmbed.ts

@@ -31,7 +31,6 @@ import { verifyDenoiseAssets } from './denoiseSmokeCheck';
 import { canDelegateCapability } from './utils';
 import { getCallPageUrl } from './callPageUrl';
 import { restrictWidgetMessages } from '../widgetTransport';
-import { isRingableRoom } from '../../utils/callRing';
 
 // Maximum time to wait for the embedded Element Call iframe to progress from
 // initial load to a ready/joined state. If it hasn't by then, we assume the
@@ -218,9 +217,6 @@ export class CallEmbed {
       //  - transparent background so the room wallpaper shows through natively
       lotusCallState: 'true',
       lotusTransparent: 'true',
-      // [Gitea #293] the fork applies the theme with transparency anyway, and
-      // warned in every call that lotusTheme wasn't set
-      lotusTheme: 'true',
       // [Gitea #43] The fork hides its own footer (we draw the call bar) and
       // sets its root color-scheme from the theme, instead of us injecting CSS.
       lotusHostControls: 'true',
@@ -255,18 +251,8 @@ export class CallEmbed {
       verifyDenoiseAssets(denoiseModel).catch(() => undefined);
     }
 
-    // [Gitea #295] Only ask Element Call to notify where a call can ring at all
-    // (DMs, invite-only groups outside a space). In a voice channel or space
-    // room the notification carries an @room mention, so every member got a
-    // highlighted ping (and phone push) whenever a moderator hopped in, and
-    // other clients showed it as a missed call.
-    // `none` needs element-call-embedded ≥ 0.25.0-lotus.23 (older builds ignore it).
     if (CallEmbed.startingCall(intent)) {
-      let notify = 'none';
-      if (isRingableRoom(room, CallEmbed.dmCall(intent))) {
-        notify = CallEmbed.dmCall(intent) ? 'ring' : 'notification';
-      }
-      params.append('sendNotificationType', notify);
+      params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
     }
 
     // [Gitea #43] On its own origin when config.json sets elementCallUrl.

vite.config.js

@@ -87,106 +87,97 @@ function copyPdfWorker() {
   };
 }
 
-// The denoise assets the fork loads from ./denoise/ at runtime, as
-// [source, path under denoise/] pairs; `dir: true` entries are whole trees.
-// Shared by the build copy and the dev server (Gitea #293).
-function denoiseSources() {
-  const sapphi = path.resolve('node_modules/@sapphi-red/web-noise-suppressor/dist');
-  const dfnVendor = path.resolve('build/denoise-vendor/deepfilternet');
-  return {
-    // All bundled denoise assets are REQUIRED: every entry backs a model the
-    // UI can select (RNNoise, Speex) or the optional noise gate.
-    sapphi: [
-      [path.join(sapphi, 'rnnoise/workletProcessor.js'), 'rnnoiseWorklet.js'],
-      [path.join(sapphi, 'rnnoise.wasm'), 'rnnoise.wasm'],
-      [path.join(sapphi, 'rnnoise_simd.wasm'), 'rnnoise_simd.wasm'],
-      [path.join(sapphi, 'speex/workletProcessor.js'), 'speexWorklet.js'],
-      [path.join(sapphi, 'speex.wasm'), 'speex.wasm'],
-      [path.join(sapphi, 'noiseGate/workletProcessor.js'), 'noiseGateWorklet.js'],
-    ],
-    // DTLN (@workadventure/noise-suppression): a self-contained ES module that
-    // resolves its own worklet, LiteRT WASM runtime and TFLite models via
-    // `import.meta.url`, so its whole dist/ tree is served intact.
-    dtln: [path.resolve('node_modules/@workadventure/noise-suppression/dist'), 'workadventure'],
-    // DeepFilterNet 3: the ESM (worklet inlined) plus the vendored wasm and ONNX
-    // model (CDN-free / Tauri-CSP safe), in the package's expected v2/ layout.
-    dfn: [
-      [
-        path.resolve('node_modules/deepfilternet3-noise-filter/dist/index.esm.js'),
-        'deepfilternet/index.esm.js',
-      ],
-      [path.join(dfnVendor, 'v2/pkg/df_bg.wasm'), 'deepfilternet/v2/pkg/df_bg.wasm'],
-      [
-        path.join(dfnVendor, 'v2/models/DeepFilterNet3_onnx.tar.gz'),
-        'deepfilternet/v2/models/DeepFilterNet3_onnx.tar.gz',
-      ],
-    ],
-  };
-}
-
-// Lotus ML noise suppression: ship the denoise worklets/wasm/models alongside
-// the vendored Element Call bundle. Runs after viteStaticCopy has populated
-// dist/public/element-call (closeBundle order). [Gitea #293] The dev server
-// serves the same files at the same URLs, so `npm start` can test denoise.
+// Lotus ML noise suppression: ship the RNNoise worklet/wasm + our getUserMedia
+// shim alongside the vendored Element Call bundle, and inject the shim <script>
+// into EC's index.html so it runs before EC captures the mic. Runs after
+// viteStaticCopy has populated dist/public/element-call (closeBundle order).
 function lotusDenoise() {
-  const DEV_PREFIX = '/public/element-call/denoise/';
   return {
     name: 'lotus-denoise',
-    configureServer(server) {
-      const { sapphi, dtln, dfn } = denoiseSources();
-      const files = new Map([...sapphi, ...dfn].map(([src, rel]) => [rel, src]));
-      const types = { '.js': 'text/javascript', '.wasm': 'application/wasm' };
-      server.middlewares.use((req, res, next) => {
-        const url = (req.url ?? '').split('?')[0];
-        if (!url.startsWith(DEV_PREFIX)) return next();
-        const rel = decodeURIComponent(url.slice(DEV_PREFIX.length));
-        let file = files.get(rel);
-        if (!file && rel.startsWith(`${dtln[1]}/`)) {
-          const candidate = path.resolve(dtln[0], rel.slice(dtln[1].length + 1));
-          if (candidate.startsWith(dtln[0] + path.sep)) file = candidate;
-        }
-        if (!file || !fs.existsSync(file)) return next();
-        res.setHeader('Content-Type', types[path.extname(file)] ?? 'application/octet-stream');
-        fs.createReadStream(file).pipe(res);
-        return undefined;
-      });
-    },
     closeBundle() {
       const ecDir = path.resolve('dist/public/element-call');
       if (!fs.existsSync(ecDir)) return;
 
       const denoiseDir = path.join(ecDir, 'denoise');
       fs.mkdirSync(denoiseDir, { recursive: true });
-      const { sapphi, dtln, dfn } = denoiseSources();
 
-      // A missing source means a partial/changed install would otherwise
-      // silently ship a broken ML feature (worklet 404 -> raw mic), so we fail
-      // the build instead.
-      const missing = sapphi.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
+      const sapphi = path.resolve('node_modules/@sapphi-red/web-noise-suppressor/dist');
+      // All bundled denoise assets are REQUIRED: every entry backs a model the
+      // UI can select (RNNoise, Speex) or the optional noise gate. A missing
+      // source means a partial/changed install would otherwise silently ship a
+      // broken ML feature (worklet 404 -> raw mic), so we fail the build instead.
+      const assets = [
+        [
+          path.join(sapphi, 'rnnoise/workletProcessor.js'),
+          path.join(denoiseDir, 'rnnoiseWorklet.js'),
+        ],
+        [path.join(sapphi, 'rnnoise.wasm'), path.join(denoiseDir, 'rnnoise.wasm')],
+        [path.join(sapphi, 'rnnoise_simd.wasm'), path.join(denoiseDir, 'rnnoise_simd.wasm')],
+        [path.join(sapphi, 'speex/workletProcessor.js'), path.join(denoiseDir, 'speexWorklet.js')],
+        [path.join(sapphi, 'speex.wasm'), path.join(denoiseDir, 'speex.wasm')],
+        [
+          path.join(sapphi, 'noiseGate/workletProcessor.js'),
+          path.join(denoiseDir, 'noiseGateWorklet.js'),
+        ],
+      ];
+      const missing = assets.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
       if (missing.length > 0) {
         throw new Error(
           `[lotus-denoise] Required denoise asset(s) missing — build aborted to avoid shipping a broken ML feature:\n  ${missing.join('\n  ')}`,
         );
       }
-      sapphi.forEach(([s, rel]) => fs.copyFileSync(s, path.join(denoiseDir, rel)));
+      assets.forEach(([s, d]) => fs.copyFileSync(s, d));
 
-      const dtlnEntry = path.join(dtln[0], 'audio-worklet.js');
+      // DTLN (@workadventure/noise-suppression): unlike the flat sapphi
+      // worklets, this package is a self-contained ES module that resolves its
+      // own AudioWorklet processor, LiteRT WASM runtime and TFLite models via
+      // `import.meta.url`. So we copy its whole dist/ tree intact to
+      // denoise/workadventure/ (preserving assets/ + vendor/) and let the shim
+      // dynamic-import denoise/workadventure/audio-worklet.js at runtime. The
+      // entry module is required — fail the build if the install is broken.
+      const dtlnSrc = path.resolve('node_modules/@workadventure/noise-suppression/dist');
+      const dtlnEntry = path.join(dtlnSrc, 'audio-worklet.js');
       if (!fs.existsSync(dtlnEntry)) {
         throw new Error(
           `[lotus-denoise] DTLN entry missing (${dtlnEntry}) — build aborted. ` +
             'Run `npm ci` to install @workadventure/noise-suppression.',
         );
       }
-      fs.cpSync(dtln[0], path.join(denoiseDir, dtln[1]), { recursive: true });
+      fs.cpSync(dtlnSrc, path.join(denoiseDir, 'workadventure'), { recursive: true });
 
-      const dfnMissing = dfn.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
+      // DeepFilterNet 3 (deepfilternet3-noise-filter): the npm package ships only
+      // its ESM (index.esm.js) with the AudioWorklet processor + wasm-bindgen glue
+      // INLINED as a string (loaded via a Blob URL, no CDN for the worklet). The
+      // only runtime CDN fetches are its single-threaded `df_bg.wasm` and the
+      // ONNX `DeepFilterNet3_onnx.tar.gz` model — which we VENDOR locally (under
+      // build/denoise-vendor/deepfilternet/) and serve, overriding the package's
+      // cdnUrl to our self-hosted base. This keeps the feature CDN-free / Tauri-CSP
+      // safe. We copy the ESM (the shim dynamic-imports it, mirroring DTLN) plus
+      // the vendored assets, preserving the package's expected v2/... layout. All
+      // are required — a missing entry means a broken install, so fail the build.
+      const dfnEsm = path.resolve('node_modules/deepfilternet3-noise-filter/dist/index.esm.js');
+      const dfnVendor = path.resolve('build/denoise-vendor/deepfilternet');
+      const dfnAssets = [
+        [dfnEsm, path.join(denoiseDir, 'deepfilternet/index.esm.js')],
+        [
+          path.join(dfnVendor, 'v2/pkg/df_bg.wasm'),
+          path.join(denoiseDir, 'deepfilternet/v2/pkg/df_bg.wasm'),
+        ],
+        [
+          path.join(dfnVendor, 'v2/models/DeepFilterNet3_onnx.tar.gz'),
+          path.join(denoiseDir, 'deepfilternet/v2/models/DeepFilterNet3_onnx.tar.gz'),
+        ],
+      ];
+      const dfnMissing = dfnAssets.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
       if (dfnMissing.length > 0) {
         throw new Error(
-          `[lotus-denoise] DeepFilterNet 3 asset(s) missing — build aborted to avoid shipping a broken ML feature:\n  ${dfnMissing.join('\n  ')}\n(Run \`npm ci\`; the vendored wasm/model live under build/denoise-vendor/deepfilternet/.)`,
+          '[lotus-denoise] DeepFilterNet 3 asset(s) missing — build aborted to avoid ' +
+            'shipping a broken ML feature:\n  ' +
+            dfnMissing.join('\n  ') +
+            '\n(Run `npm ci`; the vendored wasm/model live under build/denoise-vendor/deepfilternet/.)',
         );
       }
-      dfn.forEach(([s, rel]) => {
-        const d = path.join(denoiseDir, rel);
+      dfnAssets.forEach(([s, d]) => {
         fs.mkdirSync(path.dirname(d), { recursive: true });
         fs.copyFileSync(s, d);
       });