diff --git a/src/app/components/editor/Editor.css.ts b/src/app/components/editor/Editor.css.ts
index 990c6a74..9c40ea3b 100644
--- a/src/app/components/editor/Editor.css.ts
+++ b/src/app/components/editor/Editor.css.ts
@@ -28,6 +28,14 @@ export const EditorRowMultiline = style({
alignItems: 'start',
});
+export const EditorRowMultilineWithResponsiveAfter = style({
+ gridTemplateColumns: 'auto 1fr auto',
+ gridTemplateAreas: `
+ "before textarea textarea"
+ "before responsive-after after"
+ `,
+});
+
export const EditorOptions = style([
DefaultReset,
{
@@ -53,34 +61,12 @@ export const EditorTextareaScrollMultiline = style({
gridArea: 'textarea',
});
-export const EditorReplacementContent = style([
- DefaultReset,
- {
- flexGrow: 1,
- height: '100%',
- padding: `${toRem(13)} ${toRem(1)}`,
- selectors: {
- [`${EditorTextareaScroll}:first-child &`]: {
- paddingLeft: toRem(13),
- },
- [`${EditorTextareaScroll}:last-child &`]: {
- paddingRight: toRem(13),
- },
- },
- },
-]);
-
-export const EditorReplacementContentMultiline = style({
- paddingLeft: config.space.S200,
- paddingRight: config.space.S200,
-});
-
export const EditorTextarea = style([
DefaultReset,
{
flexGrow: 1,
height: 'auto',
- padding: `${toRem(13)} ${toRem(1)}`,
+ padding: `${toRem(13)} 0 0`,
selectors: {
[`${EditorTextareaScroll}:first-child &`]: {
paddingLeft: toRem(13),
@@ -95,10 +81,14 @@ export const EditorTextarea = style([
},
]);
-export const EditorTextareaMultiline = style({
- paddingLeft: config.space.S200,
- paddingRight: config.space.S200,
-});
+export const EditorResponsiveAfterMultiline = style([
+ EditorOptions,
+ {
+ gridArea: 'responsive-after',
+ minWidth: 0,
+ alignSelf: 'stretch',
+ },
+]);
export const EditorPlaceholderContainer = style([
DefaultReset,
diff --git a/src/app/components/editor/Editor.test.tsx b/src/app/components/editor/Editor.test.tsx
new file mode 100644
index 00000000..f0a488b9
--- /dev/null
+++ b/src/app/components/editor/Editor.test.tsx
@@ -0,0 +1,161 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { useState } from 'react';
+import { Transforms } from 'slate';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { useEditor, CustomEditor } from './Editor';
+import { BlockType } from './types';
+import * as css from './Editor.css';
+
+let shouldWrapToggleHarness = false;
+
+function EditorHarness() {
+ const editor = useEditor();
+
+ return (
+ <>
+
+ Attach}
+ after={}
+ responsiveAfter={Recorder
}
+ />
+ >
+ );
+}
+
+function ToggleRecorderHarness() {
+ const editor = useEditor();
+ const [showRecorder, setShowRecorder] = useState(false);
+
+ return (
+ <>
+
+
+ Attach}
+ after={}
+ responsiveAfter={
+ showRecorder ? Recorder
: undefined
+ }
+ />
+ >
+ );
+}
+
+function ForcedFooterHarness() {
+ const editor = useEditor();
+
+ return (
+ Attach}
+ after={}
+ responsiveAfter={Recorder
}
+ forceMultilineLayout
+ />
+ );
+}
+
+const nativeScrollHeight = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'scrollHeight');
+
+beforeEach(() => {
+ shouldWrapToggleHarness = false;
+ Object.defineProperty(HTMLElement.prototype, 'scrollHeight', {
+ configurable: true,
+ get() {
+ if (
+ this instanceof HTMLElement &&
+ this.getAttribute('data-editable-name') === 'ToggleRecorderHarness'
+ ) {
+ return shouldWrapToggleHarness ? 40 : 20;
+ }
+ return nativeScrollHeight?.get?.call(this) ?? 0;
+ },
+ });
+});
+
+afterEach(() => {
+ shouldWrapToggleHarness = false;
+ if (nativeScrollHeight) {
+ Object.defineProperty(HTMLElement.prototype, 'scrollHeight', nativeScrollHeight);
+ } else {
+ Reflect.deleteProperty(HTMLElement.prototype, 'scrollHeight');
+ }
+});
+
+describe('CustomEditor', () => {
+ it('moves responsive after content into the multiline footer without keeping the textarea max height', async () => {
+ render();
+ const editable = document.querySelector('[data-editable-name="EditorHarness"]');
+ const scroll = editable?.parentElement as HTMLElement | null;
+
+ expect(scroll).not.toBeNull();
+ expect(scroll?.style.maxHeight).toBe('50vh');
+ expect(screen.getByText('Attach')).toBeVisible();
+ expect(screen.getByText('Send')).toBeVisible();
+ expect(screen.getByTestId('recorder').parentElement).toHaveClass(css.EditorOptions);
+
+ fireEvent.click(screen.getByRole('button', { name: 'Make multiline' }));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('recorder').parentElement).toHaveClass(
+ css.EditorResponsiveAfterMultiline
+ );
+ expect(scroll?.style.maxHeight).toBe('');
+ });
+
+ expect(screen.getByText('Attach')).toBeVisible();
+ expect(screen.getByText('Send')).toBeVisible();
+ });
+
+ it('recomputes multiline layout when inline responsive content makes existing text wrap', async () => {
+ render();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Add text' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Start recorder' }));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('toggle-recorder').parentElement).toHaveClass(
+ css.EditorResponsiveAfterMultiline
+ );
+ });
+ });
+
+ it('supports forcing multiline layout so responsive content moves into the footer immediately', () => {
+ render();
+
+ expect(screen.getByTestId('forced-footer-recorder').parentElement).toHaveClass(
+ css.EditorResponsiveAfterMultiline
+ );
+ });
+});
diff --git a/src/app/components/editor/Editor.tsx b/src/app/components/editor/Editor.tsx
index a8afb579..683ab2c9 100644
--- a/src/app/components/editor/Editor.tsx
+++ b/src/app/components/editor/Editor.tsx
@@ -60,6 +60,8 @@ type CustomEditorProps = {
bottom?: ReactNode;
before?: ReactNode;
after?: ReactNode;
+ responsiveAfter?: ReactNode;
+ forceMultilineLayout?: boolean;
maxHeight?: string;
editor: Editor;
placeholder?: string;
@@ -69,7 +71,6 @@ type CustomEditorProps = {
onPaste?: ClipboardEventHandler;
className?: string;
variant?: 'Surface' | 'SurfaceVariant' | 'Background';
- replacementContent?: ReactNode;
};
export const CustomEditor = forwardRef(
(
@@ -79,6 +80,8 @@ export const CustomEditor = forwardRef(
bottom,
before,
after,
+ responsiveAfter,
+ forceMultilineLayout = false,
maxHeight = '50vh',
editor,
placeholder,
@@ -88,7 +91,6 @@ export const CustomEditor = forwardRef(
onPaste,
className,
variant = 'SurfaceVariant',
- replacementContent,
},
ref
) => {
@@ -105,7 +107,9 @@ export const CustomEditor = forwardRef(
const afterRef = useRef(null);
const isMultilineRef = useRef(false);
const [isMultiline, setIsMultiline] = useState(false);
- const layoutIsMultiline = isMultiline && !replacementContent;
+ const layoutIsMultiline = isMultiline || forceMultilineLayout;
+ const showResponsiveAfterInFooter = Boolean(responsiveAfter) && layoutIsMultiline;
+ const showResponsiveAfterInline = Boolean(responsiveAfter) && !showResponsiveAfterInFooter;
const handleChange = useCallback(
(value: Descendant[]) => {
@@ -198,7 +202,7 @@ export const CustomEditor = forwardRef(
{top}
{before && (
@@ -215,37 +219,29 @@ export const CustomEditor = forwardRef(
- {replacementContent ? (
-
- {replacementContent}
-
- ) : (
- {
- if (mobileOrTablet()) ReactEditor.focus(editor);
- }}
- />
- )}
+ {
+ if (mobileOrTablet()) ReactEditor.focus(editor);
+ }}
+ />
- {after && (
+ {(after || showResponsiveAfterInline) && (
(
gap="100"
shrink="No"
>
+ {showResponsiveAfterInline && responsiveAfter}
{after}
)}
+ {showResponsiveAfterInFooter && (
+
+ {responsiveAfter}
+
+ )}
{bottom}
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 96a56131..e6203d7c 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -164,7 +164,11 @@ import {
getVideoMsgContent,
} from './msgContent';
import { CommandAutocomplete } from './CommandAutocomplete';
-import { AudioMessageRecorder, AudioMessageRecorderHandle } from './AudioMessageRecorder';
+import {
+ AudioMessageRecorder,
+ AudioMessageRecorderHandle,
+ AudioRecordingCompletePayload,
+} from './AudioMessageRecorder';
// Returns the event ID of the most recent non-reaction/non-edit event in a thread,
// falling back to the thread root if no replies exist yet.
@@ -290,7 +294,6 @@ export const RoomInput = forwardRef(
const audioRecorderRef = useRef(null);
const micHoldStartRef = useRef(0);
const HOLD_THRESHOLD_MS = 400;
- const isMobileRecording = showAudioRecorder && mobileOrTablet();
const [autocompleteQuery, setAutocompleteQuery] =
useState>();
const [isQuickTextReact, setQuickTextReact] = useState(false);
@@ -474,6 +477,35 @@ export const RoomInput = forwardRef(
[setSelectedFiles, selectedFiles]
);
+ const handleAudioRecordingComplete = useCallback(
+ (payload: AudioRecordingCompletePayload) => {
+ const extension = getSupportedAudioExtension(payload.audioCodec);
+ const file = new File(
+ [payload.audioBlob],
+ `sable-audio-message-${Date.now()}.${extension}`,
+ {
+ type: payload.audioCodec,
+ }
+ );
+ handleFiles([file], {
+ waveform: payload.waveform,
+ audioDuration: payload.audioLength,
+ });
+ setShowAudioRecorder(false);
+ },
+ [handleFiles]
+ );
+
+ const audioRecorder = showAudioRecorder ? (
+ setShowAudioRecorder(false)}
+ onRecordingComplete={handleAudioRecordingComplete}
+ onAudioLengthUpdate={() => {}}
+ onWaveformUpdate={() => {}}
+ />
+ ) : undefined;
+
const handleCancelUpload = (uploads: Upload[]) => {
uploads.forEach((upload) => {
if (upload.status === UploadStatus.Loading) {
@@ -1082,31 +1114,8 @@ export const RoomInput = forwardRef(
onKeyDown={handleKeyDown}
onKeyUp={handleKeyUp}
onPaste={handlePaste}
- replacementContent={
- isMobileRecording ? (
- setShowAudioRecorder(false)}
- onRecordingComplete={(payload) => {
- const extension = getSupportedAudioExtension(payload.audioCodec);
- const file = new File(
- [payload.audioBlob],
- `sable-audio-message-${Date.now()}.${extension}`,
- {
- type: payload.audioCodec,
- }
- );
- handleFiles([file], {
- waveform: payload.waveform,
- audioDuration: payload.audioLength,
- });
- setShowAudioRecorder(false);
- }}
- onAudioLengthUpdate={() => {}}
- onWaveformUpdate={() => {}}
- />
- ) : undefined
- }
+ responsiveAfter={audioRecorder}
+ forceMultilineLayout={showAudioRecorder}
top={
<>
{scheduledTime && (
@@ -1223,45 +1232,19 @@ export const RoomInput = forwardRef(
>
}
before={
- !isMobileRecording && (
- pickFile('*')}
- variant="SurfaceVariant"
- size="300"
- radii="300"
- title="Upload File"
- aria-label="Upload and attach a File"
- >
-
-
- )
+ pickFile('*')}
+ variant="SurfaceVariant"
+ size="300"
+ radii="300"
+ title="Upload File"
+ aria-label="Upload and attach a File"
+ >
+
+
}
after={
<>
- {showAudioRecorder && !isMobileRecording && (
- setShowAudioRecorder(false)}
- onRecordingComplete={(payload) => {
- const extension = getSupportedAudioExtension(payload.audioCodec);
- const file = new File(
- [payload.audioBlob],
- `sable-audio-message-${Date.now()}.${extension}`,
- {
- type: payload.audioCodec,
- }
- );
- handleFiles([file], {
- waveform: payload.waveform,
- audioDuration: payload.audioLength,
- });
- setShowAudioRecorder(false);
- }}
- onAudioLengthUpdate={() => {}}
- onWaveformUpdate={() => {}}
- />
- )}
-
{/* ── Mic button — always present; icon swaps to Stop while recording ── */}