Merge branch 'master' into u/juliaroldi/image-editing-refactor

microsoft · Oct 21, 2022 · 709e22a · 709e22a
2 parents 7fe3b15 + cdf5eca
commit 709e22a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/packages/roosterjs-content-model/lib/modelToDom/handlers/handleSegment.ts b/packages/roosterjs-content-model/lib/modelToDom/handlers/handleSegment.ts
@@ -36,8 +36,12 @@ export const handleSegment: ContentModelHandler<ContentModelSegment> = (
             break;
 
         case 'Br':
-            element = doc.createElement('br');
-            regularSelection.current.segment = element;
+            const br = doc.createElement('br');
+            element = doc.createElement('span');
+            element.appendChild(br);
+            regularSelection.current.segment = br;
+
+            applyFormat(element, context.formatAppliers.segment, segment.format, context);
             break;
 
         case 'General':

diff --git a/packages/roosterjs-content-model/test/modelToDom/handlers/handleSegmentTest.ts b/packages/roosterjs-content-model/test/modelToDom/handlers/handleSegmentTest.ts
@@ -50,7 +50,7 @@ describe('handleSegment', () => {
                 segmentType: 'Br',
                 format: {},
             },
-            '<br>',
+            '<span><br></span>',
             0
         );
     });

diff --git a/packages/roosterjs-editor-api/lib/format/changeFontSize.ts b/packages/roosterjs-editor-api/lib/format/changeFontSize.ts
@@ -29,7 +29,7 @@ export default function changeFontSize(
             let pt = parseFloat(getComputedStyle(element, 'font-size') || element.style.fontSize);
             element.style.fontSize = getNewFontSize(pt, changeBase, fontSizes) + 'pt';
             let lineHeight = getComputedStyle(element, 'line-height');
-            if (lineHeight != 'normal') {
+            if (lineHeight && lineHeight != 'normal') {
                 element.style.lineHeight = 'normal';
             }
         },

diff --git a/packages/roosterjs-editor-api/lib/format/setFontSize.ts b/packages/roosterjs-editor-api/lib/format/setFontSize.ts
@@ -17,7 +17,7 @@ export default function setFontSize(editor: IEditor, fontSize: string) {
         (element, isInnerNode) => {
             element.style.fontSize = isInnerNode ? '' : fontSize;
             let lineHeight = getComputedStyle(element, 'line-height');
-            if (lineHeight != 'normal') {
+            if (lineHeight && lineHeight != 'normal') {
                 element.style.lineHeight = 'normal';
             }
         },

diff --git a/packages/roosterjs-editor-core/lib/corePlugins/PendingFormatStatePlugin.ts b/packages/roosterjs-editor-core/lib/corePlugins/PendingFormatStatePlugin.ts
@@ -94,6 +94,7 @@ export default class PendingFormatStatePlugin
                     isCharacterValue(event.rawEvent) &&
                     this.state.pendableFormatSpan
                 ) {
+                    this.state.pendableFormatSpan.removeAttribute('contentEditable');
                     this.editor.insertNode(this.state.pendableFormatSpan);
                     this.editor.select(
                         this.state.pendableFormatSpan,
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ describe('handleSegment', () => { @@
                     segmentType: 'Br',
                     format: {},
                 },
-                '<br>',
+                '<span><br></span>',
             );
         });
@@ Expand Down @@