Skip to content

feat: reorderable composer trigger buttons #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7w1 merged 1 commit into from
Jul 23, 2026
Merged

feat: reorderable composer trigger buttons #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/add-reorderable-composer-buttons.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: minor
---

Add toggleable, reorderable composer trigger buttons (emoji, gif, sticker) with a drag-and-drop settings list.
4 changes: 4 additions & 0 deletions src/app/components/icons/phosphor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
DevicesIcon,
DotsThreeIcon,
DotsThreeOutlineVerticalIcon,
DotsSixVerticalIcon,
DownloadIcon,
EnvelopeSimpleIcon,
EyeIcon,
Expand All @@ -45,6 +46,7 @@ import {
FlowerIcon,
FunnelIcon,
GearSixIcon,
GifIcon,
GlobeIcon,
GridFourIcon,
HardDrivesIcon,
Expand Down Expand Up @@ -342,6 +344,7 @@ export {
DevicesIcon as Devices,
DotsThreeIcon as DotsThree,
DotsThreeOutlineVerticalIcon,
DotsSixVerticalIcon,
DownloadIcon as Download,
EnvelopeSimpleIcon as EnvelopeSimple,
EyeIcon as Eye,
Expand All @@ -352,6 +355,7 @@ export {
FlowerIcon as Flower,
FunnelIcon as Funnel,
GearSixIcon as GearSix,
GifIcon as Gif,
GlobeIcon as Globe,
GridFourIcon as GridFour,
HardDrivesIcon as HardDrives,
Expand Down
99 changes: 78 additions & 21 deletions src/app/features/room/RoomInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { KeyboardEventHandler, MouseEvent, RefObject } from 'react';
import { forwardRef, useCallback, useEffect, useRef, useState, useMemo } from 'react';
import { forwardRef, Fragment, useCallback, useEffect, useRef, useState, useMemo } from 'react';
import type { ReactElement } from 'react';
import { useAtom, useAtomValue, useSetAtom } from 'jotai';

import { isKeyHotkey } from 'is-hotkey';
Expand Down Expand Up @@ -145,6 +146,7 @@ import {
composerIcon,
dropzoneIcon,
File as FileIcon,
Gif,
Image as ImageIcon,
ListBullets,
MapPinPlusIcon,
Expand All @@ -154,6 +156,7 @@ import {
getPhosphorIconSize,
PlusCircle,
Smiley,
Sticker,
Stop,
X,
} from '$components/icons/phosphor';
Expand Down Expand Up @@ -297,6 +300,11 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
const useAuthentication = useMediaAuthentication();
const [enterForNewline] = useSetting(settingsAtom, 'enterForNewline');
const [editorOldAddFile] = useSetting(settingsAtom, 'editorOldAddFile');
const [editorGifButton] = useSetting(settingsAtom, 'editorGifButton');
const [editorEmojiButton] = useSetting(settingsAtom, 'editorEmojiButton');
const [editorStickerButton] = useSetting(settingsAtom, 'editorStickerButton');
const [editorMicButton] = useSetting(settingsAtom, 'editorMicButton');
const [editorButtonOrder] = useSetting(settingsAtom, 'editorButtonOrder');
const [shortcutOverrides] = useSetting(settingsAtom, 'shortcutOverrides');

const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
Expand Down Expand Up @@ -1878,22 +1886,69 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
/>
);
const triggers = (
<IconButton
ref={emojiBtnRef}
aria-pressed={emojiBoardTab !== undefined}
onClick={() => setEmojiBoardTab(EmojiBoardTab.Emoji)}
onPointerDown={suppressEditorRefocus}
variant="SurfaceVariant"
size="300"
radii="300"
style={{ backgroundColor: 'transparent' }}
title="open emoji board"
aria-label="Open emoji board"
>
{composerIcon(Smiley, {
weight: emojiBoardTab !== undefined ? 'fill' : 'regular',
<>
{editorButtonOrder.map((id) => {
let button: ReactElement | null = null;
if (id === 'gif' && editorGifButton) {
button = (
<IconButton
aria-pressed={emojiBoardTab === EmojiBoardTab.Gif}
onClick={() => setEmojiBoardTab(EmojiBoardTab.Gif)}
onPointerDown={suppressEditorRefocus}
variant="SurfaceVariant"
size="300"
radii="300"
style={{ backgroundColor: 'transparent' }}
title="open gif picker"
aria-label="Open gif picker"
>
{composerIcon(Gif, {
weight: emojiBoardTab === EmojiBoardTab.Gif ? 'fill' : 'regular',
})}
</IconButton>
);
} else if (id === 'sticker' && editorStickerButton) {
button = (
<IconButton
aria-pressed={emojiBoardTab === EmojiBoardTab.Sticker}
onClick={() => setEmojiBoardTab(EmojiBoardTab.Sticker)}
onPointerDown={suppressEditorRefocus}
variant="SurfaceVariant"
size="300"
radii="300"
style={{ backgroundColor: 'transparent' }}
title="open sticker picker"
aria-label="Open sticker picker"
>
{composerIcon(Sticker, {
weight:
emojiBoardTab === EmojiBoardTab.Sticker ? 'fill' : 'regular',
})}
</IconButton>
);
} else if (id === 'emoji' && editorEmojiButton) {
button = (
<IconButton
ref={emojiBtnRef}
aria-pressed={emojiBoardTab !== undefined}
onClick={() => setEmojiBoardTab(EmojiBoardTab.Emoji)}
onPointerDown={suppressEditorRefocus}
variant="SurfaceVariant"
size="300"
radii="300"
style={{ backgroundColor: 'transparent' }}
title="open emoji board"
aria-label="Open emoji board"
>
{composerIcon(Smiley, {
weight: emojiBoardTab !== undefined ? 'fill' : 'regular',
})}
</IconButton>
);
}
return <Fragment key={id}>{button}</Fragment>;
})}
</IconButton>
</>
);
if (mobileOrTablet()) {
return (
Expand Down Expand Up @@ -1943,23 +1998,23 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
showAudioRecorder ? 'Critical' : scheduledTime ? 'Primary' : 'SurfaceVariant'
}
size="300"
radii={hasContent || showAudioRecorder ? '0' : '300'}
radii={hasContent || showAudioRecorder || !editorMicButton ? '0' : '300'}
title={
showAudioRecorder
? 'Stop recording'
: hasContent
: hasContent || !editorMicButton
? 'Send Message'
: 'Record audio message'
}
aria-label={
showAudioRecorder
? 'Stop recording'
: hasContent
: hasContent || !editorMicButton
? 'Send your composed Message'
: 'Record audio message'
}
style={{ backgroundColor: 'transparent' }}
aria-pressed={!hasContent ? showAudioRecorder : undefined}
aria-pressed={!hasContent && editorMicButton ? showAudioRecorder : undefined}
onClick={() => {
if (showAudioRecorder) {
audioRecorderRef.current?.stop();
Expand All @@ -1973,6 +2028,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
submit();
return;
}
if (!editorMicButton) return;
if (mobileOrTablet()) return;
setShowAudioRecorder(true);
}}
Expand All @@ -1991,6 +2047,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
}
return;
}
if (!editorMicButton) return;
if (!mobileOrTablet()) return;
micHoldStartRef.current = Date.now();
setShowAudioRecorder(true);
Expand Down Expand Up @@ -2042,7 +2099,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
weight="fill"
style={{ color: color.Critical.Main }}
/>
) : hasContent ? (
) : hasContent || !editorMicButton ? (
sendBusy ? (
<Spinner size="300" variant="Secondary" />
) : scheduledTime ? (
Expand Down
Loading
Loading