devexpress-richedit 24.1.1-alpha-24085-0102 → 24.1.2-beta

package/lib/common/model/sub-document.js

@@ -37,6 +37,12 @@ export class SubDocument {
     getFirstChunk() {
         return this.chunks[0];
     }
+    getLastParagraph() {
+        return this.paragraphs[this.paragraphs.length - 1];
+    }
+    getFirstParagraph() {
+        return this.paragraphs[0];
+    }
     getText(interval = new FixedInterval(0, this.getDocumentEndPosition())) {
         var buffer = "";
         var chunkIndex = SearchUtils.normedInterpolationIndexOf(this.chunks, (c) => c.startLogPosition.value, interval.start);
@@ -407,8 +413,8 @@ export class SubDocumentPosition {
         this.position = position;
     }
     validateInterval() {
-        const docEnd = this.subDocument.getDocumentEndPosition();
-        this.position = Math.min(docEnd - 1, this.position);
+        const documentEndPosition = this.subDocument.getDocumentEndPosition();
+        this.position = Math.min(this.position, documentEndPosition - 1);
     }
     clone() {
         return new SubDocumentPosition(this.subDocument, this.position);
@@ -431,11 +437,7 @@ export class SubDocumentInterval {
         return new SubDocumentInterval(this.subDocument, this.interval.clone());
     }
     validateInterval() {
-        const docEnd = this.subDocument.getDocumentEndPosition();
-        if (this.interval.start == 0 && this.interval.end == docEnd)
-            return;
-        this.interval.start = Math.min(docEnd, this.interval.start);
-        this.interval.end = Math.min(docEnd, this.interval.end);
+        internalValidateInterval(this.subDocument, this.interval);
     }
     equals(obj) {
         return obj &&
@@ -450,15 +452,8 @@ export class SubDocumentIntervals {
     }
     get multiselection() { return this.intervals.length > 1; }
     validateInterval() {
-        const docEnd = this.subDocument.getDocumentEndPosition();
-        for (let curr of this.intervals) {
-            if (curr.start == 0 && curr.end == docEnd)
-                continue;
-            const start = Math.min(docEnd - 1, curr.start);
-            const end = Math.min(docEnd - 1, curr.end);
-            curr.start = start;
-            curr.end = end;
-        }
+        for (let interval of this.intervals)
+            internalValidateInterval(this.subDocument, interval);
     }
     clone() {
         return new SubDocumentIntervals(this.subDocument, ListUtils.deepCopy(this.intervals));
@@ -472,3 +467,10 @@ export class SubDocumentIntervals {
         return new SubDocumentIntervals(subDocument, [new FixedInterval(pos, 0)]);
     }
 }
+function internalValidateInterval(subDocument, interval) {
+    const documentEndPosition = subDocument.getDocumentEndPosition();
+    if (interval.start == 0 && interval.end == documentEndPosition)
+        return;
+    interval.start = Math.min(interval.start, documentEndPosition - 1);
+    interval.end = Math.min(interval.end, documentEndPosition);
+}

package/lib/common/mouse-handler/touch-handler/touch-handler-state-base.d.ts

@@ -15,6 +15,7 @@ export declare class TouchHandlerStateBase extends ManipulatorHandlerStateBase<T
     showPopupMenu(): void;
     setEditableDocumentContent(): void;
     setLastLayoutPosition(): void;
+    private createLayoutPosition;
 }
 export declare class TouchHandlerBeginDragHelperState extends TouchHandlerStateBase {
     dragState: TouchHandlerStateBase;

package/lib/common/mouse-handler/touch-handler/touch-handler-state-base.js

@@ -4,6 +4,8 @@ import { LayoutWordBounds } from '../../word-bounds-engine/layout-word-bounds';
 import { Browser } from '@devexpress/utils/lib/browser';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { ManipulatorHandlerStateBase } from '../base/manipulator-handler-state-base';
+import { SubDocumentPosition } from '../../../common/model/sub-document';
+import { LayoutBoxType } from '../../../common/layout/main-structures/layout-boxes/layout-box';
 export class TouchHandlerStateBase extends ManipulatorHandlerStateBase {
     constructor() {
         super(...arguments);
@@ -27,15 +29,15 @@ export class TouchHandlerStateBase extends ManipulatorHandlerStateBase {
         if (!Browser.IE && !Browser.Edge) {
             var subDocument = this.handler.control.selection.activeSubDocument;
             let position = this.handler.control.selection.lastSelectedInterval.start;
-            let startInterval = LayoutWordBounds.getLayoutWordStartBound(this.handler.control.layout, this.handler.control.selection.activeSubDocument, this.handler.control.selection, position);
-            let startIntervalLayoutPosition = (subDocument.isMain()
-                ? new LayoutPositionMainSubDocumentCreator(this.handler.control.layout, subDocument, startInterval, DocumentLayoutDetailsLevel.Box)
-                : new LayoutPositionOtherSubDocumentCreator(this.handler.control.layout, subDocument, startInterval, this.handler.control.selection.pageIndex, DocumentLayoutDetailsLevel.Box))
-                .create(new LayoutPositionCreatorConflictFlags().setDefault(this.handler.control.selection.endOfLine), new LayoutPositionCreatorConflictFlags().setDefault(false));
-            if (startIntervalLayoutPosition.isLastBoxInRow())
-                startInterval = LayoutWordBounds.getLayoutWordStartBound(this.handler.control.layout, this.handler.control.selection.activeSubDocument, this.handler.control.selection, position - 1);
-            let endInterval = LayoutWordBounds.getLayoutWordEndBound(this.handler.control.layout, this.handler.control.selection.activeSubDocument, this.handler.control.selection, startInterval, false);
-            let textUnderCursor = position >= startInterval && position <= endInterval ? this.handler.control.selection.activeSubDocument.getText(new FixedInterval(startInterval, endInterval - startInterval)) : "";
+            let startInterval = LayoutWordBounds.getLayoutWordStartBound(this.handler.control.layout, subDocument, this.handler.control.selection, position);
+            let startIntervalLayoutPosition = this.createLayoutPosition(new SubDocumentPosition(subDocument, startInterval), DocumentLayoutDetailsLevel.Box);
+            if (startIntervalLayoutPosition.isLastBoxInRow()) {
+                const prevPosition = this.createLayoutPosition(new SubDocumentPosition(subDocument, position - 1), DocumentLayoutDetailsLevel.Box);
+                if (prevPosition.detailsLevel !== DocumentLayoutDetailsLevel.Box || prevPosition.box.getType() !== LayoutBoxType.PageBreak)
+                    startInterval = LayoutWordBounds.getLayoutWordStartBound(this.handler.control.layout, subDocument, this.handler.control.selection, position - 1);
+            }
+            let endInterval = LayoutWordBounds.getLayoutWordEndBound(this.handler.control.layout, subDocument, this.handler.control.selection, startInterval, false);
+            let textUnderCursor = position >= startInterval && position <= endInterval ? subDocument.getText(new FixedInterval(startInterval, endInterval - startInterval)) : "";
             this.handler.control.inputController.setEditableDocumentContent(textUnderCursor);
             if (textUnderCursor.length)
                 this.handler.control.inputController.setEditableDocumentCursorPosition(position - startInterval);
@@ -44,10 +46,16 @@ export class TouchHandlerStateBase extends ManipulatorHandlerStateBase {
     setLastLayoutPosition() {
         var subDocument = this.handler.control.selection.activeSubDocument;
         var logPosition = this.handler.control.selection.lastSelectedInterval.start;
-        this.lastLayoutPosition = (subDocument.isMain()
-            ? new LayoutPositionMainSubDocumentCreator(this.handler.control.layout, subDocument, logPosition, DocumentLayoutDetailsLevel.Character)
-            : new LayoutPositionOtherSubDocumentCreator(this.handler.control.layout, subDocument, logPosition, this.handler.control.selection.pageIndex, DocumentLayoutDetailsLevel.Character))
-            .create(new LayoutPositionCreatorConflictFlags().setDefault(this.handler.control.selection.endOfLine), new LayoutPositionCreatorConflictFlags().setDefault(true));
+        this.lastLayoutPosition = this.createLayoutPosition(new SubDocumentPosition(subDocument, logPosition), DocumentLayoutDetailsLevel.Character, true);
+    }
+    createLayoutPosition(subDocPos, detailsLevel, useNextBoxBounds = false) {
+        const subDocument = subDocPos.subDocument;
+        const position = subDocPos.position;
+        const endRowConflictFlags = new LayoutPositionCreatorConflictFlags().setDefault(this.handler.control.selection.endOfLine);
+        const middleRowConflictFlags = new LayoutPositionCreatorConflictFlags().setDefault(useNextBoxBounds);
+        return (subDocument.isMain()
+            ? new LayoutPositionMainSubDocumentCreator(this.handler.control.layout, subDocument, position, detailsLevel)
+            : new LayoutPositionOtherSubDocumentCreator(this.handler.control.layout, subDocument, position, this.handler.control.selection.pageIndex, detailsLevel)).create(endRowConflictFlags, middleRowConflictFlags);
     }
 }
 export class TouchHandlerBeginDragHelperState extends TouchHandlerStateBase {

package/lib/common/processor.d.ts

@@ -3,10 +3,12 @@ import { FormatterManager } from './layout-formatter/managers/formatter-manager'
 import { IModelManager } from './model-manager';
 import { FieldRequestManager } from './model/fields/field-request-manager';
 import { ISelectionBase } from './selection/selection-base';
+import { IExportModelOptions } from './formats/i-document-exporter';
 export interface IProcessor extends IBatchUpdatableObject {
     selection: ISelectionBase;
     modelManager: IModelManager;
     layoutFormatterManager: FormatterManager;
+    getExportModelOptions(initOptions?: Partial<IExportModelOptions>): IExportModelOptions;
     createFieldRequestManager(): FieldRequestManager;
     invalidateLayoutAfterFontsLoaded(): any;
 }

package/lib/common/rich-edit-core.d.ts

@@ -36,6 +36,7 @@ import { SelectionModelChangesListener } from './selection/selection-model-chang
 import { IRulerControl } from './ui/ruler/ruler';
 import { RulerSettings } from './ui/ruler/settings';
 import { SearchManager } from './ui/search-manager';
+import { IExportModelOptions } from './formats/i-document-exporter';
 export declare abstract class RichEditCore implements IRichEditControl {
     modelManager: IModelManager;
     barHolder: IBarHolder;
@@ -113,6 +114,7 @@ export declare abstract class RichEditCore implements IRichEditControl {
     isRibbon(element: HTMLElement): boolean;
     isClosed(): boolean;
     invalidateLayoutAfterFontsLoaded(): void;
+    getExportModelOptions(initOptions?: Partial<IExportModelOptions>): IExportModelOptions;
     protected abstract createSpellChecker(): any;
     protected createViewElement(id: string, element: HTMLElement): HTMLDivElement;
     private isUsedInnerClipboard;
@@ -122,12 +124,14 @@ export declare class DocumentInfo {
     static defaultDocumentName: string;
     static defaultDocumentFormat: DocumentFormat;
     private _fileName;
-    private _documentFormat;
+    private _documentFormat?;
+    private _documentExtension;
     readonly documentHasSource: boolean;
     get fileName(): string;
     set fileName(val: string);
     get documentFormat(): DocumentFormat;
     set documentFormat(val: DocumentFormat);
-    constructor(fileName: string, documentHasSource: boolean, documentFormat?: DocumentFormat);
+    get documentExtension(): string;
+    constructor(fileName: string, documentHasSource: boolean, documentFormat?: DocumentFormat, documentExtension?: string);
     getFileNameForDownload(fileName?: string): string;
 }

package/lib/common/rich-edit-core.js

@@ -43,6 +43,7 @@ import { SelectionModelChangesListener } from './selection/selection-model-chang
 import { SpellCheckerSelectionChangesListener } from './spelling/spell-checker-selection-changes-listener';
 import { HorizontalRulerControl } from './ui/ruler/ruler';
 import { SearchManager } from './ui/search-manager';
+import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class RichEditCore {
     constructor(owner, name, element, clientGuid, readOnly, barHolder, unitsType, rulerSettings, richOptions, viewsSettings, stringResources) {
         this.isLoadingPictureFromClipboard = false;
@@ -167,6 +168,7 @@ export class RichEditCore {
         this.registerActiveContextTabManager();
         this.modelManager.modelManipulator.modelListeners.push(this.globalEventDispatcher);
         this.modelManager.modelManipulator.modelListeners.push(this.barHolder.publicUiChangesListener);
+        this.inputController.initExporter();
     }
     dispose() {
         var _a, _b;
@@ -376,10 +378,24 @@ export class RichEditCore {
             this.layoutFormatterManager.invalidator.onChangedAllLayout();
         }
     }
+    getExportModelOptions(initOptions = {}) {
+        return {
+            modelManager: isDefined(initOptions.modelManager) ? initOptions.modelManager : this.modelManager,
+            pictureRenderer: this.viewManager.renderer,
+            uiUnitConverter: this.uiUnitConverter,
+            lastMaxNumPages: this.layout.lastMaxNumPages,
+            pageIndex: this.selection.pageIndex,
+            sessionGuid: this.sessionGuid,
+            clientGuid: this.clientGuid,
+            documentFormat: isDefined(initOptions.documentFormat) ? initOptions.documentFormat : this.getExportDocumentFormat(),
+        };
+    }
     createViewElement(id, element) {
         const viewElement = document.createElement("DIV");
         viewElement.id = id + "_View";
         viewElement.className = "dxreView";
+        viewElement.tabIndex = 0;
+        viewElement.setAttribute("role", "document");
         element.appendChild(viewElement);
         return viewElement;
     }
@@ -393,9 +409,10 @@ export class RichEditCore {
     }
 }
 export class DocumentInfo {
-    constructor(fileName, documentHasSource, documentFormat = DocumentInfo.defaultDocumentFormat) {
+    constructor(fileName, documentHasSource, documentFormat = DocumentInfo.defaultDocumentFormat, documentExtension = FileNameHelper.convertToString(documentFormat)) {
         this._fileName = fileName;
         this._documentFormat = documentFormat;
+        this._documentExtension = documentExtension;
         this.documentHasSource = documentHasSource;
     }
     get fileName() { return this._fileName; }
@@ -406,7 +423,9 @@ export class DocumentInfo {
             this._documentFormat = FileNameHelper.convertExtensionToDocumentFormat(val);
         else
             this._documentFormat = val;
+        this._documentExtension = FileNameHelper.convertToString(val);
     }
+    get documentExtension() { return this._documentExtension; }
     getFileNameForDownload(fileName) {
         if (!StringUtils.isNullOrEmpty(fileName))
             return fileName;

package/lib/common/selection/selection-intervals-info.js

@@ -47,7 +47,7 @@ export class SelectionIntervalsInfo {
         const docEnd = this.subDocument.getDocumentEndPosition();
         for (let curr of this.intervals) {
             curr.start = Math.max(docEnd - 1, curr.start);
-            curr.end = Math.max(docEnd - 1, curr.end);
+            curr.end = Math.max(docEnd, curr.end);
         }
     }
     equals(obj) {

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

@@ -0,0 +1 @@
+export {};

package/lib/common/utils/_license.js

@@ -0,0 +1,2 @@
+import TrialPanel from 'devextreme/core/trial_panel';
+TrialPanel.registerTrialPanelComponents();

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

@@ -1,4 +1,7 @@
 export declare class SizeUtils {
     static getClientWidth(element: Element): number;
     static getClientHeight(element: Element): number;
+    static getOffsetSize(element: Element): DOMRect;
+    static getOffsetWidth(element: Element): number;
+    static getOffsetHeight(element: Element): number;
 }

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

@@ -1,12 +1,25 @@
 export class SizeUtils {
     static getClientWidth(element) {
-        const width = element.getBoundingClientRect().width;
         const style = getComputedStyle(element);
-        return width - parseFloat(style.borderLeftWidth) - parseFloat(style.borderRightWidth) - parseFloat(style.paddingLeft) - parseFloat(style.paddingRight);
+        const offset = parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth) + parseFloat(style.paddingLeft) + parseFloat(style.paddingRight);
+        const sizeWithScrollBar = SizeUtils.getOffsetWidth(element) - offset;
+        const scrollBarSize = Math.round(sizeWithScrollBar) - element.clientWidth;
+        return sizeWithScrollBar - scrollBarSize;
     }
     static getClientHeight(element) {
-        const width = element.getBoundingClientRect().height;
         const style = getComputedStyle(element);
-        return width - parseFloat(style.borderTopWidth) - parseFloat(style.borderBottomWidth) - parseFloat(style.paddingTop) - parseFloat(style.paddingBottom);
+        const offset = parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth) + parseFloat(style.paddingTop) + parseFloat(style.paddingBottom);
+        const sizeWithScrollBar = SizeUtils.getOffsetHeight(element) - offset;
+        const scrollBarSize = Math.round(sizeWithScrollBar) - element.clientHeight;
+        return sizeWithScrollBar - scrollBarSize;
+    }
+    static getOffsetSize(element) {
+        return element.getBoundingClientRect();
+    }
+    static getOffsetWidth(element) {
+        return SizeUtils.getOffsetSize(element).width;
+    }
+    static getOffsetHeight(element) {
+        return SizeUtils.getOffsetSize(element).height;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.1-alpha-24085-0102",
+  "version": "24.1.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.1.1-alpha-24082-1039",
-    "devextreme-dist": "24.1.1-alpha-24082-1039"
+    "devextreme": "24.1.2-beta",
+    "devextreme-dist": "24.1.2-beta"
   },
   "dependencies": {
     "jszip": "~3.10.1",

package/lib/common/html-export.d.ts

@@ -1,32 +0,0 @@
-import { DocumentModel } from './model/document-model';
-import { RangeCopy } from './model/manipulators/range/create-range-copy-operation';
-import { SubDocument } from './model/sub-document';
-import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
-import { IRichEditControl } from './interfaces/i-rich-edit-core';
-export declare class HtmlBuilder {
-    _getHtmlString(): string;
-    private _currentElement;
-    childElements: Array<Element | string>;
-    callbacks: Array<(target: HtmlBuilder) => void>;
-    isEmpty(): boolean;
-    clear(): this;
-    startChild(tagName: string, namespaceUri?: string): this;
-    configure<T extends Element = HTMLElement>(config: (element: T) => void): this;
-    addCallback(callback: (target: HtmlBuilder) => void): void;
-    assignFrom(builder: HtmlBuilder | string): this;
-    addElement(element: Element | string): this;
-    endChild(tagName: string): this;
-}
-export declare class HtmlExporter {
-    control: IRichEditControl;
-    rangeCopy: RangeCopy;
-    private get colorProvider();
-    constructor(control: IRichEditControl);
-    getHtmlElementsByInterval(model: DocumentModel, subDocument: SubDocument, interval: FixedInterval, guidLabel: string): HtmlBuilder;
-    private getHtmlText;
-    private getBorderCssString;
-    private getTableWidthUnitCssString;
-    private getTableStyle;
-    private getCellStyle;
-    private getTextBoxStyleString;
-}