roosterjs-content-model-core 9.1.0 → 9.3.0

package/lib/command/exportContent/exportContent.d.ts

@@ -1,11 +1,22 @@
-import type { ExportContentMode, IEditor, ModelToDomOption } from 'roosterjs-content-model-types';
+import type { IEditor, ModelToDomOption, ModelToTextCallbacks } from 'roosterjs-content-model-types';
 /**
- * Export string content of editor
+ * Export HTML content. If there are entities, this will cause EntityOperation event with option = 'replaceTemporaryContent' to get a dehydrated entity
  * @param editor The editor to get content from
- * @param mode Mode of content to export. It supports:
- * - HTML: Export HTML content. If there are entities, this will cause EntityOperation event with option = 'replaceTemporaryContent' to get a dehydrated entity
- * - PlainText: Export plain text content
- * - PlainTextFast: Export plain text using editor's textContent property directly
+ * @param mode Specify HTML to get plain text result. This is the default option
  * @param options @optional Options for Model to DOM conversion
  */
-export declare function exportContent(editor: IEditor, mode?: ExportContentMode, options?: ModelToDomOption): string;
+export declare function exportContent(editor: IEditor, mode?: 'HTML', options?: ModelToDomOption): string;
+/**
+ * Export plain text content
+ * @param editor The editor to get content from
+ * @param mode Specify PlainText to get plain text result
+ * @param callbacks @optional Callbacks to customize conversion behavior
+ */
+export declare function exportContent(editor: IEditor, mode: 'PlainText', callbacks?: ModelToTextCallbacks): string;
+/**
+ * Export plain text using editor's textContent property directly
+ * @param editor The editor to get content from
+ * @param mode Specify PlainTextFast to get plain text result using textContent property
+ * @param options @optional Options for Model to DOM conversion
+ */
+export declare function exportContent(editor: IEditor, mode: 'PlainTextFast'): string;

package/lib/command/exportContent/exportContent.js

@@ -2,16 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportContent = void 0;
 var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
-/**
- * Export string content of editor
- * @param editor The editor to get content from
- * @param mode Mode of content to export. It supports:
- * - HTML: Export HTML content. If there are entities, this will cause EntityOperation event with option = 'replaceTemporaryContent' to get a dehydrated entity
- * - PlainText: Export plain text content
- * - PlainTextFast: Export plain text using editor's textContent property directly
- * @param options @optional Options for Model to DOM conversion
- */
-function exportContent(editor, mode, options) {
+function exportContent(editor, mode, optionsOrCallbacks) {
     if (mode === void 0) { mode = 'HTML'; }
     if (mode == 'PlainTextFast') {
         return editor.getDOMHelper().getTextContent();
@@ -19,12 +10,12 @@ function exportContent(editor, mode, options) {
     else {
         var model = editor.getContentModelCopy('clean');
         if (mode == 'PlainText') {
-            return (0, roosterjs_content_model_dom_1.contentModelToText)(model);
+            return (0, roosterjs_content_model_dom_1.contentModelToText)(model, undefined /*separator*/, optionsOrCallbacks);
         }
         else {
             var doc = editor.getDocument();
             var div = doc.createElement('div');
-            (0, roosterjs_content_model_dom_1.contentModelToDom)(doc, div, model, (0, roosterjs_content_model_dom_1.createModelToDomContext)(undefined /*editorContext*/, options));
+            (0, roosterjs_content_model_dom_1.contentModelToDom)(doc, div, model, (0, roosterjs_content_model_dom_1.createModelToDomContext)(undefined /*editorContext*/, optionsOrCallbacks));
             editor.triggerEvent('extractContentWithDom', { clonedRoot: div }, true /*broadcast*/);
             return div.innerHTML;
         }

package/lib/command/exportContent/exportContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"exportContent.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/command/exportContent/exportContent.ts"],"names":[],"mappings":";;;AAAA,2EAIqC;AAGrC;;;;;;;;GAQG;AACH,SAAgB,aAAa,CACzB,MAAe,EACf,IAAgC,EAChC,OAA0B;IAD1B,qBAAA,EAAA,aAAgC;IAGhC,IAAI,IAAI,IAAI,eAAe,EAAE;QACzB,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC,cAAc,EAAE,CAAC;KACjD;SAAM;QACH,IAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAElD,IAAI,IAAI,IAAI,WAAW,EAAE;YACrB,OAAO,IAAA,gDAAkB,EAAC,KAAK,CAAC,CAAC;SACpC;aAAM;YACH,IAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YACjC,IAAM,GAAG,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAErC,IAAA,+CAAiB,EACb,GAAG,EACH,GAAG,EACH,KAAK,EACL,IAAA,qDAAuB,EAAC,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAChE,CAAC;YAEF,MAAM,CAAC,YAAY,CAAC,uBAAuB,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAEtF,OAAO,GAAG,CAAC,SAAS,CAAC;SACxB;KACJ;AACL,CAAC;AA5BD,sCA4BC","sourcesContent":["import {\n    contentModelToDom,\n    contentModelToText,\n    createModelToDomContext,\n} from 'roosterjs-content-model-dom';\nimport type { ExportContentMode, IEditor, ModelToDomOption } from 'roosterjs-content-model-types';\n\n/**\n * Export string content of editor\n * @param editor The editor to get content from\n * @param mode Mode of content to export. It supports:\n * - HTML: Export HTML content. If there are entities, this will cause EntityOperation event with option = 'replaceTemporaryContent' to get a dehydrated entity\n * - PlainText: Export plain text content\n * - PlainTextFast: Export plain text using editor's textContent property directly\n * @param options @optional Options for Model to DOM conversion\n */\nexport function exportContent(\n    editor: IEditor,\n    mode: ExportContentMode = 'HTML',\n    options?: ModelToDomOption\n): string {\n    if (mode == 'PlainTextFast') {\n        return editor.getDOMHelper().getTextContent();\n    } else {\n        const model = editor.getContentModelCopy('clean');\n\n        if (mode == 'PlainText') {\n            return contentModelToText(model);\n        } else {\n            const doc = editor.getDocument();\n            const div = doc.createElement('div');\n\n            contentModelToDom(\n                doc,\n                div,\n                model,\n                createModelToDomContext(undefined /*editorContext*/, options)\n            );\n\n            editor.triggerEvent('extractContentWithDom', { clonedRoot: div }, true /*broadcast*/);\n\n            return div.innerHTML;\n        }\n    }\n}\n"]}
+{"version":3,"file":"exportContent.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/command/exportContent/exportContent.ts"],"names":[],"mappings":";;;AAAA,2EAIqC;AAoCrC,SAAgB,aAAa,CACzB,MAAe,EACf,IAAgC,EAChC,kBAA4D;IAD5D,qBAAA,EAAA,aAAgC;IAGhC,IAAI,IAAI,IAAI,eAAe,EAAE;QACzB,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC,cAAc,EAAE,CAAC;KACjD;SAAM;QACH,IAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAElD,IAAI,IAAI,IAAI,WAAW,EAAE;YACrB,OAAO,IAAA,gDAAkB,EACrB,KAAK,EACL,SAAS,CAAC,aAAa,EACvB,kBAA0C,CAC7C,CAAC;SACL;aAAM;YACH,IAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YACjC,IAAM,GAAG,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAErC,IAAA,+CAAiB,EACb,GAAG,EACH,GAAG,EACH,KAAK,EACL,IAAA,qDAAuB,EACnB,SAAS,CAAC,iBAAiB,EAC3B,kBAAsC,CACzC,CACJ,CAAC;YAEF,MAAM,CAAC,YAAY,CAAC,uBAAuB,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAEtF,OAAO,GAAG,CAAC,SAAS,CAAC;SACxB;KACJ;AACL,CAAC;AAnCD,sCAmCC","sourcesContent":["import {\n    contentModelToDom,\n    contentModelToText,\n    createModelToDomContext,\n} from 'roosterjs-content-model-dom';\nimport type {\n    ExportContentMode,\n    IEditor,\n    ModelToDomOption,\n    ModelToTextCallbacks,\n} from 'roosterjs-content-model-types';\n\n/**\n * Export HTML content. If there are entities, this will cause EntityOperation event with option = 'replaceTemporaryContent' to get a dehydrated entity\n * @param editor The editor to get content from\n * @param mode Specify HTML to get plain text result. This is the default option\n * @param options @optional Options for Model to DOM conversion\n */\nexport function exportContent(editor: IEditor, mode?: 'HTML', options?: ModelToDomOption): string;\n\n/**\n * Export plain text content\n * @param editor The editor to get content from\n * @param mode Specify PlainText to get plain text result\n * @param callbacks @optional Callbacks to customize conversion behavior\n */\nexport function exportContent(\n    editor: IEditor,\n    mode: 'PlainText',\n    callbacks?: ModelToTextCallbacks\n): string;\n\n/**\n * Export plain text using editor's textContent property directly\n * @param editor The editor to get content from\n * @param mode Specify PlainTextFast to get plain text result using textContent property\n * @param options @optional Options for Model to DOM conversion\n */\nexport function exportContent(editor: IEditor, mode: 'PlainTextFast'): string;\n\nexport function exportContent(\n    editor: IEditor,\n    mode: ExportContentMode = 'HTML',\n    optionsOrCallbacks?: ModelToDomOption | ModelToTextCallbacks\n): string {\n    if (mode == 'PlainTextFast') {\n        return editor.getDOMHelper().getTextContent();\n    } else {\n        const model = editor.getContentModelCopy('clean');\n\n        if (mode == 'PlainText') {\n            return contentModelToText(\n                model,\n                undefined /*separator*/,\n                optionsOrCallbacks as ModelToTextCallbacks\n            );\n        } else {\n            const doc = editor.getDocument();\n            const div = doc.createElement('div');\n\n            contentModelToDom(\n                doc,\n                div,\n                model,\n                createModelToDomContext(\n                    undefined /*editorContext*/,\n                    optionsOrCallbacks as ModelToDomOption\n                )\n            );\n\n            editor.triggerEvent('extractContentWithDom', { clonedRoot: div }, true /*broadcast*/);\n\n            return div.innerHTML;\n        }\n    }\n}\n"]}

package/lib/command/paste/mergePasteContent.js

@@ -57,6 +57,7 @@ function mergePasteContent(editor, eventResult, clipboardData) {
     }, {
         changeSource: roosterjs_content_model_dom_1.ChangeSource.Paste,
         getChangeData: function () { return clipboardData; },
+        scrollCaretIntoView: true,
         apiName: 'paste',
     });
 }

