Skip to content

fix: prevent Enter key from inserting newline before submit #346

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

Open
hakonharnes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent Enter key from inserting newline before submit #346

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
50 changes: 27 additions & 23 deletions src/components/mention-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,34 @@ export default function MentionInput({
class:
"w-full max-h-80 min-h-[2rem] break-words overflow-y-auto resize-none focus:outline-none px-2 py-1 prose prose-sm dark:prose-invert ",
},
handleKeyDown: (view, event) => {
const isSubmit =
!open &&
event.key === "Enter" &&
view.state.doc.textContent.trim().length > 0 &&
!event.shiftKey &&
!event.metaKey &&
!event.isComposing;
if (isSubmit) {
event.preventDefault();
onEnter?.();
if (isMobile) {
view.dom.blur();
}
return true;
}
},
},
};
}, [disabled, MentionItem, suggestionChar, onChange]);
}, [
disabled,
MentionItem,
suggestionChar,
onChange,
open,
onEnter,
isMobile,
]);

const editor = useEditor(editorConfig);

Expand All @@ -201,27 +226,6 @@ export default function MentionInput({
editor?.setEditable(!disabled);
}, [disabled]);

// Memoize handlers
const handleKeyDown = useCallback(
(e: React.KeyboardEvent) => {
const isSubmit =
!open &&
e.key === "Enter" &&
editor?.getText().trim().length &&
!e.shiftKey &&
!e.metaKey &&
!e.nativeEvent.isComposing;
if (isSubmit) {
e.preventDefault();
onEnter?.();
if (isMobile) {
editor?.commands.blur();
}
}
},
[editor, onEnter, open],
);

// Memoize the DOM structure
const suggestion = useMemo(() => {
if (!open || disabledMention) return null;
Expand Down Expand Up @@ -303,7 +307,7 @@ export default function MentionInput({
onClick={focus}
className={cn("relative w-full", className)}
>
<EditorContent editor={editor} onKeyDown={handleKeyDown} />
<EditorContent editor={editor} />
{suggestion}
{placeholderElement}
</div>
Expand Down
Loading