devexpress-richedit 24.1.4-build-24183-0102 → 24.1.4

package/dist/dx.richedit.js

@@ -68016,6 +68016,7 @@ class HtmlModelInserter {
 class HtmlTagImporterBase {
     constructor(importer) {
         this.enablePreserveLineBreaks = false;
+        this.paragraphWasAddedBefore = false;
         this.importer = importer;
     }
     get colorProvider() { return this.importer.modelManager.model.colorProvider; }
@@ -68063,7 +68064,7 @@ class HtmlATagImporter extends HtmlTagImporterBase {
         this.addRun(new ImportedTextRunInfo(this.importer.modelManager.model, this.importer.measurer, codeText, this.importer.htmlImporterMaskedCharacterProperties.getBundleFrom(this.element, new fixed.FixedInterval(this.importer.currPosition, codeText.length))));
         this.addRun(new ImportedFieldCodeEndRunInfo(this.importer.charPropsBundle, this.importer.fieldsId));
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68085,7 +68086,7 @@ class HtmlBTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68107,7 +68108,7 @@ class HtmlBrTagImporter extends HtmlTagImporterBase {
             RichUtils.specialCharacters.LineBreak;
         this.addRun(new ImportedTextRunInfo(this.importer.modelManager.model, this.importer.measurer, breakChar, this.importer.htmlImporterMaskedCharacterProperties.getBundleFrom(this.element, new fixed.FixedInterval(this.importer.currPosition, 1))));
     }
-    isImportChilds() {
+    isImportChildren() {
         return false;
     }
     importAfter() {
@@ -68122,7 +68123,7 @@ class HtmlCenterTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68137,7 +68138,7 @@ class HtmlCiteTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68152,14 +68153,14 @@ class HtmlDivTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
         if (!this.importer.prevRunIsParagraph && this.importer.importStarted)
-            this.importer.addParagraphRun(null, this.element);
+            this.importer.addParagraphRun(this.element);
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
         if (!this.importer.prevRunIsParagraph)
-            this.importer.addParagraphRun(null, this.element);
+            this.importer.addParagraphRun(this.element);
     }
 }
 
@@ -68171,7 +68172,7 @@ class HtmlEmTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68186,7 +68187,7 @@ class HtmlITagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68206,7 +68207,8 @@ class HtmlImgTagImporter extends HtmlTagImporterBase {
     importBefore() {
         const imageElement = this.importer.currElement;
         const originalSize = new geometry_size.Size(imageElement.naturalWidth, imageElement.naturalHeight);
-        const actualSize = new geometry_size.Size(imageElement.width, imageElement.height);
+        const styleSize = new geometry_size.Size(parseFloat(imageElement.style.width), parseFloat(imageElement.style.height));
+        const actualSize = new geometry_size.Size(imageElement.width || styleSize.width, imageElement.height || styleSize.height);
         if (originalSize.width !== undefined && originalSize.height !== undefined)
             originalSize.applyConverter(unit_converter/* UnitConverter */.u.pixelsToTwips);
         if (actualSize.width !== undefined && actualSize.height !== undefined)
@@ -68214,7 +68216,7 @@ class HtmlImgTagImporter extends HtmlTagImporterBase {
         const cacheInfo = this.importer.modelManager.model.cache.imageCache.createUnloadedByBase64OrUrl(imageElement.src, originalSize);
         this.addRun(new ImportedInlinePictureRunInfo(this.importer.charPropsBundle, InlinePictureInfo.defaultInfo(cacheInfo), actualSize));
     }
-    isImportChilds() {
+    isImportChildren() {
         return false;
     }
     importAfter() {
@@ -68225,24 +68227,27 @@ class HtmlImgTagImporter extends HtmlTagImporterBase {
 
 
 
-
-
 class HtmlLiTagImporter extends HtmlTagImporterBase {
     elementTag() {
         return 'LI';
     }
-    importBefore() { }
-    isImportChilds() {
+    importBefore() {
+        const firstChild = this.element.childNodes[0];
+        this.element.innerHTML = this.element.innerHTML.trim();
+        if (this.isListElement(firstChild))
+            this.importer.addParagraphRun(this.element, this.importer.currListInfo);
+    }
+    isImportChildren() {
         return true;
     }
     importAfter() {
         const lastChild = utils_list.ListUtils.last([...this.element.childNodes]);
-        if (!dom.DomUtils.isHTMLElementNode(lastChild) || LevelInfo.getElementTag(lastChild) !== 'UL' && LevelInfo.getElementTag(lastChild) !== 'OL') {
-            const listInfo = utils_list.ListUtils.last(this.importer.listInfos);
-            if (!listInfo)
-                throw new Error(errors/* Errors */.D.InternalException);
-            this.importer.addParagraphRun(listInfo, this.element);
-        }
+        if (!this.importer.prevRunIsParagraph && !this.isListElement(lastChild))
+            this.importer.addParagraphRun(this.element, this.importer.currListInfo);
+    }
+    isListElement(elem) {
+        const tagName = LevelInfo.getElementTag(elem);
+        return tagName === 'OL' || tagName === 'UL';
     }
 }
 
@@ -68388,13 +68393,14 @@ class ParagraphListPropertiesUtils {
         return utils_list.ListUtils.accumulate(lists, 0, (acc, list, index) => acc + (list == mainParentListElement ? index : 0));
     }
     importListLevelIndex() {
+        var _a;
         if (this.msoListAttr && this.msoListAttr.length)
             return parseInt(this.msoListAttr[0].replace(/mso-list:\s*\w*\s*level/gi, '')) - 1;
         let listLevelIndex = 0;
-        let parentListItemElement = this.parentListElement ? dom.DomUtils.getParentByTagName(this.parentListElement, "LI") : null;
+        let parentListItemElement = ParagraphListPropertiesUtils.getParentListElement((_a = this.parentListElement) === null || _a === void 0 ? void 0 : _a.parentElement);
         while (parentListItemElement) {
             listLevelIndex++;
-            parentListItemElement = dom.DomUtils.getParentByTagName(parentListItemElement.parentNode, "LI");
+            parentListItemElement = ParagraphListPropertiesUtils.getParentListElement(parentListItemElement === null || parentListItemElement === void 0 ? void 0 : parentListItemElement.parentElement);
         }
         return listLevelIndex;
     }
@@ -68466,8 +68472,16 @@ class ParagraphListPropertiesUtils {
     static getListText(listTextElement) {
         return listTextElement ? utils_string.StringUtils.trim((listTextElement.nodeValue || dom.DomUtils.getInnerText(listTextElement)).split(" ")[0]) : "";
     }
-    static getParentListElement(childElement) {
-        return dom.DomUtils.getParentByTagName(childElement, "UL") || dom.DomUtils.getParentByTagName(childElement, "OL");
+    static getParentListElement(element) {
+        const targetElementTags = ['UL', 'OL'];
+        const exceptionElementTags = ['BODY', 'DIV', 'P'];
+        while (element = element === null || element === void 0 ? void 0 : element.parentElement) {
+            if (exceptionElementTags.includes(element.tagName))
+                return null;
+            if (targetElementTags.includes(element.tagName))
+                return element;
+        }
+        return null;
     }
     static removeSomeHtml(element, listTextElement, listText) {
         if (element.childNodes.length == 1)
@@ -68507,6 +68521,7 @@ class HtmlListTagImporterBase extends HtmlTagImporterBase {
         this._ignored = false;
     }
     importBefore() {
+        this.importer.addCurrLevelParagraphRunIfNeeded();
         const listIndex = this.importer.listIndex;
         const parentList = utils_list.ListUtils.last(this.importer.listInfos);
         const listLevel = parentList
@@ -68520,7 +68535,7 @@ class HtmlListTagImporterBase extends HtmlTagImporterBase {
         const displayFormat = ParagraphListPropertiesUtils.importDisplayFormatStringByParentListFormat(listFormat, parentList === null || parentList === void 0 ? void 0 : parentList.listFormat, listLevel);
         this.importer.listInfos.push(new ImportedParagraphListInfo(listIndex, listLevel, listFormat, listFormat == NumberingFormat.Bullet ? numbering_list_NumberingType.Bullet : numbering_list_NumberingType.MultiLevel, displayFormat, null));
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68544,36 +68559,39 @@ class HtmlOlTagImporter extends HtmlListTagImporterBase {
 
 
 
-
 class HtmlPTagImporter extends HtmlTagImporterBase {
     constructor() {
         super(...arguments);
         this.listInfo = null;
-        this.importChilds = false;
-        this.generateParagraph = true;
+        this.importChildren = false;
     }
     elementTag() {
         return "P";
     }
     importBefore() {
+        this.importer.addCurrLevelParagraphRunIfNeeded();
+        this.element.innerHTML = this.element.innerHTML.trim();
         let emptyParagraphMatches = this.element.outerHTML.match(/^<([^\s >]+)(\s[^>]*)?>&nbsp;<\/\1>/gi);
-        if (!(emptyParagraphMatches && emptyParagraphMatches.length)) {
-            if (utils_string.StringUtils.trim(dom.DomUtils.getInnerText(this.element))) {
-                const htmlListInfo = utils_list.ListUtils.last(this.importer.listInfos);
-                if (htmlListInfo && !this.element.nextSibling)
-                    this.generateParagraph = false;
-                else
-                    this.listInfo = htmlListInfo !== null && htmlListInfo !== void 0 ? htmlListInfo : this.importer.paragraphListpropertiesUtils.import(this.element, new fixed.FixedInterval(this.importer.currPosition, 0));
-            }
-            this.importChilds = true;
+        if (!(emptyParagraphMatches === null || emptyParagraphMatches === void 0 ? void 0 : emptyParagraphMatches.length)) {
+            this.listInfo = this.getListInfo();
+            this.importChildren = true;
         }
     }
-    isImportChilds() {
-        return this.importChilds;
+    isImportChildren() {
+        return this.importChildren;
     }
     importAfter() {
-        if (this.generateParagraph)
-            this.importer.addParagraphRun(this.listInfo, this.element);
+        this.importer.addParagraphRun(this.element, this.listInfo);
+    }
+    getListInfo() {
+        var _a, _b;
+        if (!utils_string.StringUtils.trim(dom.DomUtils.getInnerText(this.element)) || ((_b = (_a = this.element.parentElement) === null || _a === void 0 ? void 0 : _a.closest('ul,ol,li')) === null || _b === void 0 ? void 0 : _b.tagName) !== 'LI')
+            return null;
+        if (!this.importer.currListItemLevelInfo)
+            return this.importer.paragraphListPropertiesUtils.import(this.element, new fixed.FixedInterval(this.importer.currPosition, 0));
+        if (!this.importer.currListItemLevelInfo.tagImporter.paragraphWasAddedBefore)
+            return this.importer.currListInfo;
+        return null;
     }
 }
 class HtmlH1TagImporter extends HtmlPTagImporter {
@@ -68615,7 +68633,7 @@ class HtmlPreTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68648,7 +68666,7 @@ class HtmlSpanTagImporter extends HtmlTagImporterBase {
             this.importChilds = false;
         }
     }
-    isImportChilds() {
+    isImportChildren() {
         return this.importChilds;
     }
     importAfter() {
@@ -68754,11 +68772,11 @@ class HtmlTableTagImporter extends HtmlTagImporterBase {
         const lastTableInfo = utils_list.ListUtils.last(this.importer.importedTablesInfo);
         if (lastTableInfo && utils_list.ListUtils.last(utils_list.ListUtils.last(lastTableInfo.rows).cells).endPosition == this.importer.currPosition ||
             !this.importer.prevRunIsParagraph)
-            this.importer.addParagraphRun(null, this.element);
+            this.importer.addParagraphRun(this.element);
         utils_list.ListUtils.last(this.importer.levelInfo).allowInsertRuns = false;
         this.element.innerHTML = this.element.innerHTML.replace(/<td([^>]*mso-cell-special:\s*placeholder[^>]*)>[\s\S]*?<\/td>/gi, "<td$1></td>");
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68817,7 +68835,7 @@ class HtmlTbodyTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68844,7 +68862,7 @@ class HtmlTrTagImporter extends HtmlTagImporterBase {
         this.rowElement = this.element;
         this.gridBeforeInfo = HtmlTrTagImporter.importGridBefore(this.rowElement);
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68912,7 +68930,7 @@ class HtmlTdTagImporter extends HtmlTagImporterBase {
         HtmlTdTagImporter.addVerticalMergedCells(this.importer, this.getClosestImporterByTagName(HtmlTableTagImporter.tagName), this.rowImporter);
         this.startPosition = this.importer.currPosition;
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -68930,7 +68948,7 @@ class HtmlTdTagImporter extends HtmlTagImporterBase {
         const lastImportedRun = this.importer.getLastImportedRun();
         if (!lastImportedRun || !this.importer.prevRunIsParagraph ||
             this.importer.currPosition - lastImportedRun.runLength < this.startPosition) {
-            this.importer.addParagraphRun(null, this.element, true);
+            this.importer.addParagraphRun(this.element, null, true);
         }
         this.rowImporter.cells.push(new ImportedTableCellInfo(preferredWidth, this.startPosition, this.importer.currPosition, columnSpan, rowSpan, props, true));
     }
@@ -69029,7 +69047,7 @@ class HtmlTextNodeImporter extends HtmlTagImporterBase {
                         this.addRun(new ImportedTextRunInfo(this.importer.modelManager.model, this.importer.measurer, lines[i], this.importer.htmlImporterMaskedCharacterProperties.getBundleFrom(this.element, new fixed.FixedInterval(this.importer.currPosition, lines[i].length))));
                     }
                     if (i < lines.length - 1)
-                        this.importer.addParagraphRun(null, this.element.parentElement || this.element.parentNode);
+                        this.importer.addParagraphRun(this.element.parentElement || this.element.parentNode);
                 }
             }
             else {
@@ -69037,7 +69055,7 @@ class HtmlTextNodeImporter extends HtmlTagImporterBase {
             }
         }
     }
-    isImportChilds() {
+    isImportChildren() {
         return false;
     }
     importAfter() {
@@ -69052,7 +69070,7 @@ class HtmlTtTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {
@@ -69078,8 +69096,8 @@ class HtmlUndefinedTagImporter extends HtmlTagImporterBase {
     importBefore() {
         Log.print(LogSource.HtmlImporter, "HtmlUndefinedTagImporter.importBefore undefined tag", this.element);
     }
-    isImportChilds() {
-        return !!this.importer.currElementChilds.length;
+    isImportChildren() {
+        return !!this.importer.currElementChildren.length;
     }
     importAfter() {
     }
@@ -69599,6 +69617,10 @@ class HtmlImporterTabStops {
 
 
 
+
+
+
+
 
 
 
@@ -69620,8 +69642,8 @@ class LevelInfo {
         return this;
     }
     static getElementTag(elem) {
-        const tag = elem.tagName;
-        return tag ? tag.toUpperCase() : "";
+        const tag = dom.DomUtils.isHTMLElementNode(elem) && elem.tagName;
+        return tag ? tag.toUpperCase() : '';
     }
 }
 class HtmlImportData {
@@ -69631,7 +69653,7 @@ class HtmlImportData {
     }
 }
 class HtmlImporter {
-    constructor(modelManager, measurer, subDocPosition, initElements, charPropsBundle) {
+    constructor(modelManager, measurer, subDocPosition, initElements, charPropsBundle, formatImagesImporter) {
         this.fieldsId = 0;
         this.listIndex = 0;
         this.listInfos = [];
@@ -69672,19 +69694,27 @@ class HtmlImporter {
         this.measurer = measurer;
         this.currPosition = this.subDocPosition.position;
         this.levelInfo = [new LevelInfo(null, initElements, true)];
+        this.formatImagesImporter = formatImagesImporter;
         this.loadFontInfos = [];
         this.tempFontInfoCache = new FontInfoCache(this.modelManager.model.cache.fontInfoCache.fontMeasurer);
         this.htmlImporterMaskedCharacterProperties =
             new HtmlImporterMaskedCharacterProperties(this, this.loadFontInfos, this.tempFontInfoCache, !modelManager.richOptions.fonts.limitedFonts);
-        this.paragraphListpropertiesUtils = new ParagraphListPropertiesUtils(this, this.htmlImporterMaskedCharacterProperties);
+        this.paragraphListPropertiesUtils = new ParagraphListPropertiesUtils(this, this.htmlImporterMaskedCharacterProperties);
         this.tagImporters = {};
         for (let importerConst of HtmlImporter.importers)
             this.tagImporters[new importerConst(this).elementTag()] = importerConst;
     }
     get currElement() { return utils_list.ListUtils.last(this.levelInfo).element; }
     ;
-    get currElementChilds() { return utils_list.ListUtils.last(this.levelInfo).childElements; }
+    get currElementChildren() { return utils_list.ListUtils.last(this.levelInfo).childElements; }
     ;
+    get prevLevelInfo() { return this.levelInfo[this.levelInfo.length - 2]; }
+    get currLevelInfo() { return utils_list.ListUtils.last(this.levelInfo); }
+    get currListItemLevelInfo() { return utils_list.ListUtils.reverseElementBy(this.levelInfo, (levelInfo) => { var _a; return ((_a = levelInfo.tagImporter) === null || _a === void 0 ? void 0 : _a.elementTag()) === 'LI'; }); }
+    get currListInfo() {
+        const currListItemLevelInfo = this.currListItemLevelInfo;
+        return currListItemLevelInfo && !currListItemLevelInfo.tagImporter.paragraphWasAddedBefore ? utils_list.ListUtils.last(this.listInfos) : null;
+    }
     get subDocument() { return this.subDocPosition.subDocument; }
     import() {
         this.importStarted = false;
@@ -69705,11 +69735,13 @@ class HtmlImporter {
                 insertedInterval = new fixed.FixedInterval(this.subDocPosition.position, 0);
             for (let info of this.loadFontInfos)
                 this.modelManager.modelManipulator.font.loadFontInfo(info.fontInfo, info.subDocument, [info.applyNewFontOnIntervalsAfterLoad], this.measurer);
+            if (this.formatImagesImporter)
+                this.registerImageRuns();
         });
         return insertedInterval;
     }
     convertChildElements(preserveLineBreaks = false) {
-        for (let element of this.currElementChilds)
+        for (let element of this.currElementChildren)
             this.convertElement(element, preserveLineBreaks);
     }
     getSortedTables() {
@@ -69731,18 +69763,18 @@ class HtmlImporter {
         importer.enablePreserveLineBreaks = preserveLineBreaks;
         if (importer.isAllowed())
             importer.importBefore();
-        if (importer.isImportChilds())
+        if (importer.isImportChildren())
             this.convertChildElements(preserveLineBreaks || importer.shouldPreserveLineBreaksOnChilds());
         if (importer.isAllowed())
             importer.importAfter();
         this.levelInfo.pop();
     }
     putDownParentPropertiesToChild() {
-        if (!this.currElementChilds)
+        if (!this.currElementChildren)
             return;
         const element = this.currElement;
         const missTag = HtmlImporter.MapMissTablePropertiesByTagNames[utils_list.ListUtils.last(this.levelInfo).tagImporter.elementTag()];
-        utils_list.ListUtils.forEach(this.currElementChilds, (childElement) => {
+        utils_list.ListUtils.forEach(this.currElementChildren, (childElement) => {
             const childElemStyle = this.getStyles(childElement);
             if (!Object.keys(childElemStyle).length)
                 return;
@@ -69778,19 +69810,26 @@ class HtmlImporter {
     }
     addRun(run, forceAdd = false) {
         if (forceAdd || utils_list.ListUtils.last(this.levelInfo).allowInsertRuns) {
+            const isParagraph = run.runType == RunType.ParagraphRun || run.runType == RunType.SectionRun;
             this.importedRunsInfo.push(run);
             this.currPosition += run.runLength;
-            this.prevRunIsParagraph = run.runType == RunType.ParagraphRun || run.runType == RunType.SectionRun;
+            this.prevRunIsParagraph = isParagraph;
             this.importStarted = true;
+            if (isParagraph && this.currListItemLevelInfo)
+                this.currListItemLevelInfo.tagImporter.paragraphWasAddedBefore = true;
         }
     }
-    addParagraphRun(listInfo, element, isTableCellTag = false) {
+    addParagraphRun(element, listInfo = null, isTableCellTag = false) {
         const htmlProperties = new HtmlImporterMaskedParagraphProperties();
         const properties = htmlProperties.import(this.modelManager.model.colorProvider, element, isTableCellTag);
         const tabs = HtmlImporterTabStops.import(element);
         this.removeAllTrailingLineBreaks();
         this.addRun(new ImportedParagraphRunInfo(listInfo, this.charPropsBundle, properties, tabs));
     }
+    addCurrLevelParagraphRunIfNeeded() {
+        if (this.currLevelInfo.element.previousSibling && !this.prevRunIsParagraph)
+            this.addParagraphRun(this.currLevelInfo.element, this.currListInfo);
+    }
     removeAllTrailingLineBreaks() {
         const last = this.importedRunsInfo.length - 1;
         for (let i = last; i >= last - 1; i--) {
@@ -69811,6 +69850,28 @@ class HtmlImporter {
         return ColumnCalculator.findMinimalColumnSize(section.sectionProperties)
             .applyConverter(unit_converter/* UnitConverter */.u.pixelsToTwips);
     }
+    registerImageRuns() {
+        let importedRunsInfoIndex = -1;
+        this.subDocument.chunks.forEach((chunk) => {
+            chunk.textRuns.forEach((run) => {
+                if (run instanceof InlinePictureRun) {
+                    importedRunsInfoIndex = this.findIndexImportedInlinePictureRunInfo(run.info.publicAPIID, ++importedRunsInfoIndex);
+                    const subDocPos = new SubDocumentPosition(this.subDocument, run.startOffset);
+                    const importedRunsInfo = this.importedRunsInfo[importedRunsInfoIndex];
+                    const options = ImageLoadingOptions.initByActualSize(importedRunsInfo.actualSize);
+                    const importerData = new FormatImagesImporterData(subDocPos, options, run);
+                    this.formatImagesImporter.registerImageRun(importerData);
+                }
+            });
+        });
+    }
+    findIndexImportedInlinePictureRunInfo(publicAPIID, startIndex = 0) {
+        for (let i = startIndex, runInfo; runInfo = this.importedRunsInfo[i]; i++) {
+            if (runInfo instanceof ImportedInlinePictureRunInfo && runInfo.picInfo.publicAPIID === publicAPIID)
+                return i;
+        }
+        return -1;
+    }
     static convertHtml(html) {
         Log.print(LogSource.HtmlImporter, "convertHtml", () => html);
         html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
@@ -69843,10 +69904,6 @@ class HtmlImporter {
         html = html.replace(/<font[^>]*>([^<>]+)<\/font>/gi, '$1');
         html = html.replace(/<span\s*><span\s*>([^<>]+)<\/span><\/span>/ig, '$1');
         html = html.replace(/<span>([^<>]+)<\/span>/gi, '$1');
-        html = html.replace(/\s*(<li[\S\s]*?>)\s*/gi, '$1');
-        html = html.replace(/\s*(<\/li>)\s*/gi, '$1');
-        html = html.replace(/<li([^>]*)>([^<>]+)<\/li>/gi, '<li$1><p>$2</p></li>');
-        html = html.replace(/<li([^>]*)>(([^<>]*)<(?!p)[\s\S]*?)<\/li>/gi, '<li$1><p>$2</p></li>');
         html = html.replace(/<caption([^>]*)>[\s\S]*?<\/caption>/gi, '');
         var array = html.match(/<[^>]*style\s*=\s*[^>]*>/gi);
         if (array && array.length > 0) {
@@ -69878,6 +69935,8 @@ class HtmlImporter {
         html = html.replace(/<u>([\s\S]*?)<\/u>/gi, '<span style="text-decoration: underline">$1</span>');
         html = html.replace(/<s>([\s\S]*?)<\/s>/gi, '<span style="text-decoration: line-through">$1</span>');
         html = html.replace(/<\/([^\s>]+)(\s[^>]*)?><br><\/([^\s>]+)(\s[^>]*)?>/gi, '');
+        html = html.replace(/\s*(<([ph]\d?|ol|ul|li))/gi, '$1');
+        html = html.replace(/(<\/([ph]\d?|ol|ul|li)>)\s*/gi, '$1');
         html = this.extractBodyContent(html);
         Log.print(LogSource.HtmlImporter, "convertHtml", () => html);
         return html;
@@ -69901,7 +69960,7 @@ HtmlImporter.MapMissTablePropertiesByTagNames = new MapCreator()
     .add("TH", true)
     .get();
 HtmlImporter.MapShorthandProperty = new MapCreator()
-    .add("background", true)
+    .add("background", false)
     .add("border", true)
     .add("borderImage", true)
     .add("borderTop", true)
@@ -69977,7 +70036,7 @@ class HtmlDocumentImporter {
             const measurer = new Measurer('');
             const position = new SubDocumentPosition(this.documentModel.mainSubDocument, 0);
             const initElements = container.childNodes;
-            new HtmlImporter(this.modelManager, measurer, position, initElements, charPropsBundle).import();
+            new HtmlImporter(this.modelManager, measurer, position, initElements, charPropsBundle, this.formatImagesImporter).import();
             this.removeLastParagraph();
         }
         finally {
@@ -89414,7 +89473,7 @@ class ControlFontsLoader {
         const xhr = new XMLHttpRequest();
         xhr.onload = (_e) => {
             const contentType = xhr.getResponseHeader("Content-Type");
-            if (contentType != null && contentType.startsWith('font')) {
+            if (contentType !== 'text/html') {
                 const fontSource = xhr.response;
                 if (xhr.status >= 400 || !fontSource) {
                     if (fontInfo.next())
@@ -112813,7 +112872,7 @@ class DivInputEditor extends InputEditorBase {
         return super.getEditableDocumentText().replace(/\s/g, " ");
     }
     getEditableDocumentContent() {
-        const htmlItems = this.inputElement.cloneNode(true).children;
+        const htmlItems = this.inputElement.cloneNode(true).childNodes;
         if (htmlItems.length)
             return htmlItems;
         return this.inputElement.innerText;
@@ -112955,9 +113014,9 @@ class IFrameInputEditor extends InputEditorBase {
         }
     }
     getEditableDocumentContent() {
-        const htmlItems = this.editableDocument.body.cloneNode(true).children;
-        if (htmlItems.length)
-            return htmlItems;
+        const items = this.editableDocument.body.cloneNode(true).childNodes;
+        if (items.length)
+            return items;
         return this.editableDocument.body.innerText;
     }
     selectEditableDocumentContent() {
@@ -113152,7 +113211,7 @@ class InputController {
         else {
             const _fragment = document.createDocumentFragment();
             _fragment.appendChild(result);
-            this.setEditableDocumentContent(_fragment.children);
+            this.setEditableDocumentContent(_fragment.childNodes);
         }
         this.selectEditableDocumentContent();
     }
@@ -143633,7 +143692,7 @@ class ClientRichEdit {
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
         if (true)
-            external_DevExpress_config_default()(JSON.parse(atob('eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=')));
+            external_DevExpress_config_default()(JSON.parse(atob('eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=')));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);