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

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;
@@ -49,7 +50,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;
@@ -61,6 +63,8 @@ export declare class HtmlImporter {
     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;
@@ -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,6 +109,7 @@ 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 =
@@ -138,6 +143,8 @@ 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;
     }
@@ -244,6 +251,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");

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)

package/lib/common/model/fonts/loader.js

@@ -46,7 +46,7 @@ export 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())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.4-build-24183-0102",
+  "version": "24.1.4-build-24186-1015",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,8 +14,8 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.1.4-build-24181-1937",
-    "devextreme-dist": "24.1.4-build-24181-1937"
+    "devextreme": "24.1.4-build-24185-1936",
+    "devextreme-dist": "24.1.4-build-24185-1936"
   },
   "dependencies": {
     "jszip": "~3.10.1",