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

package/lib/common/ui/ruler/manager.js

@@ -59,7 +59,7 @@ export class RulerControls {
         this.tabs = new RulerTabsControl(modelData, this);
         this.ruler.init();
         this.tabTypeBox.init();
-        this.lineControl = new RulerVerticalLineControl(this.canvas, modelData.settings, this.ruler.rootElement);
+        this.lineControl = new RulerVerticalLineControl(this.canvas, modelData.styles.line.className, this.ruler.rootElement);
         this.mouseHandler = new RulerMouseHandler(modelData, this);
         this.mouseEventsManager.addListener(this.mouseHandler);
         this.viewElementScrollManager.addListener(this.ruler, this.canvas);

package/lib/common/ui/ruler/model-data.d.ts

@@ -4,10 +4,16 @@ import { CommandManager } from '../../commands/command-manager';
 import { RichEditCore } from '../../rich-edit-core';
 import { InputPosition } from '../../selection/input-position';
 import { Selection } from '../../selection/selection';
-import { RulerSettings } from './settings';
+import { RulerSettings, RulerStyles, RulerTitles, RulerVisibility } from './settings';
 export declare class RulerModelData {
     private core;
-    readonly settings: RulerSettings;
+    private readonly settings;
+    visibility: RulerVisibility;
+    showTabs: boolean;
+    get showLeftIndent(): boolean;
+    get showRightIndent(): boolean;
+    get titles(): RulerTitles;
+    get styles(): RulerStyles;
     get inputPosition(): InputPosition;
     get commandManager(): CommandManager;
     get isClosed(): boolean;

package/lib/common/ui/ruler/model-data.js

@@ -1,6 +1,10 @@
 import { ReadOnlyMode } from '../../interfaces/i-rich-edit-core';
 import { RulerStyleInfo } from './settings';
 export class RulerModelData {
+    get showLeftIndent() { return this.settings.showLeftIndent; }
+    get showRightIndent() { return this.settings.showRightIndent; }
+    get titles() { return this.settings.titles; }
+    get styles() { return this.settings.styles; }
     get inputPosition() { return this.core.inputPosition; }
     ;
     get commandManager() { return this.core.commandManager; }
@@ -12,6 +16,8 @@ export class RulerModelData {
     constructor(core, settings) {
         this.core = core;
         this.settings = this.fixSettings(settings);
+        this.visibility = this.settings.visibility;
+        this.showTabs = this.settings.showTabs;
     }
     fixSettings(settings) {
         if (!settings.styles.firstLineIndent)

package/lib/common/ui/ruler/ruler.js

@@ -175,6 +175,7 @@ export class HorizontalRulerControl extends BatchUpdatableObject {
     }
     setVisible(visible) {
         if (visible != this._innerVisible || visible != this._visible) {
+            this.modelData.visibility = visible ? RulerVisibility.Visible : RulerVisibility.Hidden;
             this._visible = visible;
             this.innerSetVisible(visible);
         }
@@ -201,7 +202,7 @@ export class HorizontalRulerControl extends BatchUpdatableObject {
             return;
         if (!this.initialized && this.canvas.offsetWidth)
             this.controls = new RulerControls(this.canvas, this.modelData);
-        this.setVisible(this.modelData.settings.visibility != RulerVisibility.Hidden);
+        this.setVisible(this.modelData.visibility != RulerVisibility.Hidden);
         this.onViewTypeChanged();
     }
 }

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

@@ -1,5 +1,5 @@
 import { Point } from '@devexpress/utils/lib/geometry/point';
-import { IRichEditControl } from '../interfaces/i-rich-edit-core';
+import { IModelManager } from '../model-manager';
 export declare function rotatePoint(point: Point, angle: number, center: Point): Point;
 export declare class SearchTreeItemResult<T> {
     readonly parentList: T[];
@@ -13,8 +13,13 @@ export declare function searchTreeItem<T extends {
 export declare function convertToFunction(func: any): any | null;
 export declare function splitByLines(text: string): string[];
 export interface IUrlValidationOptions {
-    allowRelativeUrl?: boolean;
-    allowedProtocols?: string[];
+    allowedSchemes?: string[];
+}
+export declare function createUrlValidationOptions(modelManager: IModelManager): IUrlValidationOptions;
+export declare class UrlUtils {
+    static EmptyPage: string;
+    static isValid(url: string, options?: IUrlValidationOptions): boolean;
+    static isRelative(url: string): boolean;
+    static convertToAbsolute(url: string): URL | null;
+    static splitUrlByAnchor(url: string): [url: string, anchor: string];
 }
-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,57 @@ 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;
+export function createUrlValidationOptions(modelManager) {
+    const fieldSettings = modelManager.richOptions.fields;
     return {
-        allowRelativeUrl: !fieldSettings.disableRelativeHyperlinkUri,
-        allowedProtocols: fieldSettings.allowedHyperlinkUriProtocols
+        allowedSchemes: fieldSettings.allowedHyperlinkUriSchemes
     };
 }
+const defaultAllowedProtocols = [
+    'http',
+    'https',
+    'mailto',
+    'tel'
+];
 const disallowedProtocols = [
-    'data',
-    'javascript'
+    'javascript',
+    'data'
 ];
-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);
+export class UrlUtils {
+    static isValid(url, options) {
+        var _a;
+        const resultUrl = this.convertToAbsolute(url);
+        if (!resultUrl)
+            return false;
         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);
+        if (disallowedProtocols.includes(protocol))
+            return false;
+        const allowedProtocols = (_a = options === null || options === void 0 ? void 0 : options.allowedSchemes) !== null && _a !== void 0 ? _a : defaultAllowedProtocols;
+        return allowedProtocols.includes(protocol);
+    }
+    static isRelative(url) {
+        try {
+            new URL(url);
+            return false;
+        }
+        catch (_a) {
+            return true;
+        }
+    }
+    static convertToAbsolute(url) {
+        const currentLocation = window.location.href;
+        try {
+            return new URL(url, currentLocation);
+        }
+        catch (_a) {
+            return null;
+        }
+    }
+    static splitUrlByAnchor(url) {
+        const hashTagPosition = url.indexOf("#");
+        if (hashTagPosition < 0)
+            return [url, ""];
+        return [url.substring(0, hashTagPosition), url.substring(hashTagPosition + 1)];
     }
-    catch (_a) { }
-    return false;
 }
+UrlUtils.EmptyPage = "about:blank";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.2.1-alpha-24260-0102",
+  "version": "24.2.2-beta",
   "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.2.1-alpha-24256-1935",
-    "devextreme-dist": "24.2.1-alpha-24256-1935"
+    "devextreme": "24.2.2-beta",
+    "devextreme-dist": "24.2.2-beta"
   },
   "dependencies": {
     "jszip": "~3.10.1",