CI / Build & Quality Checks (push) Canceled after 0s
CI / Trigger Desktop Build (push) Canceled after 0s
CI / Secret scan (gitleaks) (push) Canceled after 0s
CI / Docker image build & smoke test (push) Canceled after 0s
CI / Playwright smoke (e2e) (push) Canceled after 0s
Most modals rendered a folds Dialog/Modal with no role and no name, and their focus traps used `initialFocus: false`, so focus stayed behind the modal and a screen reader never announced it. - 32 dialogs with a visible heading: role="dialog", aria-modal, aria-labelledby → the heading (given an id), tabIndex=-1. - 4 dialogs that already had a name (Leave Room, room topic viewer, server ACL, room-nav prompt): role + aria-modal. - Their focus traps drop `initialFocus: false` for focus-trap's default (keep an already-focused autoFocus field, else the first tabbable element) with the dialog itself as fallbackFocus, so a dialog without a tabbable node can't crash the trap. Traps that live in a parent (UIA stages, Logout, Forward, Invite) get the semantics only. - The file drop overlay is deliberately left alone (not a dialog). Checked at runtime: Join with Address, Delete Message, Report Message, Leave Room and Logout open as named dialogs with focus inside and close with Escape (Tab first when a text field has focus — the shared stopPropagation keeps Escape from discarding typed text, by design). The axe e2e spec (6 tests) passes; eslint warnings unchanged (46). 17 modals with no heading (image/file viewers, loading screens) remain. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PPmy3tPq869XDW4njjVaKA
147 lines
4.5 KiB
TypeScript
147 lines
4.5 KiB
TypeScript
import React, { FormEventHandler, useState } from 'react';
|
|
import FocusTrap from 'focus-trap-react';
|
|
import {
|
|
Dialog,
|
|
Overlay,
|
|
OverlayCenter,
|
|
OverlayBackdrop,
|
|
Header,
|
|
config,
|
|
Box,
|
|
Text,
|
|
IconButton,
|
|
Icon,
|
|
Icons,
|
|
Button,
|
|
Input,
|
|
color,
|
|
} from 'folds';
|
|
import { stopPropagation } from '../../utils/keyboard';
|
|
import { isRoomAlias, isRoomId } from '../../utils/matrix';
|
|
import { useModalStyle } from '../../hooks/useModalStyle';
|
|
import { parseMatrixToRoom, parseMatrixToRoomEvent, testMatrixTo } from '../../plugins/matrix-to';
|
|
import { tryDecodeURIComponent } from '../../utils/dom';
|
|
|
|
type JoinAddressProps = {
|
|
onOpen: (roomIdOrAlias: string, via?: string[], eventId?: string) => void;
|
|
onCancel: () => void;
|
|
};
|
|
export function JoinAddressPrompt({ onOpen, onCancel }: JoinAddressProps) {
|
|
const modalStyle = useModalStyle(480);
|
|
const [invalid, setInvalid] = useState(false);
|
|
|
|
const handleSubmit: FormEventHandler<HTMLFormElement> = (evt) => {
|
|
evt.preventDefault();
|
|
setInvalid(false);
|
|
|
|
const target = evt.target as HTMLFormElement | undefined;
|
|
const addressInput = target?.addressInput as HTMLInputElement | undefined;
|
|
const address = addressInput?.value.trim();
|
|
if (!address) return;
|
|
|
|
if (isRoomId(address) || isRoomAlias(address)) {
|
|
onOpen(address);
|
|
return;
|
|
}
|
|
|
|
if (testMatrixTo(address)) {
|
|
const decodedAddress = tryDecodeURIComponent(address);
|
|
const toRoom = parseMatrixToRoom(decodedAddress);
|
|
if (toRoom) {
|
|
onOpen(toRoom.roomIdOrAlias, toRoom.viaServers);
|
|
return;
|
|
}
|
|
|
|
const toEvent = parseMatrixToRoomEvent(decodedAddress);
|
|
if (toEvent) {
|
|
onOpen(toEvent.roomIdOrAlias, toEvent.viaServers, toEvent.eventId);
|
|
return;
|
|
}
|
|
}
|
|
|
|
setInvalid(true);
|
|
};
|
|
|
|
return (
|
|
<Overlay open backdrop={<OverlayBackdrop />}>
|
|
<OverlayCenter>
|
|
<FocusTrap
|
|
focusTrapOptions={{
|
|
fallbackFocus: '#joinaddressprompt-dialog-1',
|
|
onDeactivate: onCancel,
|
|
clickOutsideDeactivates: true,
|
|
escapeDeactivates: stopPropagation,
|
|
}}
|
|
>
|
|
<Dialog
|
|
id="joinaddressprompt-dialog-1"
|
|
role="dialog"
|
|
aria-modal="true"
|
|
aria-labelledby="joinaddressprompt-dialog-1-title"
|
|
tabIndex={-1}
|
|
variant="Surface"
|
|
style={modalStyle}
|
|
>
|
|
<Header
|
|
style={{
|
|
padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
|
|
}}
|
|
variant="Surface"
|
|
size="500"
|
|
>
|
|
<Box grow="Yes">
|
|
<Text id="joinaddressprompt-dialog-1-title" as="h2" size="H4">
|
|
Join with Address
|
|
</Text>
|
|
</Box>
|
|
<IconButton size="300" onClick={onCancel} radii="300" aria-label="Cancel">
|
|
<Icon src={Icons.Cross} />
|
|
</IconButton>
|
|
</Header>
|
|
<Box
|
|
as="form"
|
|
onSubmit={handleSubmit}
|
|
style={{ padding: config.space.S400, paddingTop: 0 }}
|
|
direction="Column"
|
|
gap="400"
|
|
>
|
|
<Box direction="Column" gap="200">
|
|
<Text priority="400" size="T300">
|
|
Enter public address to join the community. Addresses looks like:
|
|
</Text>
|
|
<Text as="ul" size="T200" priority="300" style={{ paddingLeft: config.space.S400 }}>
|
|
<li>#community:server</li>
|
|
<li>https://matrix.to/#/#community:server</li>
|
|
<li>https://matrix.to/#/!xYzAj?via=server</li>
|
|
</Text>
|
|
</Box>
|
|
<Box direction="Column" gap="100">
|
|
<Text as="label" htmlFor="join-address" size="L400">
|
|
Address
|
|
</Text>
|
|
<Input
|
|
id="join-address"
|
|
size="500"
|
|
autoFocus
|
|
name="addressInput"
|
|
variant="Background"
|
|
placeholder="#community:server"
|
|
required
|
|
/>
|
|
{invalid && (
|
|
<Text size="T200" style={{ color: color.Critical.Main }}>
|
|
<b>Invalid Address</b>
|
|
</Text>
|
|
)}
|
|
</Box>
|
|
<Button type="submit" variant="Primary">
|
|
<Text size="B400">Open</Text>
|
|
</Button>
|
|
</Box>
|
|
</Dialog>
|
|
</FocusTrap>
|
|
</OverlayCenter>
|
|
</Overlay>
|
|
);
|
|
}
|