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

package/index.d.ts

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

package/index.js

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

package/lib/client/bars/rich-edit-ribbon/ribbon-items-data.js

@@ -256,7 +256,8 @@ export class RibbonItemsData {
                     { text: formatMessage('ASPxRichEditStringId.CreatePageField'), name: Command.CreatePageField },
                     { text: formatMessage('ASPxRichEditStringId.CreatePageCountField'), name: Command.InsertPageCountField },
                     { text: formatMessage('ASPxRichEditStringId.CreateEmptyMergeField'), name: Command.CreateEmptyMergeField },
-                    { text: formatMessage('ASPxRichEditStringId.CreateEmptyDocVariableField'), name: Command.CreateEmptyDocVariableField }
+                    { text: formatMessage('ASPxRichEditStringId.CreateEmptyDocVariableField'), name: Command.CreateEmptyDocVariableField },
+                    { text: formatMessage('ASPxRichEditStringId.CreateEmptyIfField'), name: Command.CreateEmptyIfField }
                 ]
             },
             { type: 'Button', text: formatMessage('ASPxRichEditStringId.InsertMergeFieldTitle'), icon: 'dxre-icon-InsertDataField', alwaysShowText: true, name: Command.ShowInsertMergeFieldForm, },

package/lib/client/client-rich-edit.js

@@ -61,8 +61,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFIaHFVV1ZWV0RGWFJVZFJTM1ZrTFU1bVQxbE5aeUlLZlE9PS5VMEV0VjZRMUNKaDR1WDIzbXZzcEl1d1prYVhDbzZKQittWFJqQTNZZ3pHOWxIL3dCQ2hNeDJ3RFdxdG1BQnpzYXdJc3hqME0yN2FDaFRCMTlJamR2L2ozRzE2Rk9zQTdJampEOTZjcGpWS29VZnkvS1I4K2dVcDFHSTEybnF3czZDWGNFdz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFIaHFVV1ZWV0RGWFJVZFJTM1ZrTFU1bVQxbE5aeUlLZlE9PS5VMEV0VjZRMUNKaDR1WDIzbXZzcEl1d1prYVhDbzZKQittWFJqQTNZZ3pHOWxIL3dCQ2hNeDJ3RFdxdG1BQnpzYXdJc3hqME0yN2FDaFRCMTlJamR2L2ozRzE2Rk9zQTdJampEOTZjcGpWS29VZnkvS1I4K2dVcDFHSTEybnF3czZDWGNFdz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);
@@ -589,11 +589,11 @@ export class ClientRichEdit {
         return this.barHolder.ribbon;
     }
     getLinkType(hyperlinkInfo) {
-        if (hyperlinkInfo.anchor)
-            return DocumentLinkType.Bookmark;
-        if (hyperlinkInfo.uri && hyperlinkInfo.uri.substr(0, 7) === "mailto:")
+        if (hyperlinkInfo.isMail())
             return DocumentLinkType.EmailAddress;
-        return DocumentLinkType.Hyperlink;
+        if (hyperlinkInfo.isUri())
+            return DocumentLinkType.Hyperlink;
+        return DocumentLinkType.Bookmark;
     }
     setFullScreenMode() {
         this.fullScreenHelper.prepareFullScreenMode();

package/lib/client/commands/commands.js

@@ -387,6 +387,9 @@ export function executeApiCommandCore(commandManager, commandId, parameter) {
         case MailMergeTabCommandId.CreateEmptyDocVariableField:
             parameter = undefined;
             break;
+        case MailMergeTabCommandId.CreateEmptyIfField:
+            parameter = undefined;
+            break;
         case MailMergeTabCommandId.ShowInsertMergeFieldDialog:
             parameter = undefined;
             break;

package/lib/client/commands/mail-merge-command.d.ts

@@ -11,8 +11,11 @@ export declare class MailMergeCommand extends CommandBase<SimpleCommandState> {
     executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<MailMergeCommandParameters>): boolean;
     prepareMergedDocument(modelManager: IModelManager, param: MailMergeCommandParameters): void;
     private getDataSource;
-    private replaceMergeFieldsInModel;
+    private replaceFieldsInModel;
+    private processFieldsInSubDocument;
     private replaceMergeFieldsInSubDocument;
+    private replaceIfFieldsInSubDocument;
+    private replaceFieldWithText;
     private getResultByFieldName;
     private insertSeparator;
     private createModelManager;

package/lib/client/commands/mail-merge-command.js

@@ -24,6 +24,7 @@ import { DocxExporter } from '../formats/docx/export/exporter';
 import { Importer } from '../formats/docx/import/importer';
 import { ImporterOptions } from '../formats/docx/import/importer-options';
 import { exportModelToBlob } from '../model-api/formats/exporter';
+import { FieldCodeParserIf } from '../../common/model/fields/parsers/field-code-parser-if';
 export class MailMergeCommand extends CommandBase {
     getState() {
         var state = new SimpleCommandState(this.isEnabled());
@@ -34,8 +35,10 @@ export class MailMergeCommand extends CommandBase {
         return true;
     }
     isEnabled() {
-        return super.isEnabled() && ControlOptions.isEnabled(this.control.modelManager.richOptions.control.fields) &&
-            this.control.modelManager.model.mainSubDocument.getDocumentEndPosition() > 1 && !!this.getDataSource();
+        return (super.isEnabled() &&
+            ControlOptions.isEnabled(this.control.modelManager.richOptions.control.fields) &&
+            this.control.modelManager.model.mainSubDocument.getDocumentEndPosition() > 1 &&
+            !!this.getDataSource());
     }
     canModify() {
         return true;
@@ -58,7 +61,7 @@ export class MailMergeCommand extends CommandBase {
                         throw new Error(Errors.InternalException);
                     const param = options.param;
                     this.prepareMergedDocument(exportModelOptions.modelManager, param);
-                    exportModelToBlob(exportModelOptions, blob => param.callback(blob));
+                    exportModelToBlob(exportModelOptions, (blob) => param.callback(blob));
                 }, 3000);
                 formatImagesImporter.import(exportModelOptions.modelManager.modelManipulator);
             }, () => { });
@@ -79,7 +82,7 @@ export class MailMergeCommand extends CommandBase {
             if (index > param.exportFrom)
                 rangeCopy.insertTo(modelManager.modelManipulator, new SubDocumentPosition(subDoc, subDoc.getDocumentEndPosition() - 1));
             const record = dataSource.items()[index];
-            this.replaceMergeFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds);
+            this.replaceFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds);
             if (index < exportToIndex)
                 this.insertSeparator(modelManager, param.mergeMode);
             lastProcessedPositionInMainSubDocument = subDoc.getDocumentEndPosition() - 1;
@@ -88,41 +91,71 @@ export class MailMergeCommand extends CommandBase {
     getDataSource() {
         return this.control.owner.dataSource;
     }
-    replaceMergeFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds) {
+    replaceFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds) {
         NumberMapUtils.forEach(modelManager.model.subDocuments, (subDoc) => {
-            if (!ListUtils.anyOf(processedSubDocIds, id => id === subDoc.id)) {
+            if (!ListUtils.anyOf(processedSubDocIds, (id) => id === subDoc.id)) {
                 this.replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc);
+                this.replaceIfFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc);
                 if (!subDoc.isMain())
                     processedSubDocIds.push(subDoc.id);
             }
         });
     }
