devexpress-richedit 24.1.13-build-25156-0103 → 24.1.13

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 ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVREZzBkbWxZYUZOS1MyWnRRams0U0VOTVkxTTRNaUlLZlE9PS53SkN1UVJhY3dIaU9DMEdWZFBPVlNacDJsRThrcTdTbUZTTWpIMXgvamxEMnowbzQvYWFkVm9zK1g2ZzlwSDZaYjdUUXdOdlZvQkduRUNwblB2M0ZaOUV4eWlkK3pybUxITE8yZnIyVzFTOEJOWE1YaE1mSlNPdjJ3aCs5SDBSd2lMejJxUT09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVREZzBkbWxZYUZOS1MyWnRRams0U0VOTVkxTTRNaUlLZlE9PS53SkN1UVJhY3dIaU9DMEdWZFBPVlNacDJsRThrcTdTbUZTTWpIMXgvamxEMnowbzQvYWFkVm9zK1g2ZzlwSDZaYjdUUXdOdlZvQkduRUNwblB2M0ZaOUV4eWlkK3pybUxITE8yZnIyVzFTOEJOWE1YaE1mSlNPdjJ3aCs5SDBSd2lMejJxUT09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVUyTnFlV05wY0hrM1ptcHpZMm8wV2xwdWVFUTVUaUlLZlE9PS5NQTY1NWlJNi9wMlJTZ2NnamlnVXFOTDVNUU15YjAzRGh3ZjdUeWlvcURSajIwL3Izbnl3S3dJOHdUVlM4aUR3eG1ZeWN4UmlIYWtiTTN3dS8ydUs2UTY2V3VXalFEeFlJbXhhajVBVFUrZDQzN2gwTGQvYXlqTHRiZWlhbFJBRkxWVWh6Zz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVUyTnFlV05wY0hrM1ptcHpZMm8wV2xwdWVFUTVUaUlLZlE9PS5NQTY1NWlJNi9wMlJTZ2NnamlnVXFOTDVNUU15YjAzRGh3ZjdUeWlvcURSajIwL3Izbnl3S3dJOHdUVlM4aUR3eG1ZeWN4UmlIYWtiTTN3dS8ydUs2UTY2V3VXalFEeFlJbXhhajVBVFUrZDQzN2gwTGQvYXlqTHRiZWlhbFJBRkxWVWh6Zz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/client/model-api/images/images.js

