From 8c2c94fa6cf608070b47f030d3df738e1d4e25d8 Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Wed, 11 Feb 2026 11:44:20 +0100
Subject: [PATCH] Add Cmd/Ctrl+Enter to submit when Textarea is focused
 (#37821)

---
 .../form_fields/text_area_field.tsx           | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/components/form_fields/text_area_field.tsx b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
index bbde89574fa..6cbced9faf4 100644
--- a/app/javascript/mastodon/components/form_fields/text_area_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
@@ -1,5 +1,5 @@
 import type { ComponentPropsWithoutRef } from 'react';
-import { forwardRef } from 'react';
+import { forwardRef, useCallback } from 'react';
 
 import classNames from 'classnames';
 
@@ -36,12 +36,26 @@ TextAreaField.displayName = 'TextAreaField';
 export const TextArea = forwardRef<
   HTMLTextAreaElement,
   ComponentPropsWithoutRef<'textarea'>
->(({ className, ...otherProps }, ref) => (
-  <textarea
-    {...otherProps}
-    className={classNames(className, classes.input)}
-    ref={ref}
-  />
-));
+>(({ className, onKeyDown, ...otherProps }, ref) => {
+  const handleSubmitHotkey = useCallback(
+    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+      onKeyDown?.(e);
+      if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+        const targetForm = e.currentTarget.form;
+        targetForm?.requestSubmit();
+      }
+    },
+    [onKeyDown],
+  );
+
+  return (
+    <textarea
+      {...otherProps}
+      onKeyDown={handleSubmitHotkey}
+      className={classNames(className, classes.input)}
+      ref={ref}
+    />
+  );
+});
 
 TextArea.displayName = 'TextArea';