package/lib/command/paste/mergePasteContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergePasteContent.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/command/paste/mergePasteContent.ts"],"names":[],"mappings":"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","sourcesContent":["import { createDomToModelContextForSanitizing } from '../createModelFromHtml/createDomToModelContextForSanitizing';\nimport {\n    ChangeSource,\n    cloneModel,\n    domToContentModel,\n    getSegmentTextFormat,\n    getSelectedSegments,\n    mergeModel,\n} from 'roosterjs-content-model-dom';\nimport type {\n    BeforePasteEvent,\n    ClipboardData,\n    CloneModelOptions,\n    ContentModelDocument,\n    ContentModelSegmentFormat,\n    IEditor,\n    MergeModelOption,\n} from 'roosterjs-content-model-types';\n\nconst EmptySegmentFormat: Required<ContentModelSegmentFormat> = {\n    backgroundColor: '',\n    fontFamily: '',\n    fontSize: '',\n    fontWeight: '',\n    italic: false,\n    letterSpacing: '',\n    lineHeight: '',\n    strikethrough: false,\n    superOrSubScriptSequence: '',\n    textColor: '',\n    underline: false,\n};\n\nconst CloneOption: CloneModelOptions = {\n    includeCachedElement: (node, type) => (type == 'cache' ? undefined : node),\n};\n\n/**\n * @internal\n */\nexport function cloneModelForPaste(model: ContentModelDocument) {\n    return cloneModel(model, CloneOption);\n}\n\n/**\n * @internal\n */\nexport function mergePasteContent(\n    editor: IEditor,\n    eventResult: BeforePasteEvent,\n    clipboardData: ClipboardData\n) {\n    const { fragment, domToModelOption, customizedMerge, pasteType } = eventResult;\n\n    editor.formatContentModel(\n        (model, context) => {\n            if (clipboardData.modelBeforePaste) {\n                const clonedModel = cloneModelForPaste(clipboardData.modelBeforePaste);\n                model.blocks = clonedModel.blocks;\n            }\n\n            const selectedSegment = getSelectedSegments(model, true /*includeFormatHolder*/)[0];\n            const domToModelContext = createDomToModelContextForSanitizing(\n                editor.getDocument(),\n                undefined /*defaultFormat*/,\n                editor.getEnvironment().domToModelSettings.customized,\n                domToModelOption\n            );\n\n            domToModelContext.segmentFormat = selectedSegment\n                ? getSegmentTextFormat(selectedSegment)\n                : {};\n\n            const pasteModel = domToContentModel(fragment, domToModelContext);\n            const mergeOption: MergeModelOption = {\n                mergeFormat: pasteType == 'mergeFormat' ? 'keepSourceEmphasisFormat' : 'none',\n                mergeTable: shouldMergeTable(pasteModel),\n            };\n\n            const insertPoint = customizedMerge\n                ? customizedMerge(model, pasteModel)\n                : mergeModel(model, pasteModel, context, mergeOption);\n\n            if (insertPoint) {\n                context.newPendingFormat = {\n                    ...EmptySegmentFormat,\n                    ...model.format,\n                    ...insertPoint.marker.format,\n                };\n            }\n\n            return true;\n        },\n        {\n            changeSource: ChangeSource.Paste,\n            getChangeData: () => clipboardData,\n            apiName: 'paste',\n        }\n    );\n}\n\nfunction shouldMergeTable(pasteModel: ContentModelDocument): boolean | undefined {\n    // If model contains a table and a paragraph element after the table with a single BR segment, remove the Paragraph after the table\n    if (\n        pasteModel.blocks.length == 2 &&\n        pasteModel.blocks[0].blockType === 'Table' &&\n        pasteModel.blocks[1].blockType === 'Paragraph' &&\n        pasteModel.blocks[1].segments.length === 1 &&\n        pasteModel.blocks[1].segments[0].segmentType === 'Br'\n    ) {\n        pasteModel.blocks.splice(1);\n    }\n    // Only merge table when the document contain a single table.\n    return pasteModel.blocks.length === 1 && pasteModel.blocks[0].blockType === 'Table';\n}\n"]}
+{"version":3,"file":"mergePasteContent.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/command/paste/mergePasteContent.ts"],"names":[],"mappings":"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","sourcesContent":["import { createDomToModelContextForSanitizing } from '../createModelFromHtml/createDomToModelContextForSanitizing';\nimport {\n    ChangeSource,\n    cloneModel,\n    domToContentModel,\n    getSegmentTextFormat,\n    getSelectedSegments,\n    mergeModel,\n} from 'roosterjs-content-model-dom';\nimport type {\n    BeforePasteEvent,\n    ClipboardData,\n    CloneModelOptions,\n    ContentModelDocument,\n    ContentModelSegmentFormat,\n    IEditor,\n    MergeModelOption,\n} from 'roosterjs-content-model-types';\n\nconst EmptySegmentFormat: Required<ContentModelSegmentFormat> = {\n    backgroundColor: '',\n    fontFamily: '',\n    fontSize: '',\n    fontWeight: '',\n    italic: false,\n    letterSpacing: '',\n    lineHeight: '',\n    strikethrough: false,\n    superOrSubScriptSequence: '',\n    textColor: '',\n    underline: false,\n};\n\nconst CloneOption: CloneModelOptions = {\n    includeCachedElement: (node, type) => (type == 'cache' ? undefined : node),\n};\n\n/**\n * @internal\n */\nexport function cloneModelForPaste(model: ContentModelDocument) {\n    return cloneModel(model, CloneOption);\n}\n\n/**\n * @internal\n */\nexport function mergePasteContent(\n    editor: IEditor,\n    eventResult: BeforePasteEvent,\n    clipboardData: ClipboardData\n) {\n    const { fragment, domToModelOption, customizedMerge, pasteType } = eventResult;\n\n    editor.formatContentModel(\n        (model, context) => {\n            if (clipboardData.modelBeforePaste) {\n                const clonedModel = cloneModelForPaste(clipboardData.modelBeforePaste);\n                model.blocks = clonedModel.blocks;\n            }\n\n            const selectedSegment = getSelectedSegments(model, true /*includeFormatHolder*/)[0];\n            const domToModelContext = createDomToModelContextForSanitizing(\n                editor.getDocument(),\n                undefined /*defaultFormat*/,\n                editor.getEnvironment().domToModelSettings.customized,\n                domToModelOption\n            );\n\n            domToModelContext.segmentFormat = selectedSegment\n                ? getSegmentTextFormat(selectedSegment)\n                : {};\n\n            const pasteModel = domToContentModel(fragment, domToModelContext);\n            const mergeOption: MergeModelOption = {\n                mergeFormat: pasteType == 'mergeFormat' ? 'keepSourceEmphasisFormat' : 'none',\n                mergeTable: shouldMergeTable(pasteModel),\n            };\n\n            const insertPoint = customizedMerge\n                ? customizedMerge(model, pasteModel)\n                : mergeModel(model, pasteModel, context, mergeOption);\n\n            if (insertPoint) {\n                context.newPendingFormat = {\n                    ...EmptySegmentFormat,\n                    ...model.format,\n                    ...insertPoint.marker.format,\n                };\n            }\n\n            return true;\n        },\n        {\n            changeSource: ChangeSource.Paste,\n            getChangeData: () => clipboardData,\n            scrollCaretIntoView: true,\n            apiName: 'paste',\n        }\n    );\n}\n\nfunction shouldMergeTable(pasteModel: ContentModelDocument): boolean | undefined {\n    // If model contains a table and a paragraph element after the table with a single BR segment, remove the Paragraph after the table\n    if (\n        pasteModel.blocks.length == 2 &&\n        pasteModel.blocks[0].blockType === 'Table' &&\n        pasteModel.blocks[1].blockType === 'Paragraph' &&\n        pasteModel.blocks[1].segments.length === 1 &&\n        pasteModel.blocks[1].segments[0].segmentType === 'Br'\n    ) {\n        pasteModel.blocks.splice(1);\n    }\n    // Only merge table when the document contain a single table.\n    return pasteModel.blocks.length === 1 && pasteModel.blocks[0].blockType === 'Table';\n}\n"]}

package/lib/command/paste/paste.js

