sheet-happens 0.0.47 → 0.0.49

package/dist/index.js

@@ -1747,6 +1747,8 @@ var useScroll = function useScroll(offset, maxScroll, cellLayout, onOffsetChange
 var clipDataOffset = function clipDataOffset(view, offset, freeze, maxCells, cellLayout) {
   var newX = offset[0],
       newY = offset[1];
+  var freezeX = freeze[0],
+      freezeY = freeze[1];
   var maxColumns = maxCells[0],
       maxRows = maxCells[1];
   var absoluteToColumn = cellLayout.absoluteToColumn,
@@ -1756,31 +1758,27 @@ var clipDataOffset = function clipDataOffset(view, offset, freeze, maxCells, cel
 
   var _getViewExtent = getViewExtent(view, [newX, newY], freeze, cellLayout),
       _getViewExtent$edge = _getViewExtent.edge,
-      rightEdge = _getViewExtent$edge[0],
-      bottomEdge = _getViewExtent$edge[1],
+      leftEdge = _getViewExtent$edge[0],
+      topEdge = _getViewExtent$edge[1],
       _getViewExtent$viewpo = _getViewExtent.viewport,
       scrollW = _getViewExtent$viewpo[0],
       scrollH = _getViewExtent$viewpo[1];
 
-  if (rightEdge > maxColumns) {
-    var remainder = columnToAbsolute(maxColumns) - columnToAbsolute(newX);
-    newX = absoluteToColumn(columnToAbsolute(newX) - scrollW + remainder) + 1;
+  if (leftEdge >= maxColumns) {
+    var remainder = columnToAbsolute(maxColumns) - columnToAbsolute(newX + freezeX);
+    newX = Math.max(0, absoluteToColumn(columnToAbsolute(newX + freezeX) - scrollW + remainder) - freezeX + 1);
   }
 
-  if (bottomEdge > maxRows) {
-    var _remainder = rowToAbsolute(maxRows) - rowToAbsolute(newY);
+  if (topEdge >= maxRows) {
+    var _remainder = rowToAbsolute(maxRows) - rowToAbsolute(newY + freezeY);
 
-    newY = absoluteToRow(rowToAbsolute(newY) - scrollH + _remainder) + 1;
+    newY = Math.max(0, absoluteToRow(rowToAbsolute(newY + freezeY) - scrollH + _remainder) - freezeY + 1);
   }
 
   return [newX, newY];
 };
 var getViewExtent = function getViewExtent(view, offset, freeze, cellLayout) {
   var cellToAbsolute = cellLayout.cellToAbsolute,
-      absoluteToColumn = cellLayout.absoluteToColumn,
-      columnToAbsolute = cellLayout.columnToAbsolute,
-      absoluteToRow = cellLayout.absoluteToRow,
-      rowToAbsolute = cellLayout.rowToAbsolute,
       getIndentX = cellLayout.getIndentX,
       getIndentY = cellLayout.getIndentY;
   var x = offset[0],
@@ -1796,10 +1794,8 @@ var getViewExtent = function getViewExtent(view, offset, freeze, cellLayout) {
   var scrollH = h - frozenY - getIndentY();
   var leftEdge = x + freeze[0];
   var topEdge = y + freeze[1];
-  var rightEdge = absoluteToColumn(columnToAbsolute(leftEdge) + scrollW);
-  var bottomEdge = absoluteToRow(rowToAbsolute(topEdge) + scrollH);
   return {
-    edge: [rightEdge, bottomEdge],
+    edge: [leftEdge, topEdge],
     viewport: [scrollW, scrollH]
   };
 };
@@ -1854,20 +1850,25 @@ var scrollToCell = function scrollToCell(element, cell, view, freeze, offset, ma
 
   if (!isSameXY(newOffset, offset)) {
     var scroll = cellToAbsolute(newOffset);
-
-    var _cellToAbsolute4 = cellToAbsolute([0, 0], [0.5, 0.5]),
-        nudgeX = _cellToAbsolute4[0],
-        nudgeY = _cellToAbsolute4[1];
-
     callback(newOffset, maxXY(maxScroll, scroll));
     setTimeout(function () {
-      var scrollX = scroll[0],
-          scrollY = scroll[1];
-      element.scrollLeft = scrollX - nudgeX;
-      element.scrollTop = scrollY - nudgeY;
+      updateScrollPosition(element, newOffset, cellLayout);
     });
   }
 };
+var updateScrollPosition = function updateScrollPosition(element, dataOffset, cellLayout) {
+  var cellToAbsolute = cellLayout.cellToAbsolute;
+  var scroll = cellToAbsolute(dataOffset);
+
+  var _cellToAbsolute4 = cellToAbsolute([0, 0], [0.5, 0.5]),
+      nudgeX = _cellToAbsolute4[0],
+      nudgeY = _cellToAbsolute4[1];
+
+  var scrollX = scroll[0],
+      scrollY = scroll[1];
+  element.scrollLeft = scrollX - nudgeX;
+  element.scrollTop = scrollY - nudgeY;
+};
 
 var useAutoSizeColumn = function useAutoSizeColumn(rows, displayData, cellStyle, columnHeaders, columnHeaderStyle, canvasWidth) {
   var context = React.useMemo(function () {
@@ -3726,9 +3727,13 @@ var Sheet = React.forwardRef(function (props, ref) {
       _props$maxRows = props.maxRows,
       maxRows = _props$maxRows === void 0 ? Infinity : _props$maxRows;
   React.useLayoutEffect(function () {
+    var overlay = overlayRef.current;
+    if (!overlay) return;
     var view = [canvasWidth, canvasHeight];
     var freeze = [freezeColumns, freezeRows];
-    setDataOffset(clipDataOffset(view, dataOffset, freeze, [maxColumns, maxRows], cellLayout));
+    var newOffset = clipDataOffset(view, dataOffset, freeze, [maxColumns, maxRows], cellLayout);
+    setDataOffset(newOffset);
+    updateScrollPosition(overlay, newOffset, cellLayout);
   }, [maxRows, maxColumns]);
   var hitmapRef = React.useRef(NO_CLICKABLES);
   var isFocused = focused || editMode;