devexpress-richedit 24.1.6 → 24.1.7-build-24274-0102

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.1.6
+* Version: 24.1.7
 * 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.1.6
+* Version: 24.1.7
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

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

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

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

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

package/lib/client/settings.js

@@ -146,10 +146,6 @@ 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;
         }
     }
     static parsePrintingSettings(settings, result) {

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 { UrlUtils } from '../../../common/utils/utils';
 export class OpenHyperlinkCommand extends HyperlinkCommandBase {
     executeCore(state, options) {
         let field;
@@ -29,9 +29,8 @@ export class OpenHyperlinkCommand extends HyperlinkCommandBase {
             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");
+            const url = UrlUtils.isValid(hyperlinkInfo.uri) ? hyperlinkInfo.uri : UrlUtils.EmptyPage;
+            Url.navigate(url, "_blank");
         }
         return true;
     }

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

@@ -6,8 +6,6 @@ export declare class FieldsSettings {
     defaultTimeFormat: string;
     defaultDateFormat: string;
     openHyperlinkOnClick: boolean;
-    disableRelativeHyperlinkUri: boolean;
-    allowedHyperlinkUriProtocols: string[];
     keepHyperlinkResultForInvalidReference: boolean;
     createHyperlinkTooltip: (hyperlinkTooltip: string, hint: string) => string;
     constructor();

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

@@ -3,7 +3,6 @@ import { isDefined, isNonNullString } from '@devexpress/utils/lib/utils/common';
 export class FieldsSettings {
     constructor() {
         this.openHyperlinkOnClick = false;
-        this.disableRelativeHyperlinkUri = false;
         this.updateFieldsBeforePrint = true;
         this.updateFieldsOnPaste = true;
         this.defaultTimeFormat = FieldsSettings.DEFAULT_TIME_FORMAT;
@@ -30,10 +29,6 @@ export class FieldsSettings {
             this.keepHyperlinkResultForInvalidReference = obj.keepHyperlinkResultForInvalidReference;
         if (isDefined(obj.createHyperlinkTooltip) && obj.createHyperlinkTooltip !== '')
             this.createHyperlinkTooltip = convertToFunction(obj.createHyperlinkTooltip);
-        if (isDefined(obj.disableRelativeHyperlinkUri))
-            this.disableRelativeHyperlinkUri = obj.disableRelativeHyperlinkUri;
-        if (isDefined(obj.allowedHyperlinkUriProtocols))
-            this.allowedHyperlinkUriProtocols = obj.allowedHyperlinkUriProtocols;
     }
     clone() {
         const result = new FieldsSettings();

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

@@ -1,5 +1,4 @@
 import { Point } from '@devexpress/utils/lib/geometry/point';
-import { IRichEditControl } from '../interfaces/i-rich-edit-core';
 export declare function rotatePoint(point: Point, angle: number, center: Point): Point;
 export declare class SearchTreeItemResult<T> {
     readonly parentList: T[];
@@ -12,9 +11,7 @@ export declare function searchTreeItem<T extends {
 }>(items: T[], comparer: (item: T) => boolean): SearchTreeItemResult<T> | null;
 export declare function convertToFunction(func: any): any | null;
 export declare function splitByLines(text: string): string[];
-export interface IUrlValidationOptions {
-    allowRelativeUrl?: boolean;
-    allowedProtocols?: string[];
+export declare class UrlUtils {
+    static EmptyPage: string;
+    static isValid(url: string): boolean;
 }
-export declare function createUrlValidationOptions(control: IRichEditControl): IUrlValidationOptions;
-export declare function isUrlValid(url: string, options?: IUrlValidationOptions): boolean;

package/lib/common/utils/utils.js

@@ -56,29 +56,20 @@ export function convertToFunction(func) {
 export function splitByLines(text) {
     return text ? text.split(/\r\n|\r|\n/) : [''];
 }
-export function createUrlValidationOptions(control) {
-    const fieldSettings = control.modelManager.richOptions.fields;
-    return {
-        allowRelativeUrl: !fieldSettings.disableRelativeHyperlinkUri,
-        allowedProtocols: fieldSettings.allowedHyperlinkUriProtocols
-    };
-}
 const disallowedProtocols = [
     'data',
     'javascript'
 ];
-export function isUrlValid(url, options) {
-    let currentLocation;
-    if (options === null || options === void 0 ? void 0 : options.allowRelativeUrl)
-        currentLocation = window.location.href;
-    try {
-        const resultUrl = new URL(url, currentLocation);
-        const protocol = resultUrl.protocol.slice(0, -1);
-        const allowedProtocols = options === null || options === void 0 ? void 0 : options.allowedProtocols;
-        if (allowedProtocols)
-            return allowedProtocols.includes(protocol);
-        return !disallowedProtocols.includes(protocol);
+export class UrlUtils {
+    static isValid(url) {
+        const currentLocation = window.location.href;
+        try {
+            const resultUrl = new URL(url, currentLocation);
+            const protocol = resultUrl.protocol.slice(0, -1);
+            return !disallowedProtocols.includes(protocol);
+        }
+        catch (_a) { }
+        return false;
     }
-    catch (_a) { }
-    return false;
 }
+UrlUtils.EmptyPage = "about:blank";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.6",
+  "version": "24.1.7-build-24274-0102",
   "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.6",
-    "devextreme-dist": "24.1.6"
+    "devextreme": "24.1.7-build-24272-1937",
+    "devextreme-dist": "24.1.7-build-24272-1937"
   },
   "dependencies": {
     "jszip": "~3.10.1",