devexpress-richedit 24.1.7-build-24281-0102 → 24.1.7

package/dist/dx.richedit.js

@@ -10323,6 +10323,12 @@ class UrlUtils {
         catch (_a) { }
         return false;
     }
+    static splitUrlByAnchor(url) {
+        const hashTagPosition = url.indexOf("#");
+        if (hashTagPosition < 0)
+            return [url, ""];
+        return [url.substring(0, hashTagPosition), url.substring(hashTagPosition + 1)];
+    }
 }
 UrlUtils.EmptyPage = "about:blank";
 
@@ -11356,10 +11362,11 @@ class color_model_info_ColorModelInfo {
     }
     static get nullColor() { return color_model_info_ColorModelInfo.makeByColor(ColorHelper.AUTOMATIC_COLOR); }
     ;
-    static makeByThemeColorIndex(themeColorIndex, tint = 0) {
+    static makeByThemeColorIndex(themeColorIndex, tint = 0, themeValue = ThemeColorValues.None) {
         const result = new color_model_info_ColorModelInfo();
         result.themeColorIndex = themeColorIndex;
         result.tint = tint;
+        result.themeValue = themeValue;
         return result;
     }
     static makeByColor(color, tint = 0) {
@@ -25038,6 +25045,8 @@ class FieldDeletedSubDocumentChange {
     }
 }
 
+// EXTERNAL MODULE: ./src/common/utils/utils.ts
+var utils = __webpack_require__(5929);
 ;// CONCATENATED MODULE: ./src/common/model/fields/field.ts
 
 
@@ -25045,6 +25054,7 @@ class FieldDeletedSubDocumentChange {
 
 
 
+
 var FieldNameType;
 (function (FieldNameType) {
     FieldNameType[FieldNameType["None"] = 0] = "None";
@@ -25074,8 +25084,8 @@ 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 [
@@ -25086,6 +25096,21 @@ 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 utils/* UrlUtils */.jE.isValid(this.uri);
+    }
+    isMail() {
+        return this.uri.startsWith("mailto:");
+    }
+    isValid() {
+        return !!(this.uri || this.anchor);
+    }
 }
 class SequenceInfo {
     constructor(identifier, repeats, hidesResult, resets, resetsWith) {
@@ -28870,6 +28895,7 @@ class StylesManager {
     }
     addTableCellStyleCore(oldStyle) {
         var newStyle = oldStyle.clone();
+        this.tableCellStyleNameToIndex[newStyle.styleName] = this.documentModel.tableCellStyles.push(newStyle) - 1;
         newStyle.characterProperties = this.documentModel.cache.mergedCharacterPropertiesCache.getItem(oldStyle.characterProperties);
         newStyle.tableCellProperties = this.documentModel.cache.tableCellPropertiesCache.getItem(oldStyle.tableCellProperties);
         return newStyle;
@@ -33623,6 +33649,7 @@ ApplyFieldHyperlinkStyleHistoryItem.mask = CharacterPropertiesMask.UseAll & ~(Ch
 
 
 
+
 class FieldCodeParserHyperlink extends FieldCodeParserClientUpdatingBase {
     get name() { return FieldName.Hyperlink; }
     parseCodeCurrentFieldInternal(_responce) {
@@ -33634,55 +33661,48 @@ class FieldCodeParserHyperlink extends FieldCodeParserClientUpdatingBase {
         return true;
     }
     fillResult() {
-        var field = this.getTopField();
-        var text = this.parameterInfoList[0] ? this.parameterInfoList[0].text : "";
-        var newHyperlinkInfo = this.updateHyperlinkInfo(field, text);
+        var _a, _b;
+        const field = this.getTopField();
+        const text = (_b = (_a = this.parameterInfoList[0]) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : "";
+        const newHyperlinkInfo = this.updateHyperlinkInfo(text);
         if (!newHyperlinkInfo) {
-            if (!this.modelManager.richOptions.fields.keepHyperlinkResultForInvalidReference)
+            if (!this.modelManager.richOptions.fields.keepHyperlinkResultForInvalidReference) {
                 this.removeInterval(this.getTopField().getResultInterval());
+            }
             return true;
         }
-        var modelManipulator = this.modelManager.modelManipulator;
-        var resultInterval = field.getResultInterval();
-        if (resultInterval.length == 0) {
-            var resultText = text.length > 0 ? text : "#" + newHyperlinkInfo.anchor;
-            var newResultInterval = new fixed.FixedInterval(resultInterval.start, resultText.length);
+        const modelManipulator = this.modelManager.modelManipulator;
+        const resultInterval = field.getResultInterval();
+        if (resultInterval.length === 0) {
+            const resultText = text !== null && text !== void 0 ? text : "#" + newHyperlinkInfo.anchor;
+            const newResultInterval = new fixed.FixedInterval(resultInterval.start, resultText.length);
             this.setInputPositionState();
             this.replaceTextByInterval(resultInterval, resultText);
-            this.modelManager.history.addAndRedo(new ApplyFieldHyperlinkStyleHistoryItem(modelManipulator, new SubDocumentInterval(this.subDocument, newResultInterval)));
+            const subDocumentInterval = new SubDocumentInterval(this.subDocument, newResultInterval);
+            const historyItem = new ApplyFieldHyperlinkStyleHistoryItem(modelManipulator, subDocumentInterval);
+            this.modelManager.history.addAndRedo(historyItem);
         }
-        this.modelManager.history.addAndRedo(new ChangeFieldHyperlinkInfoHistoryItem(modelManipulator, this.subDocument, field.index, newHyperlinkInfo));
+        const historyItem = new ChangeFieldHyperlinkInfoHistoryItem(modelManipulator, this.subDocument, field.index, newHyperlinkInfo);
+        this.modelManager.history.addAndRedo(historyItem);
         return true;
     }
-    updateHyperlinkInfo(field, text) {
-        var newHyperlinkInfo = field.isHyperlinkField() ? field.getHyperlinkInfo().clone() : new HyperlinkInfo("", "", "", false);
+    updateHyperlinkInfo(text) {
+        const newHyperlinkInfo = new HyperlinkInfo("", "", "", false);
+        [newHyperlinkInfo.uri, newHyperlinkInfo.anchor] = utils/* UrlUtils */.jE.splitUrlByAnchor(text);
         newHyperlinkInfo.visited = false;
-        var tipSwitch;
-        var bookmarkSwitch;
-        for (var i = 0, switchInfo; switchInfo = this.switchInfoList[i]; i++)
-            if (switchInfo.type == FieldSwitchType.FieldSpecific) {
-                switch (switchInfo.name.toLocaleUpperCase()) {
-                    case "O":
-                        tipSwitch = switchInfo;
-                        break;
-                    case "L":
-                        bookmarkSwitch = switchInfo;
-                        break;
-                }
+        for (const switchInfo of this.switchInfoList) {
+            if (switchInfo.type != FieldSwitchType.FieldSpecific)
+                continue;
+            switch (switchInfo.name.toLocaleUpperCase()) {
+                case "O":
+                    newHyperlinkInfo.tip = switchInfo.arg;
+                    break;
+                case "L":
+                    newHyperlinkInfo.anchor = switchInfo.arg;
+                    break;
             }
-        newHyperlinkInfo.tip = tipSwitch ? tipSwitch.arg : "";
-        var splitted = text.split("#");
-        if (splitted.length == 1) {
-            newHyperlinkInfo.uri = splitted[0];
-            newHyperlinkInfo.anchor = bookmarkSwitch ? bookmarkSwitch.arg : "";
-            if (newHyperlinkInfo.uri == "" && newHyperlinkInfo.anchor == "")
-                return null;
         }
-        else {
-            newHyperlinkInfo.uri = splitted[0];
-            newHyperlinkInfo.anchor = splitted[1];
-        }
-        return newHyperlinkInfo;
+        return newHyperlinkInfo.isValid() ? newHyperlinkInfo : null;
     }
 }
 
@@ -48019,7 +48039,7 @@ class TextManipulator extends RunsBaseManipulator {
             return null;
         const historyItems = history.historyItems;
         const result = history.currentIndex == historyItems.length - 1 ? this.getLastHistoryItemNode(historyItems, null, checkType) : null;
-        return !result.empty ? result : null;
+        return (result === null || result === void 0 ? void 0 : result.empty) ? null : result;
     }
     getLastHistoryItemNode(historyItems, parent, checkType) {
         for (let ind = historyItems.length - 1, item; item = historyItems[ind]; ind--) {
@@ -69146,8 +69166,6 @@ class HtmlThTagImporter extends HtmlTdTagImporter {
     }
 }
 
-// EXTERNAL MODULE: ./src/common/utils/utils.ts
-var utils = __webpack_require__(5929);
 ;// CONCATENATED MODULE: ./src/common/formats/html/import/importers/text-node.ts
 
 
@@ -69877,7 +69895,7 @@ class HtmlImporter {
         const missTag = HtmlImporter.MapMissTablePropertiesByTagNames[utils_list.ListUtils.last(this.levelInfo).tagImporter.elementTag()];
         utils_list.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))
@@ -71303,7 +71321,7 @@ 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();
@@ -74920,9 +74938,10 @@ class StyleManager {
         string.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()));
@@ -77725,7 +77744,7 @@ class OpenXmlColorImportHelper {
         if (themeValue != ThemeColorValues.None) {
             const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
             return themeColorIndex != ThemeColorIndexConstants.None ?
-                color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade')) :
+                color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade'), themeValue) :
                 color_model_info_ColorModelInfo.makeByThemeColorIndex(DXColor.empty);
         }
         else {
@@ -77756,7 +77775,7 @@ class OpenXmlColorImportHelper {
         if (themeValue != ThemeColorValues.None) {
             const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
             if (themeColorIndex != ThemeColorIndexConstants.None)
-                return color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint);
+                return color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint, themeValue);
         }
         return color_model_info_ColorModelInfo.makeByColor(data.readerHelper.getWpSTColorValue(reader, 'fill', DXColor.empty), tint);
     }
@@ -128142,8 +128161,14 @@ 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);
         }
@@ -128156,7 +128181,7 @@ 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;
@@ -128178,7 +128203,7 @@ 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);
@@ -130308,7 +130333,7 @@ class GoToLastDataRecordCommand extends GoToRecordCommandBase {
 }
 
 // EXTERNAL MODULE: ./node_modules/@devexpress/utils/lib/utils/url.js
-var utils_url = __webpack_require__(6795);
+var url = __webpack_require__(6795);
 ;// CONCATENATED MODULE: ./src/common/commands/fields/hyperlink-command-base.ts
 
 
@@ -130355,12 +130380,15 @@ class OpenHyperlinkCommand extends HyperlinkCommandBase {
             this.history.endTransaction();
             this.aspxForceSendingRequest();
         }
-        if (hyperlinkInfo.anchor)
+        if (hyperlinkInfo.isUri()) {
+            let uri = hyperlinkInfo.getUriWithAnchor();
+            if (!utils/* UrlUtils */.jE.isValid(uri))
+                uri = utils/* UrlUtils */.jE.EmptyPage;
+            url/* Url */.R.navigate(uri, "_blank");
+        }
+        else {
             this.control.commandManager.getCommand(RichEditClientCommand.GoToBookmark)
                 .execute(this.control.commandManager.isPublicApiCall, new CommandSimpleOptions(this.control, hyperlinkInfo.anchor));
-        else {
-            const url = utils/* UrlUtils */.jE.isValid(hyperlinkInfo.uri) ? hyperlinkInfo.uri : utils/* UrlUtils */.jE.EmptyPage;
-            utils_url/* Url */.R.navigate(url, "_blank");
         }
         return true;
     }
@@ -141433,6 +141461,7 @@ class FontDialog extends DialogBase {
 ;// CONCATENATED MODULE: ./src/client/dialogs/hyperlink-dialog.ts
 
 
+
 class HyperlinkDialog extends DialogBase {
     constructor() {
         super(...arguments);
@@ -141579,13 +141608,19 @@ 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] = utils/* UrlUtils */.jE.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 = "";
+            }
         }
     }
 }
@@ -143830,7 +143865,7 @@ class ClientRichEdit {
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
         if (true)
-            external_DevExpress_config_default()(JSON.parse(atob('eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWNIQktkR3hUTlRaeU1HRjZNV3R4VldwWFNuTXRaeUlLZlE9PS5GSzV0WCtSUkt0akY2Q2NwaExOa0R2V0RCTHVkb0ZrdTN3LzJEMGMxRVlWMXp4KzJEYURkYnA0MGtPbXpKTnBRMXB0TUpiT1NTUm1JVmJaSU5VejRINDE3ejZMTDF4cDRZdWpyL2hQU3RiZlNodkNJMGFmemN4TzhXL1ZaVUJUR2gyZUh6UT09In0=')));
+            external_DevExpress_config_default()(JSON.parse(atob('eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWNsQXpXRVkxYm5aUmEyRjVjRTk1UWt4d2RXTlVRU0lLZlE9PS5mRVhyTm1adGMwdWRsdzlOa3hheDBPejFzTEdNU0RwUHBXWGhVdEllc0xvU21lMVhxTC9jZWw2QUtMVVFjVFJERURuN0dRM1k0ZzVMRTlVSGJsK0lUM09zbmpOZnBxYS9nTFY2bmpHbWt2NytLQnVvWWtyTE9LbGtyQjRWQ00rVVZYdDNKZz09In0=')));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);
@@ -144361,11 +144396,11 @@ 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();