-    replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc) {
+    processFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc, processField) {
         for (let i = subDoc.fields.length - 1; i >= 0; i--) {
             const field = subDoc.fields[i];
-            if (subDoc.isMain() && field.getFieldStartPosition() < lastProcessedPositionInMainSubDocument)
+            if (subDoc.isMain() && field.getFieldStartPosition() < lastProcessedPositionInMainSubDocument) {
                 return;
+            }
             const parser = FieldsWaitingForUpdate.getParser(modelManager, null, null, subDoc, field);
             if (parser) {
-                if (parser instanceof FieldCodeParserMailMerge) {
-                    const fieldName = parser.getMergeFieldName();
-                    const pos = field.getFieldStartPosition();
-                    const text = RichUtils.replaceParagraphEndCharsWithLineBreak(this.getResultByFieldName(record, fieldName));
-                    if (!StringUtils.isNullOrEmpty(text)) {
-                        const insertParams = new InsertTextManipulatorParams(new SubDocumentPosition(subDoc, pos), subDoc.getRunByPosition(pos).getCharPropsBundle(modelManager.model), RunType.TextRun, text);
-                        modelManager.modelManipulator.text.insertTextInner(insertParams);
+                try {
+                    const text = processField(parser);
+                    if (text !== null) {
+                        this.replaceFieldWithText(modelManager, subDoc, field, text);
                     }
-                    modelManager.modelManipulator.range.removeIntervalWithoutHistory(subDoc, field.getAllFieldInterval(), false);
                 }
-                parser.destructor();
+                finally {
+                    parser.destructor();
+                }
             }
         }
     }
+    replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc) {
+        const processField = (parser) => {
+            if (parser instanceof FieldCodeParserMailMerge) {
+                const fieldName = parser.getMergeFieldName();
+                return RichUtils.replaceParagraphEndCharsWithLineBreak(this.getResultByFieldName(record, fieldName));
+            }
+            return null;
+        };
+        this.processFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc, processField);
+    }
+    replaceIfFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc) {
+        const processField = (parser) => {
+            if (parser instanceof FieldCodeParserIf) {
+                parser.parseSwitchesAndArgs();
+                return parser.getResult();
+            }
+            return null;
+        };
+        this.processFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc, processField);
+    }
+    replaceFieldWithText(modelManager, subDoc, field, text) {
+        if (!StringUtils.isNullOrEmpty(text)) {
+            const pos = field.getFieldStartPosition();
+            const runProps = subDoc.getRunByPosition(pos).getCharPropsBundle(modelManager.model);
+            const insertParams = new InsertTextManipulatorParams(new SubDocumentPosition(subDoc, pos), runProps, RunType.TextRun, text);
+            modelManager.modelManipulator.text.insertTextInner(insertParams);
+        }
+        modelManager.modelManipulator.range.removeIntervalWithoutHistory(subDoc, field.getAllFieldInterval(), false);
+    }
     getResultByFieldName(record, fieldName) {
         const keys = Object.keys(record);
-        for (let i = 0, key; key = keys[i]; i++)
+        for (let i = 0, key; (key = keys[i]); i++) {
             if (key.toLowerCase() == fieldName.toLowerCase())
                 return record[key] + '';
+        }
         return '';
     }
     insertSeparator(modelManager, mergeMode) {

package/lib/client/commands/new-document-command.js

@@ -19,9 +19,10 @@ export class NewDocumentCommand extends CommandBase {
         return true;
     }
     static newDocumentInner() {
+        var _a;
         this.control.closeDocument();
         this.control.loadingPanelManager.loadingPanel.setVisible(true);
-        const documentInfo = new DocumentInfo(DocumentInfo.defaultDocumentName, false);
+        const documentInfo = new DocumentInfo((_a = this.control.documentInfo) === null || _a === void 0 ? void 0 : _a.fileName, false);
         this.control.initialize("", documentInfo, 1, null);
         const options = new ModelCreatorOptions();
         new ModelCreator(options).setModel(this.control.modelManager.model).fillModel();

package/lib/client/default-localization.js

@@ -2030,6 +2030,8 @@ export function loadDefaultMessages() {
             "ASPxRichEditStringId.CreateEmptyMergeFieldDescription": "Retrieves a value from the bound data source.",
             "ASPxRichEditStringId.CreateEmptyDocVariableField": "DOCVARIABLE",
             "ASPxRichEditStringId.CreateEmptyDocVariableFieldDescription": "Enables you to programmatically insert complex content when this field is updated.",
+            "ASPxRichEditStringId.CreateEmptyIfField": "IF",
+            "ASPxRichEditStringId.CreateEmptyIfFieldDescription": "Compares two values and inserts text related to the comparison result.",
             "ASPxRichEditStringId.MenuCmd_Font_settings": "Font settings",
             "ASPxRichEditStringId.MenuCmd_Align_Paragraph": "Align Paragraph",
             "ASPxRichEditStringId.MenuCmd_Empty": "Empty",

package/lib/client/dialogs/hyperlink-dialog.js

@@ -1,5 +1,6 @@
 import { formatMessage } from 'devextreme/localization';
 import { DialogBase } from './dialog-base';
+import { UrlUtils } from '../../common/utils/utils';
 export class HyperlinkDialog extends DialogBase {
     constructor() {
         super(...arguments);
@@ -146,13 +147,19 @@ export class HyperlinkDialog extends DialogBase {
         parameters.text = data.text;
         parameters.tooltip = data.tooltip;
         const tabPanelSelectedIndex = this.tabPanel.option('selectedIndex');
-        if (tabPanelSelectedIndex == 0)
-            parameters.url = data.url;
-        else if (tabPanelSelectedIndex == 1)
-            parameters.anchor = data.anchor;
+        if (tabPanelSelectedIndex == 0) {
+            [parameters.url, parameters.anchor] = UrlUtils.splitUrlByAnchor(data.url);
+        }
         else {
-            const subject = data.subject ? this.subjectPrefix + data.subject : '';
-            parameters.url = this.mailtoPrefix + data.email + subject;
+            if (tabPanelSelectedIndex == 1) {
+                parameters.url = "";
+                parameters.anchor = data.anchor;
+            }
+            else {
+                const subject = data.subject ? this.subjectPrefix + data.subject : '';
+                parameters.url = this.mailtoPrefix + data.email + subject;
+                parameters.anchor = "";
+            }
         }
     }
 }

package/lib/client/formats/docx/export/exporters/styles.d.ts

@@ -4,8 +4,13 @@ export declare class StylesExporter extends ExporterBaseWithRootElement {
     get rootElement(): string;
     get rootNSPrefix(): string;
     get rootNSValue(): string;
+    private styleNameToIndex;
+    private sortedStyleIndexes;
+    private processedStyleNames;
     protected fillWriter(): void;
     private exportDocumentDefaults;
     private exportDocumentCharacterDefaults;
     private exportDocumentParagraphDefaults;
+    private getSortedStyleIndexes;
+    private sortStyleIndexRecursive;
 }

package/lib/client/formats/docx/export/exporters/styles.js

@@ -3,13 +3,20 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { DocxNsType } from '../../utils/constants';
 import { ExporterBaseWithRootElement } from './base';
 export class StylesExporter extends ExporterBaseWithRootElement {
+    constructor() {
+        super(...arguments);
+        this.styleNameToIndex = new Map();
+        this.sortedStyleIndexes = [];
+        this.processedStyleNames = new Set();
+    }
     get filePath() { return 'word/styles.xml'; }
     get rootElement() { return 'styles'; }
     get rootNSPrefix() { return this.data.constants.namespaces[DocxNsType.WordProcessing].prefix; }
     get rootNSValue() { return this.data.constants.namespaces[DocxNsType.WordProcessing].namespace; }
     fillWriter() {
         this.exportDocumentDefaults();
-        ListUtils.forEach(this.data.model.paragraphStyles, (style, index) => this.data.parStyleExporter.export(style, index));
+        const paragraphStyleIndexes = this.getSortedStyleIndexes();
+        ListUtils.forEach(paragraphStyleIndexes, (index) => this.data.parStyleExporter.export(this.data.model.paragraphStyles[index], index));
         ListUtils.forEach(this.data.model.characterStyles, (style, index) => this.data.charStyleExporter.export(style, index));
         ListUtils.forEach(this.data.model.tableStyles, (style, index) => this.data.tblStyleExporter.export(style, index));
     }
@@ -33,4 +40,26 @@ export class StylesExporter extends ExporterBaseWithRootElement {
         this.writer.endElement();
         this.writer.endElement();
     }
+    getSortedStyleIndexes() {
+        this.styleNameToIndex = new Map();
+        this.sortedStyleIndexes = [];
+        this.processedStyleNames = new Set();
+        const styles = this.data.model.paragraphStyles;
+        styles.forEach((style, index) => this.styleNameToIndex.set(style.styleName, index));
+        for (let index = 0; index < styles.length; index++)
+            this.sortStyleIndexRecursive(index);
+        return this.sortedStyleIndexes;
+    }
+    sortStyleIndexRecursive(index) {
+        const styles = this.data.model.paragraphStyles;
+        const style = styles[index];
+        if (this.processedStyleNames.has(style.styleName))
+            return;
+        this.processedStyleNames.add(style.styleName);
+        if (style.parent) {
+            const parentIndex = this.styleNameToIndex.get(style.parent.styleName);
+            this.sortStyleIndexRecursive(parentIndex);
+        }
+        this.sortedStyleIndexes.push(index);
+    }
 }

package/lib/client/formats/docx/import/color/open-xml-color-import-helper.js

@@ -11,7 +11,7 @@ export class OpenXmlColorImportHelper {
         if (themeValue != ThemeColorValues.None) {
             const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
             return themeColorIndex != ThemeColorIndexConstants.None ?
-                ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade')) :
+                ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade'), themeValue) :
                 ColorModelInfo.makeByThemeColorIndex(DXColor.empty);
         }
         else {
@@ -42,7 +42,7 @@ export class OpenXmlColorImportHelper {
         if (themeValue != ThemeColorValues.None) {
             const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
             if (themeColorIndex != ThemeColorIndexConstants.None)
-                return ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint);
+                return ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint, themeValue);
         }
         return ColorModelInfo.makeByColor(data.readerHelper.getWpSTColorValue(reader, 'fill', DXColor.empty), tint);
     }

package/lib/client/formats/docx/import/importers/styles-importer.js

@@ -77,9 +77,10 @@ export class StyleManager {
         StringMapUtils.forEach(this.info, (info) => action(info));
     }
     addStyle(dest) {
+        var _a;
         if (this.currInfo.isDefault && !this.isDefaultProcessed) {
             this.isDefaultProcessed = true;
-            if (this.defaultStyle.styleName === this.currInfo.name)
+            if (((_a = this.defaultStyle) === null || _a === void 0 ? void 0 : _a.styleName) === this.currInfo.name)
                 this.applyProperties(dest, this.defaultStyle);
             else
                 this.defaultStyle = this.addToModel(this.applyProperties(dest, this.createEmpty()));

package/lib/client/formatters-options.js

@@ -1,5 +1,5 @@
-import * as DxLocDate from 'devextreme/localization/date';
-import * as DxLocNumber from 'devextreme/localization/number';
+import * as DxLocDate from 'devextreme/common/core/localization/date';
+import * as DxLocNumber from 'devextreme/common/core/localization/number';
 export class ClientFormattersOptions {
     get locDate() { var _a; return (_a = DxLocDate.default) !== null && _a !== void 0 ? _a : DxLocDate; }
     get locNumber() { var _a; return (_a = DxLocNumber.default) !== null && _a !== void 0 ? _a : DxLocNumber; }

package/lib/client/i-rich-constructor-settings.d.ts

@@ -80,8 +80,7 @@ export interface IRichEditFieldsSettings {
     defaultDateFormat?: string;
     openHyperlinkOnClick?: boolean;
     keepHyperlinkResultForInvalidReference?: boolean;
-    disableRelativeHyperlinkUri?: boolean;
-    allowedHyperlinkUriProtocols?: string[];
+    allowedHyperlinkUriSchemes?: string[];
     createHyperlinkTooltip?: (hyperlinkTooltip: string, hint: string) => string;
 }
 export interface IRichEditRangePermissionsSettings {

package/lib/client/model-api/api-utils/range-permission-finder.js

@@ -1,4 +1,5 @@
 import { IntervalAlgorithms } from '@devexpress/utils/lib/intervals/algorithms';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export function findRangePermissionsByIntervals(sourceCollection, intervals) {
     const permissions = [];
@@ -19,5 +20,6 @@ export function findRangePermissions(sourceCollection, check) {
 }
 export function findRangePermission(sourceCollection, coreInterval, userName, group) {
     const intervals = findRangePermissionsByIntervals(sourceCollection, [coreInterval]);
-    return ListUtils.elementBy(intervals, (permission) => permission.userName == userName && permission.group == group);
+    return ListUtils.elementBy(intervals, (permission) => Comparers.stringIgnoreCase(permission.userName, userName) == 0 &&
+        Comparers.stringIgnoreCase(permission.group, group) == 0);
 }

package/lib/client/model-api/collections/drawing-object-collection.js

@@ -59,7 +59,7 @@ export class TextBoxCollection extends DrawingObjectCollectionBase {
         const anchorInfo = new AnchorInfo();
         anchorInfo.zOrder = this._processor.modelManager.modelManipulator.floatingObject.zOrder.getNewZOrder(this._subDocument);
         const inputPos = new InputPositionBase().setIntervals(SelectionIntervalsInfo.fromPosition(this._subDocument, position));
-        this._processor.modelManager.modelManipulator.textBox.insertAnchoredTextBoxViaHistoty(new SubDocumentPosition(this._subDocument, position), inputPos.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._processor.modelManager.modelManipulator.textBox.insertAnchoredTextBoxViaHistory(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
         const textBoxRun = this._subDocument.getRunByPosition(position);
         return new TextBoxApi(this._processor.modelManager, this._subDocument, textBoxRun, position);
     }

package/lib/client/model-api/collections/hyperlink-collection.js

@@ -60,7 +60,7 @@ export class HyperlinkCollection extends Collection {
         subDocument.insertText(field.getCodeInterval().start, HyperlinkInfo.getNewCodeText(info));
         if (canChangeHyperlinkDisplayText && hyperlinkInfo.text || field.getResultInterval().length == 0) {
             subDocument.deleteText(convertToIntervalApi(field.getResultInterval()));
-            subDocument.insertText(field.getResultInterval().start, !hyperlinkInfo.text || hyperlinkInfo.text == "" ? info.getUriPlusAnchor() : hyperlinkInfo.text);
+            subDocument.insertText(field.getResultInterval().start, !hyperlinkInfo.text || hyperlinkInfo.text == "" ? info.getUriWithAnchor() : hyperlinkInfo.text);
         }
         this._processor.modelManager.history.addAndRedo(new ApplyFieldHyperlinkStyleHistoryItem(this._processor.modelManager.modelManipulator, new SubDocumentInterval(this._subDocument, field.getResultInterval())));
         this._processor.modelManager.history.endTransaction();

package/lib/client/model-api/collections/range-permission-collection.js

@@ -10,6 +10,7 @@ import { ModelParametersChecker } from '../api-utils/model-parameter-checker';
 import { findRangePermission, findRangePermissions, findRangePermissionsByIntervals } from '../api-utils/range-permission-finder';
 import { RangePermissionApi } from '../range-permission';
 import { Collection } from './collection';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 export class RangePermissionCollection extends Collection {
     constructor(processor, subDocument) {
         super(processor);
@@ -81,13 +82,13 @@ function findByPosition(position, canBeUndefined, sourceCollection) {
 }
 function findByUserName(value, permissions) {
     return ListUtils.map(ApiParametersChecker.check(value, 1, true, [
-        ApiParametersChecker.stringDescriptor("userName", (userName) => findRangePermissions(permissions, permission => permission.userName == userName), false),
+        ApiParametersChecker.stringDescriptor("userName", (userName) => findRangePermissions(permissions, permission => Comparers.stringIgnoreCase(permission.userName, userName) == 0), false),
         ApiParametersChecker.regExpDescriptor('regexp', (regexp) => findRangePermissions(permissions, permission => regexp.test(permission.userName)))
     ]), (b) => b);
 }
 function findByGroup(value, permissions) {
     return ListUtils.map(ApiParametersChecker.check(value, 1, true, [
-        ApiParametersChecker.stringDescriptor("group", (group) => findRangePermissions(permissions, permission => permission.group == group), false),
+        ApiParametersChecker.stringDescriptor("group", (group) => findRangePermissions(permissions, permission => Comparers.stringIgnoreCase(permission.group, group) == 0), false),
         ApiParametersChecker.regExpDescriptor('regexp', (regexp) => findRangePermissions(permissions, permission => regexp.test(permission.group)))
     ]), (b) => b);
 }

package/lib/client/public/commands/enum.d.ts

@@ -133,6 +133,7 @@ export declare enum MailMergeTabCommandId {
     CreateNumPagesField = 236,
     CreateEmptyMergeField = 372,
     CreateEmptyDocVariableField = 373,
+    CreateEmptyIfField = 459,
     ShowInsertMergeFieldDialog = 214,
     ToggleViewMergedData = 213,
     ShowAllFieldCodes = 186,

package/lib/client/public/commands/enum.js

@@ -139,6 +139,7 @@ export var MailMergeTabCommandId;
     MailMergeTabCommandId[MailMergeTabCommandId["CreateNumPagesField"] = 236] = "CreateNumPagesField";
     MailMergeTabCommandId[MailMergeTabCommandId["CreateEmptyMergeField"] = 372] = "CreateEmptyMergeField";
     MailMergeTabCommandId[MailMergeTabCommandId["CreateEmptyDocVariableField"] = 373] = "CreateEmptyDocVariableField";
+    MailMergeTabCommandId[MailMergeTabCommandId["CreateEmptyIfField"] = 459] = "CreateEmptyIfField";
     MailMergeTabCommandId[MailMergeTabCommandId["ShowInsertMergeFieldDialog"] = 214] = "ShowInsertMergeFieldDialog";
     MailMergeTabCommandId[MailMergeTabCommandId["ToggleViewMergedData"] = 213] = "ToggleViewMergedData";
     MailMergeTabCommandId[MailMergeTabCommandId["ShowAllFieldCodes"] = 186] = "ShowAllFieldCodes";

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

@@ -93,8 +93,7 @@ export interface IFieldsSettings {
     defaultDateFormat?: string;
     openHyperlinkOnClick?: boolean;
     keepHyperlinkResultForInvalidReference?: boolean;
-    disableRelativeHyperlinkUri?: boolean;
-    allowedHyperlinkUriProtocols?: string[];
+    allowedHyperlinkUriSchemes?: string[];
     createHyperlinkTooltip?: (hyperlinkTooltip: string, hint: string) => string;
 }
 export interface IBookmarkSettings {

package/lib/client/public/ribbon/item-ids.d.ts

@@ -133,6 +133,7 @@ export declare enum MailMergeTabItemId {
     CreateNumPagesField = 236,
     CreateEmptyMergeField = 372,
     CreateEmptyDocVariableField = 373,
+    CreateEmptyIfField = 459,
     ShowInsertMergeFieldDialog = 214,
     ToggleViewMergedData = 213,
     ShowAllFieldCodes = 186,

package/lib/client/public/ribbon/item-ids.js

@@ -139,6 +139,7 @@ export var MailMergeTabItemId;
     MailMergeTabItemId[MailMergeTabItemId["CreateNumPagesField"] = 236] = "CreateNumPagesField";
     MailMergeTabItemId[MailMergeTabItemId["CreateEmptyMergeField"] = 372] = "CreateEmptyMergeField";
     MailMergeTabItemId[MailMergeTabItemId["CreateEmptyDocVariableField"] = 373] = "CreateEmptyDocVariableField";
+    MailMergeTabItemId[MailMergeTabItemId["CreateEmptyIfField"] = 459] = "CreateEmptyIfField";
     MailMergeTabItemId[MailMergeTabItemId["ShowInsertMergeFieldDialog"] = 214] = "ShowInsertMergeFieldDialog";
     MailMergeTabItemId[MailMergeTabItemId["ToggleViewMergedData"] = 213] = "ToggleViewMergedData";
     MailMergeTabItemId[MailMergeTabItemId["ShowAllFieldCodes"] = 186] = "ShowAllFieldCodes";

package/lib/client/public/rich-edit.js

@@ -118,7 +118,7 @@ class RichEditPublic {
                 mimeType = HtmlMimeType;
                 break;
         }
-        const fileName = OpenDocumentCommand.getFileNameWithoutExtension(this.documentName);
+        const fileName = OpenDocumentCommand.getFileNameWithoutExtension(this._native.core.documentInfo.fileName);
         const extension = Utils.documentFormatToExtension(format);
         const exportModelOptions = this._native.core.getExportModelOptions({ documentFormat: format });
         exportModelToBlob(exportModelOptions, blob => callback(FileUtils.createFile([blob], fileName + extension, { type: mimeType })));

package/lib/client/settings.js

@@ -146,10 +146,8 @@ export class Settings {
                 result.fields.createHyperlinkTooltip = this.parseEventHandler(settings.fields.createHyperlinkTooltip);
             if (isDefined(settings.fields.keepHyperlinkResultForInvalidReference))
                 result.fields.keepHyperlinkResultForInvalidReference = settings.fields.keepHyperlinkResultForInvalidReference;
-            if (isDefined(settings.fields.disableRelativeHyperlinkUri))
-                result.fields.disableRelativeHyperlinkUri = settings.fields.disableRelativeHyperlinkUri;
-            if (isDefined(settings.fields.allowedHyperlinkUriProtocols))
-                result.fields.allowedHyperlinkUriProtocols = settings.fields.allowedHyperlinkUriProtocols;
+            if (isDefined(settings.fields.allowedHyperlinkUriSchemes))
+                result.fields.allowedHyperlinkUriSchemes = settings.fields.allowedHyperlinkUriSchemes;
         }
     }
     static parsePrintingSettings(settings, result) {

package/lib/common/commands/client-command.d.ts

@@ -418,5 +418,6 @@ export declare enum RichEditClientCommand {
     FloatingObjectBringForwardMenu = 455,
     FloatingObjectSendBackwardMenu = 456,
     NoSpellingSuggestions = 457,
-    GetHtml = 458
+    GetHtml = 458,
+    CreateEmptyIfField = 459
 }

package/lib/common/commands/client-command.js

@@ -420,4 +420,5 @@ export var RichEditClientCommand;
     RichEditClientCommand[RichEditClientCommand["FloatingObjectSendBackwardMenu"] = 456] = "FloatingObjectSendBackwardMenu";
     RichEditClientCommand[RichEditClientCommand["NoSpellingSuggestions"] = 457] = "NoSpellingSuggestions";
     RichEditClientCommand[RichEditClientCommand["GetHtml"] = 458] = "GetHtml";
+    RichEditClientCommand[RichEditClientCommand["CreateEmptyIfField"] = 459] = "CreateEmptyIfField";
 })(RichEditClientCommand || (RichEditClientCommand = {}));

package/lib/common/commands/command-manager.js

@@ -35,7 +35,7 @@ import { ShowQuickSearchPanelCommand } from './dialogs/show-quick-search-panel-c
 import { ChangePageColorCommand } from './document-properties/change-page-color-command';
 import { PrintDocumentOnClient } from './document/print-document-on-client-command';
 import { ChangeHyperlinkCommand } from './fields/change-hyperlink-command';
-import { CreateDateFieldCommand, CreateEmptyDocVariableFieldCommand, CreateEmptyMergeFieldCommand, CreateEquationCaptionFieldCommand, CreateFieldCommand, CreateFieldWithCodeCommand, CreateFigureCaptionFieldCommand, CreateMergeFieldCommand, CreatePageCountFieldCommand, CreatePageFieldCommand, CreateTableCaptionFieldCommand, CreateTableOfEquationsFieldCommand, CreateTableOfFiguresFieldCommand, CreateTableOfTablesFieldCommand, CreateTimeFieldCommand, CreateTocFieldCommand } from './fields/create-field-command';
+import { CreateDateFieldCommand, CreateEmptyDocVariableFieldCommand, CreateEmptyIfFieldCommand, CreateEmptyMergeFieldCommand, CreateEquationCaptionFieldCommand, CreateFieldCommand, CreateFieldWithCodeCommand, CreateFigureCaptionFieldCommand, CreateMergeFieldCommand, CreatePageCountFieldCommand, CreatePageFieldCommand, CreateTableCaptionFieldCommand, CreateTableOfEquationsFieldCommand, CreateTableOfFiguresFieldCommand, CreateTableOfTablesFieldCommand, CreateTimeFieldCommand, CreateTocFieldCommand } from './fields/create-field-command';
 import { GoToFirstDataRecordCommand, GoToLastDataRecordCommand, GoToNextDataRecordCommand, GoToPreviousDataRecordCommand, GoToRecordCommandBase } from './fields/go-to-record-command';
 import { OpenHyperlinkCommand } from './fields/open-hyperlink-command';
 import { RemoveHyperlinkCommand } from './fields/remove-hyperlink-command';
@@ -524,6 +524,7 @@ export class CommandManager {
         this.createCommand(control, RichEditClientCommand.ChangeTextBoxProperties, ChangeTextBoxPropertiesCommand);
         this.createCommand(control, RichEditClientCommand.CreateEmptyMergeField, CreateEmptyMergeFieldCommand);
         this.createCommand(control, RichEditClientCommand.CreateEmptyDocVariableField, CreateEmptyDocVariableFieldCommand);
+        this.createCommand(control, RichEditClientCommand.CreateEmptyIfField, CreateEmptyIfFieldCommand);
         this.createCommand(control, RichEditClientCommand.FloatingObjectDragDropChangePosition, FloatingObjectDragDropChangePositionCommand);
         this.createCommand(control, RichEditClientCommand.InsertHtml, InsertHtmlCommand);
         this.createCommand(control, RichEditClientCommand.CreateTocField, CreateTocFieldCommand);

package/lib/common/commands/dialogs/dialog-hyperlink-command.js

@@ -36,8 +36,14 @@ export class DialogHyperlinkCommandBase extends ShowDialogCommandBase {
         var field = this.getState().value;
         if (field) {
             var hyperlinkInfo = field.getHyperlinkInfo();
-            parameters.url = hyperlinkInfo.uri;
-            parameters.anchor = hyperlinkInfo.anchor;
+            if (hyperlinkInfo.isUri()) {
+                parameters.url = hyperlinkInfo.getUriWithAnchor();
+                parameters.anchor = "";
+            }
+            else {
+                parameters.url = "";
+                parameters.anchor = hyperlinkInfo.anchor;
+            }
             parameters.tooltip = hyperlinkInfo.tip;
             parameters.text = FieldContextMenuHelper.getHyperlinkResultText(options.subDocument, field);
         }
@@ -50,7 +56,7 @@ export class DialogHyperlinkCommandBase extends ShowDialogCommandBase {
         if (newParams.tooltip == initParams.tooltip && newParams.url == initParams.url && newParams.anchor == initParams.anchor && newParams.text == initParams.text)
             return false;
         var hyperlinkInfo = new HyperlinkInfo(newParams.url, newParams.anchor, newParams.tooltip, false);
-        if (hyperlinkInfo.anchor == "" && hyperlinkInfo.uri == "")
+        if (!hyperlinkInfo.isValid())
             return false;
         var modelManipulator = this.modelManipulator;
         var selection = this.selection;
@@ -72,7 +78,7 @@ export class DialogHyperlinkCommandBase extends ShowDialogCommandBase {
         }
         if (initParams.canChangeDisplayText && newParams.text != initParams.text || field.getResultInterval().length == 0) {
             selection.deprecatedSetSelection(field.getResultStartPosition(), field.getResultEndPosition(), false, selection.keepX, false, false);
-            this.control.commandManager.getCommand(RichEditClientCommand.InsertText).execute(this.control.commandManager.isPublicApiCall, new CommandSimpleOptions(this.control, !newParams.text || newParams.text == "" ? hyperlinkInfo.getUriPlusAnchor() : newParams.text));
+            this.control.commandManager.getCommand(RichEditClientCommand.InsertText).execute(this.control.commandManager.isPublicApiCall, new CommandSimpleOptions(this.control, !newParams.text || newParams.text == "" ? hyperlinkInfo.getUriWithAnchor() : newParams.text));
         }
         history.addAndRedo(new ApplyFieldHyperlinkStyleHistoryItem(modelManipulator, new SubDocumentInterval(this.selection.activeSubDocument, field.getResultInterval())));
         selection.deprecatedSetSelection(field.getFieldEndPosition(), field.getFieldEndPosition(), false, selection.keepX, false, false);

package/lib/common/commands/fields/create-field-command.d.ts

@@ -47,6 +47,10 @@ export declare class CreateEmptyDocVariableFieldCommand extends CreatePredefined
     getInsertedText(_parameter: string): string;
     needUpdate(): boolean;
 }
+export declare class CreateEmptyIfFieldCommand extends CreatePredefinedFieldCommand {
+    getInsertedText(_parameter: string): string;
+    needUpdate(): boolean;
+}
 export declare abstract class CreateTableOfContentCommandBase extends CreatePredefinedFieldCommand {
     isEnabled(): boolean;
     getInsertedText(_parameter: string): string;

package/lib/common/commands/fields/create-field-command.js

@@ -170,6 +170,14 @@ export class CreateEmptyDocVariableFieldCommand extends CreatePredefinedFieldCom
         return false;
     }
 }
+export class CreateEmptyIfFieldCommand extends CreatePredefinedFieldCommand {
+    getInsertedText(_parameter) {
+        return "IF";
+    }
+    needUpdate() {
+        return false;
+    }
+}
 export class CreateTableOfContentCommandBase extends CreatePredefinedFieldCommand {
     isEnabled() {
         const currentTocField = FieldCommandHelper.findTocFieldBySelection(this.selection.activeSubDocument, this.selection);