@@ -18,7 +18,10 @@ function paste(editor, clipboardData, pasteType) {
     editor.focus();
     var trustedHTMLHandler = editor.getTrustedHTMLHandler();
     if (!clipboardData.modelBeforePaste) {
-        clipboardData.modelBeforePaste = (0, mergePasteContent_1.cloneModelForPaste)(editor.getContentModelCopy('connected'));
+        editor.formatContentModel(function (model) {
+            clipboardData.modelBeforePaste = (0, mergePasteContent_1.cloneModelForPaste)(model);
+            return false;
+        });
     }
     // 1. Prepare variables
     var doc = createDOMFromHtml(clipboardData.rawHtml, trustedHTMLHandler);

package/lib/command/paste/paste.js.map

@@ -1 +1 @@
-{"version":3,"file":"paste.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/command/paste/paste.ts"],"names":[],"mappings":";;;AAAA,yDAA4E;AAC5E,4EAA2E;AAC3E,6DAA4D;AAC5D,mFAAkF;AAClF,uDAAsD;AAQtD;;;;;GAKG;AACH,SAAgB,KAAK,CACjB,MAAe,EACf,aAA4B,EAC5B,SAA+B;;IAA/B,0BAAA,EAAA,oBAA+B;IAE/B,MAAM,CAAC,KAAK,EAAE,CAAC;IAEf,IAAM,kBAAkB,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE;QACjC,aAAa,CAAC,gBAAgB,GAAG,IAAA,sCAAkB,EAC/C,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAC1C,CAAC;KACL;IAED,uBAAuB;IACvB,IAAM,GAAG,GAAG,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAEzE,gCAAgC;IAChC,IAAM,iBAAiB,GAAG,IAAA,mCAAgB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAE/D,4BAA4B;IAC5B,IAAM,cAAc,GAAG,IAAA,yCAAmB,EACtC,MAAM,CAAC,WAAW,EAAE,EACpB,aAAa,EACb,SAAS,EACT,MAAA,CAAC,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,IAAI;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAC9D,0CAAE,IAAI,CACV,CAAC;IAEF,oEAAoE;IACpE,IAAM,WAAW,GAAG,IAAA,+DAA8B,EAC9C,MAAM,EACN,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,SAAS,CACZ,CAAC;IAEF,sCAAsC;IACtC,IAAA,mCAAgB,EAAC,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAEzE,kDAAkD;IAClD,IAAA,qCAAiB,EAAC,MAAM,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC;AA9CD,sBA8CC;AAED,SAAS,iBAAiB,CACtB,IAA+B,EAC/B,kBAAsC;IAEtC,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChG,CAAC","sourcesContent":["import { cloneModelForPaste, mergePasteContent } from './mergePasteContent';\nimport { convertInlineCss } from '../createModelFromHtml/convertInlineCss';\nimport { createPasteFragment } from './createPasteFragment';\nimport { generatePasteOptionFromPlugins } from './generatePasteOptionFromPlugins';\nimport { retrieveHtmlInfo } from './retrieveHtmlInfo';\nimport type {\n    PasteType,\n    ClipboardData,\n    TrustedHTMLHandler,\n    IEditor,\n} from 'roosterjs-content-model-types';\n\n/**\n * Paste into editor using a clipboardData object\n * @param editor The Editor object.\n * @param clipboardData Clipboard data retrieved from clipboard\n * @param pasteType Type of content to paste. @default normal\n */\nexport function paste(\n    editor: IEditor,\n    clipboardData: ClipboardData,\n    pasteType: PasteType = 'normal'\n) {\n    editor.focus();\n\n    const trustedHTMLHandler = editor.getTrustedHTMLHandler();\n\n    if (!clipboardData.modelBeforePaste) {\n        clipboardData.modelBeforePaste = cloneModelForPaste(\n            editor.getContentModelCopy('connected')\n        );\n    }\n\n    // 1. Prepare variables\n    const doc = createDOMFromHtml(clipboardData.rawHtml, trustedHTMLHandler);\n\n    // 2. Handle HTML from clipboard\n    const htmlFromClipboard = retrieveHtmlInfo(doc, clipboardData);\n\n    // 3. Create target fragment\n    const sourceFragment = createPasteFragment(\n        editor.getDocument(),\n        clipboardData,\n        pasteType,\n        (clipboardData.rawHtml == clipboardData.html\n            ? doc\n            : createDOMFromHtml(clipboardData.html, trustedHTMLHandler)\n        )?.body\n    );\n\n    // 4. Trigger BeforePaste event to allow plugins modify the fragment\n    const eventResult = generatePasteOptionFromPlugins(\n        editor,\n        clipboardData,\n        sourceFragment,\n        htmlFromClipboard,\n        pasteType\n    );\n\n    // 5. Convert global CSS to inline CSS\n    convertInlineCss(eventResult.fragment, htmlFromClipboard.globalCssRules);\n\n    // 6. Merge pasted content into main Content Model\n    mergePasteContent(editor, eventResult, clipboardData);\n}\n\nfunction createDOMFromHtml(\n    html: string | null | undefined,\n    trustedHTMLHandler: TrustedHTMLHandler\n): Document | null {\n    return html ? new DOMParser().parseFromString(trustedHTMLHandler(html), 'text/html') : null;\n}\n"]}
+{"version":3,"file":"paste.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/command/paste/paste.ts"],"names":[],"mappings":";;;AAAA,yDAA4E;AAC5E,4EAA2E;AAC3E,6DAA4D;AAC5D,mFAAkF;AAClF,uDAAsD;AAQtD;;;;;GAKG;AACH,SAAgB,KAAK,CACjB,MAAe,EACf,aAA4B,EAC5B,SAA+B;;IAA/B,0BAAA,EAAA,oBAA+B;IAE/B,MAAM,CAAC,KAAK,EAAE,CAAC;IAEf,IAAM,kBAAkB,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE;QACjC,MAAM,CAAC,kBAAkB,CAAC,UAAA,KAAK;YAC3B,aAAa,CAAC,gBAAgB,GAAG,IAAA,sCAAkB,EAAC,KAAK,CAAC,CAAC;YAE3D,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;KACN;IAED,uBAAuB;IACvB,IAAM,GAAG,GAAG,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAEzE,gCAAgC;IAChC,IAAM,iBAAiB,GAAG,IAAA,mCAAgB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAE/D,4BAA4B;IAC5B,IAAM,cAAc,GAAG,IAAA,yCAAmB,EACtC,MAAM,CAAC,WAAW,EAAE,EACpB,aAAa,EACb,SAAS,EACT,MAAA,CAAC,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,IAAI;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAC9D,0CAAE,IAAI,CACV,CAAC;IAEF,oEAAoE;IACpE,IAAM,WAAW,GAAG,IAAA,+DAA8B,EAC9C,MAAM,EACN,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,SAAS,CACZ,CAAC;IAEF,sCAAsC;IACtC,IAAA,mCAAgB,EAAC,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAEzE,kDAAkD;IAClD,IAAA,qCAAiB,EAAC,MAAM,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC;AAhDD,sBAgDC;AAED,SAAS,iBAAiB,CACtB,IAA+B,EAC/B,kBAAsC;IAEtC,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChG,CAAC","sourcesContent":["import { cloneModelForPaste, mergePasteContent } from './mergePasteContent';\nimport { convertInlineCss } from '../createModelFromHtml/convertInlineCss';\nimport { createPasteFragment } from './createPasteFragment';\nimport { generatePasteOptionFromPlugins } from './generatePasteOptionFromPlugins';\nimport { retrieveHtmlInfo } from './retrieveHtmlInfo';\nimport type {\n    PasteType,\n    ClipboardData,\n    TrustedHTMLHandler,\n    IEditor,\n} from 'roosterjs-content-model-types';\n\n/**\n * Paste into editor using a clipboardData object\n * @param editor The Editor object.\n * @param clipboardData Clipboard data retrieved from clipboard\n * @param pasteType Type of content to paste. @default normal\n */\nexport function paste(\n    editor: IEditor,\n    clipboardData: ClipboardData,\n    pasteType: PasteType = 'normal'\n) {\n    editor.focus();\n\n    const trustedHTMLHandler = editor.getTrustedHTMLHandler();\n\n    if (!clipboardData.modelBeforePaste) {\n        editor.formatContentModel(model => {\n            clipboardData.modelBeforePaste = cloneModelForPaste(model);\n\n            return false;\n        });\n    }\n\n    // 1. Prepare variables\n    const doc = createDOMFromHtml(clipboardData.rawHtml, trustedHTMLHandler);\n\n    // 2. Handle HTML from clipboard\n    const htmlFromClipboard = retrieveHtmlInfo(doc, clipboardData);\n\n    // 3. Create target fragment\n    const sourceFragment = createPasteFragment(\n        editor.getDocument(),\n        clipboardData,\n        pasteType,\n        (clipboardData.rawHtml == clipboardData.html\n            ? doc\n            : createDOMFromHtml(clipboardData.html, trustedHTMLHandler)\n        )?.body\n    );\n\n    // 4. Trigger BeforePaste event to allow plugins modify the fragment\n    const eventResult = generatePasteOptionFromPlugins(\n        editor,\n        clipboardData,\n        sourceFragment,\n        htmlFromClipboard,\n        pasteType\n    );\n\n    // 5. Convert global CSS to inline CSS\n    convertInlineCss(eventResult.fragment, htmlFromClipboard.globalCssRules);\n\n    // 6. Merge pasted content into main Content Model\n    mergePasteContent(editor, eventResult, clipboardData);\n}\n\nfunction createDOMFromHtml(\n    html: string | null | undefined,\n    trustedHTMLHandler: TrustedHTMLHandler\n): Document | null {\n    return html ? new DOMParser().parseFromString(trustedHTMLHandler(html), 'text/html') : null;\n}\n"]}

package/lib/coreApi/announce/announce.d.ts

@@ -0,0 +1,8 @@
+import type { Announce } from 'roosterjs-content-model-types';
+/**
+ * @internal
+ * Announce the given data
+ * @param core The EditorCore object
+ * @param announceData Data to announce
+ */
+export declare const announce: Announce;

package/lib/coreApi/announce/announce.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.announce = void 0;
+/**
+ * @internal
+ * Announce the given data
+ * @param core The EditorCore object
+ * @param announceData Data to announce
+ */
+var announce = function (core, announceData) {
+    var _a;
+    var text = announceData.text, defaultStrings = announceData.defaultStrings, _b = announceData.formatStrings, formatStrings = _b === void 0 ? [] : _b;
+    var announcerStringGetter = core.lifecycle.announcerStringGetter;
+    var template = defaultStrings && (announcerStringGetter === null || announcerStringGetter === void 0 ? void 0 : announcerStringGetter(defaultStrings));
+    var textToAnnounce = formatString(template || text, formatStrings);
+    if (textToAnnounce) {
+        var announceContainer = core.lifecycle.announceContainer;
+        if (!announceContainer || textToAnnounce == announceContainer.textContent) {
+            (_a = announceContainer === null || announceContainer === void 0 ? void 0 : announceContainer.parentElement) === null || _a === void 0 ? void 0 : _a.removeChild(announceContainer);
+            announceContainer = createAriaLiveElement(core.physicalRoot.ownerDocument);
+            core.lifecycle.announceContainer = announceContainer;
+        }
+        if (announceContainer) {
+            announceContainer.textContent = textToAnnounce;
+        }
+    }
+};
+exports.announce = announce;
+function formatString(text, formatStrings) {
+    if (text == undefined) {
+        return text;
+    }
+    text = text.replace(/\{(\d+)\}/g, function (_, sub) {
+        var index = parseInt(sub);
+        var replace = formatStrings[index];
+        return replace !== null && replace !== void 0 ? replace : '';
+    });
+    return text;
+}
+function createAriaLiveElement(document) {
+    var div = document.createElement('div');
+    div.style.clip = 'rect(0px, 0px, 0px, 0px)';
+    div.style.clipPath = 'inset(100%)';
+    div.style.height = '1px';
+    div.style.overflow = 'hidden';
+    div.style.position = 'absolute';
+    div.style.whiteSpace = 'nowrap';
+    div.style.width = '1px';
+    div.ariaLive = 'assertive';
+    document.body.appendChild(div);
+    return div;
+}
+//# sourceMappingURL=announce.js.map

package/lib/coreApi/announce/announce.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"announce.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/announce/announce.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACI,IAAM,QAAQ,GAAa,UAAC,IAAI,EAAE,YAAY;;IACzC,IAAA,IAAI,GAAyC,YAAY,KAArD,EAAE,cAAc,GAAyB,YAAY,eAArC,EAAE,KAAuB,YAAY,cAAjB,EAAlB,aAAa,mBAAG,EAAE,KAAA,CAAkB;IAC1D,IAAA,qBAAqB,GAAK,IAAI,CAAC,SAAS,sBAAnB,CAAoB;IACjD,IAAM,QAAQ,GAAG,cAAc,KAAI,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,cAAc,CAAC,CAAA,CAAC;IAC3E,IAAM,cAAc,GAAG,YAAY,CAAC,QAAQ,IAAI,IAAI,EAAE,aAAa,CAAC,CAAC;IAErE,IAAI,cAAc,EAAE;QAChB,IAAI,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC;QAEzD,IAAI,CAAC,iBAAiB,IAAI,cAAc,IAAI,iBAAiB,CAAC,WAAW,EAAE;YACvE,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa,0CAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC;YACjE,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAE3E,IAAI,CAAC,SAAS,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;SACxD;QAED,IAAI,iBAAiB,EAAE;YACnB,iBAAiB,CAAC,WAAW,GAAG,cAAc,CAAC;SAClD;KACJ;AACL,CAAC,CAAC;AApBW,QAAA,QAAQ,YAoBnB;AAEF,SAAS,YAAY,CAAC,IAAwB,EAAE,aAAuB;IACnE,IAAI,IAAI,IAAI,SAAS,EAAE;QACnB,OAAO,IAAI,CAAC;KACf;IAED,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,UAAC,CAAC,EAAE,GAAW;QAC7C,IAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAkB;IAC7C,IAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAE1C,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,0BAA0B,CAAC;IAC5C,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAC;IACnC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC;IACzB,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC9B,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;IAChC,GAAG,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;IAChC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,GAAG,CAAC,QAAQ,GAAG,WAAW,CAAC;IAE3B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/B,OAAO,GAAG,CAAC;AACf,CAAC","sourcesContent":["import type { Announce } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Announce the given data\n * @param core The EditorCore object\n * @param announceData Data to announce\n */\nexport const announce: Announce = (core, announceData) => {\n    const { text, defaultStrings, formatStrings = [] } = announceData;\n    const { announcerStringGetter } = core.lifecycle;\n    const template = defaultStrings && announcerStringGetter?.(defaultStrings);\n    const textToAnnounce = formatString(template || text, formatStrings);\n\n    if (textToAnnounce) {\n        let announceContainer = core.lifecycle.announceContainer;\n\n        if (!announceContainer || textToAnnounce == announceContainer.textContent) {\n            announceContainer?.parentElement?.removeChild(announceContainer);\n            announceContainer = createAriaLiveElement(core.physicalRoot.ownerDocument);\n\n            core.lifecycle.announceContainer = announceContainer;\n        }\n\n        if (announceContainer) {\n            announceContainer.textContent = textToAnnounce;\n        }\n    }\n};\n\nfunction formatString(text: string | undefined, formatStrings: string[]) {\n    if (text == undefined) {\n        return text;\n    }\n\n    text = text.replace(/\\{(\\d+)\\}/g, (_, sub: string) => {\n        const index = parseInt(sub);\n        const replace = formatStrings[index];\n        return replace ?? '';\n    });\n\n    return text;\n}\n\nfunction createAriaLiveElement(document: Document): HTMLDivElement {\n    const div = document.createElement('div');\n\n    div.style.clip = 'rect(0px, 0px, 0px, 0px)';\n    div.style.clipPath = 'inset(100%)';\n    div.style.height = '1px';\n    div.style.overflow = 'hidden';\n    div.style.position = 'absolute';\n    div.style.whiteSpace = 'nowrap';\n    div.style.width = '1px';\n    div.ariaLive = 'assertive';\n\n    document.body.appendChild(div);\n\n    return div;\n}\n"]}

