Merge branch 'master' into u/jisong/skipunstabletest

microsoft · Feb 18, 2025 · 3d25790 · 3d25790
2 parents e84ab9c + ce1afbe
commit 3d25790
Show file tree

Hide file tree

Showing 3 changed files with 4 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-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]
                 )