@revolist/revogrid 4.12.5 → 4.12.6

package/dist/cjs/revogr-attribution_7.cjs.entry.js

@@ -14,7 +14,7 @@ const key_utils = require('./key.utils-05f14738.js');
 const debounce = require('./debounce-ec7a04b4.js');
 const viewport_store = require('./viewport.store-4dbfeaa3.js');
 const viewport_helpers = require('./viewport.helpers-e59a544e.js');
-const throttle = require('./throttle-08957661.js');
+const throttle = require('./throttle-5674040a.js');
 
 const Attribution = class {
     constructor(hostRef) {
@@ -1328,15 +1328,31 @@ const RevogrScrollVirtual = class {
     }
     componentDidRender() {
         const type = this.dimension === 'rgRow' ? 'scrollHeight' : 'scrollWidth';
-        if (this.element[type] > this.size) {
-            this.size = this.scrollSize;
+        // Get scrollbar size once during component initialization
+        const scrollbarSize = this.scrollSize;
+        // Calculate if content exceeds viewport size
+        // Add scrollbar size to the comparison to account for other dimension's scrollbar
+        const hasScroll = this.element[type] > this.size + scrollbarSize;
+        // Set scroll size based on whether scroll is needed
+        this.size = hasScroll ? this.scrollSize : 0;
+        let additionalScrollbarSize = 0;
+        if (this.dimension === 'rgRow') {
+            additionalScrollbarSize =
+                this.element.scrollWidth > this.element.clientWidth
+                    ? scrollbarSize
+                    : 0;
         }
         else {
-            this.size = 0;
+            additionalScrollbarSize =
+                this.element.scrollHeight > this.element.clientHeight
+                    ? scrollbarSize
+                    : 0;
         }
+        const clientSize = this.size + additionalScrollbarSize;
         this.localScrollService.setParams({
             contentSize: this.dimensionStore.get('realSize'),
-            clientSize: this.size,
+            // Add scrollbar size to clientSize if other dimension has scroll
+            clientSize,
             virtualSize: this.viewportStore.get('clientSize'),
         }, this.dimension);
     }
@@ -1357,9 +1373,8 @@ const RevogrScrollVirtual = class {
     }
     render() {
         const sizeType = this.dimension === 'rgRow' ? 'height' : 'width';
-        const size = throttle.getContentSize(this.dimensionStore.get('realSize'), this.size, this.viewportStore.get('clientSize') // content viewport size
-        );
-        return (index.h(index.Host, { key: '2d11902403db45b805bde88b6fc40acff4b6b910', onScroll: (e) => this.onScroll(e) }, index.h("div", { key: '74978e90cbf66e3fb6dcc25bd5882346f1515c39', style: {
+        const size = throttle.getContentSize(this.dimensionStore.get('realSize'), this.size, this.viewportStore.get('clientSize'));
+        return (index.h(index.Host, { key: '7789bd408d3e154836bcd2aed4ebaa1663e7f968', onScroll: (e) => this.onScroll(e) }, index.h("div", { key: '40549da97df3a580ad2ddef13fe7b4dbe6df54bc', style: {
                 [sizeType]: `${size}px`,
             } })));
     }