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
165 lines
5.3 KiB
TypeScript
165 lines
5.3 KiB
TypeScript
import {
|
|
Badge,
|
|
Box,
|
|
Button,
|
|
color,
|
|
config,
|
|
Dialog,
|
|
Header,
|
|
Icon,
|
|
IconButton,
|
|
Icons,
|
|
Overlay,
|
|
OverlayBackdrop,
|
|
OverlayCenter,
|
|
Spinner,
|
|
Text,
|
|
} from 'folds';
|
|
import React, { useCallback, useState } from 'react';
|
|
import { MatrixError } from 'matrix-js-sdk';
|
|
import FocusTrap from 'focus-trap-react';
|
|
import { SequenceCard } from '../../../components/sequence-card';
|
|
import { SequenceCardStyle } from '../../room-settings/styles.css';
|
|
import { SettingTile } from '../../../components/setting-tile';
|
|
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
|
import { StateEvent } from '../../../../types/matrix/room';
|
|
import { sendStateEvent } from '../../../utils/room';
|
|
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
|
import { useRoom } from '../../../hooks/useRoom';
|
|
import { useStateEvent } from '../../../hooks/useStateEvent';
|
|
import { stopPropagation } from '../../../utils/keyboard';
|
|
import { RoomPermissionsAPI } from '../../../hooks/useRoomPermissions';
|
|
import { useModalStyle } from '../../../hooks/useModalStyle';
|
|
|
|
const ROOM_ENC_ALGO = 'm.megolm.v1.aes-sha2';
|
|
|
|
type RoomEncryptionProps = {
|
|
permissions: RoomPermissionsAPI;
|
|
};
|
|
export function RoomEncryption({ permissions }: RoomEncryptionProps) {
|
|
const mx = useMatrixClient();
|
|
const room = useRoom();
|
|
const modalStyle = useModalStyle(480);
|
|
|
|
const canEnable = permissions.stateEvent(StateEvent.RoomEncryption, mx.getSafeUserId());
|
|
const content = useStateEvent(room, StateEvent.RoomEncryption)?.getContent<{
|
|
algorithm: string;
|
|
}>();
|
|
const enabled = content?.algorithm === ROOM_ENC_ALGO;
|
|
|
|
const [enableState, enable] = useAsyncCallback(
|
|
useCallback(async () => {
|
|
await sendStateEvent(mx, room.roomId, StateEvent.RoomEncryption, {
|
|
algorithm: ROOM_ENC_ALGO,
|
|
});
|
|
}, [mx, room.roomId]),
|
|
);
|
|
|
|
const enabling = enableState.status === AsyncStatus.Loading;
|
|
|
|
const [prompt, setPrompt] = useState(false);
|
|
|
|
const handleEnable = () => {
|
|
enable();
|
|
setPrompt(false);
|
|
};
|
|
|
|
return (
|
|
<SequenceCard
|
|
className={SequenceCardStyle}
|
|
variant="SurfaceVariant"
|
|
direction="Column"
|
|
gap="400"
|
|
>
|
|
<SettingTile
|
|
title="Room Encryption"
|
|
description={
|
|
enabled
|
|
? 'Messages in this room are protected by end-to-end encryption.'
|
|
: 'Once enabled, encryption cannot be disabled!'
|
|
}
|
|
after={
|
|
enabled ? (
|
|
<Badge size="500" variant="Success" fill="Solid" radii="300">
|
|
<Text size="L400">Enabled</Text>
|
|
</Badge>
|
|
) : (
|
|
<Button
|
|
size="300"
|
|
variant="Primary"
|
|
fill="Solid"
|
|
radii="300"
|
|
disabled={!canEnable}
|
|
onClick={() => setPrompt(true)}
|
|
before={enabling && <Spinner size="100" variant="Primary" fill="Solid" />}
|
|
>
|
|
<Text size="B300">Enable</Text>
|
|
</Button>
|
|
)
|
|
}
|
|
>
|
|
{enableState.status === AsyncStatus.Error && (
|
|
<Text style={{ color: color.Critical.Main }} size="T200">
|
|
{(enableState.error as MatrixError).message}
|
|
</Text>
|
|
)}
|
|
{prompt && (
|
|
<Overlay open backdrop={<OverlayBackdrop />}>
|
|
<OverlayCenter>
|
|
<FocusTrap
|
|
focusTrapOptions={{
|
|
fallbackFocus: '#roomencryption-dialog-1',
|
|
onDeactivate: () => setPrompt(false),
|
|
clickOutsideDeactivates: true,
|
|
escapeDeactivates: stopPropagation,
|
|
}}
|
|
>
|
|
<Dialog
|
|
id="roomencryption-dialog-1"
|
|
role="dialog"
|
|
aria-modal="true"
|
|
aria-labelledby="roomencryption-dialog-1-title"
|
|
tabIndex={-1}
|
|
variant="Surface"
|
|
style={modalStyle}
|
|
>
|
|
<Header
|
|
style={{
|
|
padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
|
|
borderBottomWidth: config.borderWidth.B300,
|
|
}}
|
|
variant="Surface"
|
|
size="500"
|
|
>
|
|
<Box grow="Yes">
|
|
<Text id="roomencryption-dialog-1-title" as="h2" size="H4">
|
|
Enable Encryption
|
|
</Text>
|
|
</Box>
|
|
<IconButton
|
|
size="300"
|
|
onClick={() => setPrompt(false)}
|
|
radii="300"
|
|
aria-label="Cancel"
|
|
>
|
|
<Icon src={Icons.Cross} />
|
|
</IconButton>
|
|
</Header>
|
|
<Box style={{ padding: config.space.S400 }} direction="Column" gap="400">
|
|
<Text priority="400">
|
|
Are you sure? Once enabled, encryption cannot be disabled!
|
|
</Text>
|
|
<Button type="submit" variant="Primary" onClick={handleEnable}>
|
|
<Text size="B400">Enable E2E Encryption</Text>
|
|
</Button>
|
|
</Box>
|
|
</Dialog>
|
|
</FocusTrap>
|
|
</OverlayCenter>
|
|
</Overlay>
|
|
)}
|
|
</SettingTile>
|
|
</SequenceCard>
|
|
);
|
|
}
|