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

package/lib/client/client-rich-edit.js

@@ -53,8 +53,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/common/formats/html/import/html-document-importer.js

@@ -51,7 +51,7 @@ export 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 {

package/lib/common/formats/html/import/html-importer.d.ts

@@ -11,6 +11,7 @@ import { HtmlTagImporterBase } from './importers/base';
 import { LoadFontInfo } from './load-font-info';
 import { HtmlImporterMaskedCharacterProperties } from './utils/character-properties-utils';
 import { ParagraphListPropertiesUtils } from './utils/paragraph-list-properties-utils';
+import { FormatImagesImporter } from '../../utils/images-import';
 export declare type TypeOfTagImporterConstructor = new (importer: HtmlImporter) => HtmlTagImporterBase;
 export declare class LevelInfo {
     element: HTMLElement;
@@ -19,7 +20,7 @@ export declare class LevelInfo {
     allowInsertRuns: boolean;
     constructor(element: HTMLElement, childElements: HTMLElement[], allowInsertRuns: boolean);
     initTagImporter(importer: HtmlImporter): this;
-    static getElementTag(elem: HTMLElement): string;
+    static getElementTag(elem: HTMLElement | ChildNode): string;
 }
 export declare class HtmlImportData {
     runsInfo: RunInfo[];
@@ -29,18 +30,22 @@ export declare class HtmlImportData {
 export declare class HtmlImporter {
     currPosition: number;
     htmlImporterMaskedCharacterProperties: HtmlImporterMaskedCharacterProperties;
-    paragraphListpropertiesUtils: ParagraphListPropertiesUtils;
+    paragraphListPropertiesUtils: ParagraphListPropertiesUtils;
     private importedRunsInfo;
     importedTablesInfo: TableInfo[];
     loadFontInfos: LoadFontInfo[];
     tempFontInfoCache: FontInfoCache;
     get currElement(): HTMLElement;
-    get currElementChilds(): HTMLElement[];
+    get currElementChildren(): HTMLElement[];
     levelInfo: LevelInfo[];
+    get prevLevelInfo(): LevelInfo;
+    get currLevelInfo(): LevelInfo;
+    get currListItemLevelInfo(): LevelInfo | null;
     fieldsId: number;
     prevRunIsParagraph: boolean;
     listIndex: number;
     listInfos: ImportedParagraphListInfo[];
+    get currListInfo(): ImportedParagraphListInfo;
     importStarted: boolean;
     modelManager: IModelManager;
     private subDocPosition;
@@ -49,7 +54,8 @@ export declare class HtmlImporter {
     measurer: IMeasurer;
     tagImporters: Record<string, TypeOfTagImporterConstructor>;
     private static importers;
-    constructor(modelManager: IModelManager, measurer: IMeasurer, subDocPosition: SubDocumentPosition, initElements: HTMLElement[], charPropsBundle: MaskedCharacterPropertiesBundle);
+    private formatImagesImporter?;
+    constructor(modelManager: IModelManager, measurer: IMeasurer, subDocPosition: SubDocumentPosition, initElements: HTMLElement[], charPropsBundle: MaskedCharacterPropertiesBundle, formatImagesImporter?: FormatImagesImporter);
     import(): FixedInterval;
     private convertChildElements;
     private getSortedTables;
@@ -57,10 +63,13 @@ export declare class HtmlImporter {
     private putDownParentPropertiesToChild;
     private getStyles;
     addRun(run: RunInfo, forceAdd?: boolean): void;
-    addParagraphRun(listInfo: ImportedParagraphListInfo, element: HTMLElement, isTableCellTag?: boolean): void;
+    addParagraphRun(element: HTMLElement, listInfo?: ImportedParagraphListInfo, isTableCellTag?: boolean): void;
+    addCurrLevelParagraphRunIfNeeded(): void;
     removeAllTrailingLineBreaks(): void;
     getLastImportedRun(): RunInfo;
     columnSize(): Size;
+    private registerImageRuns;
+    private findIndexImportedInlinePictureRunInfo;
     static convertHtml(html: string): string;
     private static extractBodyContent;
     private static MapMissTablePropertiesByTagNames;

package/lib/common/formats/html/import/html-importer.js

@@ -2,13 +2,14 @@ import { MapCreator } from '../../../utils/map-creator';
 import { ColumnCalculator } from '../../../layout-formatter/formatter/utils/columns-calculator';
 import { FontInfoCache } from '../../../model/caches/hashed-caches/font-info-cache';
 import { RunType } from '../../../model/runs/run-type';
+import { SubDocumentPosition } from '../../../model/sub-document';
 import { Log } from '../../../rich-utils/debug/logger/base-logger/log';
 import { LogSource } from '../../../rich-utils/debug/logger/base-logger/log-source';
 import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
-import { ImportedTextRunInfo, ImportedParagraphRunInfo } from './containers/runs';
+import { ImportedTextRunInfo, ImportedParagraphRunInfo, ImportedInlinePictureRunInfo, } from './containers/runs';
 import { HtmlModelInserter } from './html-model-inserter';
 import { HtmlATagImporter } from './importers/a';
 import { HtmlBTagImporter } from './importers/b';
@@ -21,7 +22,7 @@ import { HtmlITagImporter } from './importers/i';
 import { HtmlImgTagImporter } from './importers/img';
 import { HtmlLiTagImporter } from './importers/li';
 import { HtmlOlTagImporter } from './importers/ol';
-import { HtmlH1TagImporter, HtmlH2TagImporter, HtmlH3TagImporter, HtmlH4TagImporter, HtmlH5TagImporter, HtmlH6TagImporter, HtmlPTagImporter } from './importers/p';
+import { HtmlH1TagImporter, HtmlH2TagImporter, HtmlH3TagImporter, HtmlH4TagImporter, HtmlH5TagImporter, HtmlH6TagImporter, HtmlPTagImporter, } from './importers/p';
 import { HtmlPreTagImporter } from './importers/pre';
 import { HtmlSpanTagImporter } from './importers/span';
 import { HtmlTableTagImporter } from './importers/table';
@@ -37,6 +38,9 @@ import { ParagraphListPropertiesUtils } from './utils/paragraph-list-properties-
 import { RichUtils } from '../../../model/rich-utils';
 import { HtmlImporterMaskedParagraphProperties } from './utils/paragraph-properties-utils';
 import { HtmlImporterTabStops } from './utils/tab-stops-utils';
+import { FormatImagesImporterData } from '../../utils/images-import';
+import { InlinePictureRun } from '../../../../common/model/runs/inline-picture-run';
+import { ImageLoadingOptions } from '../../../../common/model/manipulators/picture-manipulator/loader/image-loading-options';
 export class LevelInfo {
     constructor(element, childElements, allowInsertRuns) {
         this.element = element;
@@ -53,8 +57,8 @@ export class LevelInfo {
         return this;
     }
     static getElementTag(elem) {
-        const tag = elem.tagName;
-        return tag ? tag.toUpperCase() : "";
+        const tag = DomUtils.isHTMLElementNode(elem) && elem.tagName;
+        return tag ? tag.toUpperCase() : '';
     }
 }
 export class HtmlImportData {
@@ -64,7 +68,7 @@ export class HtmlImportData {
     }
 }
 export class HtmlImporter {
-    constructor(modelManager, measurer, subDocPosition, initElements, charPropsBundle) {
+    constructor(modelManager, measurer, subDocPosition, initElements, charPropsBundle, formatImagesImporter) {
         this.fieldsId = 0;
         this.listIndex = 0;
         this.listInfos = [];
@@ -105,19 +109,27 @@ export 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 ListUtils.last(this.levelInfo).element; }
     ;
-    get currElementChilds() { return ListUtils.last(this.levelInfo).childElements; }
+    get currElementChildren() { return ListUtils.last(this.levelInfo).childElements; }
     ;
+    get prevLevelInfo() { return this.levelInfo[this.levelInfo.length - 2]; }
+    get currLevelInfo() { return ListUtils.last(this.levelInfo); }
+    get currListItemLevelInfo() { return 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 ? ListUtils.last(this.listInfos) : null;
+    }
     get subDocument() { return this.subDocPosition.subDocument; }
     import() {
         this.importStarted = false;
@@ -138,11 +150,13 @@ export class HtmlImporter {
                 insertedInterval = new 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() {
@@ -164,18 +178,18 @@ export 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[ListUtils.last(this.levelInfo).tagImporter.elementTag()];
-        ListUtils.forEach(this.currElementChilds, (childElement) => {
+        ListUtils.forEach(this.currElementChildren, (childElement) => {
             const childElemStyle = this.getStyles(childElement);
             if (!Object.keys(childElemStyle).length)
                 return;
@@ -211,19 +225,26 @@ export class HtmlImporter {
     }
     addRun(run, forceAdd = false) {
         if (forceAdd || 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--) {
@@ -244,6 +265,28 @@ export class HtmlImporter {
         return ColumnCalculator.findMinimalColumnSize(section.sectionProperties)
             .applyConverter(UnitConverter.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");
@@ -276,10 +319,6 @@ export 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) {
@@ -311,6 +350,8 @@ export 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;
@@ -334,7 +375,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)

package/lib/common/formats/html/import/importers/a.d.ts

@@ -2,7 +2,7 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlATagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
     isAllowed(): boolean;
 }

package/lib/common/formats/html/import/importers/a.js

@@ -24,7 +24,7 @@ export class HtmlATagImporter extends HtmlTagImporterBase {
         this.addRun(new ImportedTextRunInfo(this.importer.modelManager.model, this.importer.measurer, codeText, this.importer.htmlImporterMaskedCharacterProperties.getBundleFrom(this.element, new FixedInterval(this.importer.currPosition, codeText.length))));
         this.addRun(new ImportedFieldCodeEndRunInfo(this.importer.charPropsBundle, this.importer.fieldsId));
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/b.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlBTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/b.js

@@ -5,7 +5,7 @@ export class HtmlBTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/base.d.ts

@@ -3,12 +3,13 @@ import { RunInfo } from '../containers/runs';
 import { HtmlImporter } from '../html-importer';
 export declare abstract class HtmlTagImporterBase {
     enablePreserveLineBreaks: boolean;
+    paragraphWasAddedBefore: boolean;
     protected importer: HtmlImporter;
     get colorProvider(): ColorProvider;
     constructor(importer: HtmlImporter);
     protected getClosestImporterByTagName(tagName: string): HtmlTagImporterBase;
     abstract importBefore(): any;
-    abstract isImportChilds(): boolean;
+    abstract isImportChildren(): boolean;
     abstract importAfter(): any;
     abstract elementTag(): string;
     shouldPreserveLineBreaksOnChilds(): boolean;

package/lib/common/formats/html/import/importers/base.js

@@ -2,6 +2,7 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class HtmlTagImporterBase {
     constructor(importer) {
         this.enablePreserveLineBreaks = false;
+        this.paragraphWasAddedBefore = false;
         this.importer = importer;
     }
     get colorProvider() { return this.importer.modelManager.model.colorProvider; }

package/lib/common/formats/html/import/importers/br.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlBrTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/br.js

@@ -12,7 +12,7 @@ export 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 FixedInterval(this.importer.currPosition, 1))));
     }
-    isImportChilds() {
+    isImportChildren() {
         return false;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/center.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlCenterTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/center.js

@@ -5,7 +5,7 @@ export class HtmlCenterTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/cite.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlCiteTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/cite.js

@@ -5,7 +5,7 @@ export class HtmlCiteTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/div.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlDivTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/div.js

@@ -5,13 +5,13 @@ export 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);
     }
 }

package/lib/common/formats/html/import/importers/em.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlEmTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/em.js

@@ -5,7 +5,7 @@ export class HtmlEmTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/font.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlFontTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/font.js

@@ -5,7 +5,7 @@ export class HtmlFontTagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/i.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlITagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/i.js

@@ -5,7 +5,7 @@ export class HtmlITagImporter extends HtmlTagImporterBase {
     }
     importBefore() {
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/img.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlImgTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/img.js

@@ -10,7 +10,8 @@ export class HtmlImgTagImporter extends HtmlTagImporterBase {
     importBefore() {
         const imageElement = this.importer.currElement;
         const originalSize = new Size(imageElement.naturalWidth, imageElement.naturalHeight);
-        const actualSize = new Size(imageElement.width, imageElement.height);
+        const styleSize = new Size(parseFloat(imageElement.style.width), parseFloat(imageElement.style.height));
+        const actualSize = new Size(imageElement.width || styleSize.width, imageElement.height || styleSize.height);
         if (originalSize.width !== undefined && originalSize.height !== undefined)
             originalSize.applyConverter(UnitConverter.pixelsToTwips);
         if (actualSize.width !== undefined && actualSize.height !== undefined)
@@ -18,7 +19,7 @@ export 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() {

package/lib/common/formats/html/import/importers/li.d.ts

@@ -2,6 +2,7 @@ import { HtmlTagImporterBase } from './base';
 export declare class HtmlLiTagImporter extends HtmlTagImporterBase {
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
+    private isListElement;
 }

package/lib/common/formats/html/import/importers/li.js

@@ -1,23 +1,26 @@
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { HtmlTagImporterBase } from './base';
-import { Errors } from '@devexpress/utils/lib/errors';
-import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { LevelInfo } from '../html-importer';
 export 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 = ListUtils.last([...this.element.childNodes]);
-        if (!DomUtils.isHTMLElementNode(lastChild) || LevelInfo.getElementTag(lastChild) !== 'UL' && LevelInfo.getElementTag(lastChild) !== 'OL') {
-            const listInfo = ListUtils.last(this.importer.listInfos);
-            if (!listInfo)
-                throw new Error(Errors.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';
     }
 }

package/lib/common/formats/html/import/importers/list-base.d.ts

@@ -2,6 +2,6 @@ import { HtmlTagImporterBase } from './base';
 export declare abstract class HtmlListTagImporterBase extends HtmlTagImporterBase {
     private _ignored;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
 }

package/lib/common/formats/html/import/importers/list-base.js

@@ -10,6 +10,7 @@ export class HtmlListTagImporterBase extends HtmlTagImporterBase {
         this._ignored = false;
     }
     importBefore() {
+        this.importer.addCurrLevelParagraphRunIfNeeded();
         const listIndex = this.importer.listIndex;
         const parentList = ListUtils.last(this.importer.listInfos);
         const listLevel = parentList
@@ -23,7 +24,7 @@ export 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 ? NumberingType.Bullet : NumberingType.MultiLevel, displayFormat, null));
     }
-    isImportChilds() {
+    isImportChildren() {
         return true;
     }
     importAfter() {

package/lib/common/formats/html/import/importers/p.d.ts

@@ -1,12 +1,12 @@
 import { HtmlTagImporterBase } from './base';
 export declare class HtmlPTagImporter extends HtmlTagImporterBase {
     private listInfo;
-    private importChilds;
-    private generateParagraph;
+    private importChildren;
     elementTag(): string;
     importBefore(): void;
-    isImportChilds(): boolean;
+    isImportChildren(): boolean;
     importAfter(): void;
+    private getListInfo;
 }
 export declare class HtmlH1TagImporter extends HtmlPTagImporter {
     elementTag(): string;