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

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.2.1
+* Version: 24.2.2
 * 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.2
 * 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 ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=")));
         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/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/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/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/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/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);

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++;
     }
 }