Bump Rooster to 8.39.0 (#1450)

* get biggest z index * comment * refactor * refactor * refactor * refactor * refactor * refactor * refactor * refactor and comments * refactor * Improve handling of quotes inside lists (#1438) * Remove coloring when removing a quote inside a LI * Prevent list items from being removed before quote * refactor * Content Model Support PRE and CODE: step 1 (#1439) * Support PRE and CODE: step 1 * improve * Content Model Support PRE and CODE: step 2 (#1440) * Support PRE and CODE: step 1 * improve * Support PRE and CODE step 2 * Fix issue when cell resizing with merged cells (#1445) * init * Fix * Content Model Support PRE and CODE: step 3 (#1441) * Support PRE and CODE: step 1 * improve * Support PRE and CODE step 2 * Support PRE and CODE: step 3 * Content Model Support PRE and CODE: step 4 (#1442) * Support PRE and CODE: step 1 * improve * Support PRE and CODE step 2 * Support PRE and CODE: step 3 * Support PRE and CODE: step 4 * Allow styled table header cells to be clear formatted (#1447) * Consider nodes with siblings with no text as empty * Cleanup * Fix background color issue that can go across block element (#1448) * Fix Unhandled Rejection: Error: Editor is already disposed (#1449) * Fix issue * fix test * Bump * Bump content model Co-authored-by: Júlia Roldi <[email protected]> Co-authored-by: Julia Roldi <[email protected]> Co-authored-by: Jiuqing Song <[email protected]> Co-authored-by: Bryan Valverde U <[email protected]>
microsoft · Jun 16, 2023 · f93e927 · f93e927
1 parent 573547d
commit f93e927
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 21 deletions.
diff --git a/packages/roosterjs-content-model/lib/domToModel/processors/knownElementProcessor.ts b/packages/roosterjs-content-model/lib/domToModel/processors/knownElementProcessor.ts
@@ -2,11 +2,12 @@ import { addBlock } from '../../modelApi/common/addBlock';
 import { blockProcessor } from './blockProcessor';
 import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat';
 import { createParagraph } from '../../modelApi/creators/createParagraph';
-import { DomToModelContext } from '../../publicTypes/context/DomToModelContext';
+import { createParagraphDecorator } from '../../modelApi/creators/createParagraphDecorator';
 import { ElementProcessor } from '../../publicTypes/context/ElementProcessor';
 import { formatContainerProcessor } from './formatContainerProcessor';
 import { getDefaultStyle } from '../utils/getDefaultStyle';
 import { isBlockElement } from '../utils/isBlockElement';
+import { MarginFormat } from '../../publicTypes/format/formatParts/MarginFormat';
 import { parseFormat } from '../utils/parseFormat';
 import { stackFormat } from '../utils/stackFormat';
 

diff --git a/packages/roosterjs-content-model/lib/formatHandlers/utils/defaultStyles.ts b/packages/roosterjs-content-model/lib/formatHandlers/utils/defaultStyles.ts
@@ -27,6 +27,7 @@ export const defaultStyleMap: DefaultStyleMap = {
         display: 'block',
         textAlign: 'center',
     },
+    code: { fontFamily: 'monospace' },
     dd: blockElement,
     div: blockElement,
     dl: blockElement,

diff --git a/packages/roosterjs-content-model/lib/modelToDom/handlers/handleText.ts b/packages/roosterjs-content-model/lib/modelToDom/handlers/handleText.ts
@@ -2,6 +2,7 @@ import { ContentModelHandler } from '../../publicTypes/context/ContentModelHandl
 import { ContentModelText } from '../../publicTypes/segment/ContentModelText';
 import { handleSegmentCommon } from '../utils/handleSegmentCommon';
 import { ModelToDomContext } from '../../publicTypes/context/ModelToDomContext';
+import { stackFormat } from '../utils/stackFormat';
 
 /**
  * @internal

diff --git a/packages/roosterjs-content-model/lib/publicTypes/decorator/ContentModelHeader.ts b/packages/roosterjs-content-model/lib/publicTypes/decorator/ContentModelHeader.ts
diff --git a/packages/roosterjs-content-model/package.json b/packages/roosterjs-content-model/package.json
@@ -8,5 +8,5 @@
         "roosterjs-editor-core": ""
     },
     "main": "./lib/index.ts",
-    "version": "0.0.9"
+    "version": "0.0.10"
 }
diff --git a/packages/roosterjs-content-model/test/domToModel/processors/knownElementProcessorTest.ts b/packages/roosterjs-content-model/test/domToModel/processors/knownElementProcessorTest.ts
@@ -715,4 +715,90 @@ describe('knownElementProcessor', () => {
         });
         expect(context.link).toEqual({ format: {}, dataset: {} });
     });
+
+    it('P tag', () => {
+        const group = createContentModelDocument();
+        const p = document.createElement('p');
+
+        spyOn(parseFormat, 'parseFormat');
+
+        knownElementProcessor(group, p, context);
+
+        expect(group).toEqual({
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'Paragraph',
+                    format: {},
+                    decorator: {
+                        tagName: 'p',
+                        format: {},
+                    },
+                    segments: [],
+                },
+                {
+                    blockType: 'Paragraph',
+                    format: {},
+                    segments: [],
+                    isImplicit: true,
+                },
+            ],
+        });
+
+        expect(parseFormat.parseFormat).toHaveBeenCalledTimes(2);
+        expect(parseFormat.parseFormat).toHaveBeenCalledWith(
+            p,
+            context.formatParsers.block,
+            context.blockFormat,
+            context
+        );
+        expect(parseFormat.parseFormat).toHaveBeenCalledWith(
+            p,
+            context.formatParsers.segmentOnBlock,
+            context.segmentFormat,
+            context
+        );
+    });
+
+    it('Div with top margin', () => {
+        const group = createContentModelDocument();
+        const div = document.createElement('div');
+
+        context.defaultStyles.div = {
+            marginTop: '20px',
+            marginBottom: '40px',
+            display: 'block',
+        };
+
+        knownElementProcessor(group, div, context);
+
+        expect(group).toEqual({
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'Divider',
+                    tagName: 'div',
+                    format: {
+                        marginTop: '20px',
+                    },
+                },
+                {
+                    blockType: 'Paragraph',
+                    format: {},
+                    segments: [],
+                },
+                {
+                    blockType: 'Divider',
+                    tagName: 'div',
+                    format: { marginBottom: '40px' },
+                },
+                {
+                    blockType: 'Paragraph',
+                    segments: [],
+                    format: {},
+                    isImplicit: true,
+                },
+            ],
+        });
+    });
 });
diff --git a/packages/roosterjs-content-model/test/modelToDom/handlers/handleImageTest.ts b/packages/roosterjs-content-model/test/modelToDom/handlers/handleImageTest.ts
@@ -199,4 +199,21 @@ describe('handleSegment', () => {
 
         runTest(segment, '<a href="/test"><img src="http://test.com/test" data-a="b"></a>', 0);
     });
+
+    it('call stackFormat', () => {
+        const segment: ContentModelImage = {
+            segmentType: 'Image',
+            src: 'http://test.com/test',
+            format: { underline: true },
+            link: { format: { href: '/test' }, dataset: {} },
+            dataset: {},
+        };
+
+        spyOn(stackFormat, 'stackFormat').and.callThrough();
+
+        runTest(segment, '<a href="/test"><img src="http://test.com/test"></a>', 0);
+
+        expect(stackFormat.stackFormat).toHaveBeenCalledTimes(1);
+        expect((<jasmine.Spy>stackFormat.stackFormat).calls.argsFor(0)[1]).toBe('a');
+    });
 });
diff --git a/packages/roosterjs-content-model/test/modelToDom/handlers/handleParagraphTest.ts b/packages/roosterjs-content-model/test/modelToDom/handlers/handleParagraphTest.ts
@@ -271,8 +271,8 @@ describe('handleParagraph', () => {
             {
                 blockType: 'Paragraph',
                 format: {},
-                header: {
-                    headerLevel: 1,
+                decorator: {
+                    tagName: 'h1',
                     format: { fontWeight: 'bold', fontSize: '20px' },
                 },
                 segments: [
@@ -295,8 +295,8 @@ describe('handleParagraph', () => {
             {
                 blockType: 'Paragraph',
                 format: {},
-                header: {
-                    headerLevel: 1,
+                decorator: {
+                    tagName: 'h1',
                     format: {},
                 },
                 segments: [

diff --git a/packages/roosterjs-content-model/test/modelToDom/handlers/handleTextTest.ts b/packages/roosterjs-content-model/test/modelToDom/handlers/handleTextTest.ts
@@ -125,4 +125,21 @@ describe('handleText', () => {
 
         expect(parent.innerHTML).toBe('<span style="font-size: 12px;"><a href="#">test</a></span>');
     });
+
+    it('call stackFormat', () => {
+        const text: ContentModelText = {
+            segmentType: 'Text',
+            text: 'test',
+            format: { underline: true },
+            link: { format: { href: '/test' }, dataset: {} },
+        };
+
+        spyOn(stackFormat, 'stackFormat').and.callThrough();
+
+        handleText(document, parent, text, context);
+
+        expect(parent.innerHTML).toBe('<a href="/test">test</a>');
+        expect(stackFormat.stackFormat).toHaveBeenCalledTimes(1);
+        expect((<jasmine.Spy>stackFormat.stackFormat).calls.argsFor(0)[1]).toBe('a');
+    });
 });
diff --git a/packages/roosterjs-editor-plugins/lib/plugins/ImageEdit/ImageEdit.ts b/packages/roosterjs-editor-plugins/lib/plugins/ImageEdit/ImageEdit.ts
@@ -4,6 +4,7 @@ import DragAndDropContext, { DNDDirectionX, DnDDirectionY } from './types/DragAn
 import DragAndDropHandler from '../../pluginUtils/DragAndDropHandler';
 import DragAndDropHelper from '../../pluginUtils/DragAndDropHelper';
 import getGeneratedImageSize from './editInfoUtils/getGeneratedImageSize';
+import getLatestZIndex from './editInfoUtils/getLastZIndex';
 import ImageEditInfo from './types/ImageEditInfo';
 import ImageHtmlOptions from './types/ImageHtmlOptions';
 import { Cropper, getCropHTML } from './imageEditors/Cropper';