package/lib/coreApi/coreApiMap.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.coreApiMap = void 0;
 var addUndoSnapshot_1 = require("./addUndoSnapshot/addUndoSnapshot");
+var announce_1 = require("./announce/announce");
 var attachDomEvent_1 = require("./attachDomEvent/attachDomEvent");
 var createContentModel_1 = require("./createContentModel/createContentModel");
 var createEditorContext_1 = require("./createEditorContext/createEditorContext");
@@ -36,5 +37,6 @@ exports.coreApiMap = {
     switchShadowEdit: switchShadowEdit_1.switchShadowEdit,
     getVisibleViewport: getVisibleViewport_1.getVisibleViewport,
     setEditorStyle: setEditorStyle_1.setEditorStyle,
+    announce: announce_1.announce,
 };
 //# sourceMappingURL=coreApiMap.js.map

package/lib/coreApi/coreApiMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"coreApiMap.js","sourceRoot":"","sources":["../../../../packages/roosterjs-content-model-core/lib/coreApi/coreApiMap.ts"],"names":[],"mappings":";;;AACA,qEAAoE;AACpE,kEAAiE;AACjE,8EAA6E;AAC7E,iFAAgF;AAChF,uCAAsC;AACtC,8EAA6E;AAC7E,qEAAoE;AACpE,8EAA6E;AAC7E,iFAAgF;AAChF,qEAAoE;AACpE,qEAAoE;AACpE,kEAAiE;AACjE,kEAAiE;AACjE,wEAAuE;AACvE,4DAA2D;AAE3D;;;GAGG;AACU,QAAA,UAAU,GAAe;IAClC,kBAAkB,EAAE,uCAAkB;IACtC,mBAAmB,EAAE,yCAAmB;IACxC,kBAAkB,EAAE,uCAAkB;IACtC,eAAe,EAAE,iCAAe;IAChC,cAAc,EAAE,+BAAc;IAE9B,eAAe,EAAE,iCAAe;IAChC,eAAe,EAAE,iCAAe;IAChC,KAAK,EAAE,aAAK;IAEZ,eAAe,EAAE,iCAAe;IAChC,mBAAmB,EAAE,yCAAmB;IAExC,cAAc,EAAE,+BAAc;IAC9B,YAAY,EAAE,2BAAY;IAE1B,gBAAgB,EAAE,mCAAgB;IAClC,kBAAkB,EAAE,uCAAkB;IACtC,cAAc,EAAE,+BAAc;CACjC,CAAC","sourcesContent":["import type { CoreApiMap } from 'roosterjs-content-model-types';\nimport { addUndoSnapshot } from './addUndoSnapshot/addUndoSnapshot';\nimport { attachDomEvent } from './attachDomEvent/attachDomEvent';\nimport { createContentModel } from './createContentModel/createContentModel';\nimport { createEditorContext } from './createEditorContext/createEditorContext';\nimport { focus } from './focus/focus';\nimport { formatContentModel } from './formatContentModel/formatContentModel';\nimport { getDOMSelection } from './getDOMSelection/getDOMSelection';\nimport { getVisibleViewport } from './getVisibleViewport/getVisibleViewport';\nimport { restoreUndoSnapshot } from './restoreUndoSnapshot/restoreUndoSnapshot';\nimport { setContentModel } from './setContentModel/setContentModel';\nimport { setDOMSelection } from './setDOMSelection/setDOMSelection';\nimport { setEditorStyle } from './setEditorStyle/setEditorStyle';\nimport { setLogicalRoot } from './setLogicalRoot/setLogicalRoot';\nimport { switchShadowEdit } from './switchShadowEdit/switchShadowEdit';\nimport { triggerEvent } from './triggerEvent/triggerEvent';\n\n/**\n * @internal\n * Core API map for Editor\n */\nexport const coreApiMap: CoreApiMap = {\n    createContentModel: createContentModel,\n    createEditorContext: createEditorContext,\n    formatContentModel: formatContentModel,\n    setContentModel: setContentModel,\n    setLogicalRoot: setLogicalRoot,\n\n    getDOMSelection: getDOMSelection,\n    setDOMSelection: setDOMSelection,\n    focus: focus,\n\n    addUndoSnapshot: addUndoSnapshot,\n    restoreUndoSnapshot: restoreUndoSnapshot,\n\n    attachDomEvent: attachDomEvent,\n    triggerEvent: triggerEvent,\n\n    switchShadowEdit: switchShadowEdit,\n    getVisibleViewport: getVisibleViewport,\n    setEditorStyle: setEditorStyle,\n};\n"]}
+{"version":3,"file":"coreApiMap.js","sourceRoot":"","sources":["../../../../packages/roosterjs-content-model-core/lib/coreApi/coreApiMap.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AACpE,gDAA+C;AAC/C,kEAAiE;AACjE,8EAA6E;AAC7E,iFAAgF;AAChF,uCAAsC;AACtC,8EAA6E;AAC7E,qEAAoE;AACpE,8EAA6E;AAC7E,iFAAgF;AAChF,qEAAoE;AACpE,qEAAoE;AACpE,kEAAiE;AACjE,kEAAiE;AACjE,wEAAuE;AACvE,4DAA2D;AAG3D;;;GAGG;AACU,QAAA,UAAU,GAAe;IAClC,kBAAkB,EAAE,uCAAkB;IACtC,mBAAmB,EAAE,yCAAmB;IACxC,kBAAkB,EAAE,uCAAkB;IACtC,eAAe,EAAE,iCAAe;IAChC,cAAc,EAAE,+BAAc;IAE9B,eAAe,EAAE,iCAAe;IAChC,eAAe,EAAE,iCAAe;IAChC,KAAK,EAAE,aAAK;IAEZ,eAAe,EAAE,iCAAe;IAChC,mBAAmB,EAAE,yCAAmB;IAExC,cAAc,EAAE,+BAAc;IAC9B,YAAY,EAAE,2BAAY;IAE1B,gBAAgB,EAAE,mCAAgB;IAClC,kBAAkB,EAAE,uCAAkB;IACtC,cAAc,EAAE,+BAAc;IAE9B,QAAQ,EAAE,mBAAQ;CACrB,CAAC","sourcesContent":["import { addUndoSnapshot } from './addUndoSnapshot/addUndoSnapshot';\nimport { announce } from './announce/announce';\nimport { attachDomEvent } from './attachDomEvent/attachDomEvent';\nimport { createContentModel } from './createContentModel/createContentModel';\nimport { createEditorContext } from './createEditorContext/createEditorContext';\nimport { focus } from './focus/focus';\nimport { formatContentModel } from './formatContentModel/formatContentModel';\nimport { getDOMSelection } from './getDOMSelection/getDOMSelection';\nimport { getVisibleViewport } from './getVisibleViewport/getVisibleViewport';\nimport { restoreUndoSnapshot } from './restoreUndoSnapshot/restoreUndoSnapshot';\nimport { setContentModel } from './setContentModel/setContentModel';\nimport { setDOMSelection } from './setDOMSelection/setDOMSelection';\nimport { setEditorStyle } from './setEditorStyle/setEditorStyle';\nimport { setLogicalRoot } from './setLogicalRoot/setLogicalRoot';\nimport { switchShadowEdit } from './switchShadowEdit/switchShadowEdit';\nimport { triggerEvent } from './triggerEvent/triggerEvent';\nimport type { CoreApiMap } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Core API map for Editor\n */\nexport const coreApiMap: CoreApiMap = {\n    createContentModel: createContentModel,\n    createEditorContext: createEditorContext,\n    formatContentModel: formatContentModel,\n    setContentModel: setContentModel,\n    setLogicalRoot: setLogicalRoot,\n\n    getDOMSelection: getDOMSelection,\n    setDOMSelection: setDOMSelection,\n    focus: focus,\n\n    addUndoSnapshot: addUndoSnapshot,\n    restoreUndoSnapshot: restoreUndoSnapshot,\n\n    attachDomEvent: attachDomEvent,\n    triggerEvent: triggerEvent,\n\n    switchShadowEdit: switchShadowEdit,\n    getVisibleViewport: getVisibleViewport,\n    setEditorStyle: setEditorStyle,\n\n    announce: announce,\n};\n"]}

package/lib/coreApi/createContentModel/createContentModel.js

@@ -14,34 +14,33 @@ var createContentModel = function (core, option, selectionOverride) {
     var _a;
     // Flush all mutations if any, so that we can get an up-to-date Content Model
     (_a = core.cache.textMutationObserver) === null || _a === void 0 ? void 0 : _a.flushMutations();
-    var cachedModel = selectionOverride || (option && !option.tryGetFromCache) ? null : core.cache.cachedModel;
-    if (cachedModel && core.lifecycle.shadowEditFragment) {
-        // When in shadow edit, use a cloned model so we won't pollute the cached one
-        cachedModel = (0, roosterjs_content_model_dom_1.cloneModel)(cachedModel, { includeCachedElement: true });
+    if (!selectionOverride && (!option || option.tryGetFromCache)) {
+        var cachedModel = core.cache.cachedModel;
+        if (cachedModel) {
+            // When in shadow edit, use a cloned model so we won't pollute the cached one
+            return core.lifecycle.shadowEditFragment
+                ? (0, roosterjs_content_model_dom_1.cloneModel)(cachedModel, { includeCachedElement: true })
+                : cachedModel;
+        }
     }
-    if (cachedModel) {
-        return cachedModel;
+    var selection = selectionOverride == 'none'
+        ? undefined
+        : selectionOverride || core.api.getDOMSelection(core) || undefined;
+    var saveIndex = !option && !selectionOverride;
+    var editorContext = core.api.createEditorContext(core, saveIndex);
+    var settings = core.environment.domToModelSettings;
+    var domToModelContext = option
+        ? (0, roosterjs_content_model_dom_1.createDomToModelContext)(editorContext, settings.builtIn, settings.customized, option)
+        : (0, roosterjs_content_model_dom_1.createDomToModelContextWithConfig)(settings.calculated, editorContext);
+    if (selection) {
+        domToModelContext.selection = selection;
     }
-    else {
-        var selection = selectionOverride == 'none'
-            ? undefined
-            : selectionOverride || core.api.getDOMSelection(core) || undefined;
-        var saveIndex = !option && !selectionOverride;
-        var editorContext = core.api.createEditorContext(core, saveIndex);
-        var settings = core.environment.domToModelSettings;
-        var domToModelContext = option
-            ? (0, roosterjs_content_model_dom_1.createDomToModelContext)(editorContext, settings.builtIn, settings.customized, option)
-            : (0, roosterjs_content_model_dom_1.createDomToModelContextWithConfig)(settings.calculated, editorContext);
-        if (selection) {
-            domToModelContext.selection = selection;
-        }
-        var model = (0, roosterjs_content_model_dom_1.domToContentModel)(core.logicalRoot, domToModelContext);
-        if (saveIndex) {
-            core.cache.cachedModel = model;
-            (0, updateCachedSelection_1.updateCachedSelection)(core.cache, selection);
-        }
-        return model;
+    var model = (0, roosterjs_content_model_dom_1.domToContentModel)(core.logicalRoot, domToModelContext);
+    if (saveIndex) {
+        core.cache.cachedModel = model;
+        (0, updateCachedSelection_1.updateCachedSelection)(core.cache, selection);
     }
+    return model;
 };
 exports.createContentModel = createContentModel;
 //# sourceMappingURL=createContentModel.js.map

package/lib/coreApi/createContentModel/createContentModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"createContentModel.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/createContentModel/createContentModel.ts"],"names":[],"mappings":";;;AAAA,sFAAqF;AACrF,2EAKqC;AAGrC;;;;;;GAMG;AACI,IAAM,kBAAkB,GAAuB,UAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB;;IAClF,6EAA6E;IAC7E,MAAA,IAAI,CAAC,KAAK,CAAC,oBAAoB,0CAAE,cAAc,EAAE,CAAC;IAElD,IAAI,WAAW,GACX,iBAAiB,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAE7F,IAAI,WAAW,IAAI,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE;QAClD,6EAA6E;QAC7E,WAAW,GAAG,IAAA,wCAAU,EAAC,WAAW,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC;KACzE;IAED,IAAI,WAAW,EAAE;QACb,OAAO,WAAW,CAAC;KACtB;SAAM;QACH,IAAM,SAAS,GACX,iBAAiB,IAAI,MAAM;YACvB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;QAC3E,IAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC;QAChD,IAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACpE,IAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC;QACrD,IAAM,iBAAiB,GAAG,MAAM;YAC5B,CAAC,CAAC,IAAA,qDAAuB,EAAC,aAAa,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;YACvF,CAAC,CAAC,IAAA,+DAAiC,EAAC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAE5E,IAAI,SAAS,EAAE;YACX,iBAAiB,CAAC,SAAS,GAAG,SAAS,CAAC;SAC3C;QAED,IAAM,KAAK,GAAG,IAAA,+CAAiB,EAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAErE,IAAI,SAAS,EAAE;YACX,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC/B,IAAA,6CAAqB,EAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;SAChD;QAED,OAAO,KAAK,CAAC;KAChB;AACL,CAAC,CAAC;AAvCW,QAAA,kBAAkB,sBAuC7B","sourcesContent":["import { updateCachedSelection } from '../../corePlugin/cache/updateCachedSelection';\nimport {\n    cloneModel,\n    createDomToModelContext,\n    createDomToModelContextWithConfig,\n    domToContentModel,\n} from 'roosterjs-content-model-dom';\nimport type { CreateContentModel } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Create Content Model from DOM tree in this editor\n * @param core The editor core object\n * @param option The option to customize the behavior of DOM to Content Model conversion\n * @param selectionOverride When passed, use this selection range instead of current selection in editor\n */\nexport const createContentModel: CreateContentModel = (core, option, selectionOverride) => {\n    // Flush all mutations if any, so that we can get an up-to-date Content Model\n    core.cache.textMutationObserver?.flushMutations();\n\n    let cachedModel =\n        selectionOverride || (option && !option.tryGetFromCache) ? null : core.cache.cachedModel;\n\n    if (cachedModel && core.lifecycle.shadowEditFragment) {\n        // When in shadow edit, use a cloned model so we won't pollute the cached one\n        cachedModel = cloneModel(cachedModel, { includeCachedElement: true });\n    }\n\n    if (cachedModel) {\n        return cachedModel;\n    } else {\n        const selection =\n            selectionOverride == 'none'\n                ? undefined\n                : selectionOverride || core.api.getDOMSelection(core) || undefined;\n        const saveIndex = !option && !selectionOverride;\n        const editorContext = core.api.createEditorContext(core, saveIndex);\n        const settings = core.environment.domToModelSettings;\n        const domToModelContext = option\n            ? createDomToModelContext(editorContext, settings.builtIn, settings.customized, option)\n            : createDomToModelContextWithConfig(settings.calculated, editorContext);\n\n        if (selection) {\n            domToModelContext.selection = selection;\n        }\n\n        const model = domToContentModel(core.logicalRoot, domToModelContext);\n\n        if (saveIndex) {\n            core.cache.cachedModel = model;\n            updateCachedSelection(core.cache, selection);\n        }\n\n        return model;\n    }\n};\n"]}
+{"version":3,"file":"createContentModel.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/createContentModel/createContentModel.ts"],"names":[],"mappings":";;;AAAA,sFAAqF;AACrF,2EAKqC;AAGrC;;;;;;GAMG;AACI,IAAM,kBAAkB,GAAuB,UAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB;;IAClF,6EAA6E;IAC7E,MAAA,IAAI,CAAC,KAAK,CAAC,oBAAoB,0CAAE,cAAc,EAAE,CAAC;IAElD,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,EAAE;QAC3D,IAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;QAE3C,IAAI,WAAW,EAAE;YACb,6EAA6E;YAC7E,OAAO,IAAI,CAAC,SAAS,CAAC,kBAAkB;gBACpC,CAAC,CAAC,IAAA,wCAAU,EAAC,WAAW,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;gBACzD,CAAC,CAAC,WAAW,CAAC;SACrB;KACJ;IAED,IAAM,SAAS,GACX,iBAAiB,IAAI,MAAM;QACvB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;IAC3E,IAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC;IAChD,IAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACpE,IAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC;IACrD,IAAM,iBAAiB,GAAG,MAAM;QAC5B,CAAC,CAAC,IAAA,qDAAuB,EAAC,aAAa,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QACvF,CAAC,CAAC,IAAA,+DAAiC,EAAC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAE5E,IAAI,SAAS,EAAE;QACX,iBAAiB,CAAC,SAAS,GAAG,SAAS,CAAC;KAC3C;IAED,IAAM,KAAK,GAAG,IAAA,+CAAiB,EAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAErE,IAAI,SAAS,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAC/B,IAAA,6CAAqB,EAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;KAChD;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAtCW,QAAA,kBAAkB,sBAsC7B","sourcesContent":["import { updateCachedSelection } from '../../corePlugin/cache/updateCachedSelection';\nimport {\n    cloneModel,\n    createDomToModelContext,\n    createDomToModelContextWithConfig,\n    domToContentModel,\n} from 'roosterjs-content-model-dom';\nimport type { CreateContentModel } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Create Content Model from DOM tree in this editor\n * @param core The editor core object\n * @param option The option to customize the behavior of DOM to Content Model conversion\n * @param selectionOverride When passed, use this selection range instead of current selection in editor\n */\nexport const createContentModel: CreateContentModel = (core, option, selectionOverride) => {\n    // Flush all mutations if any, so that we can get an up-to-date Content Model\n    core.cache.textMutationObserver?.flushMutations();\n\n    if (!selectionOverride && (!option || option.tryGetFromCache)) {\n        const cachedModel = core.cache.cachedModel;\n\n        if (cachedModel) {\n            // When in shadow edit, use a cloned model so we won't pollute the cached one\n            return core.lifecycle.shadowEditFragment\n                ? cloneModel(cachedModel, { includeCachedElement: true })\n                : cachedModel;\n        }\n    }\n\n    const selection =\n        selectionOverride == 'none'\n            ? undefined\n            : selectionOverride || core.api.getDOMSelection(core) || undefined;\n    const saveIndex = !option && !selectionOverride;\n    const editorContext = core.api.createEditorContext(core, saveIndex);\n    const settings = core.environment.domToModelSettings;\n    const domToModelContext = option\n        ? createDomToModelContext(editorContext, settings.builtIn, settings.customized, option)\n        : createDomToModelContextWithConfig(settings.calculated, editorContext);\n\n    if (selection) {\n        domToModelContext.selection = selection;\n    }\n\n    const model = domToContentModel(core.logicalRoot, domToModelContext);\n\n    if (saveIndex) {\n        core.cache.cachedModel = model;\n        updateCachedSelection(core.cache, selection);\n    }\n\n    return model;\n};\n"]}

package/lib/coreApi/createEditorContext/createEditorContext.js

@@ -12,15 +12,10 @@ var createEditorContext = function (core, saveIndex) {
     var lifecycle = core.lifecycle, format = core.format, darkColorHandler = core.darkColorHandler, logicalRoot = core.logicalRoot, cache = core.cache, domHelper = core.domHelper;
     saveIndex = saveIndex && !core.lifecycle.shadowEditFragment;
     var context = (0, tslib_1.__assign)({ isDarkMode: lifecycle.isDarkMode, defaultFormat: format.defaultFormat, pendingFormat: (_a = format.pendingFormat) !== null && _a !== void 0 ? _a : undefined, darkColorHandler: darkColorHandler, addDelimiterForEntity: true, allowCacheElement: true, domIndexer: saveIndex ? cache.domIndexer : undefined, zoomScale: domHelper.calculateZoomScale() }, (0, getRootComputedStyleForContext_1.getRootComputedStyleForContext)(logicalRoot.ownerDocument));
-    checkRootRtl(logicalRoot, context);
+    if (core.domHelper.isRightToLeft()) {
+        context.isRootRtl = true;
+    }
     return context;
 };
 exports.createEditorContext = createEditorContext;
-function checkRootRtl(element, context) {
-    var _a;
-    var style = (_a = element === null || element === void 0 ? void 0 : element.ownerDocument.defaultView) === null || _a === void 0 ? void 0 : _a.getComputedStyle(element);
-    if ((style === null || style === void 0 ? void 0 : style.direction) == 'rtl') {
-        context.isRootRtl = true;
-    }
-}
 //# sourceMappingURL=createEditorContext.js.map

package/lib/coreApi/createEditorContext/createEditorContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createEditorContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/createEditorContext/createEditorContext.ts"],"names":[],"mappings":";;;;AAAA,mFAAkF;AAGlF;;;GAGG;AACI,IAAM,mBAAmB,GAAwB,UAAC,IAAI,EAAE,SAAS;;IAC5D,IAAA,SAAS,GAA8D,IAAI,UAAlE,EAAE,MAAM,GAAsD,IAAI,OAA1D,EAAE,gBAAgB,GAAoC,IAAI,iBAAxC,EAAE,WAAW,GAAuB,IAAI,YAA3B,EAAE,KAAK,GAAgB,IAAI,MAApB,EAAE,SAAS,GAAK,IAAI,UAAT,CAAU;IAEpF,SAAS,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC;IAE5D,IAAM,OAAO,2BACT,UAAU,EAAE,SAAS,CAAC,UAAU,EAChC,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,aAAa,EAAE,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,EAChD,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,IAAI,EAC3B,iBAAiB,EAAE,IAAI,EACvB,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACpD,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,IACtC,IAAA,+DAA8B,EAAC,WAAW,CAAC,aAAa,CAAC,CAC/D,CAAC;IAEF,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAEnC,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B;AAEF,SAAS,YAAY,CAAC,OAAoB,EAAE,OAAsB;;IAC9D,IAAM,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC,WAAW,0CAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAE5E,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,KAAI,KAAK,EAAE;QAC3B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;KAC5B;AACL,CAAC","sourcesContent":["import { getRootComputedStyleForContext } from './getRootComputedStyleForContext';\nimport type { EditorContext, CreateEditorContext } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Create a EditorContext object used by ContentModel API\n */\nexport const createEditorContext: CreateEditorContext = (core, saveIndex) => {\n    const { lifecycle, format, darkColorHandler, logicalRoot, cache, domHelper } = core;\n\n    saveIndex = saveIndex && !core.lifecycle.shadowEditFragment;\n\n    const context: EditorContext = {\n        isDarkMode: lifecycle.isDarkMode,\n        defaultFormat: format.defaultFormat,\n        pendingFormat: format.pendingFormat ?? undefined,\n        darkColorHandler: darkColorHandler,\n        addDelimiterForEntity: true,\n        allowCacheElement: true,\n        domIndexer: saveIndex ? cache.domIndexer : undefined,\n        zoomScale: domHelper.calculateZoomScale(),\n        ...getRootComputedStyleForContext(logicalRoot.ownerDocument),\n    };\n\n    checkRootRtl(logicalRoot, context);\n\n    return context;\n};\n\nfunction checkRootRtl(element: HTMLElement, context: EditorContext) {\n    const style = element?.ownerDocument.defaultView?.getComputedStyle(element);\n\n    if (style?.direction == 'rtl') {\n        context.isRootRtl = true;\n    }\n}\n"]}
+{"version":3,"file":"createEditorContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/createEditorContext/createEditorContext.ts"],"names":[],"mappings":";;;;AAAA,mFAAkF;AAGlF;;;GAGG;AACI,IAAM,mBAAmB,GAAwB,UAAC,IAAI,EAAE,SAAS;;IAC5D,IAAA,SAAS,GAA8D,IAAI,UAAlE,EAAE,MAAM,GAAsD,IAAI,OAA1D,EAAE,gBAAgB,GAAoC,IAAI,iBAAxC,EAAE,WAAW,GAAuB,IAAI,YAA3B,EAAE,KAAK,GAAgB,IAAI,MAApB,EAAE,SAAS,GAAK,IAAI,UAAT,CAAU;IAEpF,SAAS,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC;IAE5D,IAAM,OAAO,2BACT,UAAU,EAAE,SAAS,CAAC,UAAU,EAChC,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,aAAa,EAAE,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,EAChD,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,IAAI,EAC3B,iBAAiB,EAAE,IAAI,EACvB,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACpD,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,IACtC,IAAA,+DAA8B,EAAC,WAAW,CAAC,aAAa,CAAC,CAC/D,CAAC;IAEF,IAAI,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE;QAChC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;KAC5B;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B","sourcesContent":["import { getRootComputedStyleForContext } from './getRootComputedStyleForContext';\nimport type { EditorContext, CreateEditorContext } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Create a EditorContext object used by ContentModel API\n */\nexport const createEditorContext: CreateEditorContext = (core, saveIndex) => {\n    const { lifecycle, format, darkColorHandler, logicalRoot, cache, domHelper } = core;\n\n    saveIndex = saveIndex && !core.lifecycle.shadowEditFragment;\n\n    const context: EditorContext = {\n        isDarkMode: lifecycle.isDarkMode,\n        defaultFormat: format.defaultFormat,\n        pendingFormat: format.pendingFormat ?? undefined,\n        darkColorHandler: darkColorHandler,\n        addDelimiterForEntity: true,\n        allowCacheElement: true,\n        domIndexer: saveIndex ? cache.domIndexer : undefined,\n        zoomScale: domHelper.calculateZoomScale(),\n        ...getRootComputedStyleForContext(logicalRoot.ownerDocument),\n    };\n\n    if (core.domHelper.isRightToLeft()) {\n        context.isRootRtl = true;\n    }\n\n    return context;\n};\n"]}

