Improve handling of quotes inside lists (microsoft#1438)

* Remove coloring when removing a quote inside a LI * Prevent list items from being removed before quote
Leah-Xia-Microsoft · Nov 29, 2022 · 82e8883 · 82e8883
1 parent 3afe4ae
commit 82e8883
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/roosterjs-editor-plugins/lib/plugins/ContentEdit/features/listFeatures.ts b/packages/roosterjs-editor-plugins/lib/plugins/ContentEdit/features/listFeatures.ts
@@ -131,7 +131,12 @@ const OutdentWhenBackOn1stEmptyLine: BuildInEditFeature<PluginKeyboardEvent> = {
     keys: [Keys.BACKSPACE],
     shouldHandleEvent: (event, editor) => {
         let li = editor.getElementAtCursor('LI', null /*startFrom*/, event);
-        return li && isNodeEmpty(li) && !li.previousSibling;
+        return (
+            li &&
+            isNodeEmpty(li) &&
+            !li.previousSibling &&
+            !li.getElementsByTagName('blockquote').length
+        );
     },
     handleEvent: toggleListAndPreventDefault,
 };
@@ -371,7 +376,9 @@ const isFirstItemOfAList = (item: string) => {
 const MaintainListChain: BuildInEditFeature<PluginKeyboardEvent> = {
     keys: [Keys.ENTER, Keys.TAB, Keys.DELETE, Keys.BACKSPACE, Keys.RANGE],
     shouldHandleEvent: (event, editor) =>
-        editor.queryElements('li', QueryScope.OnSelection).length > 0,
+        editor
+            .queryElements('li', QueryScope.OnSelection)
+            .filter(li => !li.getElementsByTagName('blockquote').length).length > 0,
     handleEvent: (event, editor) => {
         const chains = getListChains(editor);
         editor.runAsync(editor => commitListChains(editor, chains));

diff --git a/packages/roosterjs-editor-plugins/lib/plugins/ContentEdit/features/quoteFeatures.ts b/packages/roosterjs-editor-plugins/lib/plugins/ContentEdit/features/quoteFeatures.ts
@@ -82,10 +82,13 @@ function splitQuote(event: PluginKeyboardEvent, editor: IEditor) {
         }
         parent = splitBalancedNodeRange(childOfQuote);
         shouldClearFormat = isStyledBlockquote(parent);
-        unwrap(parent);
+        const newParent = unwrap(parent);
         editor.select(childOfQuote, PositionType.Begin);
 
         if (shouldClearFormat) {
+            if (safeInstanceOf(newParent, 'HTMLLIElement')) {
+                newParent.style.removeProperty('color');
+            }
             clearFormat(editor);
         }
     });