fix: move recorder into multiline footer
This commit is contained in:
4 files changed
+256
-120
No files matched your search
@@ -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,
|
||||
|
||||
@@ -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 (
|
||||
<>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
Transforms.insertNodes(editor, {
|
||||
type: BlockType.Paragraph,
|
||||
children: [{ text: 'Second line' }],
|
||||
});
|
||||
}}
|
||||
>
|
||||
Make multiline
|
||||
</button>
|
||||
<CustomEditor
|
||||
editableName="EditorHarness"
|
||||
editor={editor}
|
||||
before={<button type="button">Attach</button>}
|
||||
after={<button type="button">Send</button>}
|
||||
responsiveAfter={<div data-testid="recorder">Recorder</div>}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function ToggleRecorderHarness() {
|
||||
const editor = useEditor();
|
||||
const [showRecorder, setShowRecorder] = useState(false);
|
||||
|
||||
return (
|
||||
<>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
Transforms.insertText(editor, 'Some text that still fits before recording');
|
||||
}}
|
||||
>
|
||||
Add text
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
shouldWrapToggleHarness = true;
|
||||
setShowRecorder(true);
|
||||
}}
|
||||
>
|
||||
Start recorder
|
||||
</button>
|
||||
<CustomEditor
|
||||
editableName="ToggleRecorderHarness"
|
||||
editor={editor}
|
||||
before={<button type="button">Attach</button>}
|
||||
after={<button type="button">Send</button>}
|
||||
responsiveAfter={
|
||||
showRecorder ? <div data-testid="toggle-recorder">Recorder</div> : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function ForcedFooterHarness() {
|
||||
const editor = useEditor();
|
||||
|
||||
return (
|
||||
<CustomEditor
|
||||
editableName="ForcedFooterHarness"
|
||||
editor={editor}
|
||||
before={<button type="button">Attach</button>}
|
||||
after={<button type="button">Send</button>}
|
||||
responsiveAfter={<div data-testid="forced-footer-recorder">Recorder</div>}
|
||||
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(<EditorHarness />);
|
||||
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(<ToggleRecorderHarness />);
|
||||
|
||||
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(<ForcedFooterHarness />);
|
||||
|
||||
expect(screen.getByTestId('forced-footer-recorder').parentElement).toHaveClass(
|
||||
css.EditorResponsiveAfterMultiline
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -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<HTMLDivElement, CustomEditorProps>(
|
||||
(
|
||||
@@ -79,6 +80,8 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
bottom,
|
||||
before,
|
||||
after,
|
||||
responsiveAfter,
|
||||
forceMultilineLayout = false,
|
||||
maxHeight = '50vh',
|
||||
editor,
|
||||
placeholder,
|
||||
@@ -88,7 +91,6 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
onPaste,
|
||||
className,
|
||||
variant = 'SurfaceVariant',
|
||||
replacementContent,
|
||||
},
|
||||
ref
|
||||
) => {
|
||||
@@ -105,7 +107,9 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
const afterRef = useRef<HTMLDivElement>(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<HTMLDivElement, CustomEditorProps>(
|
||||
<Slate editor={editor} initialValue={slateInitialValue} onChange={handleChange}>
|
||||
{top}
|
||||
<Box
|
||||
className={`${css.EditorRow} ${layoutIsMultiline ? css.EditorRowMultiline : ''}`}
|
||||
className={`${css.EditorRow} ${layoutIsMultiline ? css.EditorRowMultiline : ''} ${showResponsiveAfterInFooter ? css.EditorRowMultilineWithResponsiveAfter : ''}`}
|
||||
alignItems="Start"
|
||||
>
|
||||
{before && (
|
||||
@@ -215,37 +219,29 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
<Scroll
|
||||
className={`${css.EditorTextareaScroll} ${layoutIsMultiline ? css.EditorTextareaScrollMultiline : ''}`}
|
||||
variant={variant}
|
||||
style={{ maxHeight: replacementContent ? undefined : maxHeight }}
|
||||
style={{ maxHeight: showResponsiveAfterInFooter ? undefined : maxHeight }}
|
||||
size="300"
|
||||
visibility="Always"
|
||||
hideTrack
|
||||
>
|
||||
{replacementContent ? (
|
||||
<div
|
||||
className={`${css.EditorReplacementContent} ${layoutIsMultiline ? css.EditorReplacementContentMultiline : ''}`}
|
||||
>
|
||||
{replacementContent}
|
||||
</div>
|
||||
) : (
|
||||
<Editable
|
||||
ref={editableRef}
|
||||
data-editable-name={editableName}
|
||||
className={`${css.EditorTextarea} ${layoutIsMultiline ? css.EditorTextareaMultiline : ''}`}
|
||||
placeholder={placeholder}
|
||||
renderPlaceholder={renderPlaceholder}
|
||||
renderElement={renderElement}
|
||||
renderLeaf={renderLeaf}
|
||||
onKeyDown={handleKeydown}
|
||||
onKeyUp={onKeyUp}
|
||||
onPaste={onPaste}
|
||||
autoCapitalize="sentences"
|
||||
onBlur={() => {
|
||||
if (mobileOrTablet()) ReactEditor.focus(editor);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<Editable
|
||||
ref={editableRef}
|
||||
data-editable-name={editableName}
|
||||
className={css.EditorTextarea}
|
||||
placeholder={placeholder}
|
||||
renderPlaceholder={renderPlaceholder}
|
||||
renderElement={renderElement}
|
||||
renderLeaf={renderLeaf}
|
||||
onKeyDown={handleKeydown}
|
||||
onKeyUp={onKeyUp}
|
||||
onPaste={onPaste}
|
||||
autoCapitalize="sentences"
|
||||
onBlur={() => {
|
||||
if (mobileOrTablet()) ReactEditor.focus(editor);
|
||||
}}
|
||||
/>
|
||||
</Scroll>
|
||||
{after && (
|
||||
{(after || showResponsiveAfterInline) && (
|
||||
<Box
|
||||
ref={afterRef}
|
||||
className={`${css.EditorOptions} ${layoutIsMultiline ? css.EditorOptionsMultiline : ''} ${layoutIsMultiline ? css.EditorOptionsAfterMultiline : ''}`}
|
||||
@@ -253,9 +249,15 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
gap="100"
|
||||
shrink="No"
|
||||
>
|
||||
{showResponsiveAfterInline && responsiveAfter}
|
||||
{after}
|
||||
</Box>
|
||||
)}
|
||||
{showResponsiveAfterInFooter && (
|
||||
<Box className={css.EditorResponsiveAfterMultiline} alignItems="Center" gap="100">
|
||||
{responsiveAfter}
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
{bottom}
|
||||
</Slate>
|
||||
|
||||
@@ -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<HTMLDivElement, RoomInputProps>(
|
||||
const audioRecorderRef = useRef<AudioMessageRecorderHandle>(null);
|
||||
const micHoldStartRef = useRef<number>(0);
|
||||
const HOLD_THRESHOLD_MS = 400;
|
||||
const isMobileRecording = showAudioRecorder && mobileOrTablet();
|
||||
const [autocompleteQuery, setAutocompleteQuery] =
|
||||
useState<AutocompleteQuery<AutocompletePrefix>>();
|
||||
const [isQuickTextReact, setQuickTextReact] = useState(false);
|
||||
@@ -474,6 +477,35 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
[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 ? (
|
||||
<AudioMessageRecorder
|
||||
ref={audioRecorderRef}
|
||||
onRequestClose={() => 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<HTMLDivElement, RoomInputProps>(
|
||||
onKeyDown={handleKeyDown}
|
||||
onKeyUp={handleKeyUp}
|
||||
onPaste={handlePaste}
|
||||
replacementContent={
|
||||
isMobileRecording ? (
|
||||
<AudioMessageRecorder
|
||||
ref={audioRecorderRef}
|
||||
onRequestClose={() => 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<HTMLDivElement, RoomInputProps>(
|
||||
</>
|
||||
}
|
||||
before={
|
||||
!isMobileRecording && (
|
||||
<IconButton
|
||||
onClick={() => pickFile('*')}
|
||||
variant="SurfaceVariant"
|
||||
size="300"
|
||||
radii="300"
|
||||
title="Upload File"
|
||||
aria-label="Upload and attach a File"
|
||||
>
|
||||
<Icon src={Icons.PlusCircle} />
|
||||
</IconButton>
|
||||
)
|
||||
<IconButton
|
||||
onClick={() => pickFile('*')}
|
||||
variant="SurfaceVariant"
|
||||
size="300"
|
||||
radii="300"
|
||||
title="Upload File"
|
||||
aria-label="Upload and attach a File"
|
||||
>
|
||||
<Icon src={Icons.PlusCircle} />
|
||||
</IconButton>
|
||||
}
|
||||
after={
|
||||
<>
|
||||
{showAudioRecorder && !isMobileRecording && (
|
||||
<AudioMessageRecorder
|
||||
ref={audioRecorderRef}
|
||||
onRequestClose={() => 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 ── */}
|
||||
<IconButton
|
||||
ref={micBtnRef}
|
||||
|
||||
Reference in new issue
Block a user