Bump RoosterJS to 9.14.0 (#2874)

* fix test * test * Merge text node and segments (#2846) * Merge text segments * Fix test * merge node * fix build and test * add test * Add test * fix test * Remove tablePreProcessor (#2849) * Add change data and apiName to ContentChangedEvent when handle keyboard input (#2854) * Fix #2857 (#2858) * Revert Shortcut command for Clear Format on mac (#2834) * revert Shortcut command for Clear Format on mac * fix ctrl and meta can press in the same time * update comment * Allow browser's default paste behavior when pasting from Office Android (#2863) * Implement shouldPreventDefaultPaste function * fix build * fix build * list-bugs * fix image floating * Customize the behavior of merging format values (#2865) * define types * add callbacks * use param instead * fix test --------- Co-authored-by: Jiuqing Song <[email protected]> * updateVersion.json * Fix merge segment issue (#2871) --------- Co-authored-by: Julia Roldi (from Dev Box) <[email protected]> Co-authored-by: Julia Roldi <[email protected]> Co-authored-by: Jiuqing Song <[email protected]> Co-authored-by: 庄黛淳华 <[email protected]> Co-authored-by: Rain-Zheng <[email protected]>
microsoft · Nov 15, 2024 · 47c8fe5 · 47c8fe5
1 parent a0a8ec3
commit 47c8fe5
Show file tree

Hide file tree

Showing 41 changed files with 1,816 additions and 945 deletions.
diff --git a/packages/roosterjs-content-model-api/lib/publicApi/format/getFormatState.ts b/packages/roosterjs-content-model-api/lib/publicApi/format/getFormatState.ts
@@ -1,12 +1,16 @@
 import { reducedModelChildProcessor } from '../../modelApi/common/reducedModelChildProcessor';
 import { retrieveModelFormatState } from 'roosterjs-content-model-dom';
-import type { IEditor, ContentModelFormatState } from 'roosterjs-content-model-types';
+import type { IEditor, ContentModelFormatState, ConflictFormatSolution } from 'roosterjs-content-model-types';
 
 /**
  * Get current format state
  * @param editor The editor to get format from
+ * @param conflictSolution The strategy for handling format conflicts
  */
-export function getFormatState(editor: IEditor): ContentModelFormatState {
+export function getFormatState(
+    editor: IEditor,
+    conflictSolution: ConflictFormatSolution = 'remove'
+): ContentModelFormatState {
     const pendingFormat = editor.getPendingFormat();
     const manager = editor.getSnapshotsManager();
     const result: ContentModelFormatState = {
@@ -17,7 +21,7 @@ export function getFormatState(editor: IEditor): ContentModelFormatState {
 
     editor.formatContentModel(
         model => {
-            retrieveModelFormatState(model, pendingFormat, result);
+            retrieveModelFormatState(model, pendingFormat, result, conflictSolution);
 
             return false;
         },

diff --git a/packages/roosterjs-content-model-api/lib/publicApi/utils/formatSegmentWithContentModel.ts b/packages/roosterjs-content-model-api/lib/publicApi/utils/formatSegmentWithContentModel.ts
@@ -1,5 +1,5 @@
 import { adjustWordSelection } from '../../modelApi/selection/adjustWordSelection';
-import { getSelectedSegmentsAndParagraphs } from 'roosterjs-content-model-dom';
+import { getSelectedSegmentsAndParagraphs, mergeTextSegments } from 'roosterjs-content-model-dom';
 import type {
     ContentModelSegmentFormat,
     IEditor,
@@ -72,12 +72,18 @@ export function formatSegmentWithContentModel(
                   )
                 : false;
 
-            formatsAndSegments.forEach(([format, segment, paragraph]) =>
-                toggleStyleCallback(format, !isTurningOff, segment, paragraph)
-            );
+            formatsAndSegments.forEach(([format, segment, paragraph]) => {
+                toggleStyleCallback(format, !isTurningOff, segment, paragraph);
+            });
 
             afterFormatCallback?.(model);
 
+            formatsAndSegments.forEach(([_, __, paragraph]) => {
+                if (paragraph) {
+                    mergeTextSegments(paragraph);
+                }
+            });
+
             if (isCollapsedSelection) {
                 context.newPendingFormat = segmentAndParagraphs[0][0].format;
                 editor.focus();

diff --git a/packages/roosterjs-content-model-api/test/publicApi/format/getFormatStateTest.ts b/packages/roosterjs-content-model-api/test/publicApi/format/getFormatStateTest.ts
@@ -72,7 +72,8 @@ describe('getFormatState', () => {
                 canUndo: false,
                 canRedo: false,
                 isDarkMode: false,
-            }
+            },
+            'remove'
         );
         expect(result).toEqual(expectedFormat);
     }

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/applySegmentFormatTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/applySegmentFormatTest.ts
@@ -275,23 +275,7 @@ describe('applySegmentFormat', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    backgroundColor: undefined,
-                                    fontFamily: undefined,
-                                    fontSize: '10px',
-                                    fontWeight: undefined,
-                                    italic: true,
-                                    strikethrough: undefined,
-                                    superOrSubScriptSequence: undefined,
-                                    textColor: 'red',
-                                    underline: false,
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     backgroundColor: undefined,
                                     fontFamily: undefined,

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/setBackgroundColorTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/setBackgroundColorTest.ts
@@ -248,14 +248,7 @@ describe('setBackgroundColor', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    backgroundColor: 'red',
-                                },
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     backgroundColor: 'red',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/setFontNameTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/setFontNameTest.ts
@@ -237,15 +237,7 @@ describe('setFontName', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    fontFamily: 'Arial',
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     fontFamily: 'Arial',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/setFontSizeTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/setFontSizeTest.ts
@@ -235,15 +235,7 @@ describe('setFontSize', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    fontSize: '10pt',
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     fontSize: '10pt',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/setTextColorTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/setTextColorTest.ts
@@ -236,15 +236,7 @@ describe('setTextColor', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    textColor: 'red',
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     textColor: 'red',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleBoldTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleBoldTest.ts
@@ -229,15 +229,7 @@ describe('toggleBold', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    fontWeight: 'bold',
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     fontWeight: 'bold',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleCodeTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleCodeTest.ts
@@ -245,18 +245,7 @@ describe('toggleCode', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {},
-                                isSelected: true,
-                                code: {
-                                    format: {
-                                        fontFamily: 'monospace',
-                                    },
-                                },
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {},
                                 isSelected: true,
                                 code: {

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleItalicTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleItalicTest.ts
@@ -229,15 +229,7 @@ describe('toggleItalic', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    italic: true,
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     italic: true,
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleStrikethroughTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleStrikethroughTest.ts
@@ -229,15 +229,7 @@ describe('toggleStrikethrough', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    strikethrough: true,
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     strikethrough: true,
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleSubscriptTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleSubscriptTest.ts
@@ -229,15 +229,7 @@ describe('toggleSubscript', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    superOrSubScriptSequence: 'sub',
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     superOrSubScriptSequence: 'sub',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleSuperscriptTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleSuperscriptTest.ts
@@ -229,15 +229,7 @@ describe('toggleSuperscript', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    superOrSubScriptSequence: 'super',
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     superOrSubScriptSequence: 'super',
                                 },

diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleUnderlineTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleUnderlineTest.ts
@@ -229,15 +229,7 @@ describe('toggleUnderline', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'test',
-                                format: {
-                                    underline: true,
-                                },
-                                isSelected: true,
-                            },
-                            {
-                                segmentType: 'Text',
-                                text: 'test',
+                                text: 'testtest',
                                 format: {
                                     underline: true,
                                 },

diff --git a/packages/roosterjs-content-model-core/lib/corePlugin/cache/domIndexerImpl.ts b/packages/roosterjs-content-model-core/lib/corePlugin/cache/domIndexerImpl.ts
@@ -109,7 +109,8 @@ function isIndexedSegment(node: Node): node is IndexedSegmentNode {
         paragraph &&
         paragraph.blockType == 'Paragraph' &&
         Array.isArray(paragraph.segments) &&
-        Array.isArray(segments)
+        Array.isArray(segments) &&
+        segments.every(segment => paragraph.segments.includes(segment))
     );
 }
 

diff --git a/packages/roosterjs-content-model-core/lib/corePlugin/copyPaste/CopyPastePlugin.ts b/packages/roosterjs-content-model-core/lib/corePlugin/copyPaste/CopyPastePlugin.ts
@@ -198,10 +198,10 @@ class CopyPastePlugin implements PluginWithState<CopyPastePluginState> {
 
             const dataTransfer = event.clipboardData;
 
-            if (dataTransfer?.items) {
+            if (shouldPreventDefaultPaste(dataTransfer, editor)) {
                 event.preventDefault();
                 extractClipboardItems(
-                    toArray(dataTransfer.items),
+                    toArray(dataTransfer!.items),
                     this.state.allowedCustomPasteType
                 ).then((clipboardData: ClipboardData) => {
                     if (!editor.isDisposed()) {
@@ -339,6 +339,32 @@ export function preprocessTable(table: ContentModelTable) {
         : [];
 }
 
+/**
+ * @internal
+ * Exported only for unit testing
+ */
+export function shouldPreventDefaultPaste(
+    dataTransfer: DataTransfer | null,
+    editor: IEditor
+): boolean {
+    if (!dataTransfer?.items) {
+        return false;
+    }
+
+    if (!editor.getEnvironment().isAndroid) {
+        return true;
+    }
+
+    // On Android, the clipboard data from Office apps is a file, which can't be loaded
+    // so we have to allow the default browser behavior
+    return toArray(dataTransfer.items).some(item => {
+        const { type } = item;
+        const isNormalFile = item.kind === 'file' && type !== '';
+        const isText = type.indexOf('text/') === 0;
+        return isNormalFile || isText;
+    });
+}
+
 /**
  * @internal
  * Create a new instance of CopyPastePlugin