diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 2dbaf1f1..8c28b935 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -16,6 +16,7 @@ import {
} from 'folds';
import { MatrixError } from 'matrix-js-sdk';
import { Cursor } from '../plugins/text-area';
+import { PhoneHit } from '../styles/PhoneHit.css';
import { syntaxErrorPosition } from '../utils/dom';
import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
import { Page, PageHeader } from './page';
@@ -294,7 +295,7 @@ export function AccountDataEditor({
-
+
diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx
index 068f437b..57a18674 100644
--- a/src/app/components/BackupRestore.tsx
+++ b/src/app/components/BackupRestore.tsx
@@ -30,6 +30,7 @@ import {
} from '../hooks/useKeyBackup';
import { stopPropagation } from '../utils/keyboard';
import { useRestoreBackupOnVerification } from '../hooks/useRestoreBackupOnVerification';
+import { PhoneHit } from '../styles/PhoneHit.css';
type BackupStatusProps = {
enabled: boolean;
@@ -177,6 +178,7 @@ export function BackupRestoreTile({ crypto }: BackupRestoreTileProps) {
)}
Device Verification
-
+
diff --git a/src/app/components/DeviceVerificationSetup.tsx b/src/app/components/DeviceVerificationSetup.tsx
index 433fa6a1..68f42221 100644
--- a/src/app/components/DeviceVerificationSetup.tsx
+++ b/src/app/components/DeviceVerificationSetup.tsx
@@ -25,6 +25,7 @@ import { ActionUIA, ActionUIAFlowsLoader } from './ActionUIA';
import { useMatrixClient } from '../hooks/useMatrixClient';
import { useAlive } from '../hooks/useAlive';
import { UseStateProvider } from './UseStateProvider';
+import { PhoneHit } from '../styles/PhoneHit.css';
type UIACallback = (
authDict: AuthDict | null
@@ -301,7 +302,7 @@ export const DeviceVerificationSetup = forwardRef
Setup Device Verification
-
+
@@ -336,7 +337,7 @@ export const DeviceVerificationReset = forwardRef
Reset Device Verification
-
+
diff --git a/src/app/components/Pdf-viewer/PdfViewer.tsx b/src/app/components/Pdf-viewer/PdfViewer.tsx
index 9c7fd980..d0e5f715 100644
--- a/src/app/components/Pdf-viewer/PdfViewer.tsx
+++ b/src/app/components/Pdf-viewer/PdfViewer.tsx
@@ -27,6 +27,7 @@ import { AsyncStatus } from '../../hooks/useAsyncCallback';
import { useZoom } from '../../hooks/useZoom';
import { createPage, usePdfDocumentLoader, usePdfJSLoader } from '../../plugins/pdfjs-dist';
import { stopPropagation } from '../../utils/keyboard';
+import { PhoneHit, PhoneHitSpread24 } from '../../styles/PhoneHit.css';
export type PdfViewerProps = {
name: string;
@@ -108,7 +109,7 @@ export const PdfViewer = as<'div', PdfViewerProps>(
-
+
@@ -117,6 +118,7 @@ export const PdfViewer = as<'div', PdfViewerProps>(
(
{Math.round(zoom * 100)}%
1 ? 'Success' : 'SurfaceVariant'}
outlined={zoom > 1}
size="300"
diff --git a/src/app/components/UIAFlowOverlay.tsx b/src/app/components/UIAFlowOverlay.tsx
index a2bdd1b8..49e1d821 100644
--- a/src/app/components/UIAFlowOverlay.tsx
+++ b/src/app/components/UIAFlowOverlay.tsx
@@ -13,6 +13,7 @@ import {
IconButton,
} from 'folds';
import FocusTrap from 'focus-trap-react';
+import { PhoneHit } from '../styles/PhoneHit.css';
export type UIAFlowOverlayProps = {
currentStep: number;
@@ -53,6 +54,7 @@ export function UIAFlowOverlay({
>
{(anchorRef) => (
(
Seen by
-
+
diff --git a/src/app/components/image-editor/ImageEditor.tsx b/src/app/components/image-editor/ImageEditor.tsx
index 1ec474e8..0f072bb0 100644
--- a/src/app/components/image-editor/ImageEditor.tsx
+++ b/src/app/components/image-editor/ImageEditor.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
import * as css from './ImageEditor.css';
+import { PhoneHit } from '../../styles/PhoneHit.css';
export type ImageEditorProps = {
name: string;
@@ -24,7 +25,7 @@ export const ImageEditor = as<'div', ImageEditorProps>(
>
-
+
diff --git a/src/app/components/image-pack-view/ImagePackView.tsx b/src/app/components/image-pack-view/ImagePackView.tsx
index ab81d503..15b1cd08 100644
--- a/src/app/components/image-pack-view/ImagePackView.tsx
+++ b/src/app/components/image-pack-view/ImagePackView.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import { Box, IconButton, Text, Icon, Icons, Scroll, Chip } from 'folds';
import { PackAddress } from '../../plugins/custom-emoji';
+import { PhoneHit } from '../../styles/PhoneHit.css';
import { Page, PageHeader, PageContent } from '../page';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { RoomImagePack } from './RoomImagePack';
@@ -29,7 +30,7 @@ export function ImagePackView({ address, requestClose }: ImagePackViewProps) {
-
+
diff --git a/src/app/components/image-viewer/ImageViewer.tsx b/src/app/components/image-viewer/ImageViewer.tsx
index 4956a7b6..4d2d7694 100644
--- a/src/app/components/image-viewer/ImageViewer.tsx
+++ b/src/app/components/image-viewer/ImageViewer.tsx
@@ -7,6 +7,7 @@ import * as css from './ImageViewer.css';
import { useZoom } from '../../hooks/useZoom';
import { usePan } from '../../hooks/usePan';
import { downloadMedia } from '../../utils/matrix';
+import { PhoneHit, PhoneHitSpread24 } from '../../styles/PhoneHit.css';
export type ImageViewerProps = {
alt: string;
@@ -33,7 +34,7 @@ export const ImageViewer = as<'div', ImageViewerProps>(
>
-
+
@@ -42,6 +43,7 @@ export const ImageViewer = as<'div', ImageViewerProps>(
(
{Math.round(zoom * 100)}%
1 ? 'Success' : 'SurfaceVariant'}
outlined={zoom > 1}
size="300"
diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
index ddac0576..a503fe13 100644
--- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
+++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
@@ -42,6 +42,7 @@ import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { BreakWord } from '../../styles/Text.css';
import { useAlive } from '../../hooks/useAlive';
+import { PhoneHit } from '../../styles/PhoneHit.css';
const SEARCH_OPTIONS: UseAsyncSearchOptions = {
limit: 1000,
@@ -173,7 +174,7 @@ export function InviteUserPrompt({ room, requestClose }: InviteUserProps) {
-
+
diff --git a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
index 50a89418..ffd5241c 100644
--- a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
+++ b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
@@ -20,6 +20,7 @@ import { stopPropagation } from '../../utils/keyboard';
import { isRoomAlias, isRoomId } from '../../utils/matrix';
import { parseMatrixToRoom, parseMatrixToRoomEvent, testMatrixTo } from '../../plugins/matrix-to';
import { tryDecodeURIComponent } from '../../utils/dom';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type JoinAddressProps = {
onOpen: (roomIdOrAlias: string, via?: string[], eventId?: string) => void;
@@ -82,7 +83,7 @@ export function JoinAddressPrompt({ onOpen, onCancel }: JoinAddressProps) {
Join with Address
-
+
diff --git a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
index 217491e6..832dd59d 100644
--- a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
+++ b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
@@ -20,6 +20,7 @@ import { MatrixError } from 'matrix-js-sdk';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
import { stopPropagation } from '../../utils/keyboard';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type LeaveRoomPromptProps = {
roomId: string;
@@ -68,7 +69,7 @@ export function LeaveRoomPrompt({ roomId, onDone, onCancel }: LeaveRoomPromptPro
Leave Room
-
+
diff --git a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
index 8709b942..6c75ef99 100644
--- a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
+++ b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
@@ -20,6 +20,7 @@ import { MatrixError } from 'matrix-js-sdk';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
import { stopPropagation } from '../../utils/keyboard';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type LeaveSpacePromptProps = {
roomId: string;
@@ -68,7 +69,7 @@ export function LeaveSpacePrompt({ roomId, onDone, onCancel }: LeaveSpacePromptP
Leave Space
-
+
diff --git a/src/app/components/message/FileHeader.tsx b/src/app/components/message/FileHeader.tsx
index 2ffc9ec4..41cef5f4 100644
--- a/src/app/components/message/FileHeader.tsx
+++ b/src/app/components/message/FileHeader.tsx
@@ -2,6 +2,7 @@ import { Badge, Box, Icon, IconButton, Icons, Spinner, Text, as, toRem } from 'f
import React, { ReactNode, useCallback } from 'react';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import FileSaver from 'file-saver';
+import { PhoneHit } from '../../styles/PhoneHit.css';
import { mimeTypeToExt } from '../../utils/mimeTypes';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
@@ -48,6 +49,7 @@ export function FileDownloadButton({ filename, url, mimeType, encInfo }: FileDow
variant={hasError ? 'Critical' : 'SurfaceVariant'}
size="300"
radii="300"
+ className={PhoneHit}
>
{downloading ? (
diff --git a/src/app/components/message/content/AudioContent.tsx b/src/app/components/message/content/AudioContent.tsx
index 478486a4..94132cea 100644
--- a/src/app/components/message/content/AudioContent.tsx
+++ b/src/app/components/message/content/AudioContent.tsx
@@ -3,6 +3,7 @@ import React, { ReactNode, useCallback, useRef, useState } from 'react';
import { Badge, Chip, Icon, IconButton, Icons, ProgressBar, Spinner, Text, toRem } from 'folds';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { Range } from 'react-range';
+import { PhoneHitSpread24 } from '../../../styles/PhoneHit.css';
import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { IAudioInfo } from '../../../../types/matrix/common';
@@ -159,6 +160,7 @@ export function AudioContent({
variant="SurfaceVariant"
size="300"
radii="Pill"
+ className={PhoneHitSpread24}
onClick={() => setMute(!mute)}
aria-pressed={mute}
>
diff --git a/src/app/components/room-topic-viewer/RoomTopicViewer.tsx b/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
index 52128772..0d091e7e 100644
--- a/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
+++ b/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
@@ -4,6 +4,7 @@ import classNames from 'classnames';
import Linkify from 'linkify-react';
import * as css from './style.css';
import { LINKIFY_OPTS, scaleSystemEmoji } from '../../plugins/react-custom-html-parser';
+import { PhoneHit } from '../../styles/PhoneHit.css';
export const RoomTopicViewer = as<
'div',
@@ -26,7 +27,7 @@ export const RoomTopicViewer = as<
{name}
-
+
diff --git a/src/app/components/text-viewer/TextViewer.tsx b/src/app/components/text-viewer/TextViewer.tsx
index ec4ed0a5..e9e150b5 100644
--- a/src/app/components/text-viewer/TextViewer.tsx
+++ b/src/app/components/text-viewer/TextViewer.tsx
@@ -5,6 +5,7 @@ import { Box, Chip, Header, Icon, IconButton, Icons, Scroll, Text, as } from 'fo
import { ErrorBoundary } from 'react-error-boundary';
import * as css from './TextViewer.css';
import { copyToClipboard } from '../../utils/dom';
+import { PhoneHit } from '../../styles/PhoneHit.css';
const ReactPrism = lazy(() => import('../../plugins/react-prism/ReactPrism'));
@@ -53,7 +54,7 @@ export const TextViewer = as<'div', TextViewerProps>(
>
-
+
diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx
index 0164cae6..a7ca2d06 100644
--- a/src/app/components/uia-stages/PasswordStage.tsx
+++ b/src/app/components/uia-stages/PasswordStage.tsx
@@ -4,6 +4,7 @@ import { AuthType } from 'matrix-js-sdk';
import { StageComponentProps } from './types';
import { ErrorCode } from '../../cs-errorcode';
import { PasswordInput } from '../password-input';
+import { PhoneHit } from '../../styles/PhoneHit.css';
export function PasswordStage({
stageData,
@@ -45,7 +46,7 @@ export function PasswordStage({
Account Password
-
+
diff --git a/src/app/components/uia-stages/SSOStage.tsx b/src/app/components/uia-stages/SSOStage.tsx
index e3d6126a..20decb6c 100644
--- a/src/app/components/uia-stages/SSOStage.tsx
+++ b/src/app/components/uia-stages/SSOStage.tsx
@@ -1,6 +1,7 @@
import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds';
import React, { useCallback, useEffect, useState } from 'react';
import { StageComponentProps } from './types';
+import { PhoneHit } from '../../styles/PhoneHit.css';
export function SSOStage({
ssoRedirectURL,
@@ -56,7 +57,7 @@ export function SSOStage({
SSO Login
-
+
diff --git a/src/app/components/user-profile/PowerChip.tsx b/src/app/components/user-profile/PowerChip.tsx
index a6758300..d3e9cf28 100644
--- a/src/app/components/user-profile/PowerChip.tsx
+++ b/src/app/components/user-profile/PowerChip.tsx
@@ -43,6 +43,7 @@ import { getPowerTagIconSrc, useGetMemberPowerTag } from '../../hooks/useMemberP
import { useRoomCreators } from '../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../hooks/useRoomPermissions';
import { useMemberPowerCompare } from '../../hooks/useMemberPowerCompare';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type SelfDemoteAlertProps = {
power: number;
@@ -70,7 +71,7 @@ function SelfDemoteAlert({ power, onCancel, onChange }: SelfDemoteAlertProps) {
Self Demotion
-
+
@@ -120,7 +121,7 @@ function SharedPowerAlert({ power, onCancel, onChange }: SharedPowerAlertProps)
Shared Power
-
+
diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx
index d100096b..a57a6b10 100644
--- a/src/app/features/add-existing/AddExisting.tsx
+++ b/src/app/features/add-existing/AddExisting.tsx
@@ -54,6 +54,7 @@ import { StateEvent } from '../../../types/matrix/room';
import { getViaServers } from '../../plugins/via-servers';
import { rateLimitedActions } from '../../utils/matrix';
import { useAlive } from '../../hooks/useAlive';
+import { PhoneHit } from '../../styles/PhoneHit.css';
const SEARCH_OPTS: UseAsyncSearchOptions = {
limit: 500,
@@ -201,7 +202,7 @@ export function AddExistingModal({ parentId, space, requestClose }: AddExistingM
Add Existing
-
+
diff --git a/src/app/features/call-status/CallControl.tsx b/src/app/features/call-status/CallControl.tsx
index 3cf38b1f..d63f8709 100644
--- a/src/app/features/call-status/CallControl.tsx
+++ b/src/app/features/call-status/CallControl.tsx
@@ -5,6 +5,7 @@ import { StatusDivider } from './components';
import { CallEmbed, useCallControlState } from '../../plugins/call';
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
import { callEmbedAtom } from '../../state/callEmbed';
+import { PhoneHitSpread26 } from '../../styles/PhoneHit.css';
type MicrophoneButtonProps = {
enabled: boolean;
@@ -26,6 +27,7 @@ function MicrophoneButton({ enabled, onToggle, disabled }: MicrophoneButtonProps
>
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
{(anchorRef) => (
void;
@@ -92,7 +93,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
-
+
diff --git a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
index f25ba7c3..a6e60a7b 100644
--- a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
+++ b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
@@ -22,6 +22,7 @@ import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { syntaxErrorPosition } from '../../../utils/dom';
import { Cursor } from '../../../plugins/text-area';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
const EDITOR_INTENT_SPACE_COUNT = 2;
@@ -118,7 +119,7 @@ export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventPro
-
+
diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
index 0ea96901..0f9f4034 100644
--- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
+++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
@@ -31,6 +31,7 @@ import { usePowerLevels } from '../../../hooks/usePowerLevels';
import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
const EDITOR_INTENT_SPACE_COUNT = 2;
@@ -275,7 +276,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
-
+
diff --git a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
index ad8ffae6..f7e901d5 100644
--- a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
+++ b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
@@ -4,6 +4,7 @@ import { Page, PageContent, PageHeader } from '../../../components/page';
import { ImagePack } from '../../../plugins/custom-emoji';
import { ImagePackView } from '../../../components/image-pack-view';
import { RoomPacks } from './RoomPacks';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type EmojisStickersProps = {
requestClose: () => void;
@@ -29,7 +30,7 @@ export function EmojisStickers({ requestClose }: EmojisStickersProps) {
-
+
diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
index fdbe546e..7be8de35 100644
--- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
+++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
@@ -40,6 +40,7 @@ import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { useAlive } from '../../../hooks/useAlive';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type CreatePackTileProps = {
packs: ImagePack[];
@@ -215,6 +216,7 @@ export function RoomPacks({ onViewPack }: RoomPacksProps) {
{canEdit &&
(removed ? (
) : (
Enable Encryption
- setPrompt(false)} radii="300">
+ setPrompt(false)}
+ radii="300"
+ >
diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx
index 45a480aa..2971d565 100644
--- a/src/app/features/common-settings/general/RoomUpgrade.tsx
+++ b/src/app/features/common-settings/general/RoomUpgrade.tsx
@@ -39,6 +39,7 @@ import { useAlive } from '../../../hooks/useAlive';
import { creatorsSupported } from '../../../utils/matrix';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { BreakWord } from '../../../styles/Text.css';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
function RoomUpgradeDialog({ requestClose }: { requestClose: () => void }) {
const mx = useMatrixClient();
@@ -105,7 +106,7 @@ function RoomUpgradeDialog({ requestClose }: { requestClose: () => void }) {
{room.isSpaceRoom() ? 'Space Upgrade' : 'Room Upgrade'}
-
+
diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx
index 15cd1d08..a1dddb54 100644
--- a/src/app/features/common-settings/members/Members.tsx
+++ b/src/app/features/common-settings/members/Members.tsx
@@ -56,6 +56,7 @@ import { useSpaceOptionally } from '../../../hooks/useSpace';
import { useFlattenPowerTagMembers, useGetMemberPowerTag } from '../../../hooks/useMemberPowerTag';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { getMouseEventCords } from '../../../utils/dom';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
const SEARCH_OPTIONS: UseAsyncSearchOptions = {
limit: 1000,
@@ -161,7 +162,7 @@ export function Members({ requestClose }: MembersProps) {
-
+
@@ -277,6 +278,7 @@ export function Members({ requestClose }: MembersProps) {
anchorRef={scrollTopAnchorRef}
>
virtualizer.scrollToOffset(0)}
variant="Surface"
radii="Pill"
diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx
index 97305946..0684a48a 100644
--- a/src/app/features/common-settings/permissions/PowersEditor.tsx
+++ b/src/app/features/common-settings/permissions/PowersEditor.tsx
@@ -49,6 +49,7 @@ import { useAlive } from '../../../hooks/useAlive';
import { BetaNoticeBadge } from '../../../components/BetaNoticeBadge';
import { getPowerTagIconSrc } from '../../../hooks/useMemberPowerTag';
import { creatorsSupported } from '../../../utils/matrix';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type EditPowerProps = {
maxPower: number;
@@ -369,7 +370,7 @@ export function PowersEditor({ powerLevels, requestClose }: PowersEditorProps) {
-
+
diff --git a/src/app/features/create-room/CreateRoomModal.tsx b/src/app/features/create-room/CreateRoomModal.tsx
index d5d8c92d..9332f35c 100644
--- a/src/app/features/create-room/CreateRoomModal.tsx
+++ b/src/app/features/create-room/CreateRoomModal.tsx
@@ -24,6 +24,7 @@ import {
import { CreateRoomModalState } from '../../state/createRoomModal';
import { stopPropagation } from '../../utils/keyboard';
import { CreateRoomType } from '../../components/create-room/types';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type CreateRoomModalProps = {
state: CreateRoomModalState;
@@ -63,7 +64,7 @@ function CreateRoomModal({ state }: CreateRoomModalProps) {
-
+
diff --git a/src/app/features/create-space/CreateSpaceModal.tsx b/src/app/features/create-space/CreateSpaceModal.tsx
index c1bc6898..faa53b25 100644
--- a/src/app/features/create-space/CreateSpaceModal.tsx
+++ b/src/app/features/create-space/CreateSpaceModal.tsx
@@ -23,6 +23,7 @@ import {
} from '../../state/hooks/createSpaceModal';
import { CreateSpaceModalState } from '../../state/createSpaceModal';
import { stopPropagation } from '../../utils/keyboard';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type CreateSpaceModalProps = {
state: CreateSpaceModalState;
@@ -61,7 +62,7 @@ function CreateSpaceModal({ state }: CreateSpaceModalProps) {
New Space
-
+
diff --git a/src/app/features/lobby/HierarchyItemMenu.tsx b/src/app/features/lobby/HierarchyItemMenu.tsx
index 1802e3b0..cdfa2d8a 100644
--- a/src/app/features/lobby/HierarchyItemMenu.tsx
+++ b/src/app/features/lobby/HierarchyItemMenu.tsx
@@ -30,6 +30,7 @@ import { IPowerLevels } from '../../hooks/usePowerLevels';
import { getRoomCreatorsForRoomId } from '../../hooks/useRoomCreators';
import { getRoomPermissionsAPI } from '../../hooks/useRoomPermissions';
import { InviteUserPrompt } from '../../components/invite-user-prompt';
+import { PhoneHitSpread24 } from '../../styles/PhoneHit.css';
type HierarchyItemWithParent = HierarchyItem & {
parentId: string;
@@ -231,6 +232,7 @@ export function HierarchyItemMenu({
return (
virtualizer.scrollToOffset(0)}
variant="SurfaceVariant"
radii="Pill"
diff --git a/src/app/features/message-search/MessageSearch.tsx b/src/app/features/message-search/MessageSearch.tsx
index 26085b5f..a1759ef9 100644
--- a/src/app/features/message-search/MessageSearch.tsx
+++ b/src/app/features/message-search/MessageSearch.tsx
@@ -23,6 +23,7 @@ import { SearchResultGroup } from './SearchResultGroup';
import { SearchInput } from './SearchInput';
import { SearchFilters } from './SearchFilters';
import { VirtualTile } from '../../components/virtualizer';
+import { PhoneHit } from '../../styles/PhoneHit.css';
const useSearchPathSearchParams = (searchParams: URLSearchParams): _SearchPathSearchParams =>
useMemo(
@@ -193,6 +194,7 @@ export function MessageSearch({
virtualizer.scrollToOffset(0)}
variant="SurfaceVariant"
radii="Pill"
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index 8601c365..8f96bd7c 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -17,6 +17,7 @@ import { Permissions } from './permissions';
import { RoomSettingsPage } from '../../state/roomSettings';
import { useRoom } from '../../hooks/useRoom';
import { DeveloperTools } from '../common-settings/developer-tools';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type RoomSettingsMenuItem = {
page: RoomSettingsPage;
@@ -117,7 +118,7 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) {
{screenSize === ScreenSize.Mobile && (
-
+
)}
diff --git a/src/app/features/room-settings/general/General.tsx b/src/app/features/room-settings/general/General.tsx
index 15157304..e29fe2da 100644
--- a/src/app/features/room-settings/general/General.tsx
+++ b/src/app/features/room-settings/general/General.tsx
@@ -15,6 +15,7 @@ import {
} from '../../common-settings/general';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type GeneralProps = {
requestClose: () => void;
@@ -35,7 +36,7 @@ export function General({ requestClose }: GeneralProps) {
-
+
diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx
index 7572a71b..d513dda9 100644
--- a/src/app/features/room-settings/permissions/Permissions.tsx
+++ b/src/app/features/room-settings/permissions/Permissions.tsx
@@ -9,6 +9,7 @@ import { usePermissionGroups } from './usePermissionItems';
import { PermissionGroups, Powers, PowersEditor } from '../../common-settings/permissions';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type PermissionsProps = {
requestClose: () => void;
@@ -45,7 +46,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
-
+
diff --git a/src/app/features/settings/Settings.tsx b/src/app/features/settings/Settings.tsx
index 5e1a20f4..6c91bc9d 100644
--- a/src/app/features/settings/Settings.tsx
+++ b/src/app/features/settings/Settings.tsx
@@ -33,6 +33,7 @@ import { About } from './about';
import { UseStateProvider } from '../../components/UseStateProvider';
import { stopPropagation } from '../../utils/keyboard';
import { LogoutDialog } from '../../components/LogoutDialog';
+import { PhoneHit } from '../../styles/PhoneHit.css';
export enum SettingsPages {
GeneralPage,
@@ -141,7 +142,7 @@ export function Settings({ initialPage, requestClose }: SettingsProps) {
{screenSize === ScreenSize.Mobile && (
-
+
)}
diff --git a/src/app/features/settings/about/About.tsx b/src/app/features/settings/about/About.tsx
index 9ec74305..19407bdf 100644
--- a/src/app/features/settings/about/About.tsx
+++ b/src/app/features/settings/about/About.tsx
@@ -8,6 +8,7 @@ import { LogoMark } from '../../../components/logo/logoMark.css';
import RatatoskrSVG from '../../../../../public/res/svg/ratatoskr.svg';
import { clearCacheAndReload } from '../../../../client/initMatrix';
import { useMatrixClient } from '../../../hooks/useMatrixClient';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type AboutProps = {
requestClose: () => void;
@@ -25,7 +26,7 @@ export function About({ requestClose }: AboutProps) {
-
+
diff --git a/src/app/features/settings/account/Account.tsx b/src/app/features/settings/account/Account.tsx
index c4b56e47..77ee8671 100644
--- a/src/app/features/settings/account/Account.tsx
+++ b/src/app/features/settings/account/Account.tsx
@@ -5,6 +5,7 @@ import { MatrixId } from './MatrixId';
import { Profile } from './Profile';
import { ContactInformation } from './ContactInfo';
import { IgnoredUserList } from './IgnoredUserList';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type AccountProps = {
requestClose: () => void;
@@ -20,7 +21,7 @@ export function Account({ requestClose }: AccountProps) {
-
+
diff --git a/src/app/features/settings/account/IgnoredUserList.tsx b/src/app/features/settings/account/IgnoredUserList.tsx
index 98db9459..791a407b 100644
--- a/src/app/features/settings/account/IgnoredUserList.tsx
+++ b/src/app/features/settings/account/IgnoredUserList.tsx
@@ -8,6 +8,7 @@ import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { isUserId } from '../../../utils/matrix';
import { useIgnoredUsers } from '../../../hooks/useIgnoredUsers';
import { useAlive } from '../../../hooks/useAlive';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
function IgnoreUserInput({ userList }: { userList: string[] }) {
const mx = useMatrixClient();
@@ -67,6 +68,7 @@ function IgnoreUserInput({ userList }: { userList: string[] }) {
userId &&
!ignoring && (
Remove Avatar
- setAlertRemove(false)} radii="300">
+ setAlertRemove(false)}
+ radii="300"
+ >
@@ -273,6 +279,7 @@ function ProfileDisplayName({ profile, userId }: ProfileProps) {
hasChanges &&
!changingDisplayName && (
void;
@@ -51,7 +52,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
-
+
diff --git a/src/app/features/settings/devices/DeviceTile.tsx b/src/app/features/settings/devices/DeviceTile.tsx
index 71b684f5..c4912dc0 100644
--- a/src/app/features/settings/devices/DeviceTile.tsx
+++ b/src/app/features/settings/devices/DeviceTile.tsx
@@ -29,6 +29,7 @@ import { LogoutDialog } from '../../../components/LogoutDialog';
import { stopPropagation } from '../../../utils/keyboard';
import { useSetting } from '../../../state/hooks/settings';
import { settingsAtom } from '../../../state/settings';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
export function DeviceTilePlaceholder() {
return (
@@ -288,6 +289,7 @@ export function DeviceTile({
-
+
diff --git a/src/app/features/settings/devices/Verification.tsx b/src/app/features/settings/devices/Verification.tsx
index 6c7eab17..c09dff55 100644
--- a/src/app/features/settings/devices/Verification.tsx
+++ b/src/app/features/settings/devices/Verification.tsx
@@ -35,6 +35,7 @@ import { stopPropagation } from '../../../utils/keyboard';
import { useAuthMetadata } from '../../../hooks/useAuthMetadata';
import { withSearchParam } from '../../../pages/pathUtils';
import { useAccountManagementActions } from '../../../hooks/useAccountManagement';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type VerificationStatusBadgeProps = {
verificationStatus: VerificationStatus;
@@ -288,6 +289,7 @@ export function DeviceVerificationOptions() {
return (
<>
void;
@@ -30,7 +31,7 @@ export function EmojisStickers({ requestClose }: EmojisStickersProps) {
-
+
diff --git a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
index a9288728..38647b13 100644
--- a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
+++ b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
@@ -43,6 +43,7 @@ import { allRoomsAtom } from '../../../state/room-list/roomList';
import { AccountDataEvent } from '../../../../types/matrix/accountData';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { stopPropagation } from '../../../utils/keyboard';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
function GlobalPackSelector({
packs,
@@ -368,6 +369,7 @@ export function GlobalPacks({ onViewPack }: GlobalPacksProps) {
{removed ? (
) : (
;
@@ -497,6 +498,7 @@ function DateHint({ hasChanges, handleReset }: DateHintProps) {
>
{hasChanges ? (
) : (
-
+
diff --git a/src/app/features/settings/notifications/KeywordMessages.tsx b/src/app/features/settings/notifications/KeywordMessages.tsx
index 7f84d607..b77cae21 100644
--- a/src/app/features/settings/notifications/KeywordMessages.tsx
+++ b/src/app/features/settings/notifications/KeywordMessages.tsx
@@ -15,6 +15,7 @@ import {
} from '../../../hooks/useNotificationMode';
import { NotificationModeSwitcher } from './NotificationModeSwitcher';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
const NOTIFY_MODE_OPS: NotificationModeOptions = {
highlight: true,
@@ -75,6 +76,7 @@ function KeywordInput() {
keyword &&
!addingKeyword && (
+
{removing ? : }
);
diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx
index 095a9bba..61af1a09 100644
--- a/src/app/features/settings/notifications/Notifications.tsx
+++ b/src/app/features/settings/notifications/Notifications.tsx
@@ -8,6 +8,7 @@ import { KeywordMessagesNotifications } from './KeywordMessages';
import { SequenceCard } from '../../../components/sequence-card';
import { SequenceCardStyle } from '../styles.css';
import { SettingTile } from '../../../components/setting-tile';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type NotificationsProps = {
requestClose: () => void;
@@ -23,7 +24,7 @@ export function Notifications({ requestClose }: NotificationsProps) {
-
+
diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx
index b5fefc93..1030972f 100644
--- a/src/app/features/space-settings/SpaceSettings.tsx
+++ b/src/app/features/space-settings/SpaceSettings.tsx
@@ -17,6 +17,7 @@ import { Members } from '../common-settings/members';
import { DeveloperTools } from '../common-settings/developer-tools';
import { General } from './general';
import { Permissions } from './permissions';
+import { PhoneHit } from '../../styles/PhoneHit.css';
type SpaceSettingsMenuItem = {
page: SpaceSettingsPage;
@@ -117,7 +118,7 @@ export function SpaceSettings({ initialPage, requestClose }: SpaceSettingsProps)
{screenSize === ScreenSize.Mobile && (
-
+
)}
diff --git a/src/app/features/space-settings/general/General.tsx b/src/app/features/space-settings/general/General.tsx
index 72040632..e99a4906 100644
--- a/src/app/features/space-settings/general/General.tsx
+++ b/src/app/features/space-settings/general/General.tsx
@@ -13,6 +13,7 @@ import {
} from '../../common-settings/general';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type GeneralProps = {
requestClose: () => void;
@@ -33,7 +34,7 @@ export function General({ requestClose }: GeneralProps) {
-
+
diff --git a/src/app/features/space-settings/permissions/Permissions.tsx b/src/app/features/space-settings/permissions/Permissions.tsx
index 7572a71b..d513dda9 100644
--- a/src/app/features/space-settings/permissions/Permissions.tsx
+++ b/src/app/features/space-settings/permissions/Permissions.tsx
@@ -9,6 +9,7 @@ import { usePermissionGroups } from './usePermissionItems';
import { PermissionGroups, Powers, PowersEditor } from '../../common-settings/permissions';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
+import { PhoneHit } from '../../../styles/PhoneHit.css';
type PermissionsProps = {
requestClose: () => void;
@@ -45,7 +46,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
-
+
diff --git a/src/app/pages/auth/ServerPicker.tsx b/src/app/pages/auth/ServerPicker.tsx
index a2a78106..393cf34e 100644
--- a/src/app/pages/auth/ServerPicker.tsx
+++ b/src/app/pages/auth/ServerPicker.tsx
@@ -23,6 +23,7 @@ import FocusTrap from 'focus-trap-react';
import { useDebounce } from '../../hooks/useDebounce';
import { stopPropagation } from '../../utils/keyboard';
+import { PhoneHit } from '../../styles/PhoneHit.css';
export function ServerPicker({
server,
@@ -129,6 +130,7 @@ export function ServerPicker({
}
>
Add Server
- setDialog(false)} radii="300">
+ setDialog(false)}
+ radii="300"
+ >
diff --git a/src/app/phoneHit.call.test.ts b/src/app/phoneHit.call.test.ts
new file mode 100644
index 00000000..56971b05
--- /dev/null
+++ b/src/app/phoneHit.call.test.ts
@@ -0,0 +1,15 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+// Every IconButton of the call bars carries the phone hit-area variant of its drawn size, in source order
+// (mic, sound, video, share, chat; the menu button; the call-status mic, sound, video, share).
+describe('icon buttons in the call controls', () => {
+ it.each([
+ ['features/call/Controls.tsx', Array(5).fill('PhoneHitSpread40')],
+ ['features/call/CallControls.tsx', ['PhoneHitSpread40']],
+ ['features/call-status/CallControl.tsx', Array(4).fill('PhoneHitSpread26')],
+ ])('%s', (file, want) => {
+ expectPhoneHitClasses(file as string, want as string[]);
+ expectSizeTie(file as string);
+ });
+});
diff --git a/src/app/phoneHit.commonSettings.test.ts b/src/app/phoneHit.commonSettings.test.ts
new file mode 100644
index 00000000..fdb2c4e0
--- /dev/null
+++ b/src/app/phoneHit.commonSettings.test.ts
@@ -0,0 +1,26 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+// Every IconButton under features/common-settings, in source order. Header close buttons are alone at the
+// header end (the title beside them is text), the dialog close buttons are alone in their Header, the
+// scroll-to-top button floats alone, and the RoomPacks pair is a ternary (only one renders): all PhoneHit.
+const files: [string, string[]][] = [
+ ['features/common-settings/members/Members.tsx', ['PhoneHit', 'PhoneHit']],
+ ['features/common-settings/developer-tools/SendRoomEvent.tsx', ['PhoneHit']],
+ ['features/common-settings/developer-tools/StateEventEditor.tsx', ['PhoneHit']],
+ ['features/common-settings/developer-tools/DevelopTools.tsx', ['PhoneHit']],
+ ['features/common-settings/permissions/PowersEditor.tsx', ['PhoneHit']],
+ ['features/common-settings/emojis-stickers/EmojisStickers.tsx', ['PhoneHit']],
+ ['features/common-settings/emojis-stickers/RoomPacks.tsx', ['PhoneHit', 'PhoneHit']],
+ ['features/common-settings/general/RoomEncryption.tsx', ['PhoneHit']],
+ ['features/common-settings/general/RoomUpgrade.tsx', ['PhoneHit']],
+];
+
+describe.each(files)('phone hit area: %s', (file, want) => {
+ it('carries the variant its drawn size and neighbours call for', () => {
+ expectPhoneHitClasses(file, want);
+ });
+ it('names a size that matches what it draws', () => {
+ expectSizeTie(file);
+ });
+});
diff --git a/src/app/phoneHit.content.test.ts b/src/app/phoneHit.content.test.ts
new file mode 100644
index 00000000..741a5828
--- /dev/null
+++ b/src/app/phoneHit.content.test.ts
@@ -0,0 +1,26 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+describe('icon buttons in message content and data editors', () => {
+ // The class each IconButton must carry, in source order.
+ const expected: Record = {
+ // mute toggle, 16 px icon + 8 padding = 24 px, 8 px from the volume slider (tappable)
+ 'components/message/content/AudioContent.tsx': ['PhoneHitSpread24'],
+ // download, alone at the end of the header row (26 px)
+ 'components/message/FileHeader.tsx': ['PhoneHit'],
+ // code block expand/collapse, 24 px, 8 px from the Copy chip
+ 'plugins/react-custom-html-parser.tsx': ['PhoneHitSpread24'],
+ // close at the header end, alone
+ 'components/AccountDataEditor.tsx': ['PhoneHit'],
+ 'components/image-pack-view/ImagePackView.tsx': ['PhoneHit'],
+ };
+
+ it.each(Object.entries(expected))(
+ '%s: each IconButton carries its own PhoneHit class',
+ (file, want) => expectPhoneHitClasses(file, want)
+ );
+
+ it.each(Object.keys(expected))('%s: a sized variant matches the drawn size', (file) =>
+ expectSizeTie(file)
+ );
+});
diff --git a/src/app/phoneHit.dialogs.test.ts b/src/app/phoneHit.dialogs.test.ts
new file mode 100644
index 00000000..8b3416a5
--- /dev/null
+++ b/src/app/phoneHit.dialogs.test.ts
@@ -0,0 +1,28 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+// Dialog and prompt close buttons: each is a 32 px button (24 px Icon + 8 px padding) alone at the end of a
+// header whose title is not tappable, so the plain PhoneHit; no neighbour to spread from, no clipping container.
+describe('icon buttons in dialogs and prompts', () => {
+ const expected: Record = {
+ 'features/create-space/CreateSpaceModal.tsx': ['PhoneHit'],
+ 'features/create-room/CreateRoomModal.tsx': ['PhoneHit'],
+ 'features/add-existing/AddExisting.tsx': ['PhoneHit'],
+ 'components/room-topic-viewer/RoomTopicViewer.tsx': ['PhoneHit'],
+ 'components/leave-room-prompt/LeaveRoomPrompt.tsx': ['PhoneHit'],
+ 'components/leave-space-prompt/LeaveSpacePrompt.tsx': ['PhoneHit'],
+ 'components/event-readers/EventReaders.tsx': ['PhoneHit'],
+ 'components/invite-user-prompt/InviteUserPrompt.tsx': ['PhoneHit'],
+ 'components/join-address-prompt/JoinAddressPrompt.tsx': ['PhoneHit'], // join cancel
+ 'components/user-profile/PowerChip.tsx': ['PhoneHit', 'PhoneHit'], // self demotion, shared power
+ };
+
+ it.each(Object.entries(expected))(
+ '%s: each IconButton carries its own PhoneHit class',
+ (file, want) => expectPhoneHitClasses(file, want)
+ );
+
+ it.each(Object.keys(expected))('%s: a sized variant matches the drawn size', (file) =>
+ expectSizeTie(file)
+ );
+});
diff --git a/src/app/phoneHit.roomSpace.test.ts b/src/app/phoneHit.roomSpace.test.ts
new file mode 100644
index 00000000..c98c2b09
--- /dev/null
+++ b/src/app/phoneHit.roomSpace.test.ts
@@ -0,0 +1,28 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+describe('icon buttons in room settings, space settings, lobby, search and explore', () => {
+ // The class each IconButton must carry, in source order. Vertical stacks and lone buttons: the plain PhoneHit.
+ const expected: Record = {
+ 'features/room-settings/RoomSettings.tsx': ['PhoneHit'], // close, phone only, alone at the header end
+ 'features/room-settings/general/General.tsx': ['PhoneHit'], // close, 40 px
+ 'features/room-settings/permissions/Permissions.tsx': ['PhoneHit'],
+ 'features/space-settings/SpaceSettings.tsx': ['PhoneHit'],
+ 'features/space-settings/general/General.tsx': ['PhoneHit'],
+ 'features/space-settings/permissions/Permissions.tsx': ['PhoneHit'],
+ // 16 px icon + 8 padding = 24 px, 8-12 px from the Open / Add chips beside it in a hierarchy card
+ 'features/lobby/HierarchyItemMenu.tsx': ['PhoneHitSpread24'],
+ 'features/lobby/Lobby.tsx': ['PhoneHit'], // floating scroll-to-top, alone
+ 'features/message-search/MessageSearch.tsx': ['PhoneHit'], // floating scroll-to-top, alone
+ 'pages/client/explore/Explore.tsx': ['PhoneHit'], // Add Server dialog close
+ };
+
+ it.each(Object.entries(expected))(
+ '%s: each IconButton carries its own PhoneHit class',
+ (file, want) => expectPhoneHitClasses(file, want)
+ );
+
+ it.each(Object.keys(expected))('%s: a sized variant matches the drawn size', (file) =>
+ expectSizeTie(file)
+ );
+});
diff --git a/src/app/phoneHit.settingsA.test.ts b/src/app/phoneHit.settingsA.test.ts
new file mode 100644
index 00000000..37f1f3c2
--- /dev/null
+++ b/src/app/phoneHit.settingsA.test.ts
@@ -0,0 +1,29 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+describe('icon buttons in settings A', () => {
+ // The class each IconButton must carry, in source order. Every one is alone in its row (a header close next to
+ // non-tappable title text, an input slot, or a list tile beside a non-tappable Avatar), so the plain PhoneHit.
+ const expected: Record = {
+ 'features/settings/developer-tools/DevelopTools.tsx': ['PhoneHit'], // header close, 40 px
+ 'features/settings/notifications/Notifications.tsx': ['PhoneHit'], // header close, 40 px
+ 'features/settings/notifications/KeywordMessages.tsx': ['PhoneHit', 'PhoneHit'], // input reset, remove: 26 px, alone
+ 'features/settings/emojis-stickers/EmojisStickers.tsx': ['PhoneHit'], // header close, 40 px
+ 'features/settings/emojis-stickers/GlobalPacks.tsx': ['PhoneHit', 'PhoneHit'], // undo / remove, a ternary pair, 26 px
+ 'features/settings/Settings.tsx': ['PhoneHit'], // mobile-only header close, 40 px
+ 'features/settings/about/About.tsx': ['PhoneHit'], // header close, 40 px
+ 'features/settings/general/General.tsx': ['PhoneHit', 'PhoneHit', 'PhoneHit'], // reset / info (ternary), header close
+ 'features/settings/account/Account.tsx': ['PhoneHit'], // header close, 40 px
+ 'features/settings/devices/Devices.tsx': ['PhoneHit'], // header close, 40 px
+ };
+
+ it.each(Object.entries(expected))('%s carries the right hit-area class', (file, want) => {
+ expectPhoneHitClasses(file, want);
+ });
+
+ // Plain PhoneHit has no size to tie, so nothing is allow-listed; the check still fails an allow-list entry
+ // or a sized variant that disagrees with the drawn size if one is added later.
+ it.each(Object.keys(expected))('%s ties a sized variant to the drawn size', (file) => {
+ expectSizeTie(file);
+ });
+});
diff --git a/src/app/phoneHit.settingsB.test.ts b/src/app/phoneHit.settingsB.test.ts
new file mode 100644
index 00000000..4d2e3dee
--- /dev/null
+++ b/src/app/phoneHit.settingsB.test.ts
@@ -0,0 +1,21 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+// Each IconButton here is alone in its slot (a dialog header's close, an input's clear button, a tile's lone
+// menu or chevron button, its neighbours being text or a badge), so each takes PhoneHit. Every size is derivable
+// from the source, so nothing is allow-listed; plain PhoneHit has no number to tie.
+const files: [string, string[]][] = [
+ ['features/settings/account/Profile.tsx', ['PhoneHit', 'PhoneHit']],
+ ['features/settings/account/IgnoredUserList.tsx', ['PhoneHit']],
+ ['features/settings/devices/Verification.tsx', ['PhoneHit']],
+ ['features/settings/devices/DeviceTile.tsx', ['PhoneHit']],
+ ['pages/auth/ServerPicker.tsx', ['PhoneHit']],
+ ['components/BackupRestore.tsx', ['PhoneHit']],
+ ['components/DeviceVerification.tsx', ['PhoneHit']],
+ ['components/DeviceVerificationSetup.tsx', ['PhoneHit', 'PhoneHit']],
+];
+
+describe.each(files)('phone hit area: %s', (file, want) => {
+ it('gives each icon button its variant', () => expectPhoneHitClasses(file, want));
+ it('ties each sized variant to the size it draws', () => expectSizeTie(file));
+});
diff --git a/src/app/phoneHit.viewers.test.ts b/src/app/phoneHit.viewers.test.ts
new file mode 100644
index 00000000..3e579f4c
--- /dev/null
+++ b/src/app/phoneHit.viewers.test.ts
@@ -0,0 +1,27 @@
+import { describe, it } from 'vitest';
+import { expectPhoneHitClasses, expectSizeTie } from './phoneHitTestKit';
+
+// Viewer headers and the UIA stages. The back/close button sits beside a title that is not tappable, so it is a
+// plain PhoneHit; the zoom out/in buttons sit either side of a tappable zoom Chip, so they spread at their drawn
+// 24 px (IconButton size 300 around a 16 px Icon).
+// Not covered: the two scroll arrows of components/url-preview/UrlPreviewCard.tsx. They are position: absolute and
+// PhoneHit sets position: relative on phones, which would pull them into the flow; they need a variant that keeps
+// the position, which PhoneHit.css.ts does not have yet.
+const files: [string, string[]][] = [
+ ['components/uia-stages/PasswordStage.tsx', ['PhoneHit']],
+ ['components/uia-stages/SSOStage.tsx', ['PhoneHit']],
+ ['components/UIAFlowOverlay.tsx', ['PhoneHit']],
+ ['components/text-viewer/TextViewer.tsx', ['PhoneHit']],
+ ['components/image-editor/ImageEditor.tsx', ['PhoneHit']],
+ ['components/image-viewer/ImageViewer.tsx', ['PhoneHit', 'PhoneHitSpread24', 'PhoneHitSpread24']],
+ ['components/Pdf-viewer/PdfViewer.tsx', ['PhoneHit', 'PhoneHitSpread24', 'PhoneHitSpread24']],
+];
+
+describe.each(files)('phone hit area: %s', (file, want) => {
+ it('gives each icon button the variant of its surroundings', () => {
+ expectPhoneHitClasses(file, want);
+ });
+ it('ties each sized variant to the size the button draws', () => {
+ expectSizeTie(file);
+ });
+});
diff --git a/src/app/phoneHitTestKit.test.ts b/src/app/phoneHitTestKit.test.ts
index 92f1b23f..a77a2e27 100644
--- a/src/app/phoneHitTestKit.test.ts
+++ b/src/app/phoneHitTestKit.test.ts
@@ -1,5 +1,14 @@
import { describe, expect, it } from 'vitest';
-import { drawnPx, expectSizeTie, iconButtons } from './phoneHitTestKit';
+import { mkdtempSync, rmSync, writeFileSync } from 'fs';
+import { tmpdir } from 'os';
+import { relative } from 'path';
+import {
+ drawnPx,
+ expectPhoneHitClasses,
+ expectSizeTie,
+ iconButtons,
+ phoneHitOf,
+} from './phoneHitTestKit';
describe('phone hit test kit', () => {
it('reads {
@@ -38,4 +47,108 @@ describe('phone hit test kit', () => {
it('fails a file with no IconButton, which would otherwise pass vacuously', () => {
expect(() => expectSizeTie('styles/PhoneHit.css.ts')).toThrow(/no IconButton/);
});
+
+ describe('phoneHitOf reads the imported class off the AST, applied unconditionally', () => {
+ const tag = (expr: string) => ``;
+ const ok = (expr: string, name: string) => expect(phoneHitOf(tag(expr))).toBe(name);
+ const no = (expr: string) => expect(phoneHitOf(tag(expr))).toBeNull();
+
+ it('accepts the bare identifier and merges that always include it', () => {
+ ok('PhoneHitSpread26', 'PhoneHitSpread26');
+ ok('classNames(PhoneHitRoom36, css.other)', 'PhoneHitRoom36');
+ ok('clsx(css.a, { [css.b]: on }, PhoneHit)', 'PhoneHit');
+ ok('cx(PhoneHit)', 'PhoneHit');
+ ok('`${PhoneHit} ${css.other}`', 'PhoneHit');
+ ok('classNames(/* PhoneHit */ PhoneHit)', 'PhoneHit');
+ });
+
+ it('rejects the name as a string, a concatenation or a comment', () => {
+ no("'PhoneHitSpread26'");
+ no('`PhoneHitSpread26`');
+ no('"PhoneHitSpread26" + "x"');
+ no("'PhoneHit' + 'Spread26'");
+ no('/* PhoneHit */ undefined');
+ no('css.a // PhoneHit');
+ });
+
+ it('rejects a conditionally applied name', () => {
+ no('cond ? PhoneHitSpread26 : undefined');
+ no('cond && PhoneHitSpread26');
+ no('cond || PhoneHitSpread26');
+ no('maybe ?? PhoneHitSpread26');
+ no("classNames(cond ? PhoneHit : '', css.a)");
+ no('classNames(PhoneHit, cond && PhoneHit)');
+ });
+
+ it('rejects every other expression shape the name can hide in', () => {
+ no('classNames({ PhoneHit: on })');
+ no('clsx({ [PhoneHit]: on })');
+ no('`${`${PhoneHit}`}`');
+ no('typeof PhoneHit');
+ no("(PhoneHit = 'x')");
+ no('(PhoneHit, css.a)');
+ no('(PhoneHit)');
+ no('() => PhoneHit');
+ no('PhoneHit.foo');
+ no('other.PhoneHit');
+ no('classNames(css.a, [PhoneHit])');
+ no('wrap(PhoneHit)');
+ no('PhoneHitSpread26é');
+ no('`${css.a}`');
+ });
+
+ it('rejects a tag without className, with two, or with a non-expression one', () => {
+ expect(phoneHitOf('')).toBeNull();
+ expect(phoneHitOf('')).toBeNull();
+ expect(phoneHitOf('')).toBeNull();
+ expect(phoneHitOf('')).toBe('PhoneHit');
+ });
+
+ it('rejects a spread after className, which can override it, and accepts one before', () => {
+ expect(phoneHitOf('')).toBeNull();
+ expect(phoneHitOf('')).toBeNull();
+ expect(phoneHitOf('')).toBe('PhoneHit');
+ });
+
+ it('reads a className past braces inside strings', () => {
+ ok("classNames('{', PhoneHit)", 'PhoneHit');
+ });
+ });
+
+ describe('expectPhoneHitClasses', () => {
+ const check = (src: string, want: (string | null)[]) => {
+ const dir = mkdtempSync(`${tmpdir()}/phone-hit-kit-`);
+ try {
+ writeFileSync(`${dir}/Probe.tsx`, src);
+ expectPhoneHitClasses(relative(`${process.cwd()}/src/app`, `${dir}/Probe.tsx`), want);
+ } finally {
+ rmSync(dir, { recursive: true });
+ }
+ };
+ const imp = "import { PhoneHit, PhoneHitSpread26 } from '../../styles/PhoneHit.css';\n";
+ const src =
+ imp +
+ 'const A = () => (<>>);';
+
+ it('pins each button in order, null meaning no class', () => {
+ check(src, ['PhoneHit', 'PhoneHitSpread26', null]);
+ expect(() => check(src, ['PhoneHit', 'PhoneHit', null])).toThrow();
+ expect(() => check(src, ['PhoneHit', 'PhoneHitSpread26', 'PhoneHit'])).toThrow();
+ expect(() => check(src, ['PhoneHit', 'PhoneHitSpread26'])).toThrow();
+ });
+
+ it('fails a name that is not read from PhoneHit.css or is applied conditionally', () => {
+ const local = "const PhoneHit = 'x';\n";
+ expect(() => check(local, ['PhoneHit'])).toThrow();
+ expect(() => check(local, [null])).not.toThrow();
+ const cond = imp + '';
+ expect(() => check(cond, ['PhoneHit'])).toThrow();
+ const aliased =
+ "import { Other as PhoneHit } from '../../styles/PhoneHit.css';\n";
+ expect(() => check(aliased, ['PhoneHit'])).toThrow();
+ const wrongModule =
+ "import { PhoneHit } from './other';\n";
+ expect(() => check(wrongModule, ['PhoneHit'])).toThrow();
+ });
+ });
});
diff --git a/src/app/phoneHitTestKit.ts b/src/app/phoneHitTestKit.ts
index a29dcc22..896b917b 100644
--- a/src/app/phoneHitTestKit.ts
+++ b/src/app/phoneHitTestKit.ts
@@ -2,6 +2,7 @@
// group of IconButtons). Not a test file: it registers nothing, the test files call it.
import { readFileSync } from 'fs';
import { expect } from 'vitest';
+import ts from 'typescript';
import zlib from 'zlib';
import { compile, processVanillaFile } from '@vanilla-extract/integration';
@@ -72,36 +73,113 @@ const tagEnd = (src: string, from: number) => {
return j;
};
-/** Every outside any {} expression, and
- * what it wraps (empty when self-closing). */
+const tsx = (src: string) =>
+ ts.createSourceFile('source.tsx', src, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
+
+type Opening = ts.JsxOpeningElement | ts.JsxSelfClosingElement;
+
+/** Every IconButton element (not IconButtonX) of a parsed source, in source order. */
+const elements = (sf: ts.SourceFile) => {
+ const found: Opening[] = [];
+ const walk = (n: ts.Node) => {
+ if (
+ (ts.isJsxOpeningElement(n) || ts.isJsxSelfClosingElement(n)) &&
+ ts.isIdentifier(n.tagName) &&
+ n.tagName.text === 'IconButton'
+ )
+ found.push(n);
+ ts.forEachChild(n, walk);
+ };
+ walk(sf);
+ return found;
+};
+
+const bodyOf = (el: Opening) =>
+ ts.isJsxOpeningElement(el) && ts.isJsxElement(el.parent)
+ ? el.getSourceFile().text.slice(el.end, el.parent.closingElement.getStart())
+ : '';
+
+/** Every
- [...src.matchAll(//])/g)].map((m) => {
- const start = m.index ?? 0;
- const end = tagEnd(src, start);
- const tag = src.slice(start, end + 1);
- const close = src.indexOf('', end);
- return { tag, body: tag.endsWith('/>') || close === -1 ? '' : src.slice(end + 1, close) };
- });
+ elements(tsx(src)).map((el) => ({ tag: el.getText(), body: bodyOf(el) }));
export const iconButtonTags = (src: string) => iconButtons(src).map((b) => b.tag);
-const phoneHitOf = (tag: string) => tag.match(/className=\{[^}]*?\b(PhoneHit\w*)\b/)?.[1] ?? null;
-
-/** The class each IconButton must carry, in source order: the variant is chosen by the button's drawn size and
- * whether a clipping container or neighbours surround it, so a swapped variant is a wrong hit area. Also checks
- * the name is the one PhoneHit.css.ts exports, not a local of the same name. */
-export const expectPhoneHitClasses = (file: string, want: string[]) => {
- const src = readSource(file);
- expect(iconButtonTags(src).map(phoneHitOf)).toEqual(want);
- [...new Set(want)].forEach((name) =>
- expect(src).toMatch(
- new RegExp(
- `import \\{(?:[^}]*,)?\\s*${name}\\s*(?:,[^}]*)?\\} from '(\\.\\./)+styles/PhoneHit\\.css'`
- )
- )
+/** Local names the source imports from the PhoneHit.css module (as written, not aliased). */
+const importedHits = (sf: ts.SourceFile) =>
+ new Set(
+ sf.statements.flatMap((st) => {
+ const nb = ts.isImportDeclaration(st) ? st.importClause?.namedBindings : undefined;
+ return nb &&
+ ts.isNamedImports(nb) &&
+ ts.isStringLiteral((st as ts.ImportDeclaration).moduleSpecifier) &&
+ /^(\.\.\/)+styles\/PhoneHit\.css$/.test(
+ ((st as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral).text
+ )
+ ? nb.elements.filter((e) => !e.propertyName).map((e) => e.name.text)
+ : [];
+ })
);
+
+const MERGERS = new Set(['classNames', 'clsx', 'cx']);
+
+/** The PhoneHit* class an IconButton carries, or null. className must appear exactly once, with no props spread
+ * after it (a spread can override it at runtime), and its expression must be: the bare identifier; a classNames /
+ * clsx / cx call with it as a direct argument; or a template with it as a direct span. The identifier must occur
+ * nowhere else in the expression, so a key, a member, a closure, a conditional or a comma can never carry it. When
+ * `imported` is given, the identifier must also be a binding imported from the PhoneHit.css module. */
+const hitOf = (el: Opening, imported?: Set): string | null => {
+ const props = el.attributes.properties;
+ const at = props.flatMap((p, i) =>
+ ts.isJsxAttribute(p) && ts.isIdentifier(p.name) && p.name.text === 'className' ? [i] : []
+ );
+ if (at.length !== 1 || props.slice(at[0] + 1).some(ts.isJsxSpreadAttribute)) return null;
+ const attr = props[at[0]] as ts.JsxAttribute;
+ const expr =
+ attr.initializer && ts.isJsxExpression(attr.initializer) && attr.initializer.expression;
+ if (!expr) return null;
+ const isHit = (n: ts.Node): n is ts.Identifier =>
+ ts.isIdentifier(n) && /^PhoneHit\w*$/.test(n.text) && (!imported || imported.has(n.text));
+ let direct: ts.Node[] = [];
+ if (ts.isIdentifier(expr)) direct = [expr];
+ else if (
+ ts.isCallExpression(expr) &&
+ ts.isIdentifier(expr.expression) &&
+ MERGERS.has(expr.expression.text)
+ )
+ direct = [...expr.arguments];
+ else if (ts.isTemplateExpression(expr)) direct = expr.templateSpans.map((sp) => sp.expression);
+ const hits = direct.filter(isHit);
+ if (hits.length !== 1) return null;
+ let occurrences = 0;
+ const count = (n: ts.Node) => {
+ if (ts.isIdentifier(n) && n.text === hits[0].text) occurrences += 1;
+ ts.forEachChild(n, count);
+ };
+ count(expr);
+ return occurrences === 1 ? hits[0].text : null;
};
+/** The PhoneHit* class of one tag's text (see hitOf), without the import-binding check. */
+export const phoneHitOf = (tag: string) => {
+ const els = elements(tsx(tag.endsWith('/>') ? tag : `${tag}`));
+ return els.length === 1 ? hitOf(els[0]) : null;
+};
+
+/** The PhoneHit* class of each IconButton of a source, in source order; null when it has none or the name is not
+ * the one imported from PhoneHit.css. */
+const phoneHitClasses = (src: string) => {
+ const sf = tsx(src);
+ const imported = importedHits(sf);
+ return elements(sf).map((el) => hitOf(el, imported));
+};
+
+/** The class each IconButton must carry, in source order (null = must carry none): the variant is chosen by the
+ * button's drawn size and whether a clipping container or neighbours surround it, so a swapped variant is a wrong
+ * hit area. The name must also be the one PhoneHit.css exports, not a local of the same name. */
+export const expectPhoneHitClasses = (file: string, want: (string | null)[]) =>
+ expect(phoneHitClasses(readSource(file))).toEqual(want);
+
// IconButton `size` -> padding on each side, Icon `size` -> px (folds 2.7.2). Both default to 400.
const BUTTON_PAD: Record = { '300': 4, '400': 8, '500': 12, '600': 16 };
const ICON_PX: Record = {
@@ -147,10 +225,12 @@ export type SizeAllow = Record>;
export const expectSizeTie = (file: string, allow: SizeAllow = {}) => {
const allowed = allow[file] ?? {};
const seen = new Set();
- const buttons = iconButtons(readSource(file));
+ const src = readSource(file);
+ const buttons = iconButtons(src);
+ const classes = phoneHitClasses(src);
expect(buttons.length, `${file} has no IconButton`).toBeGreaterThan(0);
buttons.forEach(({ tag, body }, i) => {
- const variant = phoneHitOf(tag)?.match(/^PhoneHit(?:Spread|Room)(\d+)$/);
+ const variant = classes[i]?.match(/^PhoneHit(?:Spread|Room)(\d+)$/);
if (!variant) {
expect(allowed[i], `${file} #${i} is allow-listed but has no sized variant`).toBeUndefined();
return;
diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx
index 961131d9..2398a4c9 100644
--- a/src/app/plugins/react-custom-html-parser.tsx
+++ b/src/app/plugins/react-custom-html-parser.tsx
@@ -22,6 +22,7 @@ import Linkify from 'linkify-react';
import { ErrorBoundary } from 'react-error-boundary';
import { ChildNode } from 'domhandler';
import * as css from '../styles/CustomHtml.css';
+import { PhoneHitSpread24 } from '../styles/PhoneHit.css';
import {
getMxIdLocalPart,
getCanonicalAliasRoomId,
@@ -282,6 +283,7 @@ export function CodeBlock({
variant="SurfaceVariant"
outlined
radii="300"
+ className={PhoneHitSpread24}
onClick={toggleExpand}
aria-label={expanded ? 'Collapse' : 'Expand'}
>