devexpress-richedit 25.1.2-beta → 25.1.3

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

@@ -287,15 +287,16 @@ export class Field {
             return newInterval.start = Field.correctIntervalDueToFieldsCaseSelectionCollapsed(subDocument.fields, newInterval.start);
         const indexesInterval = Field.correctIntervalDueToFieldsWithoutUiChecks(subDocument, newInterval);
         ListUtils.forEach(fields, (field) => {
-            if (field.getResultInterval().equals(newInterval) && !this.isFloatingObjectSelected(subDocument, newInterval))
+            if (field.getResultInterval().equals(newInterval) && !this.isResizableObjectSelected(subDocument, newInterval))
                 newInterval.expand(field.getAllFieldInterval());
         }, indexesInterval.start, indexesInterval.end);
     }
-    static isFloatingObjectSelected(subDocument, interval) {
+    static isResizableObjectSelected(subDocument, interval) {
         if (interval.length !== 1)
             return false;
         const run = subDocument.getRunByPosition(interval.start);
-        return run && (run.getType() == RunType.AnchoredPictureRun || run.getType() == RunType.AnchoredTextBoxRun);
+        const runType = run && run.getType();
+        return runType == RunType.AnchoredPictureRun || runType == RunType.AnchoredTextBoxRun || runType == RunType.InlinePictureRun;
     }
     static correctWhenPositionInStartCode(fields, position) {
         if (fields.length < 1)

package/lib/common/model/fields/tree-creator.js

@@ -104,7 +104,7 @@ export class FieldsWaitingForUpdate {
                     }
                     if (!fieldParser.update(response)) {
                         someFieldInCurrentInfoNotUpdated = true;
-                        info.parsers.push(fieldParser);
+                        info.parsers.unshift(fieldParser);
                     }
                     else
                         fieldParser.destructor();

package/lib/common/model/history/items/character-properties-history-items.d.ts

@@ -14,7 +14,8 @@ import { HistoryItemIntervalStateObject, HistoryItemIntervalUseStateObject } fro
 export declare class FontUseValueHistoryItem extends IntervalBasedHistoryItem {
     oldState: HistoryItemIntervalState<HistoryItemIntervalStateObject>;
     newValue: number;
-    constructor(modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: number);
+    keepCustomFormatting: boolean;
+    constructor(modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: number, keepCustomFormatting?: boolean);
     redo(): void;
     undo(): void;
 }

package/lib/common/model/history/items/character-properties-history-items.js

@@ -1,12 +1,13 @@
 import { Errors } from '@devexpress/utils/lib/errors';
 import { IntervalBasedHistoryItem } from '../base/interval-based-history-item';
 export class FontUseValueHistoryItem extends IntervalBasedHistoryItem {
-    constructor(modelManipulator, subDocInterval, newValue) {
+    constructor(modelManipulator, subDocInterval, newValue, keepCustomFormatting = false) {
         super(modelManipulator, subDocInterval);
         this.newValue = newValue;
+        this.keepCustomFormatting = keepCustomFormatting;
     }
     redo() {
-        this.oldState = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, this.newValue);
+        this.oldState = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, this.newValue, this.keepCustomFormatting);
     }
     undo() {
         this.modelManipulator.characterProperties.useValue.restoreValue(this.boundSubDocument, this.oldState);

package/lib/common/model/manipulators/character-properties-manipulator.js

@@ -74,7 +74,7 @@ class CharacterPropertiesUseValueManipulator {
     constructor(manipulator) {
         this.manipulator = manipulator;
     }
-    setValue(subDocument, interval, newValue) {
+    setValue(subDocument, interval, newValue, keepCustomFormatting = false) {
         var oldState = new HistoryItemIntervalState();
         if (!ControlOptions.isEnabled(subDocument.documentModel.options.characterFormatting))
             return oldState;
@@ -84,7 +84,7 @@ class CharacterPropertiesUseValueManipulator {
             var run = iterator.currentRun;
             oldState.register(new HistoryItemIntervalStateObject(iterator.currentInterval(), run.maskedCharacterProperties.getUseValueFull()));
             var properties = run.maskedCharacterProperties.clone();
-            properties.setUseValueFull(newValue);
+            properties.setUseValueFull(newValue, keepCustomFormatting);
             run.setCharacterProperties(properties);
             run.onCharacterPropertiesChanged();
         }

package/lib/common/model/manipulators/i-properties-manipulator.d.ts

@@ -8,7 +8,7 @@ export interface IIntervalPropertyWithUseValueManipulator<T> {
     restoreValue(subDocument: SubDocument, state: HistoryItemIntervalState<HistoryItemIntervalUseStateObject>): any;
 }
 export interface IIntervalPropertyManipulator<T> {
-    setValue(subDocument: SubDocument, interval: FixedInterval, newValue: T): HistoryItemIntervalState<HistoryItemIntervalStateObject>;
+    setValue(subDocument: SubDocument, interval: FixedInterval, newValue: T, keepCustomFormatting?: boolean): HistoryItemIntervalState<HistoryItemIntervalStateObject>;
     restoreValue(subDocument: SubDocument, state: HistoryItemIntervalState<HistoryItemIntervalStateObject>): any;
 }
 export interface IListLevelPropertyManipulator<T> {

package/lib/common/model/manipulators/picture-manipulator/picture-manipulator.js

@@ -88,7 +88,7 @@ export class PictureManipulator extends RunsBaseManipulator {
             this.history.addTransaction(() => {
                 this.modelManipulator.range.removeInterval(new SubDocumentInterval(subDocument, interval), true, false);
                 const newInfo = new InlinePictureInfo(pictureRun.size.clone(), new Shape(), -1, pictureRun.info.containerProperties, pictureRun.info.nonVisualDrawingProperties);
-                this.modelManipulator.picture.insertInlinePictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo);
+                this.modelManipulator.picture.insertInlinePictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(!pictureRun.cacheInfo.isSizeDefined));
             });
         }
     }
@@ -103,7 +103,7 @@ export class PictureManipulator extends RunsBaseManipulator {
             anchorInfo.zOrder = this.modelManipulator.floatingObject.zOrder.getNewZOrder(subDocument);
             this.modelManipulator.range.removeInterval(new SubDocumentInterval(subDocument, interval), true, false);
             const newInfo = new AnchorPictureInfo(pictureRun.size.clone(), new Shape(), anchorInfo, pictureRun.info.containerProperties, pictureRun.info.nonVisualDrawingProperties);
-            this.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(false));
+            this.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(!pictureRun.cacheInfo.isSizeDefined));
             run = subDocument.getRunByPosition(interval.start);
         }
         let anchoredRun = run.getType() == RunType.AnchoredPictureRun ? run : run;

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

@@ -9,7 +9,7 @@ export interface IFontSettings {
     name: string;
     fontFamily: string;
     googleFontsResponse?: string;
-    useGoogleFonts?: string;
+    useGoogleFonts?: boolean;
     italicFontUri?: string;
     boldFontUri?: string;
     boldItalicFontUri?: string;

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

@@ -41,13 +41,9 @@ export class RulerControl extends RulerBase {
     }
     adjust() {
         const viewWidth = this.controls.canvas.clientWidth;
-        if (viewWidth > this.pageWidth)
-            this.initialMarginLeftElement = (viewWidth - this.pageWidth - RULLER_NUMBER_CORRECTION * 2) / 2;
-        else {
-            const paddingLeft = DomUtils.pxToInt(DomUtils.getCurrentStyle(this.controls.canvas).paddingLeft);
-            const pageAreaBorderWidth = (this.controls.canvas.scrollWidth - paddingLeft - this.pageWidth) / 2;
-            this.initialMarginLeftElement = paddingLeft + pageAreaBorderWidth - RULLER_NUMBER_CORRECTION;
-        }
+        const paddingLeft = DomUtils.pxToInt(DomUtils.getCurrentStyle(this.controls.canvas).paddingLeft);
+        const minValue = paddingLeft - RULLER_NUMBER_CORRECTION;
+        this.initialMarginLeftElement = Math.max((viewWidth - this.pageWidth - RULLER_NUMBER_CORRECTION * 2) / 2, minValue);
         this.rootElement.style.left = this.calculateLeftOffset();
         this.setPaddings();
         this.canHandleScroll = this.controls.canvas.scrollWidth > this.controls.canvas.offsetWidth;

package/lib/common/ui/ruler/controls/vertical-line.js

@@ -1,6 +1,7 @@
 import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { DocumentRenderer } from '../../../canvas/renderes/common/document-renderer';
 import { RULLER_NUMBER_CORRECTION } from '../settings';
+import { SizeUtils } from '../../../../common/utils/size-utils';
 export const TABLE_COLUMN_SEPARATOR_RULER_LINE_CLASS_NAME = " table";
 export var SnapTo;
 (function (SnapTo) {
@@ -33,7 +34,7 @@ export class RulerVerticalLineControl {
             DomUtils.addClassName(this.rootElement, TABLE_COLUMN_SEPARATOR_RULER_LINE_CLASS_NAME);
         else
             DomUtils.removeClassName(this.rootElement, TABLE_COLUMN_SEPARATOR_RULER_LINE_CLASS_NAME);
-        this.rootElement.style.height = this.canvas.clientHeight + "px";
+        this.rootElement.style.height = SizeUtils.getClientHeight(this.canvas) + "px";
         this.rootElement.style.top = this.canvas.offsetTop + "px";
         this.rulerControlLeft = this.rulerControlElement.offsetLeft;
         this.rulerControlWidth = this.rulerControlElement.offsetWidth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "25.1.2-beta",
+  "version": "25.1.3",
   "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": "25.1.2-beta",
-    "devextreme-dist": "25.1.2-beta"
+    "devextreme": "25.1.3",
+    "devextreme-dist": "25.1.3"
   },
   "dependencies": {
     "jszip": "~3.10.1",

package/lib/common/commands/layout/toggle-allow-zoom-command.d.ts

@@ -1,7 +0,0 @@
-import { CommandBase, CommandSimpleOptions } from '../command-base';
-import { SimpleCommandState } from '../command-states';
-export declare class ToggleAllowZoomCommand extends CommandBase<SimpleCommandState> {
-    getState(): SimpleCommandState;
-    executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<boolean>): boolean;
-    isEnabledInReadOnlyMode(): boolean;
-}

package/lib/common/commands/layout/toggle-allow-zoom-command.js

@@ -1,17 +0,0 @@
-import { CommandBase } from '../command-base';
-import { SimpleCommandState } from '../command-states';
-export class ToggleAllowZoomCommand extends CommandBase {
-    getState() {
-        return new SimpleCommandState(this.isEnabled(), this.control.viewManager.allowZoom);
-    }
-    executeCore(_state, options) {
-        const allowZoom = this.control.viewManager.allowZoom;
-        if (options.param === allowZoom)
-            return false;
-        this.control.viewManager.allowZoom = !allowZoom;
-        return true;
-    }
-    isEnabledInReadOnlyMode() {
-        return true;
-    }
-}