package/lib/coreApi/formatContentModel/formatContentModel.js

@@ -15,7 +15,7 @@ var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
  */
 var formatContentModel = function (core, formatter, options, domToModelOptions) {
     var _a;
-    var _b = options || {}, apiName = _b.apiName, onNodeCreated = _b.onNodeCreated, getChangeData = _b.getChangeData, changeSource = _b.changeSource, rawEvent = _b.rawEvent, selectionOverride = _b.selectionOverride;
+    var _b = options || {}, apiName = _b.apiName, onNodeCreated = _b.onNodeCreated, getChangeData = _b.getChangeData, changeSource = _b.changeSource, rawEvent = _b.rawEvent, selectionOverride = _b.selectionOverride, scrollCaretIntoView = _b.scrollCaretIntoView;
     var model = core.api.createContentModel(core, domToModelOptions, selectionOverride);
     var context = {
         newEntities: [],
@@ -40,6 +40,11 @@ var formatContentModel = function (core, formatter, options, domToModelOptions)
                 (_a = core.api.setContentModel(core, model, hasFocus ? undefined : { ignoreSelection: true }, // If editor did not have focus before format, do not set focus after format
                 onNodeCreated)) !== null && _a !== void 0 ? _a : undefined;
             handlePendingFormat(core, context, selection);
+            if (selection && scrollCaretIntoView) {
+                var selectionRoot = (0, roosterjs_content_model_dom_1.getSelectionRootNode)(selection);
+                var rootElement = selectionRoot && core.domHelper.findClosestElementAncestor(selectionRoot);
+                rootElement === null || rootElement === void 0 ? void 0 : rootElement.scrollIntoView();
+            }
             var eventData = {
                 eventType: 'contentChanged',
                 contentModel: clearModelCache ? undefined : model,
@@ -76,19 +81,19 @@ var formatContentModel = function (core, formatter, options, domToModelOptions)
         }
         handlePendingFormat(core, context, core.api.getDOMSelection(core));
     }
+    if (context.announceData) {
+        core.api.announce(core, context.announceData);
+    }
 };
 exports.formatContentModel = formatContentModel;
 function handleImages(core, context) {
     if (context.newImages.length > 0) {
-        var viewport = core.api.getVisibleViewport(core);
-        if (viewport) {
-            var left = viewport.left, right = viewport.right;
-            var minMaxImageSize = 10;
-            var maxWidth_1 = Math.max(right - left, minMaxImageSize);
-            context.newImages.forEach(function (image) {
-                image.format.maxWidth = maxWidth_1 + "px";
-            });
-        }
+        var width = core.domHelper.getClientWidth();
+        var minMaxImageSize = 10;
+        var maxWidth_1 = Math.max(width, minMaxImageSize);
+        context.newImages.forEach(function (image) {
+            image.format.maxWidth = maxWidth_1 + "px";
+        });
     }
 }
 function handlePendingFormat(core, context, selection) {

package/lib/coreApi/formatContentModel/formatContentModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatContentModel.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/formatContentModel/formatContentModel.ts"],"names":[],"mappings":";;;;AAAA,2EAA2D;AAU3D;;;;;;;;;GASG;AACI,IAAM,kBAAkB,GAAuB,UAClD,IAAI,EACJ,SAAS,EACT,OAAO,EACP,iBAAiB;;IAEX,IAAA,KACF,OAAO,IAAI,EAAE,EADT,OAAO,aAAA,EAAE,aAAa,mBAAA,EAAE,aAAa,mBAAA,EAAE,YAAY,kBAAA,EAAE,QAAQ,cAAA,EAAE,iBAAiB,uBACvE,CAAC;IAClB,IAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;IACtF,IAAM,OAAO,GAA8B;QACvC,WAAW,EAAE,EAAE;QACf,eAAe,EAAE,EAAE;QACnB,QAAQ,UAAA;QACR,SAAS,EAAE,EAAE;KAChB,CAAC;IAEF,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IAE3C,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClC,IAAA,gBAAgB,GAAwD,OAAO,iBAA/D,EAAE,eAAe,GAAuC,OAAO,gBAA9C,EAAE,YAAY,GAAyB,OAAO,aAAhC,EAAE,kBAAkB,GAAK,OAAO,mBAAZ,CAAa;IAExF,IAAI,OAAO,EAAE;QACT,IAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,IAAM,iBAAiB,GAAG,CAAC,gBAAgB,IAAI,CAAC,QAAQ,CAAC;QACzD,IAAI,SAAS,SAA0B,CAAC;QAExC,IAAI,iBAAiB,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YAE1B,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;SACtE;QAED,IAAI;YACA,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE5B,SAAS;gBACL,MAAA,IAAI,CAAC,GAAG,CAAC,eAAe,CACpB,IAAI,EACJ,KAAK,EACL,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,4EAA4E;gBAC9H,aAAa,CAChB,mCAAI,SAAS,CAAC;YAEnB,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9C,IAAM,SAAS,GAAwB;gBACnC,SAAS,EAAE,gBAAgB;gBAC3B,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;gBACjD,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAClD,MAAM,EAAE,YAAY,IAAI,0CAAY,CAAC,MAAM;gBAC3C,IAAI,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,EAAI;gBACvB,aAAa,EAAE,OAAO;gBACtB,eAAe,EAAE,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC;aACzD,CAAC;YAEF,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAE3D,IAAI,kBAAkB,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,KAAI,OAAO,EAAE;gBAClD,IAAI,CAAC,IAAI,CAAC,uBAAuB,GAAG;oBAChC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,cAAc;oBACpC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW;iBACtC,CAAC;aACL;YAED,IAAI,iBAAiB,EAAE;gBACnB,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAC;aAC9E;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,aAAa,GAAG,IAAI,CAAC;aACnD;SACJ;gBAAS;YACN,IAAI,CAAC,QAAQ,EAAE;gBACX,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;aAC9B;SACJ;KACJ;SAAM;QACH,IAAI,eAAe,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,SAAS,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,SAAS,CAAC;SAC1C;QAED,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;KACtE;AACL,CAAC,CAAC;AAlFW,QAAA,kBAAkB,sBAkF7B;AAEF,SAAS,YAAY,CAAC,IAAgB,EAAE,OAAkC;IACtE,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,IAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEnD,IAAI,QAAQ,EAAE;YACF,IAAA,IAAI,GAAY,QAAQ,KAApB,EAAE,KAAK,GAAK,QAAQ,MAAb,CAAc;YACjC,IAAM,eAAe,GAAG,EAAE,CAAC;YAC3B,IAAM,UAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,eAAe,CAAC,CAAC;YACzD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,UAAA,KAAK;gBAC3B,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAM,UAAQ,OAAI,CAAC;YAC5C,CAAC,CAAC,CAAC;SACN;KACJ;AACL,CAAC;AAED,SAAS,mBAAmB,CACxB,IAAgB,EAChB,OAAkC,EAClC,SAA+B;;IAE/B,IAAM,aAAa,GACf,OAAO,CAAC,gBAAgB,IAAI,UAAU;QAClC,CAAC,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,aAAa,0CAAE,MAAM;QACnC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAEnC,IAAI,aAAa,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,KAAI,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE;QAC1E,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG;YACxB,MAAM,4BAAO,aAAa,CAAE;YAC5B,WAAW,EAAE;gBACT,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,cAAc;gBACpC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW;aACtC;SACJ,CAAC;KACL;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAkC,EAAE,QAAgB;IAC5E,OAAO,OAAO,CAAC,WAAW;SACrB,GAAG,CACA,UAAC,MAAM,IAAoB,OAAA,CAAC;QACxB,MAAM,QAAA;QACN,SAAS,EAAE,WAAW;QACtB,QAAQ,UAAA;KACX,CAAC,EAJyB,CAIzB,CACL;SACA,MAAM,CACH,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,UAAA,KAAK,IAAI,OAAA,CAAC;QAClC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,UAAA;KACX,CAAC,EAJmC,CAInC,CAAC,CACN,CAAC;AACV,CAAC","sourcesContent":["import { ChangeSource } from 'roosterjs-content-model-dom';\nimport type {\n    ChangedEntity,\n    ContentChangedEvent,\n    DOMSelection,\n    FormatContentModel,\n    FormatContentModelContext,\n    EditorCore,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * The general API to do format change with Content Model\n * It will grab a Content Model for current editor content, and invoke a callback function\n * to do format change. Then according to the return value, write back the modified content model into editor.\n * If there is cached model, it will be used and updated.\n * @param core The EditorCore object\n * @param formatter Formatter function, see ContentModelFormatter\n * @param options More options, see FormatContentModelOptions\n */\nexport const formatContentModel: FormatContentModel = (\n    core,\n    formatter,\n    options,\n    domToModelOptions\n) => {\n    const { apiName, onNodeCreated, getChangeData, changeSource, rawEvent, selectionOverride } =\n        options || {};\n    const model = core.api.createContentModel(core, domToModelOptions, selectionOverride);\n    const context: FormatContentModelContext = {\n        newEntities: [],\n        deletedEntities: [],\n        rawEvent,\n        newImages: [],\n    };\n\n    const hasFocus = core.domHelper.hasFocus();\n\n    const changed = formatter(model, context);\n    const { skipUndoSnapshot, clearModelCache, entityStates, canUndoByBackspace } = context;\n\n    if (changed) {\n        const isNested = core.undo.isNested;\n        const shouldAddSnapshot = !skipUndoSnapshot && !isNested;\n        let selection: DOMSelection | undefined;\n\n        if (shouldAddSnapshot) {\n            core.undo.isNested = true;\n\n            core.api.addUndoSnapshot(core, !!canUndoByBackspace, entityStates);\n        }\n\n        try {\n            handleImages(core, context);\n\n            selection =\n                core.api.setContentModel(\n                    core,\n                    model,\n                    hasFocus ? undefined : { ignoreSelection: true }, // If editor did not have focus before format, do not set focus after format\n                    onNodeCreated\n                ) ?? undefined;\n\n            handlePendingFormat(core, context, selection);\n\n            const eventData: ContentChangedEvent = {\n                eventType: 'contentChanged',\n                contentModel: clearModelCache ? undefined : model,\n                selection: clearModelCache ? undefined : selection,\n                source: changeSource || ChangeSource.Format,\n                data: getChangeData?.(),\n                formatApiName: apiName,\n                changedEntities: getChangedEntities(context, rawEvent),\n            };\n\n            core.api.triggerEvent(core, eventData, true /*broadcast*/);\n\n            if (canUndoByBackspace && selection?.type == 'range') {\n                core.undo.autoCompleteInsertPoint = {\n                    node: selection.range.startContainer,\n                    offset: selection.range.startOffset,\n                };\n            }\n\n            if (shouldAddSnapshot) {\n                core.api.addUndoSnapshot(core, false /*canUndoByBackspace*/, entityStates);\n            } else {\n                core.undo.snapshotsManager.hasNewContent = true;\n            }\n        } finally {\n            if (!isNested) {\n                core.undo.isNested = false;\n            }\n        }\n    } else {\n        if (clearModelCache) {\n            core.cache.cachedModel = undefined;\n            core.cache.cachedSelection = undefined;\n        }\n\n        handlePendingFormat(core, context, core.api.getDOMSelection(core));\n    }\n};\n\nfunction handleImages(core: EditorCore, context: FormatContentModelContext) {\n    if (context.newImages.length > 0) {\n        const viewport = core.api.getVisibleViewport(core);\n\n        if (viewport) {\n            const { left, right } = viewport;\n            const minMaxImageSize = 10;\n            const maxWidth = Math.max(right - left, minMaxImageSize);\n            context.newImages.forEach(image => {\n                image.format.maxWidth = `${maxWidth}px`;\n            });\n        }\n    }\n}\n\nfunction handlePendingFormat(\n    core: EditorCore,\n    context: FormatContentModelContext,\n    selection?: DOMSelection | null\n) {\n    const pendingFormat =\n        context.newPendingFormat == 'preserve'\n            ? core.format.pendingFormat?.format\n            : context.newPendingFormat;\n\n    if (pendingFormat && selection?.type == 'range' && selection.range.collapsed) {\n        core.format.pendingFormat = {\n            format: { ...pendingFormat },\n            insertPoint: {\n                node: selection.range.startContainer,\n                offset: selection.range.startOffset,\n            },\n        };\n    }\n}\n\nfunction getChangedEntities(context: FormatContentModelContext, rawEvent?: Event): ChangedEntity[] {\n    return context.newEntities\n        .map(\n            (entity): ChangedEntity => ({\n                entity,\n                operation: 'newEntity',\n                rawEvent,\n            })\n        )\n        .concat(\n            context.deletedEntities.map(entry => ({\n                entity: entry.entity,\n                operation: entry.operation,\n                rawEvent,\n            }))\n        );\n}\n"]}
+{"version":3,"file":"formatContentModel.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/formatContentModel/formatContentModel.ts"],"names":[],"mappings":"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","sourcesContent":["import { ChangeSource, getSelectionRootNode } from 'roosterjs-content-model-dom';\nimport type {\n    ChangedEntity,\n    ContentChangedEvent,\n    DOMSelection,\n    FormatContentModel,\n    FormatContentModelContext,\n    EditorCore,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * The general API to do format change with Content Model\n * It will grab a Content Model for current editor content, and invoke a callback function\n * to do format change. Then according to the return value, write back the modified content model into editor.\n * If there is cached model, it will be used and updated.\n * @param core The EditorCore object\n * @param formatter Formatter function, see ContentModelFormatter\n * @param options More options, see FormatContentModelOptions\n */\nexport const formatContentModel: FormatContentModel = (\n    core,\n    formatter,\n    options,\n    domToModelOptions\n) => {\n    const {\n        apiName,\n        onNodeCreated,\n        getChangeData,\n        changeSource,\n        rawEvent,\n        selectionOverride,\n        scrollCaretIntoView,\n    } = options || {};\n    const model = core.api.createContentModel(core, domToModelOptions, selectionOverride);\n    const context: FormatContentModelContext = {\n        newEntities: [],\n        deletedEntities: [],\n        rawEvent,\n        newImages: [],\n    };\n\n    const hasFocus = core.domHelper.hasFocus();\n\n    const changed = formatter(model, context);\n    const { skipUndoSnapshot, clearModelCache, entityStates, canUndoByBackspace } = context;\n\n    if (changed) {\n        const isNested = core.undo.isNested;\n        const shouldAddSnapshot = !skipUndoSnapshot && !isNested;\n        let selection: DOMSelection | undefined;\n\n        if (shouldAddSnapshot) {\n            core.undo.isNested = true;\n\n            core.api.addUndoSnapshot(core, !!canUndoByBackspace, entityStates);\n        }\n\n        try {\n            handleImages(core, context);\n\n            selection =\n                core.api.setContentModel(\n                    core,\n                    model,\n                    hasFocus ? undefined : { ignoreSelection: true }, // If editor did not have focus before format, do not set focus after format\n                    onNodeCreated\n                ) ?? undefined;\n\n            handlePendingFormat(core, context, selection);\n\n            if (selection && scrollCaretIntoView) {\n                const selectionRoot = getSelectionRootNode(selection);\n                const rootElement =\n                    selectionRoot && core.domHelper.findClosestElementAncestor(selectionRoot);\n\n                rootElement?.scrollIntoView();\n            }\n\n            const eventData: ContentChangedEvent = {\n                eventType: 'contentChanged',\n                contentModel: clearModelCache ? undefined : model,\n                selection: clearModelCache ? undefined : selection,\n                source: changeSource || ChangeSource.Format,\n                data: getChangeData?.(),\n                formatApiName: apiName,\n                changedEntities: getChangedEntities(context, rawEvent),\n            };\n\n            core.api.triggerEvent(core, eventData, true /*broadcast*/);\n\n            if (canUndoByBackspace && selection?.type == 'range') {\n                core.undo.autoCompleteInsertPoint = {\n                    node: selection.range.startContainer,\n                    offset: selection.range.startOffset,\n                };\n            }\n\n            if (shouldAddSnapshot) {\n                core.api.addUndoSnapshot(core, false /*canUndoByBackspace*/, entityStates);\n            } else {\n                core.undo.snapshotsManager.hasNewContent = true;\n            }\n        } finally {\n            if (!isNested) {\n                core.undo.isNested = false;\n            }\n        }\n    } else {\n        if (clearModelCache) {\n            core.cache.cachedModel = undefined;\n            core.cache.cachedSelection = undefined;\n        }\n\n        handlePendingFormat(core, context, core.api.getDOMSelection(core));\n    }\n\n    if (context.announceData) {\n        core.api.announce(core, context.announceData);\n    }\n};\n\nfunction handleImages(core: EditorCore, context: FormatContentModelContext) {\n    if (context.newImages.length > 0) {\n        const width = core.domHelper.getClientWidth();\n        const minMaxImageSize = 10;\n        const maxWidth = Math.max(width, minMaxImageSize);\n        context.newImages.forEach(image => {\n            image.format.maxWidth = `${maxWidth}px`;\n        });\n    }\n}\n\nfunction handlePendingFormat(\n    core: EditorCore,\n    context: FormatContentModelContext,\n    selection?: DOMSelection | null\n) {\n    const pendingFormat =\n        context.newPendingFormat == 'preserve'\n            ? core.format.pendingFormat?.format\n            : context.newPendingFormat;\n\n    if (pendingFormat && selection?.type == 'range' && selection.range.collapsed) {\n        core.format.pendingFormat = {\n            format: { ...pendingFormat },\n            insertPoint: {\n                node: selection.range.startContainer,\n                offset: selection.range.startOffset,\n            },\n        };\n    }\n}\n\nfunction getChangedEntities(context: FormatContentModelContext, rawEvent?: Event): ChangedEntity[] {\n    return context.newEntities\n        .map(\n            (entity): ChangedEntity => ({\n                entity,\n                operation: 'newEntity',\n                rawEvent,\n            })\n        )\n        .concat(\n            context.deletedEntities.map(entry => ({\n                entity: entry.entity,\n                operation: entry.operation,\n                rawEvent,\n            }))\n        );\n}\n"]}

package/lib/coreApi/restoreUndoSnapshot/restoreSnapshotHTML.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreSnapshotHTML = void 0;
 var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
-var BlockEntityContainer = '_E_EBlockEntityContainer';
 /**
  * @internal
  */
@@ -54,22 +53,19 @@ function tryGetEntityElement(entityMap, node) {
             var format = (0, roosterjs_content_model_dom_1.parseEntityFormat)(node);
             result = getEntityWrapperForReuse(entityMap, format.id);
         }
-        else if (isBlockEntityContainer(node)) {
+        else if ((0, roosterjs_content_model_dom_1.isBlockEntityContainer)(node)) {
             result = tryGetEntityFromContainer(node, entityMap);
         }
     }
     return result;
 }
-function isBlockEntityContainer(node) {
-    return node.classList.contains(BlockEntityContainer);
-}
 function tryGetEntityFromContainer(element, entityMap) {
     var _a;
     for (var node = element.firstChild; node; node = node.nextSibling) {
         if ((0, roosterjs_content_model_dom_1.isEntityElement)(node) && (0, roosterjs_content_model_dom_1.isNodeOfType)(node, 'ELEMENT_NODE')) {
             var format = (0, roosterjs_content_model_dom_1.parseEntityFormat)(node);
             var parent_1 = (_a = getEntityWrapperForReuse(entityMap, format.id)) === null || _a === void 0 ? void 0 : _a.parentElement;
-            return (0, roosterjs_content_model_dom_1.isNodeOfType)(parent_1, 'ELEMENT_NODE') && isBlockEntityContainer(parent_1)
+            return (0, roosterjs_content_model_dom_1.isNodeOfType)(parent_1, 'ELEMENT_NODE') && (0, roosterjs_content_model_dom_1.isBlockEntityContainer)(parent_1)
                 ? parent_1
                 : null;
         }

package/lib/coreApi/restoreUndoSnapshot/restoreSnapshotHTML.js.map

@@ -1 +1 @@
-{"version":3,"file":"restoreSnapshotHTML.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/restoreUndoSnapshot/restoreSnapshotHTML.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    getAllEntityWrappers,\n    isEntityElement,\n    isNodeOfType,\n    parseEntityFormat,\n    reuseCachedElement,\n} from 'roosterjs-content-model-dom';\nimport type { Snapshot, EditorCore, KnownEntityItem } from 'roosterjs-content-model-types';\n\nconst BlockEntityContainer = '_E_EBlockEntityContainer';\n\n/**\n * @internal\n */\nexport function restoreSnapshotHTML(core: EditorCore, snapshot: Snapshot) {\n    const {\n        physicalRoot,\n        entity: { entityMap },\n    } = core;\n    let refNode: Node | null = physicalRoot.firstChild;\n\n    const body = new DOMParser().parseFromString(\n        core.trustedHTMLHandler?.(snapshot.html) ?? snapshot.html,\n        'text/html'\n    ).body;\n\n    for (let currentNode = body.firstChild; currentNode; ) {\n        const next = currentNode.nextSibling;\n        const originalEntityElement = tryGetEntityElement(entityMap, currentNode);\n\n        if (originalEntityElement) {\n            refNode = reuseCachedElement(physicalRoot, originalEntityElement, refNode);\n        } else {\n            physicalRoot.insertBefore(currentNode, refNode);\n\n            if (isNodeOfType(currentNode, 'ELEMENT_NODE')) {\n                const childEntities = getAllEntityWrappers(currentNode);\n\n                childEntities.forEach(element => {\n                    const wrapper = tryGetEntityElement(entityMap, element);\n\n                    if (wrapper) {\n                        if (wrapper == refNode) {\n                            // In case the node we are moving is just the ref node,\n                            // We create a temporary clone and insert it before the refNode, and use this cloned node as refNode\n                            // After replaceChild(), the original refNode will be moved away\n                            const markerNode = wrapper.cloneNode();\n\n                            physicalRoot.insertBefore(markerNode, refNode);\n                            refNode = markerNode;\n                        }\n\n                        element.parentNode?.replaceChild(wrapper, element);\n                    }\n                });\n            }\n        }\n        currentNode = next;\n    }\n\n    while (refNode) {\n        const next = refNode.nextSibling;\n\n        refNode.parentNode?.removeChild(refNode);\n        refNode = next;\n    }\n}\n\nfunction tryGetEntityElement(\n    entityMap: Record<string, KnownEntityItem>,\n    node: Node\n): HTMLElement | null {\n    let result: HTMLElement | null = null;\n\n    if (isNodeOfType(node, 'ELEMENT_NODE')) {\n        if (isEntityElement(node)) {\n            const format = parseEntityFormat(node);\n\n            result = getEntityWrapperForReuse(entityMap, format.id);\n        } else if (isBlockEntityContainer(node)) {\n            result = tryGetEntityFromContainer(node, entityMap);\n        }\n    }\n\n    return result;\n}\n\nfunction isBlockEntityContainer(node: HTMLElement) {\n    return node.classList.contains(BlockEntityContainer);\n}\n\nfunction tryGetEntityFromContainer(\n    element: HTMLElement,\n    entityMap: Record<string, KnownEntityItem>\n): HTMLElement | null {\n    for (let node = element.firstChild; node; node = node.nextSibling) {\n        if (isEntityElement(node) && isNodeOfType(node, 'ELEMENT_NODE')) {\n            const format = parseEntityFormat(node);\n            const parent = getEntityWrapperForReuse(entityMap, format.id)?.parentElement;\n\n            return isNodeOfType(parent, 'ELEMENT_NODE') && isBlockEntityContainer(parent)\n                ? parent\n                : null;\n        }\n    }\n\n    return null;\n}\n\nfunction getEntityWrapperForReuse(\n    entityMap: Record<string, KnownEntityItem>,\n    entityId: string | undefined\n): HTMLElement | null {\n    const entry = entityId ? entityMap[entityId] : undefined;\n\n    return entry?.canPersist ? entry.element : null;\n}\n"]}
+{"version":3,"file":"restoreSnapshotHTML.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-core/lib/coreApi/restoreUndoSnapshot/restoreSnapshotHTML.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    getAllEntityWrappers,\n    isBlockEntityContainer,\n    isEntityElement,\n    isNodeOfType,\n    parseEntityFormat,\n    reuseCachedElement,\n} from 'roosterjs-content-model-dom';\nimport type { Snapshot, EditorCore, KnownEntityItem } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function restoreSnapshotHTML(core: EditorCore, snapshot: Snapshot) {\n    const {\n        physicalRoot,\n        entity: { entityMap },\n    } = core;\n    let refNode: Node | null = physicalRoot.firstChild;\n\n    const body = new DOMParser().parseFromString(\n        core.trustedHTMLHandler?.(snapshot.html) ?? snapshot.html,\n        'text/html'\n    ).body;\n\n    for (let currentNode = body.firstChild; currentNode; ) {\n        const next = currentNode.nextSibling;\n        const originalEntityElement = tryGetEntityElement(entityMap, currentNode);\n\n        if (originalEntityElement) {\n            refNode = reuseCachedElement(physicalRoot, originalEntityElement, refNode);\n        } else {\n            physicalRoot.insertBefore(currentNode, refNode);\n\n            if (isNodeOfType(currentNode, 'ELEMENT_NODE')) {\n                const childEntities = getAllEntityWrappers(currentNode);\n\n                childEntities.forEach(element => {\n                    const wrapper = tryGetEntityElement(entityMap, element);\n\n                    if (wrapper) {\n                        if (wrapper == refNode) {\n                            // In case the node we are moving is just the ref node,\n                            // We create a temporary clone and insert it before the refNode, and use this cloned node as refNode\n                            // After replaceChild(), the original refNode will be moved away\n                            const markerNode = wrapper.cloneNode();\n\n                            physicalRoot.insertBefore(markerNode, refNode);\n                            refNode = markerNode;\n                        }\n\n                        element.parentNode?.replaceChild(wrapper, element);\n                    }\n                });\n            }\n        }\n        currentNode = next;\n    }\n\n    while (refNode) {\n        const next = refNode.nextSibling;\n\n        refNode.parentNode?.removeChild(refNode);\n        refNode = next;\n    }\n}\n\nfunction tryGetEntityElement(\n    entityMap: Record<string, KnownEntityItem>,\n    node: Node\n): HTMLElement | null {\n    let result: HTMLElement | null = null;\n\n    if (isNodeOfType(node, 'ELEMENT_NODE')) {\n        if (isEntityElement(node)) {\n            const format = parseEntityFormat(node);\n\n            result = getEntityWrapperForReuse(entityMap, format.id);\n        } else if (isBlockEntityContainer(node)) {\n            result = tryGetEntityFromContainer(node, entityMap);\n        }\n    }\n\n    return result;\n}\n\nfunction tryGetEntityFromContainer(\n    element: HTMLElement,\n    entityMap: Record<string, KnownEntityItem>\n): HTMLElement | null {\n    for (let node = element.firstChild; node; node = node.nextSibling) {\n        if (isEntityElement(node) && isNodeOfType(node, 'ELEMENT_NODE')) {\n            const format = parseEntityFormat(node);\n            const parent = getEntityWrapperForReuse(entityMap, format.id)?.parentElement;\n\n            return isNodeOfType(parent, 'ELEMENT_NODE') && isBlockEntityContainer(parent)\n                ? parent\n                : null;\n        }\n    }\n\n    return null;\n}\n\nfunction getEntityWrapperForReuse(\n    entityMap: Record<string, KnownEntityItem>,\n    entityId: string | undefined\n): HTMLElement | null {\n    const entry = entityId ? entityMap[entityId] : undefined;\n\n    return entry?.canPersist ? entry.element : null;\n}\n"]}

package/lib/coreApi/setDOMSelection/setDOMSelection.js

@@ -14,7 +14,7 @@ var TABLE_ID = 'table';
 var DEFAULT_SELECTION_BORDER_COLOR = '#DB626C';
 var TABLE_CSS_RULE = 'background-color:#C6C6C6!important;';
 var CARET_CSS_RULE = 'caret-color: transparent';
-var TRANSPARENT_SELECTION_CSS_RULE = 'background-color: transparent !important';
+var TRANSPARENT_SELECTION_CSS_RULE = 'background-color: transparent !important;';
 var SELECTION_SELECTOR = '*::selection';
 /**
  * @internal
@@ -32,9 +32,12 @@ var setDOMSelection = function (core, selection, skipSelectionChangedEvent) {
     try {
         switch (selection === null || selection === void 0 ? void 0 : selection.type) {
             case 'image':
-                var image = selection.image;
-                core.selection.selection = selection;
-                core.api.setEditorStyle(core, DOM_SELECTION_CSS_KEY, "outline-style:auto!important; outline-color:" + (core.selection.imageSelectionBorderColor || DEFAULT_SELECTION_BORDER_COLOR) + "!important;", ["#" + (0, ensureUniqueId_1.ensureUniqueId)(image, IMAGE_ID)]);
+                var image = ensureImageHasSpanParent(selection.image);
+                core.selection.selection = {
+                    type: 'image',
+                    image: image,
+                };
+                core.api.setEditorStyle(core, DOM_SELECTION_CSS_KEY, "outline-style:auto!important; outline-color:" + (core.selection.imageSelectionBorderColor || DEFAULT_SELECTION_BORDER_COLOR) + "!important;", ["span:has(>img#" + (0, ensureUniqueId_1.ensureUniqueId)(image, IMAGE_ID) + ")"]);
                 core.api.setEditorStyle(core, HIDE_SELECTION_CSS_KEY, TRANSPARENT_SELECTION_CSS_RULE, [SELECTION_SELECTOR]);
                 setRangeSelection(doc, image, false /* collapse */);
                 break;
@@ -165,4 +168,16 @@ function setRangeSelection(doc, element, collapse) {
         (0, addRangeToSelection_1.addRangeToSelection)(doc, range, isReverted);
     }
 }
+function ensureImageHasSpanParent(image) {
+    var parent = image.parentElement;
+    if (parent &&
+        (0, roosterjs_content_model_dom_1.isNodeOfType)(parent, 'ELEMENT_NODE') &&
+        (0, roosterjs_content_model_dom_1.isElementOfType)(parent, 'span') &&
+        parent.firstChild == image &&
+        parent.lastChild == image) {
+        return image;
+    }
+    (0, roosterjs_content_model_dom_1.wrap)(image.ownerDocument, image, 'span');
+    return image;
+}
 //# sourceMappingURL=setDOMSelection.js.map