@@ -197,7 +197,7 @@ export class ImagesApi {
             applyVerticalPosition(verticalPosition, anchorInfo);
         const anchorPictureInfo = new AnchorPictureInfo(new PictureSize(true, 0, cacheInfo, new Size(100, 100)), shape, anchorInfo, new NonVisualDrawingObjectInfo(), new NonVisualDrawingObjectInfo());
         anchorPictureInfo.containerProperties.description = options.description;
-        this._processor.modelManager.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, anchorPictureInfo, new ImageLoadingOptions(false, size ? new Size(size.width, size.height) : undefined, (_picInterval, _cacheInfo) => setTimeout(() => {
+        this._processor.modelManager.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, anchorPictureInfo, ImageLoadingOptions.initByActualSize(size ? new Size(size.width, size.height) : undefined, (_picInterval, _cacheInfo) => setTimeout(() => {
             callback(getFloatingImageApiFromRun(this._processor, this._subDocument, this._subDocument.getRunAndIndexesByPosition(position)));
         }, 0)));
         this._processor.endUpdate();

package/lib/client/public/options.d.ts

@@ -155,6 +155,7 @@ export interface IRichEditFontsSettings {
 export interface IFontSettings {
     name: string;
     fontFamily: string;
+    useGoogleFonts?: boolean;
     italicFontUri?: string;
     boldFontUri?: string;
     boldItalicFontUri?: string;

package/lib/common/commands/document/print-document-on-client-command.d.ts

@@ -13,6 +13,8 @@ export declare class PrintDocumentOnClient extends CommandBase<SimpleCommandStat
     executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<PrintMode | PrintingSettings | undefined>): boolean;
     private printCore;
     private generatePrintDocument;
+    private getGoogleFonts;
+    private createGoogleFontStyleLink;
     private generatePrintContent;
     private createZIndexStyles;
 }

package/lib/common/commands/document/print-document-on-client-command.js

@@ -80,8 +80,18 @@ export class PrintDocumentOnClient extends CommandBase {
         return true;
     }
     printCore(htmlPrinting, printWindow, closePrintDialogWithHtmlPreview, needSwitchViewType, needToggleHiddenSymbols) {
-        if (htmlPrinting)
-            this.generatePrintDocument(printWindow, closePrintDialogWithHtmlPreview);
+        if (htmlPrinting) {
+            this.generatePrintDocument(printWindow.document);
+            printWindow.focus();
+            const interval = setInterval(() => {
+                if (printWindow.document.readyState == 'complete') {
+                    printWindow.print();
+                    if (closePrintDialogWithHtmlPreview && !Browser.AndroidMobilePlatform)
+                        printWindow.close();
+                    clearInterval(interval);
+                }
+            }, 100);
+        }
         else {
             pdfExport(this.control, (blob, _stream) => {
                 if (window.navigator.msSaveOrOpenBlob && !Browser.Edge)
@@ -96,12 +106,27 @@ export class PrintDocumentOnClient extends CommandBase {
             this.control.commandManager.getCommand(RichEditClientCommand.ToggleShowWhitespace).execute(this.control.commandManager.isPublicApiCall);
         this.control.commandManager.isPrintingProcessing = false;
     }
-    generatePrintDocument(printWindow, closePrintDialogWithHtmlPreview) {
+    generatePrintDocument(document) {
         const height = this.control.layout.pages[0].height;
         const width = this.control.layout.pages[0].width;
-        let printWindowContent = `<!DOCTYPE html>
-                <html moznomarginboxes mozdisallowselectionprint>
+        let fontLink = "";
+        let divsToLoadFonts = "";
+        const googleFonts = this.getGoogleFonts();
+        if (googleFonts.length > 0) {
+            fontLink = this.createGoogleFontStyleLink(googleFonts);
+            divsToLoadFonts = googleFonts.reduce((prev, curr) => {
+                const fontStyles = [`font-family:${curr}`, 'font-weight:bold', 'font-style:italic'];
+                const result = [];
+                for (let i = 1; i <= fontStyles.length; i++)
+                    result.push(`<div style="font-size:1pt;position:absolute;top:-1000px;${fontStyles.slice(0, i).join(';')}">${curr}</div>`);
+                return prev ? [prev, ...result].join('\n') : result.join('\n');
+            }, null);
+        }
+        document.documentElement.innerHTML =
+            `<!DOCTYPE html>
+            <html moznomarginboxes mozdisallowselectionprint>
                 <head>
+                    ${fontLink}
                     <style ${this._nonce ? `nonce="${this._nonce}"` : ''}>
                         html, body {
                             margin: 0;
@@ -120,22 +145,25 @@ export class PrintDocumentOnClient extends CommandBase {
                     </style>
                 </head>
                 <body>
+                    ${divsToLoadFonts}
                 </body>
-                </html>`;
-        printWindow.document.write(printWindowContent);
-        printWindow.document.close();
+            </html>`;
         this.generatePrintContent().forEach((child) => {
-            printWindow.document.body.appendChild(child);
+            document.body.appendChild(child);
         });
-        printWindow.focus();
-        const interval = setInterval(() => {
-            if (printWindow.document.readyState == 'complete') {
-                printWindow.print();
-                if (closePrintDialogWithHtmlPreview && !Browser.AndroidMobilePlatform)
-                    printWindow.close();
-                clearInterval(interval);
-            }
-        }, 100);
+    }
+    getGoogleFonts() {
+        return this.control.modelManager.richOptions.fonts.fonts.reduce((res, f) => {
+            if (f.useGoogleFonts)
+                res.push(f.fontFamily);
+            return res;
+        }, []);
+    }
+    createGoogleFontStyleLink(fontFamilies) {
+        const url = new URL('https://fonts.googleapis.com/css');
+        url.searchParams.append('family', fontFamilies.join('|'));
+        url.searchParams.append('display', 'auto');
+        return `<link href="${url.toString()}" rel="stylesheet" />`;
     }
     generatePrintContent() {
         const layout = this.control.layout;

package/lib/common/layout-formatter/row/word-holder.js

@@ -25,7 +25,7 @@ export class WordHolderInfo {
         }
         if (res == null)
             return false;
-        if (this.rowFormatter.row.isEmpty()) {
+        if (this.rowFormatter.row.isEmpty() || this.rowFormatter.row.containsSpacesOnly()) {
             if (this.rowFormatter.rowSizesManager.rowFormattingInfo.isFloatingIntersectRow) {
                 this.rowFormatter.rowSizesManager.rowFormattingInfo.findNextYPosWhatHasNeededSpace(res.requiredWidth);
                 return this.pushBoxes();

package/lib/common/model/caches/images.d.ts

@@ -8,12 +8,15 @@ export declare class CacheImageInfo {
     private _convertedBase64?;
     private _size?;
     private _isLoaded;
+    private _isSizeDefined;
     tmpId?: number;
     actualId?: number;
     imageUrl?: string;
     file?: File;
     get isLoaded(): boolean;
     set isLoaded(val: boolean);
+    get isSizeDefined(): boolean;
+    set isSizeDefined(val: boolean);
     get size(): Size;
     set size(val: Size);
     get currId(): number;
@@ -22,7 +25,7 @@ export declare class CacheImageInfo {
     get pdfCompatibleBase64(): string | undefined;
     get referenceInfo(): CacheImageInfo | undefined;
     set referenceInfo(val: CacheImageInfo | undefined);
-    constructor(base64?: string, actualId?: number, tmpId?: number, imageUrl?: string, file?: File, referenceInfo?: CacheImageInfo, size?: Size, isLoaded?: boolean);
+    constructor(base64?: string, actualId?: number, tmpId?: number, imageUrl?: string, file?: File, referenceInfo?: CacheImageInfo, size?: Size, isLoaded?: boolean, isActualSize?: boolean);
     equals(obj: CacheImageInfo): boolean;
     clone(): CacheImageInfo;
     shouldMakeImagePdfCompatible(): boolean;

package/lib/common/model/caches/images.js

@@ -4,19 +4,22 @@ import { Base64Utils } from '@devexpress/utils/lib/utils/base64';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class CacheImageInfo {
-    constructor(base64, actualId, tmpId, imageUrl, file, referenceInfo, size, isLoaded) {
+    constructor(base64, actualId, tmpId, imageUrl, file, referenceInfo, size, isLoaded, isActualSize) {
         this._base64 = base64 !== undefined ? Base64Utils.normalizeToDataUrl(base64, "image/png") : undefined;
         this.actualId = actualId;
         this.tmpId = tmpId;
         this._referenceInfo = referenceInfo;
         this._size = size ? size : CacheImageInfo.emptyPictureSize;
         this._isLoaded = isLoaded !== undefined ? isLoaded : false;
+        this._isSizeDefined = isActualSize ? isActualSize : !!size;
         this.imageUrl = imageUrl;
         this.file = file;
     }
     static get emptyPictureSize() { return new Size(CacheImageInfo.emptyPicDimension, CacheImageInfo.emptyPicDimension); }
     get isLoaded() { return this._referenceInfo ? this._referenceInfo._isLoaded : this._isLoaded; }
     set isLoaded(val) { this._isLoaded = val; }
+    get isSizeDefined() { return this._referenceInfo ? this._referenceInfo._isSizeDefined : this._isSizeDefined; }
+    set isSizeDefined(val) { this._isSizeDefined = val; }
     get size() { return this._referenceInfo ? this._referenceInfo._size : this._size; }
     set size(val) { this._size = val; }
     get currId() { return this.actualId !== undefined ? this.actualId : this.tmpId; }
@@ -29,6 +32,7 @@ export class CacheImageInfo {
         this._base64 = undefined;
         this._size = undefined;
         this._isLoaded = undefined;
+        this._isSizeDefined = undefined;
         this.file = undefined;
     }
     equals(obj) {
@@ -41,7 +45,7 @@ export class CacheImageInfo {
                 this.size.equals(obj.size);
     }
     clone() {
-        return new CacheImageInfo(this._base64, this.actualId, this.tmpId, this.imageUrl, this.file, this._referenceInfo, this._size, this._isLoaded);
+        return new CacheImageInfo(this._base64, this.actualId, this.tmpId, this.imageUrl, this.file, this._referenceInfo, this._size, this._isLoaded, this._isSizeDefined);
     }
     shouldMakeImagePdfCompatible() {
         if (isDefined(this._convertedBase64))

package/lib/common/model/manipulators/picture-manipulator/picture-manipulator.js

@@ -88,7 +88,7 @@ export class PictureManipulator extends RunsBaseManipulator {
             this.history.addTransaction(() => {
                 this.modelManipulator.range.removeInterval(new SubDocumentInterval(subDocument, interval), true, false);
                 const newInfo = new InlinePictureInfo(pictureRun.size.clone(), new Shape(), -1, pictureRun.info.containerProperties, pictureRun.info.nonVisualDrawingProperties);
-                this.modelManipulator.picture.insertInlinePictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo);
+                this.modelManipulator.picture.insertInlinePictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(!pictureRun.cacheInfo.isSizeDefined));
             });
         }
     }
@@ -103,7 +103,7 @@ export class PictureManipulator extends RunsBaseManipulator {
             anchorInfo.zOrder = this.modelManipulator.floatingObject.zOrder.getNewZOrder(subDocument);
             this.modelManipulator.range.removeInterval(new SubDocumentInterval(subDocument, interval), true, false);
             const newInfo = new AnchorPictureInfo(pictureRun.size.clone(), new Shape(), anchorInfo, pictureRun.info.containerProperties, pictureRun.info.nonVisualDrawingProperties);
-            this.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(false));
+            this.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(!pictureRun.cacheInfo.isSizeDefined));
             run = subDocument.getRunByPosition(interval.start);
         }
         let anchoredRun = run.getType() == RunType.AnchoredPictureRun ? run : run;

package/lib/common/model/options/fonts.d.ts

@@ -9,7 +9,7 @@ export interface IFontSettings {
     name: string;
     fontFamily: string;
     googleFontsResponse?: string;
-    useGoogleFonts?: string;
+    useGoogleFonts?: boolean;
     italicFontUri?: string;
     boldFontUri?: string;
     boldItalicFontUri?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.13-build-25156-0103",
+  "version": "24.1.13",
   "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.13-build-25154-1937",
-    "devextreme-dist": "24.1.13-build-25154-1937"
+    "devextreme": "24.1.13",
+    "devextreme-dist": "24.1.13"
   },
   "dependencies": {
     "jszip": "~3.10.1",