devexpress-richedit 24.1.6-build-24232-0102 → 24.2.1-alpha-24260-0102

package/lib/common/rich-utils/debug/runtime-template-model-creator.js

@@ -95,6 +95,12 @@ export class Options {
     }
 }
 export class Creator {
+    get documentModel() { ListUtils.addListOnTail(this.idMap.createdVariables, this.str); return this.idMap.createdVariables.join("\r\n"); }
+    get tables() { return this.subDocument.tables; }
+    get table() { return this.tables[this.tblIndex]; }
+    static create(model, layout = null, options = new Options()) {
+        return new Creator(model, layout, options).documentModel;
+    }
     constructor(model, layout = null, options = new Options()) {
         this.layout = layout;
         this.subDocument = model.mainSubDocument;
@@ -131,12 +137,6 @@ export class Creator {
             this.fillPage(p);
         this.str.push(`], model).getLayout();`);
     }
-    get documentModel() { ListUtils.addListOnTail(this.idMap.createdVariables, this.str); return this.idMap.createdVariables.join("\r\n"); }
-    get tables() { return this.subDocument.tables; }
-    get table() { return this.tables[this.tblIndex]; }
-    static create(model, layout = null, options = new Options()) {
-        return new Creator(model, layout, options).documentModel;
-    }
     static getSubDocumentVariableName(sd) {
         if (sd.isMain())
             return "subDocument";

package/lib/common/scroll/model-states.d.ts

@@ -4,7 +4,7 @@ import { ScrollTopInfo } from '../canvas/canvas-manager';
 import { CanvasSizeInfo } from '../canvas/canvas-size-info';
 import { Selection } from '../selection/selection';
 import { ICanvasState } from './canvas-states';
-export declare type GetVertivalOffset = (sizes: CanvasSizeInfo) => number;
+export type GetVertivalOffset = (sizes: CanvasSizeInfo) => number;
 export declare enum RelativePosition {
     Top = 0,
     Bottom = 1,

package/lib/common/scroll/model-states.js

@@ -21,15 +21,15 @@ export class ScrollState {
     get nothing() { return new ModelStateEmpty(); }
 }
 export class ModelStateByModelPosition {
+    get subDocument() {
+        var _a;
+        return this._subDocument = (_a = this._subDocument) === null || _a === void 0 ? void 0 : _a.getActualSubDocument();
+    }
     constructor(subDocument, endOfLine, pageIndex) {
         this._subDocument = subDocument;
         this.endOfLine = endOfLine;
         this.pageIndex = pageIndex;
     }
-    get subDocument() {
-        var _a;
-        return this._subDocument = (_a = this._subDocument) === null || _a === void 0 ? void 0 : _a.getActualSubDocument();
-    }
     getModelPosition() {
         return this.modelPosition;
     }

package/lib/common/selection/input-position.js

@@ -1,3 +1,4 @@
+import { Section } from '../model/section/section';
 import { SectionPropertyDescriptor } from '../model/section/section-property-descriptor';
 import { InputPositionBase } from './input-position-base';
 import { SearchUtils } from '@devexpress/utils/lib/utils/search';
@@ -18,13 +19,23 @@ export class InputPosition extends InputPositionBase {
     }
     getMergedSectionPropertiesRaw() {
         if (!this.mergedSectionPropertiesRaw) {
-            var interval = this.intervalsInfo.interval;
-            var intervalStartPosition = interval.start;
-            var intervalEndPosition = interval.end;
-            var sections = this.model.sections;
-            var sectionIndex = SearchUtils.normedInterpolationIndexOf(sections, (s) => s.startLogPosition.value, intervalStartPosition);
+            let sectionIndex;
+            let intervalEndPosition;
+            const sections = this.model.sections;
+            const pageIndex = this.selection.pageIndex;
+            if (pageIndex < 0) {
+                const interval = this.intervalsInfo.interval;
+                const intervalStartPosition = interval.start;
+                intervalEndPosition = interval.end;
+                sectionIndex = SearchUtils.normedInterpolationIndexOf(sections, (s) => s.startLogPosition.value, intervalStartPosition);
+            }
+            else {
+                const layoutPage = this.selection.layout.pages[pageIndex];
+                sectionIndex = Section.getPageSectionIndex(layoutPage, sections);
+                intervalEndPosition = layoutPage.getEndPosition();
+            }
             this.mergedSectionPropertiesRaw = sections[sectionIndex++].sectionProperties.clone();
-            for (var section; (section = sections[sectionIndex]) && (section.startLogPosition.value < intervalEndPosition); sectionIndex++)
+            for (let section; (section = sections[sectionIndex]) && (section.startLogPosition.value < intervalEndPosition); sectionIndex++)
                 InputPositionBase.mergePropertiesRaw(this.mergedSectionPropertiesRaw, section.sectionProperties, SectionPropertyDescriptor.ALL_FIELDS);
         }
         return this.mergedSectionPropertiesRaw;

package/lib/common/selection/selected-cells-engine.js

@@ -8,11 +8,11 @@ import { CellGridInfoManager } from '../layout-formatter/table/grid-engine/cell-
 import { Table, TablePosition } from '../model/tables/main-structures/table';
 import { TableCellMergingState } from '../model/tables/secondary-structures/table-base-structures';
 export class SelectedTableRowInfo {
+    get row() { return this.cells[0].cell.parentRow; }
     constructor(rowIndex, cells) {
         this.rowIndex = rowIndex;
         this.cells = cells;
     }
-    get row() { return this.cells[0].cell.parentRow; }
     get isSeries() {
         return ListUtils.allOf(this.cells, (cellInfo, cellInd) => cellInfo.cellIndex == this.cells[cellInd - 1].cellIndex + 1, 1);
     }
@@ -27,16 +27,6 @@ export class SelectedTableCellInfo {
     }
 }
 export class TableSelectionData {
-    constructor(info, rows) {
-        this.info = info;
-        this.rows = rows;
-        if (!rows[0]) {
-            this._isSquare = false;
-            this._isSelectedEntireTable = false;
-            this._withoutGapByRows = false;
-            this._areCellsSelectedInSeries = false;
-        }
-    }
     get numRows() { return this.rows.length; }
     get startRowIndex() { return this.rows[0].rowIndex; }
     get isSquare() { return this._isSquare === undefined ? (this._isSquare = this.calculateIsSquare()) : this._isSquare; }
@@ -62,6 +52,16 @@ export class TableSelectionData {
             (this._areCellsSelectedInSeries = ListUtils.allOf(this.rows, (rowInfo, rowInd) => (rowInd == 0 || (rowInfo.rowIndex == this.rows[rowInd - 1].rowIndex + 1)) && rowInfo.isSeries)) :
             this._areCellsSelectedInSeries;
     }
+    constructor(info, rows) {
+        this.info = info;
+        this.rows = rows;
+        if (!rows[0]) {
+            this._isSquare = false;
+            this._isSelectedEntireTable = false;
+            this._withoutGapByRows = false;
+            this._areCellsSelectedInSeries = false;
+        }
+    }
     foreach(onEachRowCallback, onEachCellCallback) {
         for (let rowOffset = 0, rowInfo; rowInfo = this.rows[rowOffset]; rowOffset++) {
             onEachRowCallback(rowInfo);
@@ -99,13 +99,13 @@ export class TableSelectionData {
     }
 }
 export class SelectedTableInfo {
+    get isSelected() { return !!this.rawData.rows.length; }
     constructor(table, gridInfoManager, rawRowsData, extendedRowsData) {
         this.table = table;
         this.gridInfoManager = gridInfoManager;
         this.rawData = new TableSelectionData(this, rawRowsData);
         this.extendedData = new TableSelectionData(this, extendedRowsData);
     }
-    get isSelected() { return !!this.rawData.rows.length; }
 }
 export class SelectedCellsCalculator {
     constructor() {

package/lib/common/selection/selection-intervals-info.js

@@ -4,13 +4,6 @@ import { SubDocumentInterval, SubDocumentIntervals, SubDocumentPosition } from '
 import { SelectedCellsCalculator } from './selected-cells-engine';
 import { SelectedSpecialRunInfo } from './selected-special-run-info';
 export class SelectionIntervalsInfo {
-    constructor(subDocument, intervals, lastIntervalIndex = intervals.length - 1) {
-        this.specialRunInfo = new SelectedSpecialRunInfo();
-        this.subDocument = subDocument;
-        this._intervals = intervals;
-        this.lastIntervalIndex = lastIntervalIndex;
-        this._tableInfo = null;
-    }
     resetTableInfo() {
         this._tableInfo = null;
     }
@@ -37,6 +30,13 @@ export class SelectionIntervalsInfo {
     get subDocPosition() { return new SubDocumentPosition(this.subDocument, this.position); }
     get multiselection() { return this.intervals.length > 1; }
     get isCollapsed() { return !this._intervals[1] && this._intervals[0].isCollapsed(); }
+    constructor(subDocument, intervals, lastIntervalIndex = intervals.length - 1) {
+        this.specialRunInfo = new SelectedSpecialRunInfo();
+        this.subDocument = subDocument;
+        this._intervals = intervals;
+        this.lastIntervalIndex = lastIntervalIndex;
+        this._tableInfo = null;
+    }
     static fromPosition(subDocument, position) {
         return new SelectionIntervalsInfo(subDocument, [new FixedInterval(position, 0)], 0);
     }

package/lib/common/selection/selection-state.js

@@ -3,6 +3,11 @@ import { SelectionIntervalsInfo } from './selection-intervals-info';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class SelectionState {
+    get interval() { return this.intervalsInfo.interval; }
+    ;
+    get anchorPostion() { return this.forwardDirection ? this.interval.start : this.interval.end; }
+    get activePostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
+    get reversedAnchorPostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
     constructor(intervalsInfo, forwardDirection, endOfLine, pageIndex) {
         this.forwardDirection = true;
         this.endOfLine = false;
@@ -13,11 +18,6 @@ export class SelectionState {
         this.endOfLine = endOfLine;
         this.pageIndex = pageIndex;
     }
-    get interval() { return this.intervalsInfo.interval; }
-    ;
-    get anchorPostion() { return this.forwardDirection ? this.interval.start : this.interval.end; }
-    get activePostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
-    get reversedAnchorPostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
     setEndOfLine(endOfLine) {
         this.endOfLine = endOfLine;
         return this;

package/lib/common/selection/selection.js

@@ -35,19 +35,6 @@ export class SetSelectionStateOptions {
     }
 }
 export class Selection extends BatchUpdatableObject {
-    constructor(model, layout, activeSubDocument) {
-        super();
-        this.searchIntervals = [];
-        this.misspelledIntervals = [];
-        this.onChanged = new EventDispatcher();
-        this.onSearchChanged = new EventDispatcher();
-        this.onMisspelledSelectionChanged = new EventDispatcher();
-        this.model = model;
-        this.layout = layout;
-        this.scrollManager = new ModelScrollManager();
-        this._prevState = SelectionState.getDefault(activeSubDocument);
-        this._state = SelectionState.getDefault(activeSubDocument);
-    }
     get currState() { return this._state; }
     get keepX() { return this._state.keepX; }
     set keepX(val) { this._state.keepX = val; }
@@ -73,6 +60,19 @@ export class Selection extends BatchUpdatableObject {
     get specialRunInfo() { return this._state.intervalsInfo.specialRunInfo; }
     ;
     get tableInfo() { return this._state.intervalsInfo.tableInfo; }
+    constructor(model, layout, activeSubDocument) {
+        super();
+        this.searchIntervals = [];
+        this.misspelledIntervals = [];
+        this.onChanged = new EventDispatcher();
+        this.onSearchChanged = new EventDispatcher();
+        this.onMisspelledSelectionChanged = new EventDispatcher();
+        this.model = model;
+        this.layout = layout;
+        this.scrollManager = new ModelScrollManager();
+        this._prevState = SelectionState.getDefault(activeSubDocument);
+        this._state = SelectionState.getDefault(activeSubDocument);
+    }
     dispose() {
         this.onChanged.dispose();
     }

package/lib/common/ui/quick-search-panel.js

@@ -4,12 +4,12 @@ import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { KeyCode, KeyUtils } from '@devexpress/utils/lib/utils/key';
 import { RichEditClientCommand } from '../commands/client-command';
 export class QuickSearchPanel {
+    get core() { return this.owner.core; }
     constructor(owner, searchManager) {
         this.owner = owner;
         this.searchManager = searchManager;
         this.initialize();
     }
-    get core() { return this.owner.core; }
     dispose() {
         if (this.isVisible())
             this.onClose(true);

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

@@ -10,13 +10,13 @@ export class RulerModelState {
     }
 }
 export class RulerBase {
+    get visible() { return this._visible; }
     constructor(modelData, controls) {
         this._visible = true;
         this.modelData = modelData;
         this.controls = controls;
         this.rootElement = DocumentRenderer.renderContainer(this.getRootClassName());
     }
-    get visible() { return this._visible; }
     dispose() {
         DomUtils.hideNode(this.rootElement);
         this.rootElement = null;

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

@@ -33,12 +33,12 @@ export var ColumnAction;
     ColumnAction[ColumnAction["ColumnWidth"] = 3] = "ColumnWidth";
 })(ColumnAction || (ColumnAction = {}));
 export class RulerColumnModelState {
+    get rightPos() { return this.leftPos + this.width; }
     constructor(leftPos, width, space) {
         this.leftPos = leftPos;
         this.width = width;
         this.space = space;
     }
-    get rightPos() { return this.leftPos + this.width; }
     clone() {
         return new RulerColumnModelState(this.leftPos, this.width, this.space);
     }

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

@@ -13,6 +13,7 @@ export const DIVISION_MINOR_CLASS_NAME = RULER_CLASS_NAME + "Minor" + DIVISION_C
 export const DIVISION_MAJOR_CLASS_NAME = RULER_CLASS_NAME + "Major" + DIVISION_CLASS_NAME;
 export const DIVISION_NUMBER_CLASS_NAME = RULER_CLASS_NAME + "Number" + DIVISION_CLASS_NAME;
 export class RulerDivisionsControl extends RulerBase {
+    getRootClassName() { return DIVISION_CONTAINER_CLASS_NAME; }
     constructor(modelData, controls, divisionInfo, maxPageWidth) {
         super(modelData, controls);
         this.height = 0;
@@ -25,7 +26,6 @@ export class RulerDivisionsControl extends RulerBase {
         createDivisionElements(this.rootElement, unitCount, divisionInfo, this.height);
         this.initialLeft = -(unitCount * divisionInfo.unitSize - RULLER_NUMBER_CORRECTION);
     }
-    getRootClassName() { return DIVISION_CONTAINER_CLASS_NAME; }
     update() {
         this.updateModelState();
         this.updateView();

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

@@ -7,6 +7,11 @@ import { RulerTemplateManager } from '../template-manager';
 import { RulerBaseIndentControl, RulerMinDistanceBetweenIndents } from './base';
 import { SizeUtils } from '../../../../../common/utils/size-utils';
 export class RulerFirstLineIndentDragHandle extends RulerBaseIndentControl {
+    get heightOfProtrudingPart() { return this.modelData.settings.showLeftIndent ? this._heightOfProtrudingPart : 0; }
+    getRootClassName() {
+        return this.modelData.settings.styles.firstLineIndentImage.spriteCssClass + " " +
+            this.modelData.settings.styles.firstLineIndent.className;
+    }
     constructor(modelData, controls) {
         super(modelData, controls);
         const template = RulerTemplateManager.getFirstLineIndentElementTemplate();
@@ -18,11 +23,6 @@ export class RulerFirstLineIndentDragHandle extends RulerBaseIndentControl {
         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.firstLineIndentImage.spriteCssClass + " " +
-            this.modelData.settings.styles.firstLineIndent.className;
-    }
     adjustByTop() {
         const mainElementHeight = SizeUtils.getOffsetHeight(this.rootElement);
         const divisionsControlHeight = this.controls.divisions.height;

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

@@ -9,6 +9,8 @@ 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 {
+    get heightOfProtrudingPart() { return this.modelData.settings.showLeftIndent ? this._heightOfProtrudingPart : 0; }
+    getRootClassName() { return this.modelData.settings.styles.leftIndent.className; }
     constructor(modelData, controls) {
         super(modelData, controls);
         this.isActionLeftIndent = false;
@@ -35,8 +37,6 @@ export class RulerLeftIndentDragHandle extends RulerBaseIndentControl {
         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 = SizeUtils.getOffsetHeight(this.rootElement);
         const divisionsControlHeight = this.controls.divisions.height;

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

@@ -7,6 +7,11 @@ import { SnapTo } from '../vertical-line';
 import { RulerBaseIndentControl, RulerMinDistanceBetweenIndents } from './base';
 const RulerMinDistanceBetweenIndentsOnView = 5;
 export class RulerRightIndentDragHandle extends RulerBaseIndentControl {
+    get viewStateRelativeLeft() { return this.controls.ruler.pageWidth - this.viewState; }
+    getRootClassName() {
+        return this.modelData.settings.styles.rightIndentImage.spriteCssClass + " " +
+            this.modelData.settings.styles.rightIndent.className;
+    }
     constructor(modelData, controls) {
         super(modelData, controls);
         const template = RulerTemplateManager.getRightIndentElementTemplate();
@@ -17,11 +22,6 @@ export class RulerRightIndentDragHandle extends RulerBaseIndentControl {
         this.adjustByTop();
         this.leftCorrection = Math.round(this.rootElement.offsetWidth / 2);
     }
-    get viewStateRelativeLeft() { return this.controls.ruler.pageWidth - this.viewState; }
-    getRootClassName() {
-        return this.modelData.settings.styles.rightIndentImage.spriteCssClass + " " +
-            this.modelData.settings.styles.rightIndent.className;
-    }
     adjustByTop() {
         const divisionsControlHeight = this.controls.divisions.height;
         this.rootElement.style.marginTop = divisionsControlHeight / 2 + "px";

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

@@ -8,6 +8,9 @@ export const RulerMinDistanceBetweenMargins = 50;
 const DIVISION_MARGIN_LEFT_CURSOR_CLASS_NAME = RULER_CLASS_NAME + "MarginLeftHandlePanel";
 const DIVISION_MARGIN_LEFT_CLASS_NAME = RULER_CLASS_NAME + "MarginLeftPanel";
 export class RulerLeftMarginDragHandle extends RulerBaseMarginControl {
+    getRootClassName() { return ''; }
+    ;
+    get commandType() { return RichEditClientCommand.RulerSectionMarginLeft; }
     constructor(modelData, controls, maxPageWidth) {
         super(modelData, controls);
         this.initialLeft = -(Math.ceil(maxPageWidth) - RULLER_NUMBER_CORRECTION);
@@ -19,9 +22,6 @@ export class RulerLeftMarginDragHandle extends RulerBaseMarginControl {
         this.controls.ruler.rootElement.appendChild(this.marginPanelElement);
         this.controls.ruler.rootElement.appendChild(this.handlePanelElement);
     }
-    getRootClassName() { return ''; }
-    ;
-    get commandType() { return RichEditClientCommand.RulerSectionMarginLeft; }
     setViewStateToElement(element) {
         element.style.left = this.viewState + this.initialLeft + "px";
     }

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

@@ -1,4 +1,5 @@
 export class RulerMultiControl {
+    get activeSubControl() { return this.subControls[this.handleControlIndex]; }
     constructor(modelData, controls) {
         this.subControls = [];
         this.handleControlIndex = -1;
@@ -6,7 +7,6 @@ export class RulerMultiControl {
         this.modelData = modelData;
         this.controls = controls;
     }
-    get activeSubControl() { return this.subControls[this.handleControlIndex]; }
     dispose() {
         for (let elem of this.subControls)
             elem.dispose();

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

@@ -6,6 +6,10 @@ import { RULLER_NUMBER_CORRECTION } from '../settings';
 import { RulerBase } from './base';
 import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 export class RulerControl extends RulerBase {
+    getRootClassName() { return this.modelData.settings.styles.control.className; }
+    ;
+    get pageWidth() { return this.currPageWidth; }
+    ;
     constructor(modelData, controls) {
         super(modelData, controls);
         this.canHandleScroll = false;
@@ -17,10 +21,6 @@ export class RulerControl extends RulerBase {
             DomUtils.addClassName(this.rootElement, TouchUtils.msTouchDraggableClassName);
         this.controls.wrapper.rootElement.appendChild(this.rootElement);
     }
-    getRootClassName() { return this.modelData.settings.styles.control.className; }
-    ;
-    get pageWidth() { return this.currPageWidth; }
-    ;
     init() {
         this.rootElement.style.height = this.controls.divisions.height + "px";
         this.setPaddings();

package/lib/common/ui/ruler/controls/tab/tab-type.js

@@ -8,6 +8,8 @@ import { RulerBase } from '../base';
 import { RulerTabUtils } from './utils';
 const TAB_ALIGN_BOX_PART_HANDLE_CLASS_NAME = RICH_EDIT_CLASS_NAME_PREFIX + "rulertabAlignBox";
 export class RulerTabTypeControl extends RulerBase {
+    getRootClassName() { return TAB_ALIGN_BOX_PART_HANDLE_CLASS_NAME; }
+    ;
     constructor(modelData, controls) {
         super(modelData, controls);
         this.evtHandlersHolder = new DomEventHandlersHolder();
@@ -20,8 +22,6 @@ export class RulerTabTypeControl extends RulerBase {
         this.controls.wrapper.rootElement.appendChild(this.rootElement);
         this.evtHandlersHolder.addListener(this.innerSquareElement, TouchUtils.touchMouseDownEventName, this.onMouseDown.bind(this));
     }
-    getRootClassName() { return TAB_ALIGN_BOX_PART_HANDLE_CLASS_NAME; }
-    ;
     init() {
         this.adjust();
     }

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

@@ -20,6 +20,24 @@ import { RulerMouseEventsManager } from './events/mouse';
 import { RulerViewElementScrollManager } from './events/scroll';
 import { RulerMouseHandler } from './mouse-handler';
 export class RulerControls {
+    get paragraphLeftPosition() {
+        let pos = this.leftMargin.currModelState.modelValue + this.columns.currModelState.activeColumn.leftPos;
+        if (this.tables.currModelState.columnSeparators.hasItems) {
+            const item = this.tables.currModelState.columnSeparators.currItem;
+            pos += this.tables.currModelState.columnSeparators.cellSpacing + item.leftMargin + item.position;
+        }
+        return pos;
+    }
+    get paragraphRightPosition() {
+        const colSeps = this.tables.currModelState.columnSeparators;
+        if (colSeps.hasItems) {
+            const nextSeparatorItem = colSeps.items[colSeps.index + 1];
+            return this.leftMargin.currModelState.modelValue + this.columns.currModelState.activeColumn.leftPos +
+                (nextSeparatorItem.position - colSeps.cellSpacing - colSeps.currItem.rightMargin);
+        }
+        else
+            return this.leftMargin.currModelState.modelValue + this.columns.currModelState.activeColumn.rightPos;
+    }
     constructor(canvas, modelData) {
         this.mouseEventsManager = new RulerMouseEventsManager();
         this.viewElementScrollManager = new RulerViewElementScrollManager();
@@ -46,24 +64,6 @@ export class RulerControls {
         this.mouseEventsManager.addListener(this.mouseHandler);
         this.viewElementScrollManager.addListener(this.ruler, this.canvas);
     }
-    get paragraphLeftPosition() {
-        let pos = this.leftMargin.currModelState.modelValue + this.columns.currModelState.activeColumn.leftPos;
-        if (this.tables.currModelState.columnSeparators.hasItems) {
-            const item = this.tables.currModelState.columnSeparators.currItem;
-            pos += this.tables.currModelState.columnSeparators.cellSpacing + item.leftMargin + item.position;
-        }
-        return pos;
-    }
-    get paragraphRightPosition() {
-        const colSeps = this.tables.currModelState.columnSeparators;
-        if (colSeps.hasItems) {
-            const nextSeparatorItem = colSeps.items[colSeps.index + 1];
-            return this.leftMargin.currModelState.modelValue + this.columns.currModelState.activeColumn.leftPos +
-                (nextSeparatorItem.position - colSeps.cellSpacing - colSeps.currItem.rightMargin);
-        }
-        else
-            return this.leftMargin.currModelState.modelValue + this.columns.currModelState.activeColumn.rightPos;
-    }
     dispose() {
         this.lineControl.dispose();
         this.wrapper.dispose();

package/lib/common/ui/ruler/model-data.js

@@ -1,10 +1,6 @@
 import { ReadOnlyMode } from '../../interfaces/i-rich-edit-core';
 import { RulerStyleInfo } from './settings';
 export class RulerModelData {
-    constructor(core, settings) {
-        this.core = core;
-        this.settings = this.fixSettings(settings);
-    }
     get inputPosition() { return this.core.inputPosition; }
     ;
     get commandManager() { return this.core.commandManager; }
@@ -13,6 +9,10 @@ export class RulerModelData {
     get isReadOnly() { return this.core.readOnly != ReadOnlyMode.None; }
     get unitType() { return this.core.uiUnitConverter.getUnits(); }
     get selection() { return this.core.selection; }
+    constructor(core, settings) {
+        this.core = core;
+        this.settings = this.fixSettings(settings);
+    }
     fixSettings(settings) {
         if (!settings.styles.firstLineIndent)
             settings.styles.firstLineIndent = this.getDefaultStyle('dxreFirstLineIndentDragHandle');

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

@@ -12,6 +12,8 @@ var HorizontalRulerEventType;
     HorizontalRulerEventType[HorizontalRulerEventType["CheckSelectionChange"] = 2] = "CheckSelectionChange";
 })(HorizontalRulerEventType || (HorizontalRulerEventType = {}));
 export class HorizontalRulerControl extends BatchUpdatableObject {
+    get initialized() { return !!this.controls; }
+    ;
     constructor(core, settings, canvas) {
         super();
         this.controls = null;
@@ -23,8 +25,6 @@ export class HorizontalRulerControl extends BatchUpdatableObject {
         this.modelData = new RulerModelData(core, settings);
         this.canvas = canvas;
     }
-    get initialized() { return !!this.controls; }
-    ;
     dispose() {
         if (this.initialized)
             this.controls.dispose();

package/lib/common/utils/utils.d.ts

@@ -1,4 +1,5 @@
 import { Point } from '@devexpress/utils/lib/geometry/point';
+import { IRichEditControl } from '../interfaces/i-rich-edit-core';
 export declare function rotatePoint(point: Point, angle: number, center: Point): Point;
 export declare class SearchTreeItemResult<T> {
     readonly parentList: T[];
@@ -11,3 +12,9 @@ export declare function searchTreeItem<T extends {
 }>(items: T[], comparer: (item: T) => boolean): SearchTreeItemResult<T> | null;
 export declare function convertToFunction(func: any): any | null;
 export declare function splitByLines(text: string): string[];
+export interface IUrlValidationOptions {
+    allowRelativeUrl?: boolean;
+    allowedProtocols?: string[];
+}
+export declare function createUrlValidationOptions(control: IRichEditControl): IUrlValidationOptions;
+export declare function isUrlValid(url: string, options?: IUrlValidationOptions): boolean;

package/lib/common/utils/utils.js

@@ -56,3 +56,29 @@ export function convertToFunction(func) {
 export function splitByLines(text) {
     return text ? text.split(/\r\n|\r|\n/) : [''];
 }
+export function createUrlValidationOptions(control) {
+    const fieldSettings = control.modelManager.richOptions.fields;
+    return {
+        allowRelativeUrl: !fieldSettings.disableRelativeHyperlinkUri,
+        allowedProtocols: fieldSettings.allowedHyperlinkUriProtocols
+    };
+}
+const disallowedProtocols = [
+    'data',
+    'javascript'
+];
+export function isUrlValid(url, options) {
+    let currentLocation;
+    if (options === null || options === void 0 ? void 0 : options.allowRelativeUrl)
+        currentLocation = window.location.href;
+    try {
+        const resultUrl = new URL(url, currentLocation);
+        const protocol = resultUrl.protocol.slice(0, -1);
+        const allowedProtocols = options === null || options === void 0 ? void 0 : options.allowedProtocols;
+        if (allowedProtocols)
+            return allowedProtocols.includes(protocol);
+        return !disallowedProtocols.includes(protocol);
+    }
+    catch (_a) { }
+    return false;
+}

package/lib/common/view-settings/views-settings.js

@@ -42,12 +42,6 @@ export class RenderPageVertivalInfo {
     }
 }
 export class ViewSettings {
-    constructor() {
-        this.viewType = ViewType.PrintLayout;
-        this.paddings = new Margins(15, 15, 15, 15);
-        this.pageVerticalInfo = new RenderPageVertivalInfo();
-        this.showHorizontalRuler = true;
-    }
     get isFixedWidthMode() { return this.fixedWidth !== undefined && this.fixedWidth !== null; }
     set widthOfPage(val) { this._widthOfPage = val; }
     get widthOfPage() {
@@ -58,6 +52,12 @@ export class ViewSettings {
     }
     get isSimpleView() { return this.viewType == ViewType.Simple; }
     get isPrintLayoutView() { return this.viewType == ViewType.PrintLayout; }
+    constructor() {
+        this.viewType = ViewType.PrintLayout;
+        this.paddings = new Margins(15, 15, 15, 15);
+        this.pageVerticalInfo = new RenderPageVertivalInfo();
+        this.showHorizontalRuler = true;
+    }
     copyFrom(obj) {
         this.paddings = new Margins(obj.paddings.left, obj.paddings.right, obj.paddings.top, obj.paddings.bottom);
         this.viewType = obj.viewType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.6-build-24232-0102",
+  "version": "24.2.1-alpha-24260-0102",
   "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.6-build-24230-1935",
-    "devextreme-dist": "24.1.6-build-24230-1935"
+    "devextreme": "24.2.1-alpha-24256-1935",
+    "devextreme-dist": "24.2.1-alpha-24256-1935"
   },
   "dependencies": {
     "jszip": "~3.10.1",