Bump roosterjs-content-model-core to 0.21.3 to integrate #2259 (#2265)

* Content Model: Do not set focus to editor when format if editor did not have focus before format (#2259) * Content Model: Do not set focus to editor when format if editor did not have focus before * fix test * Bump content model core to 0.21.3
microsoft · Dec 12, 2023 · ea267e5 · ea267e5
1 parent 4b35c78
commit ea267e5
Show file tree

Hide file tree

Showing 3 changed files with 467 additions and 417 deletions.
diff --git a/packages-content-model/roosterjs-content-model-core/lib/coreApi/formatContentModel.ts b/packages-content-model/roosterjs-content-model-core/lib/coreApi/formatContentModel.ts
@@ -30,15 +30,20 @@ export const formatContentModel: FormatContentModel = (core, formatter, options)
         rawEvent,
         newImages: [],
     };
+    const hasFocus = core.api.hasFocus(core);
     let selection: DOMSelection | undefined;
 
     if (formatter(model, context)) {
         const writeBack = () => {
             handleImages(core, context);
 
             selection =
-                core.api.setContentModel(core, model, undefined /*options*/, onNodeCreated) ||
-                undefined;
+                core.api.setContentModel(
+                    core,
+                    model,
+                    hasFocus ? undefined : { ignoreSelection: true }, // If editor did not have focus before format, do not set focus after format
+                    onNodeCreated
+                ) || undefined;
 
             handlePendingFormat(core, context, selection);
         };