devexpress-richedit 24.2.1-alpha-24260-0102 → 24.2.2-beta

package/lib/common/model/fields/parsers/field-code-parser.d.ts

@@ -38,7 +38,8 @@ export declare class FieldSwitch {
 export declare class FieldParameter {
     interval: FixedInterval;
     text: string;
-    constructor(interval: FixedInterval, textRepresentation: string);
+    quoted: boolean;
+    constructor(interval: FixedInterval, textRepresentation: string, quoted?: boolean);
     clone(): FieldParameter;
 }
 export declare class FieldCodeParserHelper {
@@ -97,7 +98,7 @@ export declare abstract class FieldCodeParser {
     updateInfo(): boolean;
     protected needUpdateInfo(): boolean;
     protected updateInfoCore(): void;
-    parseSwitchesAndArgs(needAtLestOneSpaceAfterFieldName: boolean): boolean;
+    parseSwitchesAndArgs(): boolean;
     private skipWhitespaces;
     private getFieldParameterInfo;
     private getSwitchInfo;

package/lib/common/model/fields/parsers/field-code-parser.js

@@ -43,12 +43,13 @@ export class FieldSwitch {
     }
 }
 export class FieldParameter {
-    constructor(interval, textRepresentation) {
+    constructor(interval, textRepresentation, quoted = false) {
         this.text = textRepresentation;
         this.interval = interval;
+        this.quoted = quoted;
     }
     clone() {
-        return new FieldParameter(this.interval.clone(), this.text);
+        return new FieldParameter(this.interval.clone(), this.text, this.quoted);
     }
 }
 export class FieldCodeParserHelper {
@@ -313,7 +314,7 @@ export class FieldCodeParser {
     updateInfo() {
         if (!this.needUpdateInfo())
             return false;
-        this.parseSwitchesAndArgs(true);
+        this.parseSwitchesAndArgs();
         this.updateInfoCore();
         return true;
     }
@@ -321,14 +322,7 @@ export class FieldCodeParser {
         return false;
     }
     updateInfoCore() { }
-    parseSwitchesAndArgs(needAtLestOneSpaceAfterFieldName) {
-        if (needAtLestOneSpaceAfterFieldName) {
-            var prevPos = this.modelIterator.getAbsolutePosition();
-            if (this.skipWhitespaces())
-                this.modelIterator.setPosition(prevPos);
-            else
-                return this.modelIterator.run.getType() == RunType.FieldCodeEndRun;
-        }
+    parseSwitchesAndArgs() {
         while (this.skipWhitespaces() && this.modelIterator.run.getType() != RunType.FieldCodeEndRun) {
             var currChar = this.modelIterator.getCurrentChar();
             if (FieldCodeParserHelper.isBackslesh(currChar)) {
@@ -364,7 +358,7 @@ export class FieldCodeParser {
         var argInterval = parseResult.quoted ?
             FixedInterval.fromPositions(startPosition + 1, this.modelIterator.getAbsolutePosition() - 1) :
             FixedInterval.fromPositions(startPosition, this.modelIterator.getAbsolutePosition());
-        return new FieldParameter(argInterval, parseResult.argListChars.join(""));
+        return new FieldParameter(argInterval, parseResult.argListChars.join(""), parseResult.quoted);
     }
     getSwitchInfo() {
         if (!this.moveIteratorToNextChar() || this.modelIterator.run.getType() != RunType.TextRun)

package/lib/common/model/fields/tree-creator.js

@@ -18,6 +18,7 @@ import { FieldCodeParserTc } from './parsers/field-code-parser-tc';
 import { FieldCodeParserTime } from './parsers/field-code-parser-time';
 import { FieldCodeParserToc } from './parsers/field-code-parser-toc';
 import { FieldCodeParserFillIn } from './parsers/fill-in';
+import { FieldCodeParserIf } from './parsers/field-code-parser-if';
 class FieldParsersAndIntervals {
     constructor(interval) {
         this.interval = interval;
@@ -182,6 +183,7 @@ export class FieldsWaitingForUpdate {
 }
 FieldsWaitingForUpdate.TOC_NAME = "TOC";
 FieldsWaitingForUpdate.parsersMap = {
+    ["IF"]: (args) => new FieldCodeParserIf(args),
     ["DATE"]: (args) => new FieldCodeParserDate(args),
     ["TIME"]: (args) => new FieldCodeParserTime(args),
     ["DOCVARIABLE"]: (args) => new FieldCodeParserDocVariable(args),

package/lib/common/model/history/items/floating-objects/insert-anchored-picture-history-item.js

@@ -23,6 +23,7 @@ export class InsertAnchoredTextBoxHistoryItem extends PositionBasedHistoryItem {
     }
     redo() {
         this.modelManipulator.textBox.insertAnchoredTextBox(this.subDocPos, this.charPropsBundle, this.textBoxInfo);
+        this.modelManipulator.model.subDocumentsCollection.restore(this.textBoxInfo.innerSubDocument.id);
     }
     undo() {
         this.modelManipulator.range.removeIntervalWithoutHistory(this.boundSubDocument, new FixedInterval(this.position, 1), false);

package/lib/common/model/history/items/switch-text-box-sub-documents-state-history-item.js

@@ -7,7 +7,6 @@ export class SwitchTextBoxSubDocumentsStateHistoryItem extends HistoryItem {
         this.position = position;
     }
     redo() {
-        this.oldSubDocument = this.oldSubDocument.getActualSubDocument();
         const newRun = this.textBoxParentSubDocument.getRunAndIndexesByPosition(this.position).run;
         this.newSubDocument = this.modelManipulator.model.subDocuments[newRun.subDocId];
         this.modelManipulator.model.subDocumentsCollection.replace(this.oldSubDocument.id, this.newSubDocument.id);

package/lib/common/model/manipulators/document/sub-document-inserter.d.ts

@@ -53,6 +53,7 @@ export declare class SubDocumentInserter {
     private getPatternTable;
     private collectFields;
     private collectBookmarks;
+    private collectRangePermission;
     private prependTableByParagraph;
     private getFontInfo;
     private getColorModelInfo;

package/lib/common/model/manipulators/document/sub-document-inserter.js

@@ -96,6 +96,7 @@ export class SubDocumentInserter {
             this.collectTables();
             this.collectFields();
             this.collectBookmarks();
+            this.collectRangePermission();
             if (this.options.overlapTableCellContent) {
                 const lastInsertedParagraph = this.targetSubDocument.getParagraphByPosition(this.currInsertSubDocumentPosition.position - 1);
                 const nextParagraph = this.targetSubDocument.getParagraphByPosition(this.currInsertSubDocumentPosition.position);
@@ -204,6 +205,9 @@ export class SubDocumentInserter {
     collectBookmarks() {
         this.targetModelManipulator.bookmark.insertBookmarksFromSubDocument(this.sourceSubDocument, this.targetSubDocument, this.sourceInterval, this.modelsConstOffset);
     }
+    collectRangePermission() {
+        this.targetModelManipulator.rangePermission.insertRangePermissionsFromSubDocument(this.sourceSubDocument, this.targetSubDocument, this.sourceInterval, this.modelsConstOffset);
+    }
     prependTableByParagraph() {
         if (this.options.insertParagraphMarkBeforeIfStartsWithTable) {
             const tbl = Table.getTableByPosition(this.sourceSubDocument.tables, this.sourceInterval.start, false);

package/lib/common/model/manipulators/range/remove-interval-operation.d.ts

@@ -4,6 +4,7 @@ import { HistoryRun } from '../../character/history-runs';
 import { SubDocument } from '../../sub-document';
 import { TableCell } from '../../tables/main-structures/table-cell';
 import { ModelManipulator } from '../model-manipulator';
+import { ConstRangePermission } from '../../range-permissions';
 export declare class RemoveIntervalOperation {
     modelManipulator: ModelManipulator;
     currentSectionIndex: number;
@@ -42,6 +43,7 @@ export declare class RemoveIntervalOperationResult {
     private nestingLevels;
     private cellsIterator;
     bookmarkItems: ConstBookmark[];
+    rangePermssionsItems: ConstRangePermission[];
     constructor(cellsIterator: SelectedCellsIterator);
     registerItem(historyRun: HistoryRun): void;
     private registerItemCore;

package/lib/common/model/manipulators/range/remove-interval-operation.js

@@ -23,6 +23,7 @@ export class RemoveIntervalOperation {
         this.cellsIterator = new SelectedCellsIterator(this.subDocument, interval);
         const result = new RemoveIntervalOperationResult(this.cellsIterator);
         result.bookmarkItems = this.modelManipulator.bookmark.deleteBookmarks(this.subDocument, interval);
+        result.rangePermssionsItems = this.modelManipulator.rangePermission.deleteRangePermissions(this.subDocument, interval);
         if (this.tryPackSelectionInOneRun(interval, result))
             return result;
         var iterator = this.subDocument.getRunIterator(interval);
@@ -53,8 +54,14 @@ export class RemoveIntervalOperation {
         var accumulatedInterval = new FixedInterval(this.position, 0);
         let removedTextList = [];
         while (iterator.moveNext()) {
-            if (EnumUtils.isAnyOf(iterator.currentRun.getType(), RunType.AnchoredPictureRun, RunType.AnchoredTextBoxRun))
-                this.modelManipulator.notifyModelChanged(new AnchorObjectRemovedSubDocumentChange(this.subDocument.id, (iterator.currentRun).anchoredObjectID, iterator.currentInterval().start));
+            if (EnumUtils.isAnyOf(iterator.currentRun.getType(), RunType.AnchoredPictureRun, RunType.AnchoredTextBoxRun)) {
+                const currentRun = iterator.currentRun;
+                const position = iterator.currentInterval().start;
+                const change = new AnchorObjectRemovedSubDocumentChange(this.subDocument.id, currentRun.anchoredObjectID, position);
+                if (currentRun instanceof AnchoredTextBoxRun)
+                    this.modelManipulator.model.subDocumentsCollection.replace(currentRun.subDocId, subDocument.id);
+                this.modelManipulator.notifyModelChanged(change);
+            }
             if (iterator.currentChunk !== subDocument.chunks[this.currentChunkIndex]) {
                 this.removeAccumulatedInterval(accumulatedInterval, this.position, 0, removedTextList);
                 this.currentChunkIndex++;
@@ -348,6 +355,7 @@ export class RemoveIntervalOperationResult {
         this.historyRuns = [];
         this.nestingLevels = [];
         this.bookmarkItems = [];
+        this.rangePermssionsItems = [];
         this.cellsIterator = cellsIterator;
     }
     registerItem(historyRun) {

package/lib/common/model/manipulators/range-permission-manipulator.d.ts

@@ -1,7 +1,11 @@
 import { ConstRangePermission } from '../range-permissions';
 import { SubDocument } from '../sub-document';
 import { BaseManipulator } from './base-manipulator';
+import { ConstInterval } from '@devexpress/utils/lib/intervals/const';
+import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 export declare class RangePermissionManipulator extends BaseManipulator {
     createRangePermission(subDocument: SubDocument, permissionTemplate: ConstRangePermission): void;
     deleteRangePermission(subDocument: SubDocument, permissionTemplate: ConstRangePermission, permissionIndex?: number): void;
+    insertRangePermissionsFromSubDocument(fromSubDocument: SubDocument, toSubDocument: SubDocument, fromInterval: ConstInterval, modelsConstOffset: number): void;
+    deleteRangePermissions(subDocument: SubDocument, interval: FixedInterval): ConstRangePermission[];
 }

package/lib/common/model/manipulators/range-permission-manipulator.js

@@ -2,6 +2,7 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { RangePermissionsChangedSubDocumentChange } from '../changes/sub-document/range-permissions-changed';
 import { ConstRangePermission, RangePermission } from '../range-permissions';
 import { BaseManipulator } from './base-manipulator';
+import { SearchUtils } from '@devexpress/utils/lib/utils/search';
 export class RangePermissionManipulator extends BaseManipulator {
     createRangePermission(subDocument, permissionTemplate) {
         subDocument.rangePermissions.push(new RangePermission(subDocument.positionManager, permissionTemplate.interval, permissionTemplate.userName, permissionTemplate.group));
@@ -14,4 +15,38 @@ export class RangePermissionManipulator extends BaseManipulator {
         subDocument.filterRangePermissions(this.modelManipulator.modelManager.richOptions.documentProtection);
         this.modelManipulator.notifyModelChanged(new RangePermissionsChangedSubDocumentChange(subDocument.id, permissionTemplate));
     }
+    insertRangePermissionsFromSubDocument(fromSubDocument, toSubDocument, fromInterval, modelsConstOffset) {
+        const rangePermissions = fromSubDocument.rangePermissions;
+        let ind = SearchUtils.normedInterpolationIndexOf(rangePermissions, (b) => b.start, fromInterval.start);
+        while (rangePermissions[ind] && rangePermissions[ind].start >= fromInterval.start)
+            ind--;
+        ind = Math.max(0, ind);
+        for (let rpm; (rpm = rangePermissions[ind]) && rpm.start <= fromInterval.end; ind++) {
+            if (fromInterval.containsInterval(rpm.interval)) {
+                const template = rpm.constRangePermission;
+                template.interval.start += modelsConstOffset;
+                template.interval.end += modelsConstOffset + 1;
+                this.createRangePermission(toSubDocument, template);
+            }
+        }
+        toSubDocument.rangePermissions = toSubDocument.rangePermissions.sort(ConstRangePermission.comparer);
+    }
+    deleteRangePermissions(subDocument, interval) {
+        const rangePermissions = subDocument.rangePermissions;
+        const result = [];
+        let ind = SearchUtils.normedInterpolationIndexOf(rangePermissions, (b) => b.start, interval.start);
+        while (rangePermissions[ind] && rangePermissions[ind].start >= interval.start)
+            ind--;
+        ind = Math.max(0, ind);
+        for (let curr; (curr = rangePermissions[ind]) && curr.interval.start <= interval.end;) {
+            if (interval.containsInterval(curr.interval)) {
+                const tmpl = curr.constRangePermission;
+                this.deleteRangePermission(subDocument, tmpl, ind);
+                result.push(tmpl);
+            }
+            else
+                ind++;
+        }
+        return result;
+    }
 }

package/lib/common/model/manipulators/text-box-manipulator.d.ts

@@ -17,6 +17,6 @@ export declare class BaseTextBoxInfo {
     constructor(innerSubDocument: SubDocument, size: AnchorTextBoxSize, shape: Shape, anchorInfo: AnchorInfo, textBoxProperties: TextBoxProperties, containerProperties: NonVisualDrawingObjectInfo);
 }
 export declare class TextBoxManipulator extends RunsBaseManipulator {
-    insertAnchoredTextBoxViaHistoty(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): void;
+    insertAnchoredTextBoxViaHistory(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): void;
     insertAnchoredTextBox(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): AnchoredTextBoxRun;
 }

package/lib/common/model/manipulators/text-box-manipulator.js

@@ -16,7 +16,7 @@ export class BaseTextBoxInfo {
     }
 }
 export class TextBoxManipulator extends RunsBaseManipulator {
-    insertAnchoredTextBoxViaHistoty(subDocPos, charPropsBundle, textBoxInfo) {
+    insertAnchoredTextBoxViaHistory(subDocPos, charPropsBundle, textBoxInfo) {
         this.history.addAndRedo(new InsertAnchoredTextBoxHistoryItem(this.modelManipulator, subDocPos, charPropsBundle, textBoxInfo));
     }
     insertAnchoredTextBox(subDocPos, charPropsBundle, textBoxInfo) {
@@ -33,6 +33,7 @@ export class TextBoxManipulator extends RunsBaseManipulator {
         let textBoxSubDoc = textBoxInfo.innerSubDocument ?
             textBoxInfo.innerSubDocument :
             this.model.createSubDocument(SubDocumentInfoType.TextBox, subDocument.id);
+        textBoxInfo.innerSubDocument = textBoxSubDoc;
         textBoxRun.subDocId = textBoxSubDoc.id;
         subDocument.chunks[insertedRun.chunkIndex].textRuns[insertedRun.runIndex].paragraph.length++;
         this.modelManipulator.notifyModelChanged(new AnchoredTextBoxInsertedSubDocumentChange(subDocument.id, textBoxRun.anchoredObjectID, textBoxRun.subDocId, insertPositionAtStartDocument, textBoxInfo.anchorInfo, textBoxRun.containerProperties));

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

@@ -39,7 +39,7 @@ export class TextManipulator extends RunsBaseManipulator {
             return null;
         const historyItems = history.historyItems;
         const result = history.currentIndex == historyItems.length - 1 ? this.getLastHistoryItemNode(historyItems, null, checkType) : null;
-        return !result.empty ? result : null;
+        return (result === null || result === void 0 ? void 0 : result.empty) ? null : result;
     }
     getLastHistoryItemNode(historyItems, parent, checkType) {
         for (let ind = historyItems.length - 1, item; item = historyItems[ind]; ind--) {

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

@@ -6,8 +6,7 @@ export declare class FieldsSettings {
     defaultTimeFormat: string;
     defaultDateFormat: string;
     openHyperlinkOnClick: boolean;
-    disableRelativeHyperlinkUri: boolean;
-    allowedHyperlinkUriProtocols: string[];
+    allowedHyperlinkUriSchemes: string[];
     keepHyperlinkResultForInvalidReference: boolean;
     createHyperlinkTooltip: (hyperlinkTooltip: string, hint: string) => string;
     constructor();

package/lib/common/model/options/fields.js

@@ -4,7 +4,6 @@ export class FieldsSettings {
     ;
     constructor() {
         this.openHyperlinkOnClick = false;
-        this.disableRelativeHyperlinkUri = false;
         this.updateFieldsBeforePrint = true;
         this.updateFieldsOnPaste = true;
         this.defaultTimeFormat = FieldsSettings.DEFAULT_TIME_FORMAT;
@@ -30,10 +29,8 @@ export class FieldsSettings {
             this.keepHyperlinkResultForInvalidReference = obj.keepHyperlinkResultForInvalidReference;
         if (isDefined(obj.createHyperlinkTooltip) && obj.createHyperlinkTooltip !== '')
             this.createHyperlinkTooltip = convertToFunction(obj.createHyperlinkTooltip);
-        if (isDefined(obj.disableRelativeHyperlinkUri))
-            this.disableRelativeHyperlinkUri = obj.disableRelativeHyperlinkUri;
-        if (isDefined(obj.allowedHyperlinkUriProtocols))
-            this.allowedHyperlinkUriProtocols = obj.allowedHyperlinkUriProtocols;
+        if (isDefined(obj.allowedHyperlinkUriSchemes))
+            this.allowedHyperlinkUriSchemes = obj.allowedHyperlinkUriSchemes;
     }
     clone() {
         const result = new FieldsSettings();

package/lib/common/model/styles-manager.js

@@ -123,6 +123,7 @@ export class StylesManager {
     }
     addTableCellStyleCore(oldStyle) {
         var newStyle = oldStyle.clone();
+        this.tableCellStyleNameToIndex[newStyle.styleName] = this.documentModel.tableCellStyles.push(newStyle) - 1;
         newStyle.characterProperties = this.documentModel.cache.mergedCharacterPropertiesCache.getItem(oldStyle.characterProperties);
         newStyle.tableCellProperties = this.documentModel.cache.tableCellPropertiesCache.getItem(oldStyle.tableCellProperties);
         return newStyle;

package/lib/common/selection/selection.js

@@ -205,8 +205,9 @@ export class Selection extends BatchUpdatableObject {
         this.resetInputPositionIfNeeded();
     }
     shouldResetInputPosition() {
+        var _a;
         const currentState = this.getState();
-        return currentState.intervalsInfo.subDocument.id != this.prevState.intervalsInfo.subDocument.id ||
+        return currentState.intervalsInfo.subDocument.id != ((_a = this.prevState.intervalsInfo.subDocument) === null || _a === void 0 ? void 0 : _a.id) ||
             !ListUtils.equals(currentState.intervalsInfo.intervals, this.prevState.intervalsInfo.intervals);
     }
     resetInputPositionIfNeeded() {

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

@@ -7,17 +7,17 @@ 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; }
+    get heightOfProtrudingPart() { return this.modelData.showLeftIndent ? this._heightOfProtrudingPart : 0; }
     getRootClassName() {
-        return this.modelData.settings.styles.firstLineIndentImage.spriteCssClass + " " +
-            this.modelData.settings.styles.firstLineIndent.className;
+        return this.modelData.styles.firstLineIndentImage.spriteCssClass + " " +
+            this.modelData.styles.firstLineIndent.className;
     }
     constructor(modelData, controls) {
         super(modelData, controls);
         const template = RulerTemplateManager.getFirstLineIndentElementTemplate();
         if (template)
             this.rootElement.innerHTML = template;
-        this.rootElement.title = this.modelData.settings.titles.firstLineIndent;
+        this.rootElement.title = this.modelData.titles.firstLineIndent;
         this.controls.ruler.rootElement.appendChild(this.rootElement);
         this.adjustByTop();
         this.leftCorrection = Math.round(SizeUtils.getOffsetWidth(this.rootElement) / 2);
@@ -36,7 +36,7 @@ export class RulerFirstLineIndentDragHandle extends RulerBaseIndentControl {
         const newViewState = this.controls.paragraphLeftPosition + this.currModelState.modelValue;
         if (newViewState != this.viewState) {
             this.viewState = newViewState;
-            if (this.modelData.settings.showLeftIndent)
+            if (this.modelData.showLeftIndent)
                 this.rootElement.style.left = this.viewState + RULLER_NUMBER_CORRECTION - this.leftCorrection + "px";
             else
                 this.setVisible(false);

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

@@ -9,12 +9,12 @@ 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; }
+    get heightOfProtrudingPart() { return this.modelData.showLeftIndent ? this._heightOfProtrudingPart : 0; }
+    getRootClassName() { return this.modelData.styles.leftIndent.className; }
     constructor(modelData, controls) {
         super(modelData, controls);
         this.isActionLeftIndent = false;
-        this.topElement = DocumentRenderer.renderContainer(this.modelData.settings.styles.leftIndentImage.spriteCssClass);
+        this.topElement = DocumentRenderer.renderContainer(this.modelData.styles.leftIndentImage.spriteCssClass);
         this.bodyElement = DocumentRenderer.renderContainer(LEFT_INDENT_DRAG_HANDLE_BODY);
         const topElementTemplate = RulerTemplateManager.getLeftIndentTopElementTemplate();
         if (topElementTemplate)
@@ -32,8 +32,8 @@ export class RulerLeftIndentDragHandle extends RulerBaseIndentControl {
         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.bodyElement.title = this.modelData.titles.leftIndent;
+        this.topElement.title = this.modelData.titles.hangingIndent;
         this.leftCorrection = Math.round(SizeUtils.getOffsetWidth(this.rootElement) / 2);
         this._heightOfProtrudingPart = SizeUtils.getOffsetHeight(this.rootElement) - this.controls.divisions.height / 2;
     }
@@ -50,7 +50,7 @@ export class RulerLeftIndentDragHandle extends RulerBaseIndentControl {
         const newViewState = this.controls.paragraphLeftPosition + this.currModelState.modelValue;
         if (newViewState != this.viewState) {
             this.viewState = newViewState;
-            if (this.modelData.settings.showLeftIndent)
+            if (this.modelData.showLeftIndent)
                 this.rootElement.style.left = this.viewState + RULLER_NUMBER_CORRECTION - this.leftCorrection + "px";
             else
                 this.setVisible(false);

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

@@ -9,15 +9,15 @@ 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;
+        return this.modelData.styles.rightIndentImage.spriteCssClass + " " +
+            this.modelData.styles.rightIndent.className;
     }
     constructor(modelData, controls) {
         super(modelData, controls);
         const template = RulerTemplateManager.getRightIndentElementTemplate();
         if (template)
             this.rootElement.innerHTML = template;
-        this.rootElement.title = this.modelData.settings.titles.rightIndent;
+        this.rootElement.title = this.modelData.titles.rightIndent;
         this.controls.ruler.rootElement.appendChild(this.rootElement);
         this.adjustByTop();
         this.leftCorrection = Math.round(this.rootElement.offsetWidth / 2);
@@ -35,7 +35,7 @@ export class RulerRightIndentDragHandle extends RulerBaseIndentControl {
         const newViewState = this.correctRelativeLeftIndents(this.controls.ruler.pageWidth - this.controls.paragraphRightPosition + this.currModelState.modelValue);
         if (newViewState != this.viewState) {
             this.viewState = newViewState;
-            if (this.modelData.settings.showRightIndent)
+            if (this.modelData.showRightIndent)
                 this.rootElement.style.right = this.viewState + RULLER_NUMBER_CORRECTION - this.leftCorrection + "px";
             else
                 this.setVisible(false);

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

@@ -18,7 +18,7 @@ export class RulerLeftMarginDragHandle extends RulerBaseMarginControl {
         this.handlePanelElement = DocumentRenderer.renderContainer(DIVISION_MARGIN_LEFT_CURSOR_CLASS_NAME);
         this.marginPanelElement.style.width = maxPageWidth + "px";
         this.handlePanelElement.style.width = maxPageWidth + "px";
-        this.handlePanelElement.title = this.modelData.settings.titles.marginLeft;
+        this.handlePanelElement.title = this.modelData.titles.marginLeft;
         this.controls.ruler.rootElement.appendChild(this.marginPanelElement);
         this.controls.ruler.rootElement.appendChild(this.handlePanelElement);
     }

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

@@ -19,7 +19,7 @@ export class RulerRightMarginDragHandle extends RulerBaseMarginControl {
         this.handlePanelElement = DocumentRenderer.renderContainer(DIVISION_MARGIN_RIGHT_CURSOR_CLASS_NAME);
         this.marginPanelElement.style.width = maxPageWidth + "px";
         this.handlePanelElement.style.width = maxPageWidth + "px";
-        this.handlePanelElement.title = this.modelData.settings.titles.marginRight;
+        this.handlePanelElement.title = this.modelData.titles.marginRight;
         this.controls.ruler.rootElement.appendChild(this.marginPanelElement);
         this.controls.ruler.rootElement.appendChild(this.handlePanelElement);
     }

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

@@ -6,7 +6,7 @@ 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; }
+    getRootClassName() { return this.modelData.styles.control.className; }
     ;
     get pageWidth() { return this.currPageWidth; }
     ;
@@ -16,7 +16,7 @@ export class RulerControl extends RulerBase {
         this.initialMarginLeftElement = 0;
         this.currPageWidth = 0;
         this.prevPageWidth = 0;
-        this.rootElement = DocumentRenderer.renderContainer(this.modelData.settings.styles.control.className);
+        this.rootElement = DocumentRenderer.renderContainer(this.modelData.styles.control.className);
         if (Browser.MSTouchUI)
             DomUtils.addClassName(this.rootElement, TouchUtils.msTouchDraggableClassName);
         this.controls.wrapper.rootElement.appendChild(this.rootElement);

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

@@ -15,7 +15,7 @@ export class RulerTabTypeControl extends RulerBase {
         this.evtHandlersHolder = new DomEventHandlersHolder();
         this.align = TabAlign.Left;
         this.innerSquareElement = DocumentRenderer.renderContainer("");
-        this.alignElement = DocumentRenderer.renderContainer(RulerTabUtils.getSpriteClassName(this.align, this.modelData.settings));
+        this.alignElement = DocumentRenderer.renderContainer(RulerTabUtils.getSpriteClassName(this.align, this.modelData.styles));
         this.applyTemplate();
         this.innerSquareElement.appendChild(this.alignElement);
         this.rootElement.appendChild(this.innerSquareElement);
@@ -46,14 +46,14 @@ export class RulerTabTypeControl extends RulerBase {
         const size = this.innerSquareElement.offsetWidth;
         this.alignElement.style.top = (size - this.alignElement.offsetHeight) / 2 + "px";
         this.alignElement.style.left = (size - this.alignElement.offsetWidth) / 2 + "px";
-        this.alignElement.title = this.modelData.settings.titles[RulerTabUtils.getTabTitlePropertyName(this.align)];
+        this.alignElement.title = this.modelData.titles[RulerTabUtils.getTabTitlePropertyName(this.align)];
     }
     onMouseDown(evt) {
         if (!this.modelData.isReadOnly) {
             this.align++;
             if (this.align > TabAlign.Decimal)
                 this.align = TabAlign.Left;
-            this.alignElement.className = RulerTabUtils.getSpriteClassName(this.align, this.modelData.settings);
+            this.alignElement.className = RulerTabUtils.getSpriteClassName(this.align, this.modelData.styles);
             this.applyTemplate();
             this.adjustAlignElement();
             EvtUtils.preventEvent(evt);

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

@@ -50,8 +50,8 @@ export class RulerTabsControl extends RulerMultiControl {
         this.deleteTab = false;
     }
     getModelState() {
-        this.modelData.settings.showTabs = this.modelData.commandManager.getCommand(RichEditClientCommand.InsertTabRuler).getState().enabled;
-        if (this.modelData.settings.showTabs) {
+        this.modelData.showTabs = this.modelData.commandManager.getCommand(RichEditClientCommand.InsertTabRuler).getState().enabled;
+        if (this.modelData.showTabs) {
             const paragraph = this.modelData.selection.activeSubDocument.getParagraphByPosition(this.modelData.selection.intervalsInfo.interval.start);
             const tabs = ListUtils.map(paragraph.getTabs().positions, tab => {
                 const newTab = tab.clone();
@@ -195,7 +195,7 @@ class RulerTabControl {
         this.shadow = null;
         this.controls = controls;
         this.modelData = modelData;
-        this.rootElement = DocumentRenderer.renderContainer(modelData.settings.styles.tab.className + " " + RulerTabUtils.getSpriteClassName(this.viewState.align, modelData.settings));
+        this.rootElement = DocumentRenderer.renderContainer(modelData.styles.tab.className + " " + RulerTabUtils.getSpriteClassName(this.viewState.align, modelData.styles));
         this.applyTemplate();
         controls.ruler.rootElement.appendChild(this.rootElement);
         this.rootElement.style.marginTop = (controls.divisions.height - this.rootElement.offsetHeight) + "px";
@@ -209,7 +209,7 @@ class RulerTabControl {
     setVisible(visible) {
         this.rootElement.style.display = visible ? 'block' : 'none';
     }
-    canHandle(source) { return source == this.rootElement && this.modelData.settings.showTabs; }
+    canHandle(source) { return source == this.rootElement && this.modelData.showTabs; }
     showShadow() {
         this.shadow = new RulerShadow(this.rootElement);
     }
@@ -244,10 +244,10 @@ class RulerTabControl {
         }
     }
     changeAlign() {
-        this.rootElement.className = this.modelData.settings.styles.tab.className + " " +
-            RulerTabUtils.getSpriteClassName(this.viewState.align, this.modelData.settings);
+        this.rootElement.className = this.modelData.styles.tab.className + " " +
+            RulerTabUtils.getSpriteClassName(this.viewState.align, this.modelData.styles);
         this.applyTemplate();
-        this.rootElement.title = this.modelData.settings.titles[RulerTabUtils.getTabTitlePropertyName(this.viewState.align)];
+        this.rootElement.title = this.modelData.titles[RulerTabUtils.getTabTitlePropertyName(this.viewState.align)];
         this.setCorrection();
     }
     applyTemplate() {

package/lib/common/ui/ruler/controls/tab/utils.d.ts

@@ -1,7 +1,7 @@
 import { TabAlign } from '../../../../model/paragraph/paragraph';
-import { RulerSettings } from '../../settings';
+import { RulerStyles } from '../../settings';
 export declare class RulerTabUtils {
     static getTabTitlePropertyName(align: TabAlign): string;
-    static getSpriteClassName(tabAlign: TabAlign, settings: RulerSettings): string;
+    static getSpriteClassName(tabAlign: TabAlign, styles: RulerStyles): string;
     static getTemplate(tabAlign: TabAlign): string | undefined;
 }

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

@@ -19,16 +19,16 @@ export class RulerTabUtils {
         }
         return "tab" + alignString;
     }
-    static getSpriteClassName(tabAlign, settings) {
+    static getSpriteClassName(tabAlign, styles) {
         switch (tabAlign) {
             case TabAlign.Left:
-                return settings.styles.tabImages.left.spriteCssClass;
+                return styles.tabImages.left.spriteCssClass;
             case TabAlign.Right:
-                return settings.styles.tabImages.right.spriteCssClass;
+                return styles.tabImages.right.spriteCssClass;
             case TabAlign.Center:
-                return settings.styles.tabImages.center.spriteCssClass;
+                return styles.tabImages.center.spriteCssClass;
             case TabAlign.Decimal:
-                return settings.styles.tabImages.decimal.spriteCssClass;
+                return styles.tabImages.decimal.spriteCssClass;
         }
         return "";
     }

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

@@ -95,7 +95,7 @@ class RulerTableColumnState {
     constructor(modelData, controls) {
         this.controls = controls;
         this.rootElement = DocumentRenderer.renderContainer(TABLE_COLUMN_SEPARATOR_HANDLE_CLASS_NAME);
-        this.separatorElement = DocumentRenderer.renderContainer(modelData.settings.styles.columnSeparatorImage.spriteCssClass);
+        this.separatorElement = DocumentRenderer.renderContainer(modelData.styles.columnSeparatorImage.spriteCssClass);
         const template = RulerTemplateManager.getTableColumnDragElementTemplate();
         if (template)
             this.separatorElement.innerHTML = template;

package/lib/common/ui/ruler/controls/vertical-line.d.ts

@@ -1,4 +1,3 @@
-import { RulerSettings } from '../settings';
 export declare const TABLE_COLUMN_SEPARATOR_RULER_LINE_CLASS_NAME: string;
 export declare enum SnapTo {
     LeftSide = 0,
@@ -16,7 +15,7 @@ export declare class RulerVerticalLineControl {
     private rulerControlWidth;
     private viewElementLeft;
     private rulerControlElement;
-    constructor(canvas: HTMLDivElement, settings: RulerSettings, rulerControlElement: HTMLElement);
+    constructor(canvas: HTMLDivElement, className: string, rulerControlElement: HTMLElement);
     dispose(): void;
     show(type: RulerLineDisplayType): void;
     hide(): void;

package/lib/common/ui/ruler/controls/vertical-line.js

@@ -13,14 +13,14 @@ export var RulerLineDisplayType;
     RulerLineDisplayType[RulerLineDisplayType["TableColumn"] = 1] = "TableColumn";
 })(RulerLineDisplayType || (RulerLineDisplayType = {}));
 export class RulerVerticalLineControl {
-    constructor(canvas, settings, rulerControlElement) {
+    constructor(canvas, className, rulerControlElement) {
         this.borderWidth = 0;
         this.rulerControlLeft = 0;
         this.rulerControlWidth = 0;
         this.viewElementLeft = 0;
         this.canvas = canvas;
         this.rulerControlElement = rulerControlElement;
-        this.rootElement = DocumentRenderer.renderContainer(settings.styles.line.className);
+        this.rootElement = DocumentRenderer.renderContainer(className);
         this.rootElement.style.display = "block";
         this.borderWidth = DomUtils.getHorizontalBordersWidth(this.rootElement);
     }

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

@@ -1,6 +1,6 @@
 import { RulerBase } from './base';
 export class RulerWrapper extends RulerBase {
-    getRootClassName() { return this.modelData.settings.styles.wrapper.className; }
+    getRootClassName() { return this.modelData.styles.wrapper.className; }
     ;
     constructor(modelData, controls) {
         super(modelData, controls);