From e5dff007e59bc6b8e28e021dbde46ea03207b8f2 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 2 Aug 2022 15:08:41 +0200
Subject: [PATCH] Avoid inserting default line breaks in RTE with
 insertOrderedList/insertUnorderedList commands. Fixes #4449

---
 src/rich_text_editor/model/RichTextEditor.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rich_text_editor/model/RichTextEditor.js b/src/rich_text_editor/model/RichTextEditor.js
index 918b3a420..544662283 100644
--- a/src/rich_text_editor/model/RichTextEditor.js
+++ b/src/rich_text_editor/model/RichTextEditor.js
@@ -238,8 +238,11 @@ export default class RichTextEditor {
   }
 
   __onKeydown(event) {
-    if (event.key === 'Enter') {
-      this.doc.execCommand('insertLineBreak');
+    const { doc } = this;
+    const cmdList = ['insertOrderedList', 'insertUnorderedList'];
+
+    if (event.key === 'Enter' && !cmdList.some(cmd => doc.queryCommandState(cmd))) {
+      doc.execCommand('insertLineBreak');
       event.preventDefault();
     }
   }