devexpress-richedit 24.2.7-build-25093-0104 → 24.2.7-build-25100-0108

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

@@ -318,17 +318,23 @@ export class CanvasManager extends BatchUpdatableObject {
     onScrollIntervalTick() {
         const evtX = this.lastMousePosition.x;
         const evtY = this.lastMousePosition.y;
-        const inHorizontalArea = evtX >= this.canvasPosition.x && evtX <= this.canvasPosition.x + this.sizes.getVisibleAreaWidth(true);
-        const inVerticalArea = evtY >= this.canvasPosition.y && evtY <= this.canvasPosition.y + this.sizes.getVisibleAreaHeight(true);
+        const inHorizontalArea = evtX >= this.canvasPosition.x && evtX <= this.canvasPosition.x + this.sizes.getVisibleAreaWidth(false);
+        const inVerticalArea = evtY >= this.canvasPosition.y && evtY <= this.canvasPosition.y + this.sizes.getVisibleAreaHeight(false);
         if (!inHorizontalArea && !inVerticalArea)
             return;
+        const yOffsetWithoutScrollbar = this.canvasPosition.y + this.sizes.getVisibleAreaHeight(false) - evtY;
+        const yOffsetWithScrollbar = this.canvasPosition.y + this.sizes.getVisibleAreaHeight(true) - evtY;
+        const outsideHorizontalScrollbar = yOffsetWithoutScrollbar > 0 || yOffsetWithScrollbar < 0;
         if (inHorizontalArea && evtY - this.canvasPosition.y <= AUTOSCROLL_AREA_SIZE)
             this.viewManager.canvas.scrollTop -= AUTOSCROLL_STEP;
-        else if (inHorizontalArea && this.canvasPosition.y + this.sizes.getVisibleAreaHeight(true) - evtY <= AUTOSCROLL_AREA_SIZE)
+        else if (inHorizontalArea && yOffsetWithoutScrollbar <= AUTOSCROLL_AREA_SIZE && outsideHorizontalScrollbar)
             this.viewManager.canvas.scrollTop += AUTOSCROLL_STEP;
+        const xOffsetWithoutScrollbar = this.canvasPosition.x + this.sizes.getVisibleAreaWidth(false) - evtX;
+        const xOffsetWithScrollbar = this.canvasPosition.x + this.sizes.getVisibleAreaWidth(true) - evtX;
+        const outsideVerticalScrollbar = xOffsetWithoutScrollbar > 0 || xOffsetWithScrollbar < 0;
         if (inVerticalArea && evtX - this.canvasPosition.x <= AUTOSCROLL_AREA_SIZE)
             this.viewManager.canvas.scrollLeft -= AUTOSCROLL_STEP;
-        else if (inVerticalArea && this.canvasPosition.x + this.sizes.getVisibleAreaWidth(true) - evtX <= AUTOSCROLL_AREA_SIZE)
+        else if (inVerticalArea && xOffsetWithoutScrollbar <= AUTOSCROLL_AREA_SIZE && outsideVerticalScrollbar)
             this.viewManager.canvas.scrollLeft += AUTOSCROLL_STEP;
     }
     static getCursorClassName(pointer) {

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

@@ -1,11 +1,11 @@
 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;
+    static getWidthInfo(element: HTMLElement): DimensionInfo;
+    static getClientWidth(element: HTMLElement): number;
+    static getHeightInfo(element: HTMLElement): DimensionInfo;
+    static getClientHeight(element: HTMLElement): number;
+    static getOffsetSize(element: HTMLElement): DOMRect;
+    static getOffsetWidth(element: HTMLElement): number;
+    static getOffsetHeight(element: HTMLElement): number;
 }
 export declare class DimensionInfo {
     readonly offsetSize: number;

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

@@ -1,28 +1,26 @@
 export class SizeUtils {
     static getWidthInfo(element) {
-        const offsetSize = SizeUtils.getOffsetWidth(element);
-        const style = getComputedStyle(element);
-        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 new DimensionInfo(offsetSize, sizeWithScrollBar - scrollBarSize, scrollBarSize);
+        const computedStyle = getComputedStyle(element);
+        const offsetWidth = this.getOffsetWidth(element);
+        const offsetWidthWithoutBorder = offsetWidth
+            - parseCssValue(computedStyle.borderLeftWidth)
+            - parseCssValue(computedStyle.borderRightWidth);
+        const scrollbarWidth = offsetWidthWithoutBorder - element.clientWidth;
+        const clientWidth = offsetWidthWithoutBorder - scrollbarWidth;
+        return new DimensionInfo(offsetWidth, clientWidth, scrollbarWidth);
     }
     static getClientWidth(element) {
         return this.getWidthInfo(element).clientSize;
     }
     static getHeightInfo(element) {
-        const offsetSize = SizeUtils.getOffsetHeight(element);
-        const style = getComputedStyle(element);
-        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 new DimensionInfo(offsetSize, sizeWithScrollBar - scrollBarSize, scrollBarSize);
+        const computedStyle = getComputedStyle(element);
+        const offsetHeight = this.getOffsetHeight(element);
+        const offsetHeightWithoutBorder = offsetHeight
+            - parseCssValue(computedStyle.borderTopWidth)
+            - parseCssValue(computedStyle.borderBottomWidth);
+        const scrollbarHeight = offsetHeightWithoutBorder - element.clientHeight;
+        const clientHeight = offsetHeightWithoutBorder - scrollbarHeight;
+        return new DimensionInfo(offsetHeight, clientHeight, scrollbarHeight);
     }
     static getClientHeight(element) {
         return this.getHeightInfo(element).clientSize;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.2.7-build-25093-0104",
+  "version": "24.2.7-build-25100-0108",
   "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.7-build-25091-1935",
-    "devextreme-dist": "24.2.7-build-25091-1935"
+    "devextreme": "24.2.7-build-25098-1935",
+    "devextreme-dist": "24.2.7-build-25098-1935"
   },
   "dependencies": {
     "jszip": "~3.10.1",