From f4d504befa7f1bad5911fbef4c28d6eecb18c950 Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Tue, 18 Aug 2026 09:38:35 +0200 Subject: [PATCH] revert(editor): restore the always inline editor setting --- src/app/components/editor/Editor.tsx | 12 +++++++----- src/app/features/settings/general/General.tsx | 11 +++++++++++ src/app/features/settings/settingsLink.ts | 1 + src/app/state/settings.ts | 2 ++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/app/components/editor/Editor.tsx b/src/app/components/editor/Editor.tsx index e82569649..24eea2e71 100644 --- a/src/app/components/editor/Editor.tsx +++ b/src/app/components/editor/Editor.tsx @@ -79,12 +79,14 @@ export const CustomEditor = forwardRef( ref ) => { const [shortcutOverrides] = useSetting(settingsAtom, 'shortcutOverrides'); + const [alwaysInlineEditor] = useSetting(settingsAtom, 'alwaysInlineEditor'); const rootRef = useRef(null); const focusScrollTimerRef = useRef(); // Buttons stay inline however tall the composer grows; only the audio // recorder stacks, because its controls need a row of their own. - const showResponsiveAfterInFooter = Boolean(responsiveAfter) && forceMultilineLayout; + const layoutIsMultiline = !alwaysInlineEditor && forceMultilineLayout; + const showResponsiveAfterInFooter = Boolean(responsiveAfter) && layoutIsMultiline; useEffect(() => () => window.clearTimeout(focusScrollTimerRef.current), []); const handleKeyDown: KeyboardEventHandler = useCallback( @@ -133,13 +135,13 @@ export const CustomEditor = forwardRef(
{top} {before && ( ( )} ( {(after || (responsiveAfter && !showResponsiveAfterInFooter)) && ( +