devexpress-richedit 24.2.8-build-25149-0115 → 25.1.2-beta

package/lib/common/ui/ruler/controls/zoomable-value.js

@@ -0,0 +1,15 @@
+export class RulerValue {
+    set value(value) {
+        this.originalValue = value / this.zoomLevelHolder.zoomLevel;
+    }
+    ;
+    get value() {
+        const calculatedValue = this.originalValue * this.zoomLevelHolder.zoomLevel;
+        return calculatedValue;
+    }
+    ;
+    constructor(originalValue, zoomLevelHolder) {
+        this.originalValue = originalValue;
+        this.zoomLevelHolder = zoomLevelHolder;
+    }
+}

package/lib/common/ui/ruler/manager.d.ts

@@ -1,6 +1,6 @@
 import { MinMaxNumber } from '@devexpress/utils/lib/class/min-max';
 import { RulerColumnsControl } from './controls/column';
-import { RulerDivisionsControl } from './controls/divisions';
+import { DivisionInfo, RulerDivisionsControl } from './controls/divisions';
 import { RulerFirstLineIndentDragHandle } from './controls/indent/first-line';
 import { RulerLeftIndentDragHandle } from './controls/indent/left';
 import { RulerRightIndentDragHandle } from './controls/indent/right';
@@ -34,10 +34,14 @@ export declare class RulerControls {
     readonly tables: RulerTablesControl;
     readonly tabs: RulerTabsControl;
     readonly mouseHandler: RulerMouseHandler;
-    readonly moveStepSize: number;
+    readonly modelData: RulerModelData;
+    readonly divisionInfo: DivisionInfo;
+    private moveStepSize;
     get paragraphLeftPosition(): number;
     get paragraphRightPosition(): number;
     constructor(canvas: HTMLDivElement, modelData: RulerModelData);
+    calculateMoveStepSize(): void;
+    updateZoomLevel(): void;
     dispose(): void;
     update(): void;
     private updateModelState;

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

@@ -42,13 +42,14 @@ export class RulerControls {
         this.mouseEventsManager = new RulerMouseEventsManager();
         this.viewElementScrollManager = new RulerViewElementScrollManager();
         this.canvas = canvas;
-        const divisionInfo = DivisionInfo.create(modelData.unitType);
-        const maxPageWidth = UnitConverter.twipsToPixelsF(PaperSizeConverter.calculatePaperSize(PaperKind.PrcEnvelopeNumber10Rotated).width);
-        this.moveStepSize = modelData.unitType == RichEditUnit.Inch ? divisionInfo.stepSize / 2 : divisionInfo.stepSize;
+        this.modelData = modelData;
+        this.divisionInfo = DivisionInfo.create(modelData.unitType, this.modelData.innerClientProperties.viewsSettings);
+        this.calculateMoveStepSize();
+        const maxPageWidth = UnitConverter.twipsToPixelsF(PaperSizeConverter.calculatePaperSize(PaperKind.PrcEnvelopeNumber10Rotated).width) * this.modelData.zoomLevel;
         this.wrapper = new RulerWrapper(modelData, this);
         this.ruler = new RulerControl(modelData, this);
         this.tabTypeBox = new RulerTabTypeControl(modelData, this);
-        this.divisions = new RulerDivisionsControl(modelData, this, divisionInfo, maxPageWidth);
+        this.divisions = new RulerDivisionsControl(modelData, this, this.divisionInfo, maxPageWidth);
         this.leftMargin = new RulerLeftMarginDragHandle(modelData, this, maxPageWidth);
         this.rightMargin = new RulerRightMarginDragHandle(modelData, this, maxPageWidth);
         this.leftIndent = new RulerLeftIndentDragHandle(modelData, this);
@@ -64,6 +65,12 @@ export class RulerControls {
         this.mouseEventsManager.addListener(this.mouseHandler);
         this.viewElementScrollManager.addListener(this.ruler, this.canvas);
     }
+    calculateMoveStepSize() {
+        this.moveStepSize = this.modelData.unitType == RichEditUnit.Inch ? this.divisionInfo.stepSize / 2 : this.divisionInfo.stepSize;
+    }
+    updateZoomLevel() {
+        this.divisionInfo.updateZoomLevel();
+    }
     dispose() {
         this.lineControl.dispose();
         this.wrapper.dispose();
@@ -82,8 +89,10 @@ export class RulerControls {
         this.viewElementScrollManager.dispose();
     }
     update() {
+        this.updateZoomLevel();
         this.updateModelState();
         this.updateView();
+        this.calculateMoveStepSize();
     }
     updateModelState() {
         this.ruler.updateModelState();

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

@@ -21,6 +21,7 @@ export declare class RulerModelData {
     get isReadOnly(): boolean;
     get unitType(): RichEditUnit;
     get selection(): Selection;
+    get zoomLevel(): number;
     constructor(core: RichEditCore, settings: RulerSettings);
     private fixSettings;
     private getDefaultStyle;

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

@@ -13,6 +13,7 @@ export class RulerModelData {
     get isReadOnly() { return this.core.readOnly != ReadOnlyMode.None; }
     get unitType() { return this.core.uiUnitConverter.getUnits(); }
     get selection() { return this.core.selection; }
+    get zoomLevel() { return this.core.viewManager.zoomLevel; }
     constructor(core, settings) {
         this.core = core;
         this.settings = this.fixSettings(settings);

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

@@ -146,6 +146,8 @@ export class HorizontalRulerControl extends BatchUpdatableObject {
             case ModelChangeType.TableCellRemoved:
             case ModelChangeType.TableCellInserted:
                 return HorizontalRulerEventType.FullReset;
+            case ModelChangeType.ZoomLevelChanged:
+                return HorizontalRulerEventType.FullReset;
             default:
                 return HorizontalRulerEventType.None;
         }

package/lib/common/utils/mixed-size.d.ts

@@ -0,0 +1,27 @@
+export declare class MixedSize {
+    static fromLayout(value: number): MixedSize;
+    static fromUI(value: number): MixedSize;
+    private _UISizePart;
+    private _UISize;
+    private _layoutSizePart;
+    private _layoutSize;
+    private _scale;
+    private _scaleIsSpecified;
+    get UISize(): number;
+    get LayoutSize(): number;
+    private get UISizePart();
+    private set UISizePart(value);
+    private get LayoutSizePart();
+    private set LayoutSizePart(value);
+    private onSizeChanged;
+    addUISize(value: number): this;
+    addLayoutSize(value: number): this;
+    addSize(value: MixedSize): this;
+    subtractUISize(value: number): this;
+    subtractLayoutSize(value: number): this;
+    subtractSize(value: MixedSize): this;
+    private checkSizeHasSameScale;
+    private checkScaleIsSpecified;
+    useScale(value: number): this;
+    clear(): this;
+}

package/lib/common/utils/mixed-size.js

@@ -0,0 +1,91 @@
+import { isDefined } from "@devexpress/utils/lib/utils/common";
+export class MixedSize {
+    constructor() {
+        this._UISizePart = 0;
+        this._layoutSizePart = 0;
+        this._scale = 1;
+        this._scaleIsSpecified = false;
+    }
+    static fromLayout(value) {
+        return new MixedSize().addLayoutSize(value);
+    }
+    static fromUI(value) {
+        return new MixedSize().addUISize(value);
+    }
+    get UISize() {
+        this.checkScaleIsSpecified();
+        if (!isDefined(this._UISize))
+            this._UISize = this._layoutSizePart * this._scale + this._UISizePart;
+        return this._UISize;
+    }
+    get LayoutSize() {
+        this.checkScaleIsSpecified();
+        if (!isDefined(this._layoutSize))
+            this._layoutSize = this._layoutSizePart + this._UISizePart / this._scale;
+        return this._layoutSize;
+    }
+    get UISizePart() {
+        return this._UISizePart;
+    }
+    set UISizePart(value) {
+        this._UISizePart = value;
+        this.onSizeChanged();
+    }
+    get LayoutSizePart() {
+        return this._layoutSizePart;
+    }
+    set LayoutSizePart(value) {
+        this._layoutSizePart = value;
+        this.onSizeChanged();
+    }
+    onSizeChanged() {
+        this._UISize = null;
+        this._layoutSize = null;
+    }
+    addUISize(value) {
+        this.UISizePart += value;
+        return this;
+    }
+    addLayoutSize(value) {
+        this.LayoutSizePart += value;
+        return this;
+    }
+    addSize(value) {
+        this.checkSizeHasSameScale(value);
+        this.addLayoutSize(value._layoutSizePart);
+        this.addUISize(value._UISizePart);
+        return this;
+    }
+    subtractUISize(value) {
+        this.UISizePart -= value;
+        return this;
+    }
+    subtractLayoutSize(value) {
+        this.LayoutSizePart -= value;
+        return this;
+    }
+    subtractSize(value) {
+        this.checkSizeHasSameScale(value);
+        this.subtractLayoutSize(value._layoutSizePart);
+        this.subtractUISize(value._UISizePart);
+        return this;
+    }
+    checkSizeHasSameScale(size) {
+        if (size._scaleIsSpecified && size._scale !== this._scale)
+            throw new Error("The size has a different scale and cannot be added.");
+    }
+    checkScaleIsSpecified() {
+        if (!this._scaleIsSpecified)
+            console.warn("MixedSize is used without specifying the scale.");
+    }
+    useScale(value) {
+        this._scale = value;
+        this._scaleIsSpecified = true;
+        return this;
+    }
+    clear() {
+        this.UISizePart = 0;
+        this.LayoutSizePart = 0;
+        return this;
+    }
+}

package/lib/common/view-settings/views-settings.d.ts

@@ -20,6 +20,8 @@ export declare class ViewSettings {
     fixedWidth?: number;
     pageVerticalInfo: RenderPageVertivalInfo;
     showHorizontalRuler: boolean;
+    zoomLevel: number;
+    allowZoom: boolean;
     private _widthOfPage;
     get isFixedWidthMode(): boolean;
     set widthOfPage(val: number);

package/lib/common/view-settings/views-settings.js

@@ -57,6 +57,7 @@ export class ViewSettings {
         this.paddings = new Margins(15, 15, 15, 15);
         this.pageVerticalInfo = new RenderPageVertivalInfo();
         this.showHorizontalRuler = true;
+        this.zoomLevel = 1.0;
     }
     copyFrom(obj) {
         this.paddings = new Margins(obj.paddings.left, obj.paddings.right, obj.paddings.top, obj.paddings.bottom);
@@ -64,6 +65,8 @@ export class ViewSettings {
         this._widthOfPage = obj._widthOfPage;
         this.fixedWidth = obj.fixedWidth;
         this.showHorizontalRuler = obj.showHorizontalRuler;
+        this.zoomLevel = obj.zoomLevel;
+        this.allowZoom = obj.allowZoom;
         this.pageVerticalInfo.copyFrom(obj.pageVerticalInfo);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.2.8-build-25149-0115",
+  "version": "25.1.2-beta",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,18 +14,18 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.2.8-build-25148-1935",
-    "devextreme-dist": "24.2.8-build-25148-1935"
+    "devextreme": "25.1.2-beta",
+    "devextreme-dist": "25.1.2-beta"
   },
   "dependencies": {
     "jszip": "~3.10.1",
-    "tslib": "2.6.0",
+    "tslib": "2.6.2",
     "@devexpress/utils": "^1.4.3"
   },
   "devDependencies": {
-    "webpack": "5.75.0",
-    "terser-webpack-plugin": "5.3.6",
-    "webpack-cli": "5.0.1",
+    "webpack": "5.89.0",
+    "terser-webpack-plugin": "5.3.10",
+    "webpack-cli": "5.1.4",
     "gulp-minify-css": "1.2.4",
     "gulp": "4.0.2",
     "gulp-concat-css": "3.1.0",