devexpress-richedit 24.2.6-build-25065-0102 → 24.2.6-build-25072-0103

package/lib/common/canvas/canvas-scroll-manager.d.ts

@@ -5,7 +5,6 @@ import { ViewManager } from './renderes/view-manager';
 export declare class CanvasScrollManager implements IScrollLayoutChangesListener {
     private updateScrollTimeoutId;
     private waitForDblClickTimeoutId;
-    private scrollMeasurer;
     private horizontalRuler;
     private viewManager;
     private get canvas();

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

@@ -24,18 +24,8 @@ export class CanvasScrollManager {
         this.updateScrollVisibility();
     }
     updateScrollVisibility() {
-        if (!this.scrollMeasurer) {
-            this.scrollMeasurer = document.createElement("div");
-            this.scrollMeasurer.style.position = "absolute";
-            this.scrollMeasurer.style.top = "0";
-            this.scrollMeasurer.style.bottom = "0";
-            this.scrollMeasurer.style.right = "0";
-            this.scrollMeasurer.style.left = "0";
-        }
-        this.canvas.appendChild(this.scrollMeasurer);
         const prevScrollYVisibility = this.sizes.scrollYVisible;
-        this.sizes.updateScrollVisibility(this.scrollMeasurer.offsetWidth, this.scrollMeasurer.offsetHeight);
-        this.canvas.removeChild(this.scrollMeasurer);
+        this.sizes.updateScrollVisibility(this.canvas);
         if (prevScrollYVisibility !== this.sizes.scrollYVisible && this.horizontalRuler)
             this.horizontalRuler.adjust();
     }

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

@@ -14,9 +14,9 @@ export declare class CanvasSizeInfo implements IControlHeightProvider {
     initialize(page: HTMLElement, canvas: HTMLDivElement): void;
     findPageIndexByOffsetY(pages: LayoutPage[], offsetY: number): number;
     getPageOffsetY(layoutPage: LayoutPage): number;
-    setVisibleAreaSize(width: number, height: number): void;
+    private setVisibleAreaSize;
     getVisibleAreaWidth(includeScrollBars: boolean): number;
     getVisibleAreaHeight(includeScrollBars: boolean): number;
-    updateScrollVisibility(measurerWidth: number, measurerHeight: number): void;
-    isChanged(canvas: HTMLDivElement): boolean;
+    updateScrollVisibility(canvas: HTMLDivElement): void;
+    updateSize(canvas: HTMLDivElement): boolean;
 }

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

@@ -2,6 +2,7 @@ import { RenderPageVertivalInfo } from '../view-settings/views-settings';
 import { Size } from '@devexpress/utils/lib/geometry/size';
 import { SearchUtils } from '@devexpress/utils/lib/utils/search';
 import { DomUtils } from '@devexpress/utils/lib/utils/dom';
+import { SizeUtils } from '../utils/size-utils';
 export class CanvasSizeInfo {
     constructor() {
         this.topSpacing = -1;
@@ -18,7 +19,7 @@ export class CanvasSizeInfo {
         this.pageVerticalInfo.init(DomUtils.getCurrentStyle(page));
         this.topSpacing = this.pageVerticalInfo.topPageBorderWidth + this.pageVerticalInfo.topMargin;
         this.betweenPageSpacing = this.pageVerticalInfo.betweenPageSpacing;
-        this.setVisibleAreaSize(canvas.offsetWidth, canvas.offsetHeight);
+        this.setVisibleAreaSize(SizeUtils.getClientWidth(canvas), SizeUtils.getClientHeight(canvas));
     }
     findPageIndexByOffsetY(pages, offsetY) {
         return Math.max(0, SearchUtils.normedInterpolationIndexOf(pages, (p) => this.getPageOffsetY(p), offsetY));
@@ -31,21 +32,26 @@ export class CanvasSizeInfo {
         this.visibleAreaSize.height = height;
     }
     getVisibleAreaWidth(includeScrollBars) {
-        if (includeScrollBars)
+        if (!includeScrollBars)
             return this.visibleAreaSize.width;
-        return this.scrollYVisible ? this.visibleAreaSize.width - this.scrollWidth : this.visibleAreaSize.width;
+        return this.scrollYVisible ? this.visibleAreaSize.width + this.scrollWidth : this.visibleAreaSize.width;
     }
     getVisibleAreaHeight(includeScrollBars) {
-        if (includeScrollBars)
+        if (!includeScrollBars)
             return this.visibleAreaSize.height;
-        return this.scrollXVisible ? this.visibleAreaSize.height - this.scrollWidth : this.visibleAreaSize.height;
-    }
-    updateScrollVisibility(measurerWidth, measurerHeight) {
-        this.scrollXVisible = measurerHeight < this.visibleAreaSize.height;
-        this.scrollYVisible = measurerWidth < this.visibleAreaSize.width;
-    }
-    isChanged(canvas) {
-        return this.visibleAreaSize.width !== canvas.offsetWidth ||
-            this.visibleAreaSize.height !== canvas.offsetHeight;
+        return this.scrollXVisible ? this.visibleAreaSize.height + this.scrollWidth : this.visibleAreaSize.height;
+    }
+    updateScrollVisibility(canvas) {
+        this.scrollXVisible = SizeUtils.getHeightInfo(canvas).scrollbarSize > 0;
+        this.scrollYVisible = SizeUtils.getWidthInfo(canvas).scrollbarSize > 0;
+    }
+    updateSize(canvas) {
+        const width = SizeUtils.getClientWidth(canvas);
+        const height = SizeUtils.getClientHeight(canvas);
+        if (this.visibleAreaSize.width !== width || this.visibleAreaSize.height !== height) {
+            this.setVisibleAreaSize(width, height);
+            return true;
+        }
+        return false;
     }
 }

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

@@ -24,7 +24,6 @@ import { MisspelledSelectionRenderer } from './selection-renderers/misspelled-se
 import { RangePermissionRenderer } from './selection-renderers/range-permission-renderer';
 import { SearchSelectionRenderer } from './selection-renderers/search-selection-renderer';
 import { SelectionRenderer } from './selection-renderers/selection-renderer';
-import { SizeUtils } from '../../../common/utils/size-utils';
 export class ViewManager {
     get renderer() { return this.renderers[this.innerClientProperties.viewsSettings.viewType]; }
     get printLayoutRenderer() { return this.renderers[ViewType.PrintLayout]; }
@@ -82,11 +81,8 @@ export class ViewManager {
                 this.canvasListener.onCanvasScroll();
             }
         }
-        else if (this.sizes.isChanged(this.canvas)) {
-            const size = SizeUtils.getOffsetSize(this.canvas);
-            this.sizes.setVisibleAreaSize(size.width, size.height);
+        else if (this.sizes.updateSize(this.canvas))
             this.scroll.onCanvasSizeChanged();
-        }
     }
     NotifyPagesReady(pageChanges) {
         this.canvasListener.onPagesReady(pageChanges);

package/lib/common/model/section/section-properties.js

@@ -5,6 +5,7 @@ import { SectionStartType } from './enums';
 import { SectionColumnProperties } from './section-column-properties';
 import { PaperKind } from './paper-kind';
 import { LineNumberingProperties } from './line-numbering-properties';
+import { NoteProperties } from '../footnotes/footnote';
 export class SectionProperties {
     constructor() {
         this.margins = new Margins(1440, 1440, 1440, 1440);
@@ -22,6 +23,8 @@ export class SectionProperties {
         this.firstPageNumber = -1;
         this.continueNumbering = true;
         this.lineNumbering = new LineNumberingProperties();
+        this.footNote = NoteProperties.createDefault();
+        this.endNote = NoteProperties.createDefault();
     }
     static createSimpleSectionProperties(width, height) {
         const simpleSectionProperties = new SectionProperties();
@@ -64,6 +67,8 @@ export class SectionProperties {
         else
             this.columnsInfo = obj.columnsInfo;
         this.lineNumbering.copyFrom(obj.lineNumbering);
+        this.footNote.copyFrom(obj.footNote);
+        this.endNote.copyFrom(obj.endNote);
         this.equalWidthColumns = obj.equalWidthColumns;
         this.marginBottom = obj.marginBottom;
         this.marginLeft = obj.marginLeft;

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

@@ -1,7 +1,15 @@
 export declare class SizeUtils {
+    static getWidthInfo(element: Element): DimensionInfo;
     static getClientWidth(element: Element): number;
+    static getHeightInfo(element: Element): DimensionInfo;
     static getClientHeight(element: Element): number;
     static getOffsetSize(element: Element): DOMRect;
     static getOffsetWidth(element: Element): number;
     static getOffsetHeight(element: Element): number;
 }
+export declare class DimensionInfo {
+    readonly offsetSize: number;
+    readonly clientSize: number;
+    readonly scrollbarSize: number;
+    constructor(offsetSize: number, clientSize: number, scrollbarSize: number);
+}

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

@@ -1,17 +1,31 @@
 export class SizeUtils {
-    static getClientWidth(element) {
+    static getWidthInfo(element) {
+        const offsetSize = SizeUtils.getOffsetWidth(element);
         const style = getComputedStyle(element);
-        const offset = parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth) + parseFloat(style.paddingLeft) + parseFloat(style.paddingRight);
-        const sizeWithScrollBar = SizeUtils.getOffsetWidth(element) - offset;
+        const inset = parseCssValue(style.borderLeftWidth)
+            + parseCssValue(style.borderRightWidth)
+            + parseCssValue(style.paddingLeft)
+            + parseCssValue(style.paddingRight);
+        const sizeWithScrollBar = offsetSize - inset;
         const scrollBarSize = Math.round(sizeWithScrollBar) - element.clientWidth;
-        return sizeWithScrollBar - scrollBarSize;
+        return new DimensionInfo(offsetSize, sizeWithScrollBar - scrollBarSize, scrollBarSize);
     }
-    static getClientHeight(element) {
+    static getClientWidth(element) {
+        return this.getWidthInfo(element).clientSize;
+    }
+    static getHeightInfo(element) {
+        const offsetSize = SizeUtils.getOffsetHeight(element);
         const style = getComputedStyle(element);
-        const offset = parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth) + parseFloat(style.paddingTop) + parseFloat(style.paddingBottom);
-        const sizeWithScrollBar = SizeUtils.getOffsetHeight(element) - offset;
+        const inset = parseCssValue(style.borderTopWidth)
+            + parseCssValue(style.borderBottomWidth)
+            + parseCssValue(style.paddingTop)
+            + parseCssValue(style.paddingBottom);
+        const sizeWithScrollBar = offsetSize - inset;
         const scrollBarSize = Math.round(sizeWithScrollBar) - element.clientHeight;
-        return sizeWithScrollBar - scrollBarSize;
+        return new DimensionInfo(offsetSize, sizeWithScrollBar - scrollBarSize, scrollBarSize);
+    }
+    static getClientHeight(element) {
+        return this.getHeightInfo(element).clientSize;
     }
     static getOffsetSize(element) {
         return element.getBoundingClientRect();
@@ -23,3 +37,13 @@ export class SizeUtils {
         return SizeUtils.getOffsetSize(element).height;
     }
 }
+function parseCssValue(value) {
+    return value ? parseFloat(value) : 0;
+}
+export class DimensionInfo {
+    constructor(offsetSize, clientSize, scrollbarSize) {
+        this.offsetSize = offsetSize;
+        this.clientSize = clientSize;
+        this.scrollbarSize = scrollbarSize;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.2.6-build-25065-0102",
+  "version": "24.2.6-build-25072-0103",
   "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.6-build-25063-1935",
-    "devextreme-dist": "24.2.6-build-25063-1935"
+    "devextreme": "24.2.6-build-25071-1429",
+    "devextreme-dist": "24.2.6-build-25071-1429"
   },
   "dependencies": {
     "jszip": "~3.10.1",