Merge branch 'master' into u/bvalverde/fixExcelPasteWithProgramaticRe…

…trievalOfClipboard
microsoft · Feb 18, 2025 · 4a00cd5 · 4a00cd5
2 parents c5337af + ce1afbe
commit 4a00cd5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/packages/roosterjs-content-model-api/lib/publicApi/segment/toggleUnderline.ts b/packages/roosterjs-content-model-api/lib/publicApi/segment/toggleUnderline.ts
@@ -1,4 +1,3 @@
-import { adjustTrailingSpaceSelection } from '../../modelApi/selection/adjustTrailingSpaceSelection';
 import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel';
 import type { IEditor } from 'roosterjs-content-model-types';
 
@@ -20,7 +19,6 @@ export function toggleUnderline(editor: IEditor) {
             }
         },
         (format, segment) => !!format.underline || !!segment?.link?.format?.underline,
-        false /*includingFormatHolder*/,
-        adjustTrailingSpaceSelection
+        false /*includingFormatHolder*/
     );
 }
diff --git a/packages/roosterjs-content-model-api/test/publicApi/segment/toggleUnderlineTest.ts b/packages/roosterjs-content-model-api/test/publicApi/segment/toggleUnderlineTest.ts
@@ -491,18 +491,12 @@ describe('toggleUnderline', () => {
                         segments: [
                             {
                                 segmentType: 'Text',
-                                text: 'Test',
+                                text: 'Test    ',
                                 format: {
                                     underline: true,
                                 },
                                 isSelected: true,
                             },
-                            {
-                                segmentType: 'Text',
-                                text: '    ',
-                                format: {},
-                                isSelected: true,
-                            },
                         ],
                         format: {},
                     },

diff --git a/packages/roosterjs-content-model-dom/lib/domUtils/event/extractClipboardItems.ts b/packages/roosterjs-content-model-dom/lib/domUtils/event/extractClipboardItems.ts
@@ -8,6 +8,7 @@ const ContentHandlers: {
     ['text/plain']: (data, value) => (data.text = value),
     ['text/*']: (data, value, type?) => !!type && (data.customValues[type] = value),
     ['text/link-preview']: tryParseLinkPreview,
+    ['text/uri-list']: (data, value) => (data.text = value),
 };
 
 /**

diff --git a/packages/roosterjs-content-model-dom/test/domUtils/event/extractClipboardItemsTest.ts b/packages/roosterjs-content-model-dom/test/domUtils/event/extractClipboardItemsTest.ts
@@ -292,4 +292,20 @@ describe('extractClipboardItems', () => {
             pasteNativeEvent: true,
         });
     });
+
+    it('input with text/uri-list', async () => {
+        const text = 'https://example.com';
+        const clipboardData = await extractClipboardItems([
+            createStringItem('text/uri-list', text),
+        ]);
+        expect(clipboardData).toEqual({
+            types: ['text/uri-list'],
+            text: text,
+            image: null,
+            files: [],
+            rawHtml: null,
+            customValues: {},
+            pasteNativeEvent: true,
+        });
+    });
 });
diff --git a/packages/roosterjs-react/lib/ribbon/plugin/createRibbonPlugin.ts b/packages/roosterjs-react/lib/ribbon/plugin/createRibbonPlugin.ts
@@ -153,9 +153,11 @@ class RibbonPluginImpl implements RibbonPlugin {
     private updateFormat() {
         if (this.editor && this.onFormatChanged) {
             const newFormatState = getFormatState(this.editor);
+            const newFormatKeys = getObjectKeys(newFormatState);
 
             if (
                 !this.formatState ||
+                newFormatKeys.length != getObjectKeys(this.formatState).length ||
                 getObjectKeys(newFormatState).some(
                     key => newFormatState[key] != this.formatState?.[key]
                 )