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

package/dist/dx.richedit.js

@@ -68206,7 +68206,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)
@@ -69599,6 +69600,10 @@ class HtmlImporterTabStops {
 
 
 
+
+
+
+
 
 
 
@@ -69631,7 +69636,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,6 +69677,7 @@ 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 =
@@ -69705,6 +69711,8 @@ 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;
     }
@@ -69811,6 +69819,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");
@@ -69977,7 +70007,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 +89444,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())