devexpress-richedit 24.1.7-build-24288-0102 → 24.1.7

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

@@ -53,8 +53,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWNIQktkR3hUTlRaeU1HRjZNV3R4VldwWFNuTXRaeUlLZlE9PS5GSzV0WCtSUkt0akY2Q2NwaExOa0R2V0RCTHVkb0ZrdTN3LzJEMGMxRVlWMXp4KzJEYURkYnA0MGtPbXpKTnBRMXB0TUpiT1NTUm1JVmJaSU5VejRINDE3ejZMTDF4cDRZdWpyL2hQU3RiZlNodkNJMGFmemN4TzhXL1ZaVUJUR2gyZUh6UT09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWNIQktkR3hUTlRaeU1HRjZNV3R4VldwWFNuTXRaeUlLZlE9PS5GSzV0WCtSUkt0akY2Q2NwaExOa0R2V0RCTHVkb0ZrdTN3LzJEMGMxRVlWMXp4KzJEYURkYnA0MGtPbXpKTnBRMXB0TUpiT1NTUm1JVmJaSU5VejRINDE3ejZMTDF4cDRZdWpyL2hQU3RiZlNodkNJMGFmemN4TzhXL1ZaVUJUR2gyZUh6UT09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWNsQXpXRVkxYm5aUmEyRjVjRTk1UWt4d2RXTlVRU0lLZlE9PS5mRVhyTm1adGMwdWRsdzlOa3hheDBPejFzTEdNU0RwUHBXWGhVdEllc0xvU21lMVhxTC9jZWw2QUtMVVFjVFJERURuN0dRM1k0ZzVMRTlVSGJsK0lUM09zbmpOZnBxYS9nTFY2bmpHbWt2NytLQnVvWWtyTE9LbGtyQjRWQ00rVVZYdDNKZz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWNsQXpXRVkxYm5aUmEyRjVjRTk1UWt4d2RXTlVRU0lLZlE9PS5mRVhyTm1adGMwdWRsdzlOa3hheDBPejFzTEdNU0RwUHBXWGhVdEllc0xvU21lMVhxTC9jZWw2QUtMVVFjVFJERURuN0dRM1k0ZzVMRTlVSGJsK0lUM09zbmpOZnBxYS9nTFY2bmpHbWt2NytLQnVvWWtyTE9LbGtyQjRWQ00rVVZYdDNKZz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);
@@ -585,11 +585,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/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/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/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/open-hyperlink-command.js

@@ -25,12 +25,15 @@ export class OpenHyperlinkCommand extends HyperlinkCommandBase {
             this.history.endTransaction();
             this.aspxForceSendingRequest();
         }
-        if (hyperlinkInfo.anchor)
+        if (hyperlinkInfo.isUri()) {
+            let uri = hyperlinkInfo.getUriWithAnchor();
+            if (!UrlUtils.isValid(uri))
+                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 url = UrlUtils.isValid(hyperlinkInfo.uri) ? hyperlinkInfo.uri : UrlUtils.EmptyPage;
-            Url.navigate(url, "_blank");
         }
         return true;
     }

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

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

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

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

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

@@ -6,6 +6,7 @@ import { HyperlinkInfo } from '../field';
 import { FieldName } from '../names';
 import { FieldCodeParserState, FieldSwitchType } from './field-code-parser';
 import { FieldCodeParserClientUpdatingBase } from './field-code-parser-client-updating-base';
+import { UrlUtils } from '../../../utils/utils';
 export class FieldCodeParserHyperlink extends FieldCodeParserClientUpdatingBase {
     get name() { return FieldName.Hyperlink; }
     parseCodeCurrentFieldInternal(_responce) {
@@ -17,54 +18,47 @@ export 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 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 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] = UrlUtils.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;
     }
 }

package/lib/common/utils/utils.d.ts

@@ -14,4 +14,5 @@ export declare function splitByLines(text: string): string[];
 export declare class UrlUtils {
     static EmptyPage: string;
     static isValid(url: string): boolean;
+    static splitUrlByAnchor(url: string): [url: string, anchor: string];
 }

package/lib/common/utils/utils.js

@@ -71,5 +71,11 @@ export 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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.7-build-24288-0102",
+  "version": "24.1.7",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,8 +14,8 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.1.7-build-24286-1936",
-    "devextreme-dist": "24.1.7-build-24286-1936"
+    "devextreme": "24.1.7",
+    "devextreme-dist": "24.1.7"
   },
   "dependencies": {
     "jszip": "~3.10.1",