devexpress-richedit 24.2.1-alpha-24260-0102 → 24.2.3

package/lib/common/commands/fields/open-hyperlink-command.js

@@ -4,7 +4,7 @@ import { ReadOnlyMode } from '../../interfaces/i-rich-edit-core';
 import { RichEditClientCommand } from '../client-command';
 import { CommandSimpleOptions } from '../command-base';
 import { HyperlinkCommandBase } from './hyperlink-command-base';
-import { createUrlValidationOptions, isUrlValid } from '../../../common/utils/utils';
+import { createUrlValidationOptions, UrlUtils } from '../../../common/utils/utils';
 export class OpenHyperlinkCommand extends HyperlinkCommandBase {
     executeCore(state, options) {
         let field;
@@ -25,13 +25,16 @@ export class OpenHyperlinkCommand extends HyperlinkCommandBase {
             this.history.endTransaction();
             this.aspxForceSendingRequest();
         }
-        if (hyperlinkInfo.anchor)
+        if (hyperlinkInfo.isUri()) {
+            const options = createUrlValidationOptions(this.control.modelManager);
+            let uri = hyperlinkInfo.getUriWithAnchor();
+            if (!UrlUtils.isValid(uri, options))
+                uri = UrlUtils.EmptyPage;
+            Url.navigate(uri, "_blank");
+        }
+        else {
             this.control.commandManager.getCommand(RichEditClientCommand.GoToBookmark)
                 .execute(this.control.commandManager.isPublicApiCall, new CommandSimpleOptions(this.control, hyperlinkInfo.anchor));
-        else {
-            const options = createUrlValidationOptions(this.control);
-            if (isUrlValid(hyperlinkInfo.uri, options))
-                Url.navigate(hyperlinkInfo.uri, "_blank");
         }
         return true;
     }

package/lib/common/commands/floating-objects/floating-object-drag-drop-change-position-command.js

@@ -200,7 +200,7 @@ export class FloatingObjectDragDropChangePositionCommand extends CommandBase {
         const newRun = this.activeSubDocument.getRunAndIndexesByPosition(position).run;
         if (newRun.getType() == RunType.AnchoredTextBoxRun) {
             const oldTextBoxRun = oldRun;
-            const originalSubDocument = this.control.modelManager.model.subDocuments[oldTextBoxRun.subDocId];
+            const originalSubDocument = this.control.modelManager.model.subDocumentsCollection.collection[oldTextBoxRun.subDocId];
             this.history.addAndRedo(new SwitchTextBoxSubDocumentsStateHistoryItem(this.modelManipulator, originalSubDocument, this.activeSubDocument, position));
         }
     }

package/lib/common/commands/floating-objects/insert-anchored-text-box-command.js

@@ -44,7 +44,7 @@ export class InsertAnchoredTextBoxCommand extends CommandBase {
         anchorInfo.zOrder = this.modelManipulator.floatingObject.zOrder.getNewZOrder(options.subDocument);
         anchorInfo.layoutTableCell = true;
         history.addTransaction(() => {
-            this.modelManipulator.textBox.insertAnchoredTextBoxViaHistoty(new SubDocumentPosition(this.selection.activeSubDocument, this.selection.lastSelectedInterval.start), this.inputPosition.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
+            this.modelManipulator.textBox.insertAnchoredTextBoxViaHistory(new SubDocumentPosition(this.selection.activeSubDocument, this.selection.lastSelectedInterval.start), this.inputPosition.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
             this.history.addAndRedo(new SelectionHistoryItem(this.modelManipulator, this.selection, this.selection.getState(), this.selection.getState().setInterval(new FixedInterval(this.selection.lastSelectedInterval.start, 1))));
             this.control.commandManager.getCommand(RichEditClientCommand.ChangeActiveSubDocumentToTextBox)
                 .execute(this.control.commandManager.isPublicApiCall, options);

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

@@ -6,21 +6,27 @@ import { SubDocument } from '../../../model/sub-document';
 import { HtmlBuilder } from './html-builder';
 import { IExportModelOptions } from '../../i-document-exporter';
 interface List {
+    parentList?: List;
     numberingListIndex: number;
     listLevelIndex: number;
     start: number;
     end: number;
 }
+interface IHtmlExporterOptions {
+    sanitaizeHyperlinkURIs?: boolean;
+    convertRelativeURIsToAbsolute?: boolean;
+}
 export declare class HtmlExporter {
     rangeCopy: RangeCopy;
     private exportModelOptions;
+    private htmlExporterOptions;
     private get modelManager();
     private get colorProvider();
     private get unitConverter();
     private get documentRenderer();
     private get lastMaxNumPages();
     private get pageIndex();
-    constructor(exportModelOptions: IExportModelOptions);
+    constructor(exportModelOptions: IExportModelOptions, htmlExporterOptions?: IHtmlExporterOptions);
     getHtmlElementsByInterval(model: DocumentModel, subDocument: SubDocument, interval: FixedInterval, guidLabel: string): HtmlBuilder;
     getParagraphsByInterval(subDocument: SubDocument, interval: FixedInterval): Paragraph[];
     getListsByParagraphs(paragraphs: Paragraph[]): List[];

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

@@ -24,6 +24,8 @@ import { TableWidthUnitType } from '../../../model/tables/secondary-structures/t
 import { HtmlConverter } from '../../../rich-utils/html-converter';
 import { HtmlBuilder } from './html-builder';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
+import { createUrlValidationOptions, UrlUtils } from '../../../../common/utils/utils';
+import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class HtmlExporter {
     get modelManager() { return this.exportModelOptions.modelManager; }
     get colorProvider() { return this.modelManager.model.colorProvider; }
@@ -33,11 +35,13 @@ export class HtmlExporter {
     ;
     get pageIndex() { return this.exportModelOptions.pageIndex; }
     ;
-    constructor(exportModelOptions) {
+    constructor(exportModelOptions, htmlExporterOptions = null) {
         this.rangeCopy = null;
         this.exportModelOptions = exportModelOptions;
+        this.htmlExporterOptions = htmlExporterOptions;
     }
     getHtmlElementsByInterval(model, subDocument, interval, guidLabel) {
+        var _a, _b, _c, _d;
         if (interval.length === 0)
             return;
         const unitTypeToString = this.unitConverter.getUnits() == RichEditUnit.Centimeter ? "cm" : "in";
@@ -337,7 +341,18 @@ export class HtmlExporter {
                     break;
             }
             if (hyperlinkInfo && !isInsideHyperlink) {
-                const url = hyperlinkInfo.uri + (hyperlinkInfo.anchor != "" ? "#" + hyperlinkInfo.anchor : "");
+                const sanitaizeHyperlinkURIs = (_b = (_a = this.htmlExporterOptions) === null || _a === void 0 ? void 0 : _a.sanitaizeHyperlinkURIs) !== null && _b !== void 0 ? _b : false;
+                const convertRelativeURIsToAbsolute = (_d = (_c = this.htmlExporterOptions) === null || _c === void 0 ? void 0 : _c.convertRelativeURIsToAbsolute) !== null && _d !== void 0 ? _d : false;
+                let url = hyperlinkInfo.uri;
+                const options = createUrlValidationOptions(this.exportModelOptions.modelManager);
+                if (!sanitaizeHyperlinkURIs || UrlUtils.isValid(url, options)) {
+                    if (convertRelativeURIsToAbsolute && UrlUtils.isRelative(url))
+                        url = UrlUtils.convertToAbsolute(url).href;
+                    if (hyperlinkInfo.anchor != "")
+                        url = url + "#" + hyperlinkInfo.anchor;
+                }
+                else
+                    url = UrlUtils.EmptyPage;
                 const tooltip = hyperlinkInfo.tip;
                 html
                     .clear()
@@ -455,42 +470,27 @@ export class HtmlExporter {
     }
     getListsByParagraphs(paragraphs) {
         const listsInInterval = [];
+        let previousList = null;
         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 numberingListIndex = paragraph.getNumberingListIndex();
+                const listLevelIndex = paragraph.getListLevelIndex();
+                const start = paragraph.startLogPosition.value;
+                const end = paragraph.getEndPosition();
+                let list = ListUtils.reverseElementBy(listsInInterval, (list) => {
+                    return list.listLevelIndex <= (previousList === null || previousList === void 0 ? void 0 : previousList.listLevelIndex)
+                        && list.numberingListIndex === numberingListIndex
+                        && list.listLevelIndex === listLevelIndex;
+                });
+                if (!list) {
+                    const parentList = (previousList === null || previousList === void 0 ? void 0 : previousList.numberingListIndex) === numberingListIndex ? previousList : null;
+                    list = { parentList, numberingListIndex, listLevelIndex, start, end };
+                    listsInInterval.push(list);
                 }
+                previousList = list;
+                do {
+                    list.end = end;
+                } while (list = list.parentList);
             }
         }
         return listsInInterval;

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

@@ -191,7 +191,7 @@ export class HtmlImporter {
         const missTag = HtmlImporter.MapMissTablePropertiesByTagNames[ListUtils.last(this.levelInfo).tagImporter.elementTag()];
         ListUtils.forEach(this.currElementChildren, (childElement) => {
             const childElemStyle = this.getStyles(childElement);
-            if (!Object.keys(childElemStyle).length)
+            if (childElement.nodeType !== Node.ELEMENT_NODE)
                 return;
             for (var prop in this.getStyles(element)) {
                 if (missTag && /^(border|background|marginLeft)/gi.test(prop))

package/lib/common/formats/html/import/importers/list-base.js

@@ -13,9 +13,7 @@ export class HtmlListTagImporterBase extends HtmlTagImporterBase {
         this.importer.addCurrLevelParagraphRunIfNeeded();
         const listIndex = this.importer.listIndex;
         const parentList = ListUtils.last(this.importer.listInfos);
-        const listLevel = parentList
-            ? parentList.listLevel + 1
-            : 0;
+        const listLevel = parentList ? parentList.listLevel + 1 : 0;
         if (listLevel === 9) {
             this._ignored = true;
             return;
@@ -31,6 +29,8 @@ export class HtmlListTagImporterBase extends HtmlTagImporterBase {
         if (this._ignored)
             return;
         this.importer.listInfos.pop();
-        this.importer.listIndex++;
+        const parentList = ListUtils.last(this.importer.listInfos);
+        if (!parentList)
+            this.importer.listIndex++;
     }
 }

package/lib/common/formats/rtf/export/helpers/rtf-export-helper.js

@@ -4,6 +4,7 @@ import { DXColor } from '../../../../model/color/dx-color';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { RtfContentExporter } from '../exporters/rtf-content-exporter';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 export class RtfExportHelper {
     constructor() {
         this.colorCollection = [];
@@ -39,11 +40,11 @@ export class RtfExportHelper {
         return DXColor.blend(color, DXColor.white);
     }
     getUserIndex(rangePermission) {
-        let index = this.userCollection.indexOf(rangePermission.userName);
+        let index = this.userCollection.findIndex((userName) => Comparers.stringIgnoreCase(userName, rangePermission.userName) == 0);
         if (index >= 0)
             return index + 1;
         const predefinedUserGroups = RtfContentExporter.predefinedUserGroups;
-        const id = NumberMapUtils.keyBy(predefinedUserGroups, (g) => g == rangePermission.group);
+        const id = NumberMapUtils.keyBy(predefinedUserGroups, (g) => Comparers.stringIgnoreCase(g, rangePermission.group) == 0);
         return id != null ? id : 0;
     }
 }

package/lib/common/input-controller.d.ts

@@ -4,6 +4,11 @@ import { IEventManager } from './interfaces/i-event-manager';
 import { IRichEditControl } from './interfaces/i-rich-edit-core';
 import { HtmlBuilder } from './formats/html/export/html-builder';
 export declare const INPUT_CLASS_NAME = "dxreInputTarget";
+declare enum IMEState {
+    None = 0,
+    Start = 1,
+    Process = 2
+}
 export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     private newLineRegexp;
     eventManager: IEventManager;
@@ -14,7 +19,7 @@ export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     needProcessShortcut: boolean;
     initializedIfNotReadOnly: boolean;
     prevKeyCode: number;
-    isIME: boolean;
+    IMEState: IMEState;
     private inputWithAlt;
     private processTextOnKeyPress;
     protected evtHandlersHolder: DomEventHandlersHolder;
@@ -68,11 +73,15 @@ export declare class DivInputEditor extends InputEditorBase<HTMLElement> {
     private cursorWasSetOnLastPosition;
     private clearInputTimerId;
     private lastCursorPosition;
+    private composUpdateTimerId;
+    private composEndTimerId;
+    private onTextInputTimerId;
     constructor(control: IRichEditControl, eventManager: IEventManager, parent: HTMLElement);
     dispose(): void;
     initializeIfNotReadOnlyCore(): void;
     setPosition(left: number, top: number): void;
     createInputElement(): HTMLElement;
+    initEvents(): void;
     onKeyDown(evt: KeyboardEvent): void;
     onKeyUp(evt: KeyboardEvent): void;
     onInput(evt: InputEvent): void;
@@ -93,6 +102,9 @@ export declare class DivInputEditor extends InputEditorBase<HTMLElement> {
     getEditableDocumentContent(): string | NodeListOf<ChildNode>;
     getEditableDocumentCursorPosition(): number;
     selectEditableDocumentContent(): void;
+    onCompositionStart(_evt: KeyboardEvent): void;
+    onCompositionUpdate(_evt: KeyboardEvent): void;
+    onCompositionEnd(_evt: KeyboardEvent): void;
 }
 export declare class IFrameInputEditor extends InputEditorBase<HTMLIFrameElement> {
     editableDocument: Document;
@@ -145,3 +157,4 @@ export declare class InputController {
     getEditableDocumentContent(): string | NodeListOf<ChildNode>;
     selectEditableDocumentContent(): void;
 }
+export {};

package/lib/common/input-controller.js

@@ -23,9 +23,16 @@ export const INPUT_CLASS_NAME = "dxreInputTarget";
 const EMPTY_KEYCODE = 229;
 const TAB_KEYCODE = 9;
 const IDEOGRAPHIC_SPACE_CHARCODE = 12288;
+var IMEState;
+(function (IMEState) {
+    IMEState[IMEState["None"] = 0] = "None";
+    IMEState[IMEState["Start"] = 1] = "Start";
+    IMEState[IMEState["Process"] = 2] = "Process";
+})(IMEState || (IMEState = {}));
 export class InputEditorBase {
     constructor(control, eventManager, parent) {
         this.newLineRegexp = /(\r\n|\n|\r)/gm;
+        this.IMEState = IMEState.None;
         this.processTextOnKeyPress = false;
         this.evtHandlersHolder = new DomEventHandlersHolder();
         this.control = control;
@@ -33,7 +40,6 @@ export class InputEditorBase {
         this.canInsertTextOnInputEvent = this.canUseInputEvent();
         this.createHierarchy(parent);
         this.initialize();
-        this.isIME = false;
         this.inputWithAlt = false;
     }
     dispose() {
@@ -106,7 +112,7 @@ export class InputEditorBase {
     }
     onKeyDown(evt) {
         if (!this.control.clientSideEvents.raiseKeyDown(evt)) {
-            if (!this.isIME) {
+            if (this.IMEState === IMEState.None) {
                 evt = this.getNormalizedEvent(evt);
                 const keyCode = KeyUtils.getEventKeyCode(evt);
                 this.needProcessShortcut = !keyCode || keyCode == EMPTY_KEYCODE;
@@ -271,6 +277,9 @@ export class DivInputEditor extends InputEditorBase {
     dispose() {
         super.dispose();
         clearTimeout(this.clearInputTimerId);
+        clearTimeout(this.composUpdateTimerId);
+        clearTimeout(this.composEndTimerId);
+        clearTimeout(this.onTextInputTimerId);
     }
     initializeIfNotReadOnlyCore() {
         this.inputElement.contentEditable = "true";
@@ -281,14 +290,21 @@ export class DivInputEditor extends InputEditorBase {
     }
     createInputElement() {
         const element = document.createElement("DIV");
-        if (Browser.Safari)
-            element.autocapitalize = "off";
+        element.autocapitalize = "off";
         if (Browser.MacOSMobilePlatform && (Number(Browser.PlaformMajorVersion) >= 16
             || Browser.Safari && Browser.MajorVersion >= 16)) {
             element.classList.add('dxreiOS16');
         }
         return element;
     }
+    initEvents() {
+        super.initEvents();
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionstart", this.onCompositionStart.bind(this));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionupdate", (evt) => Browser.IE || Browser.Edge ?
+            this.onCompositionUpdate(evt) : this.composUpdateTimerId = setTimeout(() => this.onCompositionUpdate(evt), 0));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionend", (evt) => !Browser.Safari ?
+            this.onCompositionEnd(evt) : this.composEndTimerId = setTimeout(() => this.onCompositionEnd(evt), 0));
+    }
     onKeyDown(evt) {
         var _a;
         this.handled = false;
@@ -357,21 +373,15 @@ export class DivInputEditor extends InputEditorBase {
                     this.onTextReplace(text.substr(lastWordStartIndex), text);
                 else
                     super.onTextInput(data);
-                if (this.previousText && text.length < this.previousText.length || !text.length) {
-                    let deletedCharacterCount = this.previousText ? this.previousText.length - text.length : 1;
-                    for (let i = 0; i < deletedCharacterCount; i++)
-                        this.eventManager.onShortcut(KeyCode.Backspace);
-                    this.previousText = text;
-                }
                 this.cursorWasSetOnLastPosition = true;
             }
             this.handled = true;
-            if (Browser.MacOSMobilePlatform && text[text.length - 1] == " ")
+            if (text[text.length - 1] == " ")
                 this.clearInputElement();
         }
     }
     tryHandleShortcutByInputString(data) {
-        if (data && !this.isIME) {
+        if (data && this.IMEState === IMEState.None) {
             let enteredChar = data.charAt(data.length - 1);
             const keyCode = this.tryObtainCodeFromChar(enteredChar);
             if (keyCode != EMPTY_KEYCODE) {
@@ -462,6 +472,31 @@ export class DivInputEditor extends InputEditorBase {
         selection.selectAllChildren(this.inputElement);
         super.selectEditableDocumentContent();
     }
+    onCompositionStart(_evt) {
+        this.IMEState = IMEState.Start;
+        this.needProcessShortcut = false;
+        this.clearInputElement();
+    }
+    onCompositionUpdate(_evt) {
+        const text = this.getEditableDocumentText();
+        if (text.length && this.previousText != text) {
+            if (this.IMEState === IMEState.Start)
+                this.onText(text, text, this.previousText.length > 0);
+            else if (this.IMEState === IMEState.Process)
+                this.onTextReplace(text, text);
+        }
+        this.IMEState = IMEState.Process;
+    }
+    onCompositionEnd(_evt) {
+        const text = this.getEditableDocumentText();
+        if (this.previousText != text) {
+            if (text.length > 0)
+                this.onTextReplace(text, text);
+            else
+                this.onShortcutCore(_evt, KeyCode.Backspace);
+        }
+        this.IMEState = IMEState.None;
+    }
 }
 export class IFrameInputEditor extends InputEditorBase {
     constructor(control, eventManager, parent) {
@@ -565,7 +600,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     setEditableDocumentContent(content) {
         super.setEditableDocumentContent(content);
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.editableDocument.body.innerHTML = "";
         if (typeof content === "string")
             this.editableDocument.body.innerHTML = content;
@@ -613,7 +648,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onBlur(evt) {
         super.onBlur(evt);
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.endInputIME();
     }
     onShortcutCore(evt, shortcutCode) {
@@ -642,7 +677,7 @@ export class IFrameInputEditor extends InputEditorBase {
         }
     }
     onCompositionStart(_evt) {
-        this.isIME = true;
+        this.IMEState = IMEState.Start;
         this.needProcessShortcut = false;
         if (!Browser.IE && !Browser.Edge)
             this.clearInputElement();
@@ -650,10 +685,11 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onCompositionUpdate(_evt) {
         const text = this.getEditableDocumentText();
-        if (this.isIME && text.length && this.previousText != text) {
+        if (this.IMEState !== IMEState.None && text.length && this.previousText != text) {
             this.onTextReplace(text, text);
             this.updateInputIME();
         }
+        this.IMEState = IMEState.Process;
     }
     onCompositionEnd(_evt) {
         const text = this.getEditableDocumentText();
@@ -663,7 +699,7 @@ export class IFrameInputEditor extends InputEditorBase {
             this.clearInputElement();
         if (text.charCodeAt(text.length - 1) == IDEOGRAPHIC_SPACE_CHARCODE)
             this.clearInputElement();
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.endInputIME();
     }
     startInputIME() {
@@ -732,7 +768,10 @@ export class InputController {
         this.inputEditor = this.createInputEditor(parent, eventManager);
     }
     initExporter() {
-        this.exporter = new HtmlExporter(this.control.getExportModelOptions());
+        this.exporter = new HtmlExporter(this.control.getExportModelOptions(), {
+            sanitaizeHyperlinkURIs: true,
+            convertRelativeURIsToAbsolute: true
+        });
     }
     dispose() {
         this.inputEditor.dispose();
@@ -797,9 +836,8 @@ export class InputController {
             if (typeof html === 'string')
                 el.innerHTML = html;
         });
-        if (typeof html !== "string") {
+        if (typeof html !== "string")
             builder.assignFrom(html);
-        }
         builder.endChild('b');
         builder.endChild('span');
         builder.endChild('a');

package/lib/common/layout/document-layout.js

@@ -19,7 +19,7 @@ export class AnchorObjectsPositionInfo {
     }
     add(obj, modelPosition) {
         this.delete(obj.objectId);
-        this.cache[obj.objectId] = new ModelPositionHolder(modelPosition, this.model.subDocuments[obj.belongsToSubDocId].positionManager);
+        this.cache[obj.objectId] = new ModelPositionHolder(modelPosition, this.model.subDocumentsCollection.collection[obj.belongsToSubDocId].positionManager);
     }
     delete(id) {
         const info = this.cache[id];

package/lib/common/layout/main-structures/layout-boxes/layout-space-box.js

@@ -22,7 +22,7 @@ export class LayoutSpaceBox extends LayoutBox {
         return LayoutBoxType.Space;
     }
     pushInfoForMeasure(info, showHiddenSymbols) {
-        info.push(new MeasureInfoNonText(" ", this.characterProperties));
+        info.push(new MeasureInfoNonText(RichUtils.specialCharacters.Space, this.characterProperties));
         if (showHiddenSymbols)
             info.push(new MeasureInfoNonText(RichUtils.specialCharacters.HiddenSpace, this.characterProperties));
     }

package/lib/common/model/color/color-model-info.d.ts

@@ -9,7 +9,7 @@ export declare class ColorModelInfo implements ICloneable<ColorModelInfo>, ISupp
     static readonly auto: ColorModelInfo;
     static readonly autoColor: ColorModelInfo;
     static readonly noColor: ColorModelInfo;
-    static makeByThemeColorIndex(themeColorIndex: number, tint?: number): ColorModelInfo;
+    static makeByThemeColorIndex(themeColorIndex: number, tint?: number, themeValue?: ThemeColorValues): ColorModelInfo;
     static makeByColor(color: number, tint?: number): ColorModelInfo;
     static makeByColorIndex(colorIndex: number, tint?: number): ColorModelInfo;
     static makeByColorHash(hash: string, tint?: number): ColorModelInfo;

package/lib/common/model/color/color-model-info.js

@@ -9,10 +9,11 @@ import { ColorType, ThemeColorIndexConstants, ThemeColorValues } from './enums';
 export class ColorModelInfo {
     static get nullColor() { return ColorModelInfo.makeByColor(ColorHelper.AUTOMATIC_COLOR); }
     ;
-    static makeByThemeColorIndex(themeColorIndex, tint = 0) {
+    static makeByThemeColorIndex(themeColorIndex, tint = 0, themeValue = ThemeColorValues.None) {
         const result = new ColorModelInfo();
         result.themeColorIndex = themeColorIndex;
         result.tint = tint;
+        result.themeValue = themeValue;
         return result;
     }
     static makeByColor(color, tint = 0) {

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

@@ -29,8 +29,11 @@ export declare class HyperlinkInfo implements ICloneable<HyperlinkInfo> {
     visited: boolean;
     constructor(uri: string, anchor: string, tip: string, visited: boolean);
     clone(): HyperlinkInfo;
-    getUriPlusAnchor(): string;
+    getUriWithAnchor(): string;
     static getNewCodeText(hyperlinkInfo: HyperlinkInfo): string;
+    isUri(): boolean;
+    isMail(): boolean;
+    isValid(): boolean;
 }
 export declare class SequenceInfo {
     identifier: string;

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

@@ -4,6 +4,7 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { SearchUtils } from '@devexpress/utils/lib/utils/search';
 import { FieldDeletedSubDocumentChange } from '../changes/sub-document/field/deleted';
 import { RunType } from '../runs/run-type';
+import { UrlUtils } from '../../utils/utils';
 export var FieldNameType;
 (function (FieldNameType) {
     FieldNameType[FieldNameType["None"] = 0] = "None";
@@ -33,8 +34,8 @@ export class HyperlinkInfo {
     clone() {
         return new HyperlinkInfo(this.uri, this.anchor, this.tip, this.visited);
     }
-    getUriPlusAnchor() {
-        return this.uri + (this.anchor == "" ? "" : "#" + this.anchor);
+    getUriWithAnchor() {
+        return this.uri + (this.anchor.length > 0 ? "#" + this.anchor : "");
     }
     static getNewCodeText(hyperlinkInfo) {
         return [
@@ -45,6 +46,21 @@ export class HyperlinkInfo {
             hyperlinkInfo.anchor == "" ? "" : " \\l \"" + hyperlinkInfo.anchor + "\""
         ].join("");
     }
+    isUri() {
+        if (this.uri.length === 0)
+            return false;
+        if (this.uri.startsWith("#"))
+            return false;
+        if (this.isMail())
+            return false;
+        return UrlUtils.isValid(this.uri);
+    }
+    isMail() {
+        return this.uri.startsWith("mailto:");
+    }
+    isValid() {
+        return !!(this.uri || this.anchor);
+    }
 }
 export class SequenceInfo {
     constructor(identifier, repeats, hidesResult, resets, resetsWith) {

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

@@ -11,5 +11,6 @@ export declare enum FieldName {
     Tc = 9,
     PageRef = 10,
     Toc = 11,
-    FillIn = 12
+    FillIn = 12,
+    If = 13
 }

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

@@ -13,4 +13,5 @@ export var FieldName;
     FieldName[FieldName["PageRef"] = 10] = "PageRef";
     FieldName[FieldName["Toc"] = 11] = "Toc";
     FieldName[FieldName["FillIn"] = 12] = "FillIn";
+    FieldName[FieldName["If"] = 13] = "If";
 })(FieldName || (FieldName = {}));

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

@@ -10,7 +10,7 @@ export class FieldCodeParserClientUpdatingBase extends FieldCodeParser {
     }
     parseCodeCurrentFieldInternal(_responce) {
         this.removeInterval(this.getTopField().getResultInterval());
-        if (this.parseSwitchesAndArgs(true))
+        if (this.parseSwitchesAndArgs())
             this.fillResult();
         this.parserState = FieldCodeParserState.end;
         return true;

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

@@ -19,7 +19,7 @@ export class FieldCodeParserDocVariable extends FieldCodeParser {
                 this.parserState = FieldCodeParserState.end;
             return true;
         }
-        if (!this.parseSwitchesAndArgs(true)) {
+        if (!this.parseSwitchesAndArgs()) {
             this.parserState = FieldCodeParserState.end;
             return true;
         }