devexpress-richedit 24.1.2-beta → 24.1.3

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.1.2
+* Version: 24.1.3
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/index.js

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.js)
-* Version: 24.1.2
+* Version: 24.1.3
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

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

package/lib/client/public/ribbon/creator.js

@@ -73,6 +73,7 @@ function createItems(rawItems) {
                     displayExpr: rawItem.displayExpr,
                     valueExpr: rawItem.valueExpr,
                     value: rawItem.value,
+                    valueType: rawItem.valueType,
                     showClearButton: rawItem.showClearButton,
                     placeholder: rawItem.placeholder,
                     acceptCustomValue: rawItem.acceptCustomValue,

package/lib/client/public/ribbon/items/select-box.d.ts

@@ -6,6 +6,7 @@ export interface RibbonSelectBoxItemOptions {
     displayExpr?: string;
     valueExpr?: string;
     value?: any;
+    valueType?: string;
     textOptions?: RibbonItemTextOptions;
     showClearButton?: boolean;
     placeholder?: string;
@@ -20,6 +21,7 @@ export declare class RibbonSelectBoxItem extends RibbonItemBase {
     valueExpr?: string;
     width?: any;
     value?: any;
+    valueType?: string;
     textOptions: RibbonItemTextOptions;
     showClearButton: boolean;
     placeholder?: string;

package/lib/client/public/ribbon/items/select-box.js

@@ -1,3 +1,4 @@
+import { TypeConverterFactory } from '../../utils';
 import { RibbonItemBase, RibbonItemType } from './base';
 import { convertToFunction } from '../../../../common/utils/utils';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
@@ -11,11 +12,17 @@ export class RibbonSelectBoxItem extends RibbonItemBase {
         this.displayExpr = options.displayExpr;
         this.valueExpr = options.valueExpr;
         this.value = options.value;
+        this.valueType = options.valueType;
         this._localizeDataSourceItems = options._localizeDataSourceItems === undefined ? false : options._localizeDataSourceItems;
         this.textOptions = (_a = options.textOptions) !== null && _a !== void 0 ? _a : {};
         this.showClearButton = options.showClearButton === undefined ? false : options.showClearButton;
         this.placeholder = options.placeholder;
         this.acceptCustomValue = isDefined(options.acceptCustomValue) ? options.acceptCustomValue : false;
         this.onCustomItemCreating = options.onCustomItemCreating ? convertToFunction(options.onCustomItemCreating) : undefined;
+        if (!this.onCustomItemCreating && this.valueType) {
+            const converter = TypeConverterFactory.create(this.valueType);
+            if (converter)
+                this.onCustomItemCreating = (e) => e.customItem = { text: e.text, value: converter(e.text) };
+        }
     }
 }

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

@@ -30,4 +30,8 @@ export declare class Utils {
     static convertBlobToArrayBuffer(content: File | Blob, callback: (buffer: ArrayBuffer) => void): void;
     static getIntervalComplement(bound: IntervalApi, intervals: IntervalApi[]): IntervalApi[];
 }
+export declare class TypeConverterFactory {
+    static create(valueType: string): (text: string) => unknown | null;
+    private static createCore;
+}
 export {};

package/lib/client/public/utils.js

@@ -70,3 +70,18 @@ export class Utils {
         return ListUtils.map(coreResult, curr => convertToIntervalApi(curr));
     }
 }
+export class TypeConverterFactory {
+    static create(valueType) {
+        const converter = this.createCore(valueType);
+        return converter ? text => { var _a; return (_a = converter(text)) !== null && _a !== void 0 ? _a : text; } : null;
+    }
+    static createCore(valueType) {
+        const strType = valueType.toLowerCase();
+        switch (strType) {
+            case 'number':
+                return text => parseFloat(text);
+            default:
+                return null;
+        }
+    }
+}

package/lib/client/ribbon/i-toolbar-item-options.d.ts

@@ -45,6 +45,7 @@ export interface IToolbarSelectBoxItemOptions extends IToolbarItemOptionsBase, I
     displayExpr?: string;
     valueExpr?: string;
     value?: any;
+    valueType?: string;
     showClearButton?: boolean;
     placeholder?: string;
     acceptCustomValue?: boolean;

package/lib/common/canvas/canvas-manager.js

@@ -73,7 +73,7 @@ export class CanvasManager extends BatchUpdatableObject {
             DomUtils.removeClassName(this.viewManager.canvas, CSSCLASS_FOCUSED);
     }
     getCanvasWidth() {
-        return SizeUtils.getOffsetWidth(this.viewManager.canvas.firstElementChild);
+        return SizeUtils.getClientWidth(this.viewManager.canvas);
     }
     onCanvasMouseWheel(evt) {
         if (!this.viewManager.layout)

package/lib/common/formats/html/export/html-builder.js

@@ -76,11 +76,15 @@ export class HtmlBuilder {
         return this;
     }
     endChild(tagName) {
-        let currentElement = this._currentElement;
-        while (currentElement.tagName.toLowerCase() !== tagName.toLowerCase()) {
-            currentElement = currentElement.parentElement;
+        try {
+            let currentElement = this._currentElement;
+            while (currentElement.tagName.toLowerCase() !== tagName.toLowerCase())
+                currentElement = currentElement.parentElement;
+            this._currentElement = currentElement.parentElement;
+        }
+        catch (e) {
+            console.warn(`The element with the ${tagName} tag is not found.`);
         }
-        this._currentElement = currentElement.parentElement;
         return this;
     }
     addDefaultMarkup(content) {

package/lib/common/formats/html/export/html-export.d.ts

@@ -1,9 +1,16 @@
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { DocumentModel } from '../../../model/document-model';
 import { RangeCopy } from '../../../model/manipulators/range/create-range-copy-operation';
+import { Paragraph } from '../../../model/paragraph/paragraph';
 import { SubDocument } from '../../../model/sub-document';
 import { HtmlBuilder } from './html-builder';
 import { IExportModelOptions } from '../../i-document-exporter';
+interface List {
+    numberingListIndex: number;
+    listLevelIndex: number;
+    start: number;
+    end: number;
+}
 export declare class HtmlExporter {
     rangeCopy: RangeCopy;
     private exportModelOptions;
@@ -15,7 +22,11 @@ export declare class HtmlExporter {
     private get pageIndex();
     constructor(exportModelOptions: IExportModelOptions);
     getHtmlElementsByInterval(model: DocumentModel, subDocument: SubDocument, interval: FixedInterval, guidLabel: string): HtmlBuilder;
+    getParagraphsByInterval(subDocument: SubDocument, interval: FixedInterval): Paragraph[];
+    getListsByParagraphs(paragraphs: Paragraph[]): List[];
     private addParentTableRecursively;
+    startList(model: DocumentModel, subDocument: SubDocument, interval: FixedInterval, builder: HtmlBuilder, lists: List[], position: number): void;
+    private endList;
     private getHtmlText;
     private getBorderCssString;
     private getTableWidthUnitCssString;
@@ -23,3 +34,4 @@ export declare class HtmlExporter {
     private getCellStyle;
     private getTextBoxStyleString;
 }
+export {};

package/lib/common/formats/html/export/html-export.js

@@ -45,47 +45,8 @@ export class HtmlExporter {
         let remainLength = interval.length;
         let currentPosition = interval.start;
         let resultBuilder = new HtmlBuilder();
-        const paragraphsInInterval = subDocument.getParagraphsByInterval(interval);
-        const paragraphs = [];
-        for (let i = 0, paragraphInInterval; paragraphInInterval = paragraphsInInterval[i]; i++) {
-            if (interval.containsWithIntervalEnd(paragraphInInterval.getEndPosition()))
-                paragraphs.push(paragraphInInterval);
-        }
-        const listsInInterval = [];
-        for (let i = 0, paragraph; paragraph = paragraphs[i]; i++) {
-            if (paragraph.isInList()) {
-                const paragraphNumberingListIndex = paragraph.getNumberingListIndex();
-                const paragraphListLevelIndex = paragraph.getListLevelIndex();
-                const paragraphStart = paragraph.startLogPosition.value;
-                const paragraphEnd = paragraph.getEndPosition();
-                let existingItem = null;
-                for (let j = 0; j < listsInInterval.length; j++) {
-                    if (listsInInterval[j].numberingListIndex == paragraphNumberingListIndex && listsInInterval[j].listLevelIndex == paragraphListLevelIndex)
-                        existingItem = listsInInterval[j];
-                }
-                if (existingItem && (paragraphListLevelIndex == 0 || existingItem.end == paragraphStart
-                    || listsInInterval[listsInInterval.length - 1].listLevelIndex > paragraphListLevelIndex)) {
-                    existingItem.end = paragraphEnd;
-                }
-                else {
-                    listsInInterval.push({
-                        numberingListIndex: paragraphNumberingListIndex, listLevelIndex: paragraphListLevelIndex,
-                        start: paragraphStart, end: paragraphEnd
-                    });
-                }
-                let listLevelIndex = paragraphListLevelIndex;
-                while (listLevelIndex > 0) {
-                    let parentItem = null;
-                    for (let j = 0; j < listsInInterval.length; j++) {
-                        if (listsInInterval[j].listLevelIndex == listLevelIndex - 1)
-                            parentItem = listsInInterval[j];
-                    }
-                    if (parentItem)
-                        parentItem.end = paragraphEnd;
-                    listLevelIndex--;
-                }
-            }
-        }
+        const paragraphs = this.getParagraphsByInterval(subDocument, interval);
+        const lists = this.getListsByParagraphs(paragraphs);
         let isInsideFieldCode = false;
         let fieldDeep = 0;
         let isInsideHyperlink = false;
@@ -95,53 +56,6 @@ export class HtmlExporter {
         while (iterator.moveNext()) {
             const tableCell = Table.getTableCellByPosition(subDocument.tables, iterator.currentInterval().start);
             const isContinueMergingCell = tableCell && tableCell.verticalMerging === TableCellMergingState.Continue;
-            let listToStartIndex = -1;
-            const listsToEndIndices = [];
-            if (!tableCell) {
-                if (listsInInterval.length) {
-                    const currentPosition = iterator.currentInterval().start;
-                    for (let i = 0; i < listsInInterval.length; i++) {
-                        if (listsInInterval[i].start == currentPosition)
-                            listToStartIndex = i;
-                        if (listsInInterval[i].end == iterator.currentInterval().end)
-                            listsToEndIndices.push(i);
-                    }
-                    if (listToStartIndex < 0 && currentPosition == interval.start) {
-                        const firstParagraph = subDocument.getParagraphByPosition(currentPosition);
-                        if (firstParagraph.getNumberingListIndex() == listsInInterval[0].numberingListIndex)
-                            listToStartIndex = 0;
-                    }
-                }
-                if (listToStartIndex > -1) {
-                    const numberingList = model.numberingLists[listsInInterval[listToStartIndex].numberingListIndex];
-                    let listFormatType = "";
-                    switch (numberingList.levels[listsInInterval[listToStartIndex].listLevelIndex].getListLevelProperties().format) {
-                        case NumberingFormat.Bullet:
-                            listFormatType = "disc";
-                            break;
-                        case NumberingFormat.Decimal:
-                            listFormatType = "decimal";
-                            break;
-                        case NumberingFormat.LowerLetter:
-                            listFormatType = "lower-alpha";
-                            break;
-                        case NumberingFormat.UpperLetter:
-                            listFormatType = "upper-alpha";
-                            break;
-                        case NumberingFormat.LowerRoman:
-                            listFormatType = "lower-roman";
-                            break;
-                        case NumberingFormat.UpperRoman:
-                            listFormatType = "upper-roman";
-                            break;
-                        default:
-                            break;
-                    }
-                    resultBuilder
-                        .startChild(numberingList.getListType() != NumberingType.Bullet ? "ol" : "ul")
-                        .configure((e) => e.style.cssText = "list-style-type:" + listFormatType);
-                }
-            }
             const run = iterator.currentRun;
             const isRunInEmptyParagraph = run.paragraph.length === 1;
             if (paragraphs.length && (run.getType() != RunType.ParagraphRun || isRunInEmptyParagraph)) {
@@ -212,6 +126,7 @@ export class HtmlExporter {
                             });
                         }
                     }
+                    this.startList(model, subDocument, interval, resultBuilder, lists, iterator.currentInterval().start);
                     if (!isContinueMergingCell) {
                         const maskedParagraphProperties = currentParagraph.getParagraphMergedProperties();
                         let paragraphStyle = "";
@@ -292,17 +207,15 @@ export class HtmlExporter {
                             paragraphStyle += HtmlConverter.getCssRules(charProps, charProps.textColor.toRgb(this.colorProvider), false, false, false)
                                 .join(";");
                         }
-                        if (currentParagraph.isInList() && !tableCell)
+                        if (currentParagraph.isInList())
                             resultBuilder.startChild('li');
                         resultBuilder
                             .startChild('p')
                             .configure((e) => {
-                            if (paragraphStyle) {
+                            if (paragraphStyle)
                                 e.style.cssText = paragraphStyle;
-                            }
-                            if (isRunInEmptyParagraph) {
+                            if (isRunInEmptyParagraph)
                                 e.innerHTML = "&nbsp;";
-                            }
                         });
                     }
                 }
@@ -314,6 +227,10 @@ export class HtmlExporter {
                 case RunType.ParagraphRun:
                     if (!isContinueMergingCell) {
                         html.addCallback((builder) => builder.endChild('p'));
+                        if (run.paragraph.isInList()) {
+                            html.addCallback((builder) => builder.endChild('li'));
+                            html.addCallback((builder) => this.endList(model, builder, lists, iterator.currentInterval().end));
+                        }
                         let paragraphEndPosition = run.paragraph.getEndPosition();
                         if (tableCell) {
                             let parentRow = tableCell.parentRow;
@@ -491,10 +408,6 @@ export class HtmlExporter {
                 }
             }
             resultBuilder.assignFrom(html);
-            if (listsToEndIndices.length) {
-                for (let i = listsToEndIndices.length - 1; i >= 0; i--)
-                    resultBuilder.endChild(model.numberingLists[listsInInterval[listsToEndIndices[i]].numberingListIndex].getListType() != NumberingType.Bullet ? "ol" : "ul");
-            }
             currentPosition += length;
             remainLength -= length;
         }
@@ -531,6 +444,57 @@ export class HtmlExporter {
                 .endChild('span');
         return resultBuilder;
     }
+    getParagraphsByInterval(subDocument, interval) {
+        const paragraphsInInterval = subDocument.getParagraphsByInterval(interval);
+        const paragraphs = [];
+        for (let i = 0, paragraphInInterval; paragraphInInterval = paragraphsInInterval[i]; i++) {
+            if (interval.containsWithIntervalEnd(paragraphInInterval.getEndPosition()))
+                paragraphs.push(paragraphInInterval);
+        }
+        return paragraphs;
+    }
+    getListsByParagraphs(paragraphs) {
+        const listsInInterval = [];
+        for (let i = 0, paragraph; paragraph = paragraphs[i]; i++) {
+            if (paragraph.isInList()) {
+                const paragraphNumberingListIndex = paragraph.getNumberingListIndex();
+                const paragraphListLevelIndex = paragraph.getListLevelIndex();
+                const paragraphStart = paragraph.startLogPosition.value;
+                const paragraphEnd = paragraph.getEndPosition();
+                let existingItem = null;
+                for (let j = 0; j < listsInInterval.length; j++) {
+                    if (listsInInterval[j].numberingListIndex === paragraphNumberingListIndex
+                        && listsInInterval[j].listLevelIndex === paragraphListLevelIndex) {
+                        existingItem = listsInInterval[j];
+                    }
+                }
+                if (existingItem && (paragraphListLevelIndex === 0 || existingItem.end == paragraphStart
+                    || listsInInterval[listsInInterval.length - 1].listLevelIndex > paragraphListLevelIndex)) {
+                    existingItem.end = paragraphEnd;
+                }
+                else {
+                    listsInInterval.push({
+                        numberingListIndex: paragraphNumberingListIndex,
+                        listLevelIndex: paragraphListLevelIndex,
+                        start: paragraphStart,
+                        end: paragraphEnd,
+                    });
+                }
+                let listLevelIndex = paragraphListLevelIndex;
+                while (listLevelIndex > 0) {
+                    let parentItem = null;
+                    for (let j = 0; j < listsInInterval.length; j++) {
+                        if (listsInInterval[j].listLevelIndex == listLevelIndex - 1)
+                            parentItem = listsInInterval[j];
+                    }
+                    if (parentItem)
+                        parentItem.end = paragraphEnd;
+                    listLevelIndex--;
+                }
+            }
+        }
+        return listsInInterval;
+    }
     addParentTableRecursively(model, builder, parentCell, paragraphStartPosition) {
         const parentRow = parentCell.parentRow;
         const parentTable = parentRow.parentTable;
@@ -548,9 +512,9 @@ export class HtmlExporter {
                 builder
                     .startChild('td')
                     .configure(el => {
-                    el.style.cssText = "mso-cell-special:placeholder";
+                    el.style.cssText = 'mso-cell-special:placeholder';
                     el.setAttribute('colspan', parentRow.gridBefore.toString());
-                    el.innerHTML = "&nbsp;";
+                    el.innerHTML = '&nbsp;';
                 })
                     .endChild('td');
             }
@@ -565,6 +529,56 @@ export class HtmlExporter {
             });
         }
     }
+    startList(model, subDocument, interval, builder, lists, position) {
+        if (!lists.length)
+            return;
+        let listIndex = lists.findIndex((list) => list.start === position);
+        if (listIndex < 0 && position === interval.start) {
+            const firstParagraph = subDocument.getParagraphByPosition(position);
+            if (firstParagraph.getNumberingListIndex() === lists[0].numberingListIndex)
+                listIndex = 0;
+        }
+        if (listIndex > -1) {
+            const numberingList = model.numberingLists[lists[listIndex].numberingListIndex];
+            const numberingListFormat = numberingList.levels[lists[listIndex].listLevelIndex].getListLevelProperties().format;
+            const numberingListType = numberingList.getListType();
+            let listFormatType = "";
+            switch (numberingListFormat) {
+                case NumberingFormat.Bullet:
+                    listFormatType = "disc";
+                    break;
+                case NumberingFormat.Decimal:
+                    listFormatType = "decimal";
+                    break;
+                case NumberingFormat.LowerLetter:
+                    listFormatType = "lower-alpha";
+                    break;
+                case NumberingFormat.UpperLetter:
+                    listFormatType = "upper-alpha";
+                    break;
+                case NumberingFormat.LowerRoman:
+                    listFormatType = "lower-roman";
+                    break;
+                case NumberingFormat.UpperRoman:
+                    listFormatType = "upper-roman";
+                    break;
+                default:
+                    break;
+            }
+            builder
+                .startChild(numberingListType !== NumberingType.Bullet ? "ol" : "ul")
+                .configure((e) => e.style.cssText = "list-style-type:" + listFormatType);
+        }
+    }
+    endList(model, builder, lists, endPosition) {
+        for (let i = lists.length - 1; i >= 0; i--) {
+            if (lists[i].end === endPosition) {
+                const listType = model.numberingLists[lists[i].numberingListIndex].getListType();
+                lists.splice(i, 1);
+                builder.endChild(listType != NumberingType.Bullet ? "ol" : "ul");
+            }
+        }
+    }
     getHtmlText(text) {
         const result = new HtmlBuilder();
         for (let i = 0; i < text.length; i++) {

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

@@ -177,7 +177,7 @@ export class HtmlImporter {
         const missTag = HtmlImporter.MapMissTablePropertiesByTagNames[ListUtils.last(this.levelInfo).tagImporter.elementTag()];
         ListUtils.forEach(this.currElementChilds, (childElement) => {
             const childElemStyle = this.getStyles(childElement);
-            if (!childElemStyle)
+            if (!Object.keys(childElemStyle).length)
                 return;
             for (var prop in this.getStyles(element)) {
                 if (missTag && /^(border|background|marginLeft)/gi.test(prop))
@@ -189,13 +189,24 @@ export class HtmlImporter {
         });
     }
     getStyles(element) {
-        var _a, _b, _c;
-        return (_c = (_b = (_a = element.getAttribute) === null || _a === void 0 ? void 0 : _a.call(element, 'style')) === null || _b === void 0 ? void 0 : _b.split(';')) === null || _c === void 0 ? void 0 : _c.reduce((a, c) => {
-            if (c) {
-                const par = c.trim().split(':');
-                a[par[0].trim()] = par[1].trim();
-            }
-            return a;
+        var _a;
+        const styleStr = (_a = element.getAttribute) === null || _a === void 0 ? void 0 : _a.call(element, 'style');
+        if (!styleStr)
+            return {};
+        const urlRegExp = new RegExp('url\\(.*?\\)', 'gi');
+        const urlKey = '$URL';
+        const urlValues = styleStr.match(urlRegExp);
+        return styleStr
+            .replace(urlRegExp, urlKey)
+            .split(';')
+            .reduceRight((res, style) => {
+            if (!style)
+                return res;
+            const colonIndex = style.indexOf(':');
+            const key = style.substring(0, colonIndex).trim();
+            const value = style.substring(colonIndex + 1).trim();
+            res[key] = value === urlKey ? urlValues.pop() : value;
+            return res;
         }, {});
     }
     addRun(run, forceAdd = false) {
@@ -265,6 +276,8 @@ 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, '');

package/lib/common/ui/ruler/controls/divisions.js

@@ -4,6 +4,7 @@ import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { DocumentRenderer } from '../../../canvas/renderes/common/document-renderer';
 import { RULER_CLASS_NAME, RULLER_NUMBER_CORRECTION } from '../settings';
 import { RulerBase } from './base';
+import { SizeUtils } from '../../../../common/utils/size-utils';
 export const MINOR_TOP_AND_BOTTOM_MARGIN = 4;
 export const MAJOR_TOP_AND_BOTTOM_MARGIN = 2;
 export const DIVISION_CONTAINER_CLASS_NAME = RULER_CLASS_NAME + "Divisions";
@@ -20,7 +21,7 @@ export class RulerDivisionsControl extends RulerBase {
         this.controls.ruler.rootElement.appendChild(this.rootElement);
         if (Browser.IE && Browser.MajorVersion <= 9)
             this.rootElement.offsetParent;
-        this.height = this.rootElement.offsetHeight;
+        this.height = SizeUtils.getOffsetHeight(this.rootElement);
         createDivisionElements(this.rootElement, unitCount, divisionInfo, this.height);
         this.initialLeft = -(unitCount * divisionInfo.unitSize - RULLER_NUMBER_CORRECTION);
     }

package/lib/common/ui/ruler/controls/indent/first-line.js

@@ -5,6 +5,7 @@ import { RULLER_NUMBER_CORRECTION } from '../../settings';
 import { RulerModelState } from '../base';
 import { RulerTemplateManager } from '../template-manager';
 import { RulerBaseIndentControl, RulerMinDistanceBetweenIndents } from './base';
+import { SizeUtils } from '../../../../../common/utils/size-utils';
 export class RulerFirstLineIndentDragHandle extends RulerBaseIndentControl {
     constructor(modelData, controls) {
         super(modelData, controls);
@@ -14,8 +15,8 @@ export class RulerFirstLineIndentDragHandle extends RulerBaseIndentControl {
         this.rootElement.title = this.modelData.settings.titles.firstLineIndent;
         this.controls.ruler.rootElement.appendChild(this.rootElement);
         this.adjustByTop();
-        this.leftCorrection = Math.round(this.rootElement.offsetWidth / 2);
-        this._heightOfProtrudingPart = this.rootElement.offsetHeight - this.controls.divisions.height / 2;
+        this.leftCorrection = Math.round(SizeUtils.getOffsetWidth(this.rootElement) / 2);
+        this._heightOfProtrudingPart = SizeUtils.getOffsetHeight(this.rootElement) - this.controls.divisions.height / 2;
     }
     get heightOfProtrudingPart() { return this.modelData.settings.showLeftIndent ? this._heightOfProtrudingPart : 0; }
     getRootClassName() {
@@ -23,7 +24,7 @@ export class RulerFirstLineIndentDragHandle extends RulerBaseIndentControl {
             this.modelData.settings.styles.firstLineIndent.className;
     }
     adjustByTop() {
-        const mainElementHeight = this.rootElement.offsetHeight;
+        const mainElementHeight = SizeUtils.getOffsetHeight(this.rootElement);
         const divisionsControlHeight = this.controls.divisions.height;
         this.rootElement.style.marginTop = (mainElementHeight - divisionsControlHeight) / 2 + "px";
     }

package/lib/common/ui/ruler/controls/indent/left.js

@@ -6,6 +6,7 @@ import { RICH_EDIT_CLASS_NAME_PREFIX, RULLER_NUMBER_CORRECTION } from '../../set
 import { RulerModelState } from '../base';
 import { RulerTemplateManager } from '../template-manager';
 import { RulerBaseIndentControl, RulerMinDistanceBetweenIndents } from './base';
+import { SizeUtils } from '../../../../../common/utils/size-utils';
 const LEFT_INDENT_DRAG_HANDLE_BODY = RICH_EDIT_CLASS_NAME_PREFIX + "leftIndentDragHandleBody";
 export class RulerLeftIndentDragHandle extends RulerBaseIndentControl {
     constructor(modelData, controls) {
@@ -26,18 +27,18 @@ export class RulerLeftIndentDragHandle extends RulerBaseIndentControl {
         const mainElementWidth = this.topElement.offsetWidth;
         this.bodyElement.style.width = mainElementWidth + "px";
         const style = this.rootElement.style;
-        style.height = this.topElement.offsetHeight + this.bodyElement.offsetHeight + "px";
+        style.height = SizeUtils.getOffsetHeight(this.topElement) + SizeUtils.getOffsetHeight(this.bodyElement) + "px";
         style.width = mainElementWidth + "px";
         style.marginTop = this.controls.divisions.height / 2 + "px";
         this.bodyElement.title = this.modelData.settings.titles.leftIndent;
         this.topElement.title = this.modelData.settings.titles.hangingIndent;
-        this.leftCorrection = Math.round(this.rootElement.offsetWidth / 2);
-        this._heightOfProtrudingPart = this.rootElement.offsetHeight - this.controls.divisions.height / 2;
+        this.leftCorrection = Math.round(SizeUtils.getOffsetWidth(this.rootElement) / 2);
+        this._heightOfProtrudingPart = SizeUtils.getOffsetHeight(this.rootElement) - this.controls.divisions.height / 2;
     }
     get heightOfProtrudingPart() { return this.modelData.settings.showLeftIndent ? this._heightOfProtrudingPart : 0; }
     getRootClassName() { return this.modelData.settings.styles.leftIndent.className; }
     adjustByTop() {
-        const mainElementHeight = this.rootElement.offsetHeight;
+        const mainElementHeight = SizeUtils.getOffsetHeight(this.rootElement);
         const divisionsControlHeight = this.controls.divisions.height;
         this.rootElement.style.marginTop = (mainElementHeight - divisionsControlHeight) / 2 + "px";
     }

package/lib/common/ui/ruler/ruler.js

@@ -4,6 +4,7 @@ import { Flag } from '@devexpress/utils/lib/class/flag';
 import { RulerControls } from './manager';
 import { RulerModelData } from './model-data';
 import { RulerVisibility } from './settings';
+import { SizeUtils } from '../../../common/utils/size-utils';
 var HorizontalRulerEventType;
 (function (HorizontalRulerEventType) {
     HorizontalRulerEventType[HorizontalRulerEventType["None"] = 0] = "None";
@@ -190,7 +191,7 @@ export class HorizontalRulerControl extends BatchUpdatableObject {
         return this._visible;
     }
     getHeight() {
-        return this.initialized ? this.controls.wrapper.rootElement.offsetHeight : 0;
+        return this.initialized ? SizeUtils.getOffsetHeight(this.controls.wrapper.rootElement) : 0;
     }
     onViewTypeChanged() {
         this.innerSetVisible(this._visible && !this.modelData.innerClientProperties.viewsSettings.isSimpleView);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.2-beta",
+  "version": "24.1.3",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,13 +14,13 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.1.2-beta",
-    "devextreme-dist": "24.1.2-beta"
+    "devextreme": "24.1.3",
+    "devextreme-dist": "24.1.3"
   },
   "dependencies": {
     "jszip": "~3.10.1",
     "tslib": "2.6.0",
-    "@devexpress/utils": "1.4.1"
+    "@devexpress/utils": "^1.4.3"
   },
   "devDependencies": {
     "webpack": "5.75.0",