handsontable 12.3.1 → 12.3.2-next-e75de58-20230322

package/3rdparty/walkontable/src/viewport.js

@@ -303,13 +303,10 @@ var Viewport = /*#__PURE__*/function () {
         height = this.getViewportHeight();
       }
       var pos = this.dataAccessObject.topScrollPosition - this.dataAccessObject.topParentOffset;
-      if (pos < 0) {
-        pos = 0;
-      }
       var fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
       var fixedRowsBottom = wtSettings.getSetting('fixedRowsBottom');
       var totalRows = wtSettings.getSetting('totalRows');
-      if (fixedRowsTop) {
+      if (fixedRowsTop && pos >= 0) {
         fixedRowsHeight = this.dataAccessObject.topOverlay.sumCellSizes(0, fixedRowsTop);
         pos += fixedRowsHeight;
         height -= fixedRowsHeight;
@@ -354,11 +351,8 @@ var Viewport = /*#__PURE__*/function () {
       var width = this.getViewportWidth();
       var pos = Math.abs(this.dataAccessObject.inlineStartScrollPosition) - this.dataAccessObject.inlineStartParentOffset;
       this.columnHeaderHeight = NaN;
-      if (pos < 0) {
-        pos = 0;
-      }
       var fixedColumnsStart = wtSettings.getSetting('fixedColumnsStart');
-      if (fixedColumnsStart) {
+      if (fixedColumnsStart && pos >= 0) {
         var fixedColumnsWidth = this.dataAccessObject.inlineStartOverlay.sumCellSizes(0, fixedColumnsStart);
         pos += fixedColumnsWidth;
         width -= fixedColumnsWidth;
@@ -368,7 +362,7 @@ var Viewport = /*#__PURE__*/function () {
       }
       return new _calculator.ViewportColumnsCalculator({
         viewportSize: width,
-        scrollOffset: Math.abs(pos),
+        scrollOffset: pos,
         totalItems: wtSettings.getSetting('totalColumns'),
         itemSizeFn: function itemSizeFn(sourceCol) {
           return wtTable.getColumnWidth(sourceCol);
@@ -378,7 +372,8 @@ var Viewport = /*#__PURE__*/function () {
         stretchMode: wtSettings.getSetting('stretchH'),
         stretchingItemWidthFn: function stretchingItemWidthFn(stretchedWidth, column) {
           return wtSettings.getSetting('onBeforeStretchingColumnWidth', stretchedWidth, column);
-        }
+        },
+        inlineStartOffset: this.dataAccessObject.inlineStartParentOffset
       });
     }
 
@@ -438,11 +433,12 @@ var Viewport = /*#__PURE__*/function () {
         return false;
       }
       var startRow = proposedRowsVisibleCalculator.startRow,
-        endRow = proposedRowsVisibleCalculator.endRow;
+        endRow = proposedRowsVisibleCalculator.endRow,
+        isVisibleInTrimmingContainer = proposedRowsVisibleCalculator.isVisibleInTrimmingContainer;
 
       // if there are no fully visible rows at all, return false
       if (startRow === null && endRow === null) {
-        return false;
+        return !isVisibleInTrimmingContainer;
       }
       var _this$rowsRenderCalcu = this.rowsRenderCalculator,
         renderedStartRow = _this$rowsRenderCalcu.startRow,
@@ -470,11 +466,12 @@ var Viewport = /*#__PURE__*/function () {
         return false;
       }
       var startColumn = proposedColumnsVisibleCalculator.startColumn,
-        endColumn = proposedColumnsVisibleCalculator.endColumn;
+        endColumn = proposedColumnsVisibleCalculator.endColumn,
+        isVisibleInTrimmingContainer = proposedColumnsVisibleCalculator.isVisibleInTrimmingContainer;
 
       // if there are no fully visible columns at all, return false
       if (startColumn === null && endColumn === null) {
-        return false;
+        return !isVisibleInTrimmingContainer;
       }
       var _this$columnsRenderCa = this.columnsRenderCalculator,
         renderedStartColumn = _this$columnsRenderCa.startColumn,

package/3rdparty/walkontable/src/viewport.mjs

@@ -299,13 +299,10 @@ var Viewport = /*#__PURE__*/function () {
         height = this.getViewportHeight();
       }
       var pos = this.dataAccessObject.topScrollPosition - this.dataAccessObject.topParentOffset;
-      if (pos < 0) {
-        pos = 0;
-      }
       var fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
       var fixedRowsBottom = wtSettings.getSetting('fixedRowsBottom');
       var totalRows = wtSettings.getSetting('totalRows');
-      if (fixedRowsTop) {
+      if (fixedRowsTop && pos >= 0) {
         fixedRowsHeight = this.dataAccessObject.topOverlay.sumCellSizes(0, fixedRowsTop);
         pos += fixedRowsHeight;
         height -= fixedRowsHeight;
@@ -350,11 +347,8 @@ var Viewport = /*#__PURE__*/function () {
       var width = this.getViewportWidth();
       var pos = Math.abs(this.dataAccessObject.inlineStartScrollPosition) - this.dataAccessObject.inlineStartParentOffset;
       this.columnHeaderHeight = NaN;
-      if (pos < 0) {
-        pos = 0;
-      }
       var fixedColumnsStart = wtSettings.getSetting('fixedColumnsStart');
-      if (fixedColumnsStart) {
+      if (fixedColumnsStart && pos >= 0) {
         var fixedColumnsWidth = this.dataAccessObject.inlineStartOverlay.sumCellSizes(0, fixedColumnsStart);
         pos += fixedColumnsWidth;
         width -= fixedColumnsWidth;
@@ -364,7 +358,7 @@ var Viewport = /*#__PURE__*/function () {
       }
       return new ViewportColumnsCalculator({
         viewportSize: width,
-        scrollOffset: Math.abs(pos),
+        scrollOffset: pos,
         totalItems: wtSettings.getSetting('totalColumns'),
         itemSizeFn: function itemSizeFn(sourceCol) {
           return wtTable.getColumnWidth(sourceCol);
@@ -374,7 +368,8 @@ var Viewport = /*#__PURE__*/function () {
         stretchMode: wtSettings.getSetting('stretchH'),
         stretchingItemWidthFn: function stretchingItemWidthFn(stretchedWidth, column) {
           return wtSettings.getSetting('onBeforeStretchingColumnWidth', stretchedWidth, column);
-        }
+        },
+        inlineStartOffset: this.dataAccessObject.inlineStartParentOffset
       });
     }
 
@@ -434,11 +429,12 @@ var Viewport = /*#__PURE__*/function () {
         return false;
       }
       var startRow = proposedRowsVisibleCalculator.startRow,
-        endRow = proposedRowsVisibleCalculator.endRow;
+        endRow = proposedRowsVisibleCalculator.endRow,
+        isVisibleInTrimmingContainer = proposedRowsVisibleCalculator.isVisibleInTrimmingContainer;
 
       // if there are no fully visible rows at all, return false
       if (startRow === null && endRow === null) {
-        return false;
+        return !isVisibleInTrimmingContainer;
       }
       var _this$rowsRenderCalcu = this.rowsRenderCalculator,
         renderedStartRow = _this$rowsRenderCalcu.startRow,
@@ -466,11 +462,12 @@ var Viewport = /*#__PURE__*/function () {
         return false;
       }
       var startColumn = proposedColumnsVisibleCalculator.startColumn,
-        endColumn = proposedColumnsVisibleCalculator.endColumn;
+        endColumn = proposedColumnsVisibleCalculator.endColumn,
+        isVisibleInTrimmingContainer = proposedColumnsVisibleCalculator.isVisibleInTrimmingContainer;
 
       // if there are no fully visible columns at all, return false
       if (startColumn === null && endColumn === null) {
-        return false;
+        return !isVisibleInTrimmingContainer;
       }
       var _this$columnsRenderCa = this.columnsRenderCalculator,
         renderedStartColumn = _this$columnsRenderCa.startColumn,