{menuItems.map((item) => {
- const currentIcon =
- activePage === item.page && item.activeIcon ? item.activeIcon : item.icon;
+ const active = activePage === item.page;
+ const IconComponent = active && item.activeIcon ? item.activeIcon : item.icon;
return (
- }
+ aria-pressed={active}
+ before={settingsNavIcon(IconComponent, active)}
onClick={() => setActivePage(item.page)}
>
-
+ {composerIcon(X)}
@@ -287,7 +276,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps)
disabled={saving}
aria-label={`Remove abbreviation ${entry.term}`}
>
-
+ {menuIcon(Trash)}
)}
diff --git a/src/app/features/room-settings/general/General.tsx b/src/app/features/room-settings/general/General.tsx
index c4546b601..3f87b3b7b 100644
--- a/src/app/features/room-settings/general/General.tsx
+++ b/src/app/features/room-settings/general/General.tsx
@@ -1,4 +1,5 @@
-import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
+import { Box, IconButton, Scroll, Text } from 'folds';
+import { composerIcon, X } from '$components/icons/phosphor';
import { Page, PageContent, PageHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useRoom } from '$hooks/useRoom';
@@ -35,7 +36,7 @@ export function General({ requestClose }: GeneralProps) {
-
+ {composerIcon(X)}
diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx
index 7966b6eda..ddf89de41 100644
--- a/src/app/features/room-settings/permissions/Permissions.tsx
+++ b/src/app/features/room-settings/permissions/Permissions.tsx
@@ -1,5 +1,6 @@
import { useState } from 'react';
-import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
+import { Box, IconButton, Scroll, Text } from 'folds';
+import { composerIcon, X } from '$components/icons/phosphor';
import { Page, PageContent, PageHeader } from '$components/page';
import { useRoom } from '$hooks/useRoom';
import { usePowerLevels } from '$hooks/usePowerLevels';
@@ -48,7 +49,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
-
+ {composerIcon(X)}
diff --git a/src/app/features/room/CallChatView.tsx b/src/app/features/room/CallChatView.tsx
index e73842f94..bdd23c3fe 100644
--- a/src/app/features/room/CallChatView.tsx
+++ b/src/app/features/room/CallChatView.tsx
@@ -1,6 +1,7 @@
import { useSetAtom } from 'jotai';
import { useParams } from 'react-router-dom';
-import { Box, Text, TooltipProvider, Tooltip, Icon, Icons, IconButton, toRem } from 'folds';
+import { Box, Text, TooltipProvider, Tooltip, IconButton, toRem } from 'folds';
+import { composerIcon, X } from '$components/icons/phosphor';
import { Page, PageHeader } from '../../components/page';
import { callChatAtom } from '../../state/callEmbed';
import { RoomView } from './RoomView';
@@ -70,7 +71,7 @@ export function CallChatView() {
>
{(triggerRef) => (
-
+ {composerIcon(X)}
)}
diff --git a/src/app/features/room/MembersDrawer.tsx b/src/app/features/room/MembersDrawer.tsx
index 779003437..7e595ffbc 100644
--- a/src/app/features/room/MembersDrawer.tsx
+++ b/src/app/features/room/MembersDrawer.tsx
@@ -7,9 +7,7 @@ import {
Box,
Chip,
Header,
- Icon,
IconButton,
- Icons,
Input,
MenuItem,
PopOut,
@@ -41,6 +39,17 @@ import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { ScrollTopContainer } from '$components/scroll-top-container';
import { UserAvatar } from '$components/user-avatar';
+import {
+ ArrowsDownUp,
+ CaretUp,
+ chipIcon,
+ composerIcon,
+ Funnel,
+ MagnifyingGlass,
+ navIcon,
+ userFallbackIcon,
+ X,
+} from '$components/icons/phosphor';
import { useRoomTypingMember } from '$hooks/useRoomTypingMembers';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useMembershipFilter, useMembershipFilterMenu } from '$hooks/useMemberFilter';
@@ -93,7 +102,7 @@ function MemberDrawerHeader({ room, hideText }: MemberDrawerHeaderProps) {
variant="Background"
onClick={() => setPeopleDrawer(false)}
>
-
+ {composerIcon(X)}
)}
@@ -159,7 +168,7 @@ function MemberItem({
userId={member.userId}
src={avatarUrl ?? undefined}
alt={name}
- renderFallback={() => }
+ renderFallback={() => userFallbackIcon('md')}
/>
@@ -378,7 +387,7 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) {
variant="Background"
size="400"
radii="300"
- before={}
+ before={chipIcon(Funnel)}
>
{membershipFilter.name}
@@ -410,7 +419,7 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) {
variant="Background"
size="400"
radii="300"
- after={}
+ after={chipIcon(ArrowsDownUp)}
>
{memberSort.name}
@@ -427,7 +436,7 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) {
variant="Surface"
size="400"
radii="400"
- before={}
+ before={chipIcon(MagnifyingGlass)}
after={
result && (
}
+ after={chipIcon(X)}
>
{`${result.items.length || 'No'} ${
result.items.length === 1 ? 'Result' : 'Results'
@@ -463,7 +472,7 @@ export function MembersDrawer({ room, members }: MembersDrawerProps) {
size="300"
aria-label="Scroll to Top"
>
-
+ {navIcon(CaretUp)}
diff --git a/src/app/features/room/RoomCallButton.tsx b/src/app/features/room/RoomCallButton.tsx
index 3c60e5935..08e179f05 100644
--- a/src/app/features/room/RoomCallButton.tsx
+++ b/src/app/features/room/RoomCallButton.tsx
@@ -1,4 +1,5 @@
-import { IconButton, Icon, Icons, TooltipProvider, Tooltip, Text } from 'folds';
+import { IconButton, TooltipProvider, Tooltip, Text } from 'folds';
+import { navIcon, Phone } from '$components/icons/phosphor';
import { useAtomValue } from 'jotai';
import type { Room, TimelineEvents } from '$types/matrix-sdk';
import { useCallStart, useCallJoined } from '$hooks/useCallEmbed';
@@ -67,7 +68,7 @@ export function RoomCallButton({ room }: RoomCallButtonProps) {
onClick={handleStartCall}
aria-label="Start Voice Call"
>
-
+ {navIcon(Phone)}
)}
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 87ec6e68f..7214b430c 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -21,9 +21,7 @@ import {
color,
config,
Dialog,
- Icon,
IconButton,
- Icons,
Menu,
MenuItem,
Overlay,
@@ -129,7 +127,27 @@ import {
convertPerMessageProfileToBeeperFormat,
getCurrentlyUsedPerMessageProfileForRoom,
} from '$hooks/usePerMessageProfile';
-import { Microphone, Stop, MapPinPlusIcon } from '@phosphor-icons/react';
+import {
+ Bell,
+ BellSlash,
+ CaretDown,
+ chipIcon,
+ Clock,
+ composerIcon,
+ dropzoneIcon,
+ File as FileIcon,
+ ListBullets,
+ MapPinPlusIcon,
+ menuIcon,
+ Microphone,
+ PaperPlaneTilt,
+ PHOSPHOR_SIZE,
+ PlusCircle,
+ Smiley,
+ Sticker,
+ Stop,
+ X,
+} from '$components/icons/phosphor';
import { getSupportedAudioExtension } from '$plugins/voice-recorder-kit/supportedCodec';
import { ErrorCode } from '../../cs-errorcode';
import { sanitizeText } from '$utils/sanitize';
@@ -1337,7 +1355,7 @@ export const RoomInput = forwardRef(
gap="500"
style={{ padding: toRem(60) }}
>
-
+ {dropzoneIcon(FileIcon)}
{`Drop Files in "${room?.name || 'Room'}"`}
@@ -1434,10 +1452,10 @@ export const RoomInput = forwardRef(
radii="300"
title="schedule message send"
>
-
+ {chipIcon(X)}
-
+ {menuIcon(Clock)}
Scheduled for {timeDayMonthYear(scheduledTime.getTime())} at{' '}
{timeHourMinute(scheduledTime.getTime(), hour24Clock)}
@@ -1490,7 +1508,7 @@ export const RoomInput = forwardRef(
aria-label="Cancel reply"
title="Cancel reply"
>
-
+ {chipIcon(X)}
(
}
onClick={() => setSilentReply(!silentReply)}
>
- {!silentReply && }
- {silentReply && }
+ {!silentReply && composerIcon(Bell)}
+ {silentReply && composerIcon(BellSlash)}
@@ -1558,7 +1576,7 @@ export const RoomInput = forwardRef(
setAddMenuAnchor(undefined);
setShowPollPicker(true);
}}
- before={}
+ before={menuIcon(ListBullets)}
>
Create Poll
@@ -1569,7 +1587,7 @@ export const RoomInput = forwardRef(
setAddMenuAnchor(undefined);
setShowLocationPicker(true);
}}
- before={}
+ before={menuIcon(MapPinPlusIcon)}
>
Add Location
@@ -1580,7 +1598,7 @@ export const RoomInput = forwardRef(
pickFile('*');
setAddMenuAnchor(undefined);
}}
- before={}
+ before={menuIcon(PlusCircle)}
>
Add File
@@ -1601,7 +1619,7 @@ export const RoomInput = forwardRef(
title={editorOldAddFile ? 'Upload File' : 'Add'}
aria-label={editorOldAddFile ? 'Upload and attach a File' : 'Add new Item'}
>
-
+ {composerIcon(PlusCircle)}
>
}
@@ -1652,9 +1670,13 @@ export const RoomInput = forwardRef(
}}
>
{showAudioRecorder ? (
-
+
) : (
-
+ composerIcon(Microphone)
)}
@@ -1703,10 +1725,9 @@ export const RoomInput = forwardRef(
title="open sticker picker"
aria-label="Open sticker picker"
>
-
+ {composerIcon(Sticker, {
+ weight: emojiBoardTab === EmojiBoardTab.Sticker ? 'fill' : 'regular',
+ })}
)}
(
title="open emoji picker"
aria-label="Open emoji picker"
>
-
+ {composerIcon(Smiley, {
+ weight: hideStickerBtn
+ ? emojiBoardTab
+ ? 'fill'
+ : 'regular'
+ : emojiBoardTab === EmojiBoardTab.Emoji
+ ? 'fill'
+ : 'regular',
+ })}
)}
@@ -1754,7 +1778,7 @@ export const RoomInput = forwardRef(
setScheduleMenuAnchor(undefined);
submit();
}}
- before={}
+ before={menuIcon(PaperPlaneTilt)}
>
Send Now
@@ -1765,7 +1789,7 @@ export const RoomInput = forwardRef(
setScheduleMenuAnchor(undefined);
setShowSchedulePicker(true);
}}
- before={}
+ before={menuIcon(Clock)}
>
Schedule Send
@@ -1812,7 +1836,7 @@ export const RoomInput = forwardRef(
radii="0"
className={delayedEventsSupported ? css.SplitSendButton : undefined}
>
-
+ {scheduledTime ? composerIcon(Clock) : composerIcon(PaperPlaneTilt)}
{delayedEventsSupported && !mobileOrTablet() && (
(
radii="0"
className={css.SplitChevronButton}
>
-
+ {chipIcon(CaretDown)}
)}
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index 08bd19c53..18698fcdc 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -16,20 +16,8 @@ import classNames from 'classnames';
import type { VListHandle } from 'virtua';
import { VList } from 'virtua';
import type { ContainerColor } from 'folds';
-import {
- as,
- Box,
- Chip,
- Icon,
- Icons,
- Line,
- Text,
- Badge,
- color,
- config,
- toRem,
- Spinner,
-} from 'folds';
+import { as, Box, Chip, Line, Text, Badge, color, config, toRem, Spinner } from 'folds';
+import { ArrowDown, ChatTeardropDots, Checks, chipIcon } from '$components/icons/phosphor';
import { MessageBase, CompactPlaceholder, DefaultPlaceholder } from '$components/message';
import { RoomIntro } from '$components/room-intro';
import { useMatrixClient } from '$hooks/useMatrixClient';
@@ -61,7 +49,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
import { useImagePackRooms } from '$hooks/useImagePackRooms';
import { settingsAtom, MessageLayout } from '$state/settings';
-import { useSetting } from '$state/hooks/settings';
+import { useHiddenEventSettings, useSetting } from '$state/hooks/settings';
import { nicknamesAtom } from '$state/nicknames';
import { useRoomAbbreviationsContext } from '$hooks/useRoomAbbreviations';
import { buildAbbrReplaceTextNode } from '$components/message/RenderBody';
@@ -147,8 +135,7 @@ export function RoomTimeline({
const [encUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
const [clientUrlPreview] = useSetting(settingsAtom, 'clientUrlPreview');
const [encClientUrlPreview] = useSetting(settingsAtom, 'encClientUrlPreview');
- const [showHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
- const [showTombstoneEvents] = useSetting(settingsAtom, 'showTombstoneEvents');
+ const hiddenEvents = useHiddenEventSettings(settingsAtom);
const [showDeveloperTools] = useSetting(settingsAtom, 'developerTools');
const [reducedMotion] = useSetting(settingsAtom, 'reducedMotion');
const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock');
@@ -619,7 +606,7 @@ export function RoomTimeline({
isReadOnly,
hideMembershipEvents,
hideNickAvatarEvents,
- showHiddenEvents,
+ hiddenEvents,
},
state: { focusItem: timelineSync.focusItem, editId, activeReplyId, openThreadId },
permissions: {
@@ -780,8 +767,7 @@ export function RoomTimeline({
items: vListIndices,
linkedTimelines: timelineSync.timeline.linkedTimelines,
ignoredUsersSet,
- showHiddenEvents,
- showTombstoneEvents,
+ hiddenEvents,
mxUserId: mx.getUserId(),
readUptoEventId: readUptoEventIdRef.current,
hideMembershipEvents,
@@ -875,7 +861,7 @@ export function RoomTimeline({
variant="Primary"
radii="Pill"
outlined
- before={}
+ before={chipIcon(ChatTeardropDots)}
onClick={() => timelineSync.loadEventTimeline(unreadInfo.readUptoEventId)}
>
Jump to Unread
@@ -884,7 +870,7 @@ export function RoomTimeline({
variant="SurfaceVariant"
radii="Pill"
outlined
- before={}
+ before={chipIcon(Checks)}
onClick={() => markAsRead(mx, room.roomId, hideReads)}
>
Mark as Read
@@ -1037,7 +1023,7 @@ export function RoomTimeline({
variant="SurfaceVariant"
radii="Pill"
outlined
- before={}
+ before={chipIcon(ArrowDown)}
onClick={() => {
if (eventId) navigateRoom(room.roomId, undefined, { replace: true });
timelineSync.setTimeline(getInitialTimeline(room));
diff --git a/src/app/features/room/RoomViewFollowing.tsx b/src/app/features/room/RoomViewFollowing.tsx
index 979ee6507..5dfc01f71 100644
--- a/src/app/features/room/RoomViewFollowing.tsx
+++ b/src/app/features/room/RoomViewFollowing.tsx
@@ -1,5 +1,6 @@
import { useAtomValue } from 'jotai';
-import { Box, Icon, Icons, Text, as, config } from 'folds';
+import { Box, Text, as, config } from 'folds';
+import { Checks, menuIcon } from '$components/icons/phosphor';
import type { Room } from '$types/matrix-sdk';
import classNames from 'classnames';
import { useAtom } from 'jotai';
@@ -61,7 +62,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
>
{names.length > 0 && (
<>
-
+ {menuIcon(Checks, { style: { opacity: config.opacity.P300 } })}
{names.length === 1 && (
<>
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index f45e6172f..632331b17 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -11,8 +11,6 @@ import {
OverlayCenter,
OverlayBackdrop,
IconButton,
- Icon,
- Icons,
Tooltip,
TooltipProvider,
Menu,
@@ -37,6 +35,24 @@ import {
import { useStateEvent } from '$hooks/useStateEvent';
import { PageHeader } from '$components/page';
+import {
+ ArrowLeft,
+ ChatCircleDots,
+ Checks,
+ Chats,
+ ClockCounterClockwise,
+ composerIcon,
+ DotsThreeOutlineVerticalIcon,
+ GearSix,
+ GridFour,
+ Link,
+ MagnifyingGlass,
+ menuIcon,
+ PushPin,
+ SignOut,
+ UserCircle,
+ UserPlus,
+} from '$components/icons/phosphor';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { UseStateProvider } from '$components/UseStateProvider';
import { RoomTopicViewer } from '$components/room-topic-viewer';
@@ -73,7 +89,7 @@ import { useOpenRoomSettings } from '$state/hooks/roomSettings';
import { RoomNotificationModeSwitcher } from '$components/RoomNotificationSwitcher';
import {
getRoomNotificationMode,
- getRoomNotificationModeIcon,
+ roomNotificationModeIcon,
useRoomsNotificationPreferencesContext,
} from '$hooks/useRoomsNotificationPreferences';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
@@ -216,7 +232,7 @@ const RoomMenu = forwardRef(({ room, requestClose
}
+ after={menuIcon(Checks)}
radii="300"
disabled={!unread}
>
@@ -232,7 +248,7 @@ const RoomMenu = forwardRef(({ room, requestClose
changing ? (
) : (
-
+ roomNotificationModeIcon(notificationMode)
)
}
radii="300"
@@ -253,7 +269,7 @@ const RoomMenu = forwardRef(({ room, requestClose
variant="Primary"
fill="None"
size="300"
- after={}
+ after={menuIcon(UserPlus)}
radii="300"
aria-pressed={invitePrompt}
disabled={!canInvite}
@@ -262,22 +278,12 @@ const RoomMenu = forwardRef(({ room, requestClose
Invite
- }
- radii="300"
- >
+
- }
- radii="300"
- >
+
)}
-
+ {composerIcon(PushPin, { weight: pinMenuAnchor ? 'fill' : 'regular' })}
)}
@@ -792,7 +803,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
)}
-
+ {composerIcon(Chats, { weight: threadBrowserOpen ? 'fill' : 'regular' })}
)}
@@ -833,7 +844,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
)}
-
+ {composerIcon(GridFour, { weight: widgetDrawer ? 'fill' : 'regular' })}
)}
@@ -854,7 +865,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
>
{(triggerRef) => (
-
+ {composerIcon(UserCircle, { weight: peopleDrawer ? 'fill' : 'regular' })}
)}
@@ -878,7 +889,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
setChat(!chat);
}}
>
-
+ {composerIcon(ChatCircleDots, { weight: chat ? 'fill' : 'regular' })}
)}
@@ -901,7 +912,9 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
ref={triggerRef}
aria-pressed={!!menuAnchor}
>
-
+ {composerIcon(DotsThreeOutlineVerticalIcon, {
+ weight: menuAnchor ? 'fill' : 'regular',
+ })}
)}
diff --git a/src/app/features/room/RoomViewTyping.tsx b/src/app/features/room/RoomViewTyping.tsx
index 3d1120d52..98267fdd8 100644
--- a/src/app/features/room/RoomViewTyping.tsx
+++ b/src/app/features/room/RoomViewTyping.tsx
@@ -1,4 +1,5 @@
-import { Box, Icon, IconButton, Icons, Text, as } from 'folds';
+import { Box, IconButton, Text, as } from 'folds';
+import { chipIcon, X } from '$components/icons/phosphor';
import type { Room } from '$types/matrix-sdk';
import classNames from 'classnames';
import { useSetAtom, useAtomValue } from 'jotai';
@@ -115,7 +116,7 @@ export const RoomViewTyping = as<'div', RoomViewTypingProps>(
)}
-
+ {chipIcon(X)}
diff --git a/src/app/features/room/ThreadBrowser.tsx b/src/app/features/room/ThreadBrowser.tsx
index a5dd56382..72d967db8 100644
--- a/src/app/features/room/ThreadBrowser.tsx
+++ b/src/app/features/room/ThreadBrowser.tsx
@@ -3,9 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Box,
Header,
- Icon,
IconButton,
- Icons,
Input,
Scroll,
Spinner,
@@ -28,6 +26,14 @@ import { nicknamesAtom } from '$state/nicknames';
import { getMemberAvatarMxc, getMemberDisplayName, reactionOrEditEvent } from '$utils/room';
import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { UserAvatar } from '$components/user-avatar';
+import {
+ Chats,
+ chipIcon,
+ composerIcon,
+ MagnifyingGlass,
+ userFallbackIcon,
+ X,
+} from '$components/icons/phosphor';
import {
AvatarBase,
ModernLayout,
@@ -189,7 +195,7 @@ function ThreadPreview({ room, thread, onClick, onJump }: ThreadPreviewProps) {
: undefined
}
alt={displayName}
- renderFallback={() => }
+ renderFallback={() => userFallbackIcon('lg')}
/>
@@ -472,7 +478,7 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr
)}
-
+ {composerIcon(Chats)}
Threads
@@ -485,7 +491,7 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr
radii="300"
aria-label="Close threads"
>
-
+ {composerIcon(X)}
@@ -504,7 +510,7 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr
variant="Surface"
size="400"
radii="400"
- before={}
+ before={chipIcon(MagnifyingGlass)}
after={
query ? (
-
+ {chipIcon(X)}
) : undefined
}
@@ -553,7 +559,7 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr
justifyContent="Center"
style={{ padding: config.space.S400, gap: config.space.S200 }}
>
-
+ {composerIcon(Chats, { style: { opacity: 0.6 } })}
{lowerQuery ? 'No threads match your search.' : 'No threads yet.'}
diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx
index 7c3cb231a..8a3b206bc 100644
--- a/src/app/features/room/ThreadDrawer.tsx
+++ b/src/app/features/room/ThreadDrawer.tsx
@@ -1,6 +1,7 @@
import type { MouseEventHandler } from 'react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Box, Header, Icon, IconButton, Icons, Scroll, Spinner, Text, config, toRem } from 'folds';
+import { Box, Header, IconButton, Scroll, Spinner, Text, config, toRem } from 'folds';
+import { Chats, composerIcon, X } from '$components/icons/phosphor';
import type { IEvent, Room } from '$types/matrix-sdk';
import {
Direction,
@@ -36,7 +37,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUrl';
import { nicknamesAtom } from '$state/nicknames';
import { settingsAtom } from '$state/settings';
-import { useSetting } from '$state/hooks/settings';
+import { useHiddenEventSettings, useSetting } from '$state/hooks/settings';
import { useRoomAbbreviationsContext } from '$hooks/useRoomAbbreviations';
import { buildAbbrReplaceTextNode } from '$components/message/RenderBody';
import { createMentionElement, moveCursor, useEditor } from '$components/editor';
@@ -146,8 +147,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
const [encClientUrlPreview] = useSetting(settingsAtom, 'encClientUrlPreview');
const [autoplayStickers] = useSetting(settingsAtom, 'autoplayStickers');
const [autoplayEmojis] = useSetting(settingsAtom, 'autoplayEmojis');
- const [showHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
- const [showTombstoneEvents] = useSetting(settingsAtom, 'showTombstoneEvents');
+ const hiddenEvents = useHiddenEventSettings(settingsAtom);
const [hideMemberInReadOnly] = useSetting(settingsAtom, 'hideMembershipInReadOnly');
const [showBundledPreview] = useSetting(settingsAtom, 'bundledPreview');
const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
@@ -259,8 +259,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
linkedTimelines,
skipThreadFilter: true,
ignoredUsersSet,
- showHiddenEvents,
- showTombstoneEvents,
+ hiddenEvents,
mxUserId: mx.getUserId(),
readUptoEventId: undefined,
hideMembershipEvents: true,
@@ -719,7 +718,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
isReadOnly,
hideMembershipEvents: true,
hideNickAvatarEvents: true,
- showHiddenEvents,
+ hiddenEvents,
hideThreadChip: true,
},
state: { focusItem, editId, activeReplyId, openThreadId: threadRootId, suppressMark },
@@ -786,7 +785,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
{/* Header */}
-
+ {composerIcon(Chats)}
Thread
@@ -799,7 +798,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
radii="300"
aria-label="Close thread"
>
-
+ {composerIcon(X)}
@@ -879,7 +878,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
justifyContent="Center"
style={{ padding: config.space.S400, gap: config.space.S200 }}
>
-
+ {composerIcon(Chats, { style: { opacity: 0.6 } })}
No replies yet. Start the thread below!
diff --git a/src/app/features/room/jump-to-time/JumpToTime.tsx b/src/app/features/room/jump-to-time/JumpToTime.tsx
index 2f1318ed0..0cf34fa1e 100644
--- a/src/app/features/room/jump-to-time/JumpToTime.tsx
+++ b/src/app/features/room/jump-to-time/JumpToTime.tsx
@@ -1,6 +1,7 @@
import type { MouseEventHandler } from 'react';
import { useCallback, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
+import { CaretDown, chipIcon, composerIcon, X } from '$components/icons/phosphor';
import type { RectCords } from 'folds';
import {
Dialog,
@@ -12,8 +13,6 @@ import {
Box,
Text,
IconButton,
- Icon,
- Icons,
color,
Button,
Spinner,
@@ -111,7 +110,7 @@ export function JumpToTime({ onCancel, onSubmit }: JumpToTimeProps) {
Jump to Time