devexpress-richedit 25.1.2-beta → 25.1.4-build-25191-0102

package/index.d.ts

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

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

@@ -62,8 +62,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVJWTTBSVlk0YmxKaVpYVk9OVGRWVEdSbFlVeHhZeUlLZlE9PS5MN1o0YXlNMTRnUWtScExSaEt6MGZSMDU5d1E5cWhhMi9ESThnRG83SEJxbFM2L1BMNVRtTmRrTVRzMmdUL3oyUFVQZDgyZGRMM0dsbjZiQUM0aXB4cUI0Y1ozT1FkZjhVc1pmMm9TOCs5SnliZGdCS1diYnFseXdEMUVFbkwwNmV0eWdtQT09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVJWTTBSVlk0YmxKaVpYVk9OVGRWVEdSbFlVeHhZeUlLZlE9PS5MN1o0YXlNMTRnUWtScExSaEt6MGZSMDU5d1E5cWhhMi9ESThnRG83SEJxbFM2L1BMNVRtTmRrTVRzMmdUL3oyUFVQZDgyZGRMM0dsbjZiQUM0aXB4cUI0Y1ozT1FkZjhVc1pmMm9TOCs5SnliZGdCS1diYnFseXdEMUVFbkwwNmV0eWdtQT09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVZqSlJjRkZ0U2xaWVYzazJUbVY0YTNFNVdHczVieUlLZlE9PS5EMTNKeDFkWmJlWFE0bGVWQ05XZnk5U2FLeWFHbmxMOE1xYkF2YzloQ3FVZTlBajJWYzJUS2RaU01RR05xVkVkSjMrTWZQKzQrQTBqMFhCSGxEczdEV2xpWFlNK01EMEVCaEJVQ0JTVzVmeWRGSzhyOGpEMDRzV2ZKYS9CTDRFTGdLOWZpZz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVZqSlJjRkZ0U2xaWVYzazJUbVY0YTNFNVdHczVieUlLZlE9PS5EMTNKeDFkWmJlWFE0bGVWQ05XZnk5U2FLeWFHbmxMOE1xYkF2YzloQ3FVZTlBajJWYzJUS2RaU01RR05xVkVkSjMrTWZQKzQrQTBqMFhCSGxEczdEV2xpWFlNK01EMEVCaEJVQ0JTVzVmeWRGSzhyOGpEMDRzV2ZKYS9CTDRFTGdLOWZpZz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/client/commands/commands.js

@@ -441,9 +441,6 @@ export function executeApiCommandCore(commandManager, commandId, parameter) {
                 break;
             }
             ;
-        case ViewTabCommandId.ToggleAllowZoom:
-            parameter = undefined;
-            break;
         case HeaderAndFooterTabCommandId.GoToPageHeader:
             parameter = undefined;
             break;

package/lib/client/commands/mail-merge-command.js

@@ -8,7 +8,6 @@ import { InsertParagraphManipulatorParams } from '../../common/model/manipulator
 import { RangeCopy } from '../../common/model/manipulators/range/create-range-copy-operation';
 import { InsertTextManipulatorParams } from '../../common/model/manipulators/text-manipulator/insert-text-manipulator-params';
 import { ControlOptions, DocumentCapability } from '../../common/model/options/control';
-import { RichUtils } from '../../common/model/rich-utils';
 import { RunType } from '../../common/model/runs/run-type';
 import { SectionStartType } from '../../common/model/section/enums';
 import { SubDocumentIntervals, SubDocumentPosition } from '../../common/model/sub-document';
@@ -125,8 +124,10 @@ export class MailMergeCommand extends CommandBase {
     replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc) {
         const processField = (parser) => {
             if (parser instanceof FieldCodeParserMailMerge) {
+                parser.update(null);
                 const fieldName = parser.getMergeFieldName();
-                return RichUtils.replaceParagraphEndCharsWithLineBreak(this.getResultByFieldName(record, fieldName));
+                const simpleText = this.getResultByFieldName(record, fieldName);
+                return parser.getFormattedResult(simpleText);
             }
             return null;
         };

package/lib/client/commands/open-document-command.js

@@ -71,6 +71,8 @@ export class OpenDocumentCommand extends CommandBase {
             return false;
         this.beforeOpen();
         core.activeDocumentImporter.importFromFile(file, this.control.modelManager.richOptions, (documentModel, formatImagesImporter) => {
+            if (core.isDisposed)
+                return;
             core.activeDocumentImporter = null;
             this.openCore(fileName, format, documentModel, formatImagesImporter, extension);
             if (!this.suppressUpdateFields)
@@ -78,6 +80,8 @@ export class OpenDocumentCommand extends CommandBase {
             if (callback)
                 callback(true, null);
         }, (reason) => {
+            if (core.isDisposed)
+                return;
             core.activeDocumentImporter = null;
             this.control.loadingPanelManager.loadingPanel.setVisible(false);
             NewDocumentCommand.newDocumentInner.call(this);

package/lib/client/formats/docx/export/exporters/relations/base.js

@@ -21,9 +21,9 @@ export class RelationsBaseExporter extends ExporterBaseWithRootElement {
     urlEncodeAsciiSpecialSymbols(url) {
         if (url) {
             if (url.indexOf(' ') >= 0)
-                url = url.replace(' ', '%20');
+                url = url.replace(/ /g, '%20');
             if (url.indexOf('\'') >= 0)
-                url = url.replace("\'", '%27');
+                url = url.replace(/'/g, '%27');
         }
         return url;
     }

package/lib/client/formats/docx/import/destination/numbering/numberings-destination.js

@@ -438,7 +438,7 @@ export class ListLevelFormatStringDestination extends ListLevelElementDestinatio
     }
     convertFormatString(value) {
         const regex = new RegExp(/%\d/);
-        let result = value.replace('{', '{{').replace('}', '}}');
+        let result = value.replace(/{/g, '{{').replace(/}/g, '}}');
         let match = result.match(regex);
         if (match) {
             do {

package/lib/client/formats/docx/import/destination/runs/text-destination.js

@@ -16,6 +16,6 @@ export class TextDestination extends ElementDestination {
         return true;
     }
     replaceLineBreakOnSpace(text) {
-        return text.replace('\n', ' ');
+        return text.replace(/\n/g, ' ');
     }
 }

package/lib/client/model-api/character-properties.js

@@ -40,7 +40,7 @@ export function convertToCharacterPropertiesApi(properties, colorProvider) {
     return value;
 }
 export function convertFromCharacterPropertiesApi(properties, fontInfoCache, parameterIndex, setRestAsUndefined, propsCoreTemplate) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     properties = ApiParametersChecker.check(properties, parameterIndex, false, [
         ApiParametersChecker.objectDescriptor('properties', 'CharacterProperties', (val) => val)
     ]);
@@ -60,31 +60,27 @@ export function convertFromCharacterPropertiesApi(properties, fontInfoCache, par
     propsCoreTemplate.fontItalic = (_d = ApiParametersChecker.check(properties.italic, parameterIndex, true, [
         ApiParametersChecker.booleanDescriptor('properties.italic', (val) => val)
     ])) !== null && _d !== void 0 ? _d : propsCoreTemplate.fontItalic;
-    propsCoreTemplate.fontInfo = (_e = ApiParametersChecker.check(properties.fontName, parameterIndex, true, [
-        ApiParametersChecker.stringDescriptor('properties.fontName', (val) => {
-            const fontInfo = fontInfoCache.getItemByName(val);
-            if (!fontInfo)
-                throw Error('Unknown font name');
-            return fontInfo;
-        }, false)
-    ])) !== null && _e !== void 0 ? _e : propsCoreTemplate.fontInfo;
-    propsCoreTemplate.fontSize = (_f = ApiParametersChecker.check(properties.size, parameterIndex, true, [
+    const fontInfo = ApiParametersChecker.check(properties.fontName, parameterIndex, true, [
+        ApiParametersChecker.stringDescriptor('properties.fontName', (value) => fontInfoCache.getItemByName(value), false)
+    ]);
+    propsCoreTemplate.fontInfo = fontInfo === undefined ? propsCoreTemplate.fontInfo : fontInfo !== null && fontInfo !== void 0 ? fontInfo : fontInfoCache.addFont(properties.fontName, properties.fontName);
+    propsCoreTemplate.fontSize = (_e = ApiParametersChecker.check(properties.size, parameterIndex, true, [
         ApiParametersChecker.numberDescriptor('properties.size', (val) => val, 0, 601)
-    ])) !== null && _f !== void 0 ? _f : propsCoreTemplate.fontSize;
-    propsCoreTemplate.hidden = (_g = ApiParametersChecker.check(properties.hidden, parameterIndex, true, [
+    ])) !== null && _e !== void 0 ? _e : propsCoreTemplate.fontSize;
+    propsCoreTemplate.hidden = (_f = ApiParametersChecker.check(properties.hidden, parameterIndex, true, [
         ApiParametersChecker.booleanDescriptor('properties.hidden', (val) => val)
-    ])) !== null && _g !== void 0 ? _g : propsCoreTemplate.hidden;
+    ])) !== null && _f !== void 0 ? _f : propsCoreTemplate.hidden;
     const shadigInfoColor = ApiParametersChecker.check(properties.backColor, parameterIndex, true, ModelParametersChecker.colorDescriptors('properties.backColor'));
     propsCoreTemplate.shadingInfo = shadigInfoColor === undefined ? propsCoreTemplate.shadingInfo :
         ShadingInfo.createByColor(ColorModelInfo.makeByColor(shadigInfoColor));
-    propsCoreTemplate.script = (_h = ApiParametersChecker.check(properties.script, parameterIndex, true, [
+    propsCoreTemplate.script = (_g = ApiParametersChecker.check(properties.script, parameterIndex, true, [
         ApiParametersChecker.enumDescriptor('properties.script', (val) => val, CharacterPropertiesScriptApi, 'CharacterPropertiesScript')
-    ])) !== null && _h !== void 0 ? _h : propsCoreTemplate.script;
+    ])) !== null && _g !== void 0 ? _g : propsCoreTemplate.script;
     const underlineColor = ApiParametersChecker.check(properties.underlineColor, parameterIndex, true, ModelParametersChecker.colorDescriptors('properties.underlineColor'));
     propsCoreTemplate.underlineColor = underlineColor === undefined ? propsCoreTemplate.underlineColor : ColorModelInfo.makeByColor(underlineColor);
-    propsCoreTemplate.underlineWordsOnly = (_j = ApiParametersChecker.check(properties.underlineWordsOnly, parameterIndex, true, [
+    propsCoreTemplate.underlineWordsOnly = (_h = ApiParametersChecker.check(properties.underlineWordsOnly, parameterIndex, true, [
         ApiParametersChecker.booleanDescriptor('properties.underlineWordsOnly', (val) => val)
-    ])) !== null && _j !== void 0 ? _j : propsCoreTemplate.underlineWordsOnly;
+    ])) !== null && _h !== void 0 ? _h : propsCoreTemplate.underlineWordsOnly;
     const strikeout = ApiParametersChecker.check(properties.strikeout, parameterIndex, true, [
         ApiParametersChecker.booleanDescriptor('properties.strikeout', (val) => val)
     ]);

package/lib/client/model-api/document.js

@@ -7,6 +7,7 @@ import { HyperlinkCollection } from './collections/hyperlink-collection';
 import { ListCollection } from './collections/numbered-list-collection';
 import { SectionCollection } from './collections/section-collection';
 import { SubDocumentCollection as SubDocumentCollection } from './collections/sub-documents-collection';
+import { FontCorrector } from '../../common/model/creator/font-corrector';
 export class RichEditDocumentApi {
     constructor(processor) {
         this._processor = processor;
@@ -105,6 +106,7 @@ export class RichEditDocumentApi {
         this._processor.modelManager.model.defaultCharacterProperties =
             this._processor.modelManager.model.cache.maskedCharacterPropertiesCache.getItem(propertiesCore);
         NumberMapUtils.forEach(this._processor.modelManager.model.subDocuments, (sd) => sd.resetMergedFormattingCache(ResetFormattingCacheType.All));
+        new FontCorrector(this._processor.modelManager.modelManipulator, this._processor.modelManager.model, this._processor.modelManager.richOptions.fonts).correct();
         this._processor.layoutFormatterManager.restartManager.restartAllLayout();
         this._processor.endUpdate();
     }

package/lib/client/model-api/images/image-enums.js

@@ -1,3 +1,4 @@
+import { AnchorObjectVerticalPositionAlignment } from '../../../common/model/floating-objects/enums';
 export var FloatingObjectHorizontalPositionTypeApi;
 (function (FloatingObjectHorizontalPositionTypeApi) {
     FloatingObjectHorizontalPositionTypeApi[FloatingObjectHorizontalPositionTypeApi["Aligned"] = 0] = "Aligned";

package/lib/client/model-api/images/images.js

@@ -197,7 +197,7 @@ export class ImagesApi {
             applyVerticalPosition(verticalPosition, anchorInfo);
         const anchorPictureInfo = new AnchorPictureInfo(new PictureSize(true, 0, cacheInfo, new Size(100, 100)), shape, anchorInfo, new NonVisualDrawingObjectInfo(), new NonVisualDrawingObjectInfo());
         anchorPictureInfo.containerProperties.description = options.description;
-        this._processor.modelManager.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, anchorPictureInfo, new ImageLoadingOptions(false, size ? new Size(size.width, size.height) : undefined, (_picInterval, _cacheInfo) => setTimeout(() => {
+        this._processor.modelManager.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, anchorPictureInfo, ImageLoadingOptions.initByActualSize(size ? new Size(size.width, size.height) : undefined, (_picInterval, _cacheInfo) => setTimeout(() => {
             callback(getFloatingImageApiFromRun(this._processor, this._subDocument, this._subDocument.getRunAndIndexesByPosition(position)));
         }, 0)));
         this._processor.endUpdate();

package/lib/client/model-api/table/enums.js

@@ -1,3 +1,7 @@
+import { ParagraphAlignment } from '../../../common/model/paragraph/paragraph-properties';
+import { BorderLineStyle } from '../../../common/model/borders/enums';
+import { TableCellVerticalAlignment } from '../../../common/model/tables/secondary-structures/table-base-structures';
+import { TableHeightUnitType, TableWidthUnitType } from '../../../common/model/tables/secondary-structures/table-units';
 export var BorderLineStyleApi;
 (function (BorderLineStyleApi) {
     BorderLineStyleApi[BorderLineStyleApi["Nil"] = -1] = "Nil";

package/lib/client/public/commands/enum.d.ts

@@ -150,8 +150,7 @@ export declare enum ViewTabCommandId {
     SwitchToPrintLayout = 406,
     ToggleShowHorizontalRuler = 94,
     ToggleFullScreen = 98,
-    ChangeZoomLevel = 460,
-    ToggleAllowZoom = 461
+    ChangeZoomLevel = 460
 }
 export declare enum HeaderAndFooterTabCommandId {
     GoToPageHeader = 227,

package/lib/client/public/commands/enum.js

@@ -1,3 +1,4 @@
+import { RichEditClientCommand as Command } from '../../../common/commands/client-command';
 export var FileTabCommandId;
 (function (FileTabCommandId) {
     FileTabCommandId[FileTabCommandId["CreateDocument"] = 412] = "CreateDocument";
@@ -158,7 +159,6 @@ export var ViewTabCommandId;
     ViewTabCommandId[ViewTabCommandId["ToggleShowHorizontalRuler"] = 94] = "ToggleShowHorizontalRuler";
     ViewTabCommandId[ViewTabCommandId["ToggleFullScreen"] = 98] = "ToggleFullScreen";
     ViewTabCommandId[ViewTabCommandId["ChangeZoomLevel"] = 460] = "ChangeZoomLevel";
-    ViewTabCommandId[ViewTabCommandId["ToggleAllowZoom"] = 461] = "ToggleAllowZoom";
 })(ViewTabCommandId || (ViewTabCommandId = {}));
 export var HeaderAndFooterTabCommandId;
 (function (HeaderAndFooterTabCommandId) {

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

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

package/lib/client/public/ribbon/item-ids.js

@@ -1,3 +1,4 @@
+import { RichEditClientCommand as Command } from '../../../common/commands/client-command';
 export var FileTabItemId;
 (function (FileTabItemId) {
     FileTabItemId[FileTabItemId["CreateNewDocument"] = 412] = "CreateNewDocument";

package/lib/client/public/rich-edit.d.ts

@@ -118,20 +118,20 @@ declare enum PrintModeApi {
     Html = 1,
     Pdf = 2
 }
-export { CharacterPropertiesApi as CharacterProperties, CharacterPropertiesScriptApi as CharacterPropertiesScript, ICharacterProperties } from '../model-api/character-properties';
+export { CharacterPropertiesApi as CharacterProperties, CharacterPropertiesScriptApi as CharacterPropertiesScript, type ICharacterProperties } from '../model-api/character-properties';
 export { HyperlinkInfoApi as HyperlinkInfo } from '../model-api/field';
 export { IntervalApi as Interval } from '../model-api/interval';
 export { ListTypeApi as ListType, ListLevelNumberAlignmentApi as ListLevelNumberAlignment, ListLevelFormatApi as ListLevelFormat } from '../model-api/lists/enums';
 export { ListLevelSettingsApi as ListLevelSettings } from '../model-api/lists/list-level-settings';
 export { ListApi as List } from '../model-api/lists/lists';
-export { ParagraphAlignmentApi as ParagraphAlignment, ParagraphLineSpacingTypeApi as ParagraphLineSpacingType, ParagraphFirstLineIndentApi as ParagraphFirstLineIndent, ParagraphPropertiesApi as ParagraphProperties, ParagraphApi as Paragraph, IParagraphProperties } from '../model-api/paragraph';
-export { MarginsApi as Margins, SizeApi as Size, IMargins, } from '../model-api/size';
+export { ParagraphAlignmentApi as ParagraphAlignment, ParagraphLineSpacingTypeApi as ParagraphLineSpacingType, ParagraphFirstLineIndentApi as ParagraphFirstLineIndent, ParagraphPropertiesApi as ParagraphProperties, ParagraphApi as Paragraph, type IParagraphProperties } from '../model-api/paragraph';
+export { MarginsApi as Margins, SizeApi as Size, type IMargins, } from '../model-api/size';
 export { SubDocumentTypeApi as SubDocumentType, HeaderFooterTypeApi as HeaderFooterType, SectionBreakTypeApi as SectionBreakType, SubDocumentApi as SubDocument } from '../model-api/sub-document';
 export { BookmarkApi as Bookmark } from '../model-api/bookmark';
 export { BookmarkClientApi as BookmarkBase } from '../api/bookmark';
 export { PaperSizeApi as PaperSize } from '../model-api/section';
 export { TableApi as Table } from '../model-api/table/table';
-export { TableBordersBaseApi as TableBordersBase, TableBordersApi as TableBorders, TableCellBordersApi as TableCellBorders, TableBorderApi as TableBorder, ITableBorders, ITableCellBorders, } from '../model-api/table/table-borders';
+export { TableBordersBaseApi as TableBordersBase, TableBordersApi as TableBorders, TableCellBordersApi as TableCellBorders, TableBorderApi as TableBorder, type ITableBorders, type ITableCellBorders, } from '../model-api/table/table-borders';
 export { TableStyleOptionsApi as TableStyleOptions } from '../model-api/table/table-style-options';
 export { TableWidthTypeApi as TableWidthType, TableContentVerticalAlignmentApi as TableContentVerticalAlignment, TableContentHorizontalAlignmentApi as TableContentHorizontalAlignment, TableRowHeightTypeApi as TableRowHeightType, BorderLineStyleApi as BorderLineStyle, } from '../model-api/table/enums';
 export { SectionApi as Section } from '../model-api/section';
@@ -175,7 +175,7 @@ export { TableLayoutTabCommandId };
 export { FloatingObjectsFormatTabCommandId };
 export { ContextMenuCommandId };
 export { WrapTypeApi as WrapType, WrapSideApi as WrapSide, FloatingObjectHorizontalAlignmentApi as FloatingObjectHorizontalAlignment, FloatingObjectHorizontalAnchorElementApi as FloatingObjectHorizontalAnchorElement, FloatingObjectHorizontalPositionTypeApi as FloatingObjectHorizontalPositionType, FloatingObjectVerticalAnchorElementApi as FloatingObjectVerticalAnchorElement, FloatingObjectVerticalAlignmentApi as FloatingObjectVerticalAlignment, FloatingObjectVerticalPositionTypeApi as FloatingObjectVerticalPositionType } from '../model-api/images/image-enums';
-export { HorizontalAbsolutePositionApi as HorizontalAbsolutePosition, HorizontalAlignedPositionApi as HorizontalAlignedPosition, HorizontalRelativePositionApi as HorizontalRelativePosition, VerticalAbsolutePositionApi as VerticalAbsolutePosition, VerticalAlignedPositionApi as VerticalAlignedPosition, VerticalRelativePositionApi as VerticalRelativePosition, IFloatingObjectDistanceApi as IFloatingObjectDistance, IHorizontalAlignedPositionApi as IHorizontalAlignedPosition, IHorizontalAbsolutePositionApi as IHorizontalAbsolutePosition, IHorizontalRelativePositionApi as IHorizontalRelativePosition, IVerticalAlignedPositionApi as IVerticalAlignedPosition, IVerticalAbsolutePositionApi as IVerticalAbsolutePosition, IVerticalRelativePositionApi as IVerticalRelativePosition, IInsertedFloatingImageOptionsApi as IInsertedFloatingImageOptions, IInsertedInlineImageOptionsApi as IInsertedInlineImageOptions, } from '../model-api/images/image-interfaces';
+export { HorizontalAbsolutePositionApi as HorizontalAbsolutePosition, HorizontalAlignedPositionApi as HorizontalAlignedPosition, HorizontalRelativePositionApi as HorizontalRelativePosition, VerticalAbsolutePositionApi as VerticalAbsolutePosition, VerticalAlignedPositionApi as VerticalAlignedPosition, VerticalRelativePositionApi as VerticalRelativePosition, type IFloatingObjectDistanceApi as IFloatingObjectDistance, type IHorizontalAlignedPositionApi as IHorizontalAlignedPosition, type IHorizontalAbsolutePositionApi as IHorizontalAbsolutePosition, type IHorizontalRelativePositionApi as IHorizontalRelativePosition, type IVerticalAlignedPositionApi as IVerticalAlignedPosition, type IVerticalAbsolutePositionApi as IVerticalAbsolutePosition, type IVerticalRelativePositionApi as IVerticalRelativePosition, type IInsertedFloatingImageOptionsApi as IInsertedFloatingImageOptions, type IInsertedInlineImageOptionsApi as IInsertedInlineImageOptions, } from '../model-api/images/image-interfaces';
 export { FloatingImageApi as FloatingImage } from '../model-api/images/floating-image';
 export { InlineImageApi as InlineImage } from '../model-api/images/inline-image';
 export { ImageApi as Image } from '../model-api/images/image';

package/lib/client/ribbon/toolbar-items/index.d.ts

@@ -4,7 +4,7 @@ export { ToolbarMenuItem } from './toolbar-menu-item';
 export { ToolbarSelectBoxItem } from './toolbar-select-box-item';
 export { ToolbarSeparatorItem } from './toolbar-separator-item';
 export { ToolbarItemBase } from './toolbar-item-base';
-export { InteractiveItemOptions, ToolbarInteractiveItem } from './toolbar-interactive-item';
+export { type InteractiveItemOptions, ToolbarInteractiveItem } from './toolbar-interactive-item';
 export { ToolbarSubMenuItem } from './toolbar-sub-menu-item';
 export { ToolbarColorBoxItem } from './toolbar-color-box-item';
 export { ToolbarNumberBoxItem } from './toolbar-number-box-item';

package/lib/client/ribbon/toolbar-items/toolbar-item-template-creators/index.d.ts

@@ -1,8 +1,8 @@
-export { ButtonToolbarItemTemplateCreator, IButtonToolbarItemTemplateCreatorOptions } from './button-toolbar-item-template-creator';
-export { ButtonGroupToolbarItemTemplateCreator, IButtonGroupToolbarItemTemplateCreatorOptions } from './button-group-toolbar-item-template-creator';
-export { MenuToolbarItemTemplateCreator, IMenuToolbarItemTemplateCreatorOptions } from './menu-toolbar-item-template-creator';
-export { SelectBoxToolbarItemTemplateCreator, ISelectBoxToolbarItemTemplateCreatorOptions } from './select-box-toolbar-item-template-creator';
+export { ButtonToolbarItemTemplateCreator, type IButtonToolbarItemTemplateCreatorOptions } from './button-toolbar-item-template-creator';
+export { ButtonGroupToolbarItemTemplateCreator, type IButtonGroupToolbarItemTemplateCreatorOptions } from './button-group-toolbar-item-template-creator';
+export { MenuToolbarItemTemplateCreator, type IMenuToolbarItemTemplateCreatorOptions } from './menu-toolbar-item-template-creator';
+export { SelectBoxToolbarItemTemplateCreator, type ISelectBoxToolbarItemTemplateCreatorOptions } from './select-box-toolbar-item-template-creator';
 export { SeparatorToolbarItemTemplateCreator } from './separator-toolbar-item-template-creator';
-export { NumberBoxToolbarItemTemplateCreator, INumberBoxToolbarItemTemplateCreatorOptions } from './number-box-toolbar-item-template-creator';
-export { ColorBoxToolbarItemTemplateCreator, IColorBoxToolbarItemTemplateCreatorOptions } from './color-box-toolbar-item-template-creator';
-export { IToolbarItemTemplateCreator } from './base-types';
+export { NumberBoxToolbarItemTemplateCreator, type INumberBoxToolbarItemTemplateCreatorOptions } from './number-box-toolbar-item-template-creator';
+export { ColorBoxToolbarItemTemplateCreator, type IColorBoxToolbarItemTemplateCreatorOptions } from './color-box-toolbar-item-template-creator';
+export { type IToolbarItemTemplateCreator } from './base-types';

package/lib/client/utils/focus-helper.js

@@ -1,3 +1,4 @@
+var _a;
 export class FocusHelper {
     static preventFocusOnClick(element) {
         return new FocusBlocker(element);
@@ -10,23 +11,24 @@ class FocusBlocker {
         this.addEventListeners(target);
     }
     addEventListeners(element) {
-        element.addEventListener("pointerdown", this.onPointerDownBinded);
+        element.addEventListener("mousedown", this.onPointerDownBinded);
     }
     removeEventListeners(element) {
-        element.removeEventListener("pointerdown", this.onPointerDownBinded);
+        element.removeEventListener("mousedown", this.onPointerDownBinded);
     }
     onPointerDown(event) {
         for (const element of event.composedPath()) {
-            if (!(element instanceof HTMLElement))
-                continue;
             if (element === this.target) {
                 event.preventDefault();
                 break;
             }
-            if (!this.target.contains(element) || element.tabIndex > -1)
+            if (element instanceof Element && this.isFocusableElement(element))
                 break;
         }
     }
+    isFocusableElement(element) {
+        return element.matches(FocusBlocker.focusableSelector);
+    }
     dispose() {
         if (this.target) {
             this.removeEventListeners(this.target);
@@ -34,3 +36,18 @@ class FocusBlocker {
         }
     }
 }
+_a = FocusBlocker;
+FocusBlocker.focusableSelectors = [
+    'a[href]',
+    'area[href]',
+    'input',
+    'select',
+    'textarea',
+    'button',
+    'iframe',
+    'object',
+    'embed',
+    '[tabindex]:not([tabindex="-1"])',
+    '[contenteditable]:not([contenteditable="false"])'
+];
+FocusBlocker.focusableSelector = _a.focusableSelectors.join(',');

package/lib/common/canvas/canvas-manager.js

@@ -254,7 +254,7 @@ export class CanvasManager extends BatchUpdatableObject {
         const canvasX = MixedSize.fromUI(DomUtils.getAbsolutePositionX(canvas));
         const canvasY = MixedSize.fromUI(DomUtils.getAbsolutePositionY(canvas));
         const offsetY = MixedSize.fromUI(canvas.scrollTop).addSize(clientY).subtractSize(canvasY).useScale(scaleY);
-        const pageIndex = this.viewManager.layout.findPageIndexByOffsetY(offsetY.LayoutSize, this.sizes);
+        const pageIndex = this.viewManager.layout.findPageIndexByOffsetY(offsetY.LayoutSize * scaleY, this.sizes);
         const visibleAreaWidth = MixedSize.fromUI(this.sizes.getVisibleAreaWidth(false));
         const visibleAreaHeight = MixedSize.fromUI(this.sizes.getVisibleAreaHeight(false));
         if (checkScroll) {

package/lib/common/canvas/canvas-scroll-manager.js

@@ -69,7 +69,7 @@ export class CanvasScrollManager {
             height.clear().addLayoutSize(position.page.height);
         if (relativePosition === RelativePosition.Bottom)
             y.subtractUISize(this.sizes.getVisibleAreaHeight(false));
-        y.addUISize(canvasState.getVerticalOffset(this.sizes));
+        y.addLayoutSize(canvasState.getVerticalOffset(this.sizes));
         if (relativePosition === RelativePosition.Inside) {
             let scrollTop = this.canvas.scrollTop;
             const scrollVisibleAreaHeight = this.sizes.getVisibleAreaHeight(false);

package/lib/common/canvas/canvas-size-info.d.ts

@@ -15,6 +15,7 @@ export declare class CanvasSizeInfo implements IControlHeightProvider {
     isInitialized(): boolean;
     initialize(page: HTMLElement, canvas: HTMLDivElement): void;
     getPageOffsetY(layoutPage: LayoutPage): number;
+    get zoomLevel(): number;
     private setVisibleAreaSize;
     getVisibleAreaWidth(includeScrollBars: boolean): number;
     getVisibleAreaHeight(includeScrollBars: boolean): number;

package/lib/common/canvas/canvas-size-info.js

@@ -22,9 +22,9 @@ export class CanvasSizeInfo {
         this.setVisibleAreaSize(SizeUtils.getClientWidth(canvas), SizeUtils.getClientHeight(canvas));
     }
     getPageOffsetY(layoutPage) {
-        const pageOffsetY = layoutPage.y + (this.topSpacing + layoutPage.index * this.betweenPageSpacing);
-        return pageOffsetY * this.zoomLevelHolder.zoomLevel;
+        return layoutPage.y + (this.topSpacing + layoutPage.index * this.betweenPageSpacing);
     }
+    get zoomLevel() { return this.zoomLevelHolder.zoomLevel; }
     setVisibleAreaSize(width, height) {
         this.visibleAreaSize.width = width;
         this.visibleAreaSize.height = height;

package/lib/common/canvas/renderes/view-manager.js

@@ -28,6 +28,7 @@ import { ControlOptions, DocumentCapability } from '../../model/options/control'
 import { RichEditClientCommand } from '../../commands/client-command';
 import { ZoomLevelChange } from '../../model/changes/model/zoom-level';
 import { ModelChangeType } from '../../model/changes/enums';
+import { MixedSize } from '../../../common/utils/mixed-size';
 export class ViewManager {
     get renderer() { return this.renderers[this.innerClientProperties.viewsSettings.viewType]; }
     get printLayoutRenderer() { return this.renderers[ViewType.PrintLayout]; }
@@ -113,9 +114,9 @@ export class ViewManager {
             const pageInfo = layoutSelection.selectionInfo.pageInfos[pageIndex];
             const item = pageInfo.oldItems[0];
             const layoutPage = this.layout.pages[pageIndex];
-            const x = layoutPage.x + this.cache[pageIndex].page.offsetLeft + item.x;
-            const y = this.sizes.getPageOffsetY(layoutPage) + item.y;
-            this.inputController.setPosition(x, y);
+            const x = MixedSize.fromLayout(layoutPage.x + this.cache[pageIndex].page.offsetLeft + item.x).useScale(this.zoomLevel);
+            const y = MixedSize.fromLayout(this.sizes.getPageOffsetY(layoutPage) + item.y).useScale(this.zoomLevel);
+            this.inputController.setPosition(x.UISize, y.UISize);
         }
     }
     NotifySearchSelectionLayoutChanged() {

package/lib/common/commands/client-command.d.ts

@@ -420,6 +420,5 @@ export declare enum RichEditClientCommand {
     NoSpellingSuggestions = 457,
     GetHtml = 458,
     CreateEmptyIfField = 459,
-    ChangeZoomLevel = 460,
-    ToggleAllowZoom = 461
+    ChangeZoomLevel = 460
 }

package/lib/common/commands/client-command.js

@@ -422,5 +422,4 @@ export var RichEditClientCommand;
     RichEditClientCommand[RichEditClientCommand["GetHtml"] = 458] = "GetHtml";
     RichEditClientCommand[RichEditClientCommand["CreateEmptyIfField"] = 459] = "CreateEmptyIfField";
     RichEditClientCommand[RichEditClientCommand["ChangeZoomLevel"] = 460] = "ChangeZoomLevel";
-    RichEditClientCommand[RichEditClientCommand["ToggleAllowZoom"] = 461] = "ToggleAllowZoom";
 })(RichEditClientCommand || (RichEditClientCommand = {}));

package/lib/common/commands/command-manager.js

@@ -67,7 +67,6 @@ import { GoToNextHeaderFooterCommand, GoToPreviousHeaderFooterCommand } from './
 import { InsertFooterCommand, InsertHeaderCommand } from './header-footer/insert-header-footer-commands';
 import { LinkHeaderFooterToPreviousCommand } from './header-footer/link-header-footer-commands';
 import { ApplyStyleCommand } from './layout/apply-style-command';
-import { ToggleAllowZoomCommand } from './layout/toggle-allow-zoom-command';
 import { ChangeZoomLevelCommand } from './layout/change-zoom-level-command';
 import { ClearFormattingCommand } from './layout/clear-formatting-command';
 import { ChangeViewTypeCommand, SwitchToPrintLayoutViewCommand, SwitchToSimpleViewCommand } from './layout/switch-view-command';
@@ -558,7 +557,6 @@ export class CommandManager {
         this.createCommand(control, RichEditClientCommand.SwitchToSimpleView, SwitchToSimpleViewCommand);
         this.createCommand(control, RichEditClientCommand.SwitchToPrintLayoutView, SwitchToPrintLayoutViewCommand);
         this.createCommand(control, RichEditClientCommand.ChangeZoomLevel, ChangeZoomLevelCommand);
-        this.createCommand(control, RichEditClientCommand.ToggleAllowZoom, ToggleAllowZoomCommand);
         this.createCommand(control, RichEditClientCommand.ShowErrorLoadPictureMessage, ShowLoadPictureErrorDialogCommand);
         this.assingCommand(RichEditClientCommand.PrintDocumentOnClient, new PrintDocumentOnClient(control, printNonce));
     }

package/lib/common/commands/dialogs/dialog-layout-options-command.js

@@ -58,7 +58,6 @@ export class DialogLayoutOptionsCommand extends ShowDialogCommandBase {
         let run = subDocument.getRunByPosition(position);
         let modelManipulator = this.modelManipulator;
         let anchorInfoManipulator = modelManipulator.floatingObject.anchorInfo;
-        const topInfo = this.control.viewManager.canvasManager.getScrollTopInfo();
         let history = this.history;
         history.beginTransaction();
         let changed = false;
@@ -224,8 +223,6 @@ export class DialogLayoutOptionsCommand extends ShowDialogCommandBase {
             changed = true;
         }
         history.endTransaction();
-        if (topInfo)
-            this.selection.scrollManager.setScroll(new ScrollState().byScrollInfo.setPageInfo(topInfo));
         return changed;
     }
     getDialogName() {

package/lib/common/commands/document/print-document-on-client-command.d.ts

@@ -13,6 +13,8 @@ export declare class PrintDocumentOnClient extends CommandBase<SimpleCommandStat
     executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<PrintMode | PrintingSettings | undefined>): boolean;
     private printCore;
     private generatePrintDocument;
+    private getGoogleFonts;
+    private createGoogleFontStyleLink;
     private generatePrintContent;
     private createZIndexStyles;
 }

package/lib/common/commands/document/print-document-on-client-command.js

@@ -80,8 +80,18 @@ export class PrintDocumentOnClient extends CommandBase {
         return true;
     }
     printCore(htmlPrinting, printWindow, closePrintDialogWithHtmlPreview, needSwitchViewType, needToggleHiddenSymbols) {
-        if (htmlPrinting)
-            this.generatePrintDocument(printWindow, closePrintDialogWithHtmlPreview);
+        if (htmlPrinting) {
+            this.generatePrintDocument(printWindow.document);
+            printWindow.focus();
+            const interval = setInterval(() => {
+                if (printWindow.document.readyState == 'complete') {
+                    printWindow.print();
+                    if (closePrintDialogWithHtmlPreview && !Browser.AndroidMobilePlatform)
+                        printWindow.close();
+                    clearInterval(interval);
+                }
+            }, 100);
+        }
         else {
             pdfExport(this.control, (blob, _stream) => {
                 if (window.navigator.msSaveOrOpenBlob && !Browser.Edge)
@@ -96,12 +106,27 @@ export class PrintDocumentOnClient extends CommandBase {
             this.control.commandManager.getCommand(RichEditClientCommand.ToggleShowWhitespace).execute(this.control.commandManager.isPublicApiCall);
         this.control.commandManager.isPrintingProcessing = false;
     }
-    generatePrintDocument(printWindow, closePrintDialogWithHtmlPreview) {
+    generatePrintDocument(document) {
         const height = this.control.layout.pages[0].height;
         const width = this.control.layout.pages[0].width;
-        let printWindowContent = `<!DOCTYPE html>
-                <html moznomarginboxes mozdisallowselectionprint>
+        let fontLink = "";
+        let divsToLoadFonts = "";
+        const googleFonts = this.getGoogleFonts();
+        if (googleFonts.length > 0) {
+            fontLink = this.createGoogleFontStyleLink(googleFonts);
+            divsToLoadFonts = googleFonts.reduce((prev, curr) => {
+                const fontStyles = [`font-family:${curr}`, 'font-weight:bold', 'font-style:italic'];
+                const result = [];
+                for (let i = 1; i <= fontStyles.length; i++)
+                    result.push(`<div style="font-size:1pt;position:absolute;top:-1000px;${fontStyles.slice(0, i).join(';')}">${curr}</div>`);
+                return prev ? [prev, ...result].join('\n') : result.join('\n');
+            }, null);
+        }
+        document.documentElement.innerHTML =
+            `<!DOCTYPE html>
+            <html moznomarginboxes mozdisallowselectionprint>
                 <head>
+                    ${fontLink}
                     <style ${this._nonce ? `nonce="${this._nonce}"` : ''}>
                         html, body {
                             margin: 0;
@@ -120,22 +145,25 @@ export class PrintDocumentOnClient extends CommandBase {
                     </style>
                 </head>
                 <body>
+                    ${divsToLoadFonts}
                 </body>
-                </html>`;
-        printWindow.document.write(printWindowContent);
-        printWindow.document.close();
+            </html>`;
         this.generatePrintContent().forEach((child) => {
-            printWindow.document.body.appendChild(child);
+            document.body.appendChild(child);
         });
-        printWindow.focus();
-        const interval = setInterval(() => {
-            if (printWindow.document.readyState == 'complete') {
-                printWindow.print();
-                if (closePrintDialogWithHtmlPreview && !Browser.AndroidMobilePlatform)
-                    printWindow.close();
-                clearInterval(interval);
-            }
-        }, 100);
+    }
+    getGoogleFonts() {
+        return this.control.modelManager.richOptions.fonts.fonts.reduce((res, f) => {
+            if (f.useGoogleFonts)
+                res.push(f.fontFamily);
+            return res;
+        }, []);
+    }
+    createGoogleFontStyleLink(fontFamilies) {
+        const url = new URL('https://fonts.googleapis.com/css');
+        url.searchParams.append('family', fontFamilies.join('|'));
+        url.searchParams.append('display', 'auto');
+        return `<link href="${url.toString()}" rel="stylesheet" />`;
     }
     generatePrintContent() {
         const layout = this.control.layout;