diff --git a/packages/frontend/core/src/components/comment/comment-editor/index.tsx b/packages/frontend/core/src/components/comment/comment-editor/index.tsx index f948ea4a28..bec8847550 100644 --- a/packages/frontend/core/src/components/comment/comment-editor/index.tsx +++ b/packages/frontend/core/src/components/comment/comment-editor/index.tsx @@ -514,7 +514,7 @@ export const CommentEditor = forwardRef( return; }, [doc, onChange, snapshotHelper]); - // Add keydown handler to commit on CMD/CTRL + Enter key + // Add keydown handler to commit on Enter key const handleKeyDown = useCallback( (e: React.KeyboardEvent) => { if (readonly) return; @@ -523,8 +523,8 @@ export const CommentEditor = forwardRef( const activeElement = document.activeElement; if (!editorRef.current?.contains(activeElement)) return; - // If Enter is pressed with CMD/CTRL key, commit the comment - if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) { + // If Enter is pressed without CMD/CTRL key, commit the comment + if (e.key === 'Enter' && !(e.metaKey || e.ctrlKey)) { e.preventDefault(); e.stopPropagation(); handleCommit(); diff --git a/packages/frontend/core/src/components/comment/sidebar/index.tsx b/packages/frontend/core/src/components/comment/sidebar/index.tsx index 395bb935a1..fb860810a6 100644 --- a/packages/frontend/core/src/components/comment/sidebar/index.tsx +++ b/packages/frontend/core/src/components/comment/sidebar/index.tsx @@ -157,6 +157,7 @@ const ActionMenu = ({ } > } disabled={disabled} @@ -491,6 +492,7 @@ const CommentItem = ({ > {canResolveComment && ( } diff --git a/packages/frontend/core/src/components/comment/sidebar/style.css.ts b/packages/frontend/core/src/components/comment/sidebar/style.css.ts index 9f431c4f58..150775ba52 100644 --- a/packages/frontend/core/src/components/comment/sidebar/style.css.ts +++ b/packages/frontend/core/src/components/comment/sidebar/style.css.ts @@ -163,6 +163,10 @@ export const commentActions = style({ }, }); +export const actionButton = style({ + backgroundColor: cssVarV2('button/buttonOverHover'), +}); + export const readonlyCommentContainer = style({ display: 'flex', flexDirection: 'column',