sheet-happens 0.0.39 → 0.0.40

package/dist/coordinate.d.ts

@@ -23,3 +23,4 @@ export declare const isPointInsideSelection: (selection: Rectangle, point: XY) =
 export declare const validateSelection: (selection: Rectangle) => Rectangle;
 export declare const normalizeSelection: (selection: Rectangle) => Rectangle;
 export declare const orientSelection: (normalized: Rectangle, to: Rectangle) => Rectangle;
+export declare const clipSelection: (selection: Rectangle, max: XY) => Rectangle;

package/dist/index.js

@@ -351,6 +351,11 @@ var orientSelection = function orientSelection(normalized, to) {
   var swapY = (ay - hy || 1) * (bottom - top || 1) < 0;
   return [[swapX ? right : left, swapY ? bottom : top], [swapX ? left : right, swapY ? top : bottom]];
 };
+var clipSelection = function clipSelection(selection, max) {
+  var anchor = selection[0],
+      head = selection[1];
+  return [minXY(anchor, max), minXY(head, max)];
+};
 
 var LIMIT = 1000;
 
@@ -1487,17 +1492,25 @@ var useScroll = function useScroll(offset, maxScroll, cellLayout, onOffsetChange
     }
   }, [cellLayout, onOffsetChange, onMaxScrollChange]);
 };
-var scrollToCell = function scrollToCell(element, cell, view, freeze, offset, maxScroll, cellLayout, callback) {
+var scrollToCell = function scrollToCell(element, cell, view, freeze, offset, maxCells, maxScroll, cellLayout, callback) {
   var x = cell[0],
       y = cell[1];
   var w = view[0],
       h = view[1];
   var offsetX = offset[0],
       offsetY = offset[1];
+  var maxColumns = maxCells[0],
+      maxRows = maxCells[1];
   var cellToAbsolute = cellLayout.cellToAbsolute,
       cellToPixel = cellLayout.cellToPixel,
       columnToPixel = cellLayout.columnToPixel,
-      rowToPixel = cellLayout.rowToPixel;
+      rowToPixel = cellLayout.rowToPixel,
+      absoluteToColumn = cellLayout.absoluteToColumn,
+      columnToAbsolute = cellLayout.columnToAbsolute,
+      absoluteToRow = cellLayout.absoluteToRow,
+      rowToAbsolute = cellLayout.rowToAbsolute,
+      getIndentX = cellLayout.getIndentX,
+      getIndentY = cellLayout.getIndentY;
 
   var _cellToAbsolute2 = cellToAbsolute(freeze),
       frozenX = _cellToAbsolute2[0],
@@ -1516,10 +1529,25 @@ var scrollToCell = function scrollToCell(element, cell, view, freeze, offset, ma
 
   if (left <= frozenX) {
     newX = x - freeze[0];
+    var scrollW = w - frozenX - getIndentX();
+    var rightEdge = absoluteToColumn(columnToAbsolute(newX) + scrollW);
+
+    if (rightEdge > maxColumns) {
+      var remainder = columnToAbsolute(maxColumns) - columnToAbsolute(newX);
+      newX = absoluteToColumn(columnToAbsolute(newX) - scrollW + remainder) + 1;
+    }
   }
 
   if (top <= frozenY) {
     newY = y - freeze[1];
+    var scrollH = h - frozenY - getIndentY();
+    var bottomEdge = absoluteToRow(rowToAbsolute(newY) + scrollH);
+
+    if (bottomEdge > maxRows) {
+      var _remainder = rowToAbsolute(maxRows) - rowToAbsolute(newY);
+
+      newY = absoluteToRow(rowToAbsolute(newY) - scrollH + _remainder) + 1;
+    }
   }
 
   if (right > w) {
@@ -3025,7 +3053,7 @@ var Sheet = React.forwardRef(function (props, ref) {
     if (scrollTo) {
       var anchor = newSelection[0],
           head = newSelection[1];
-      scrollToCell(overlay, toHead ? head : anchor, [canvasWidth, canvasHeight], [freezeColumns, freezeRows], dataOffset, maxScroll, cellLayout, function (dataOffset, maxScroll) {
+      scrollToCell(overlay, toHead ? head : anchor, [canvasWidth, canvasHeight], [freezeColumns, freezeRows], dataOffset, [maxColumns, maxRows], maxScroll, cellLayout, function (dataOffset, maxScroll) {
         setDataOffset(dataOffset);
         setMaxScroll(maxScroll);
       });
@@ -3083,6 +3111,22 @@ var Sheet = React.forwardRef(function (props, ref) {
     setLastEditKey(editKeys.apply(void 0, editCell));
   };
 
+  var _props$maxColumns = props.maxColumns,
+      maxColumns = _props$maxColumns === void 0 ? Infinity : _props$maxColumns,
+      _props$maxRows = props.maxRows,
+      maxRows = _props$maxRows === void 0 ? Infinity : _props$maxRows;
+  React.useLayoutEffect(function () {
+    var _normalizeSelection2 = normalizeSelection(selection),
+        _normalizeSelection2$ = _normalizeSelection2[1],
+        maxX = _normalizeSelection2$[0],
+        maxY = _normalizeSelection2$[1];
+
+    var overflowX = maxX > maxColumns;
+    var overflowY = maxY > maxRows;
+    if (!overflowX && !overflowY) return;
+    var corner = [maxColumns - 1, maxRows - 1];
+    changeSelection(clipSelection(selection, corner), true);
+  }, [maxRows, maxColumns]);
   var hitmapRef = React.useRef(NO_CLICKABLES);
   var textAreaRef = React.useRef(null);
   useClipboardCopy(textAreaRef, selection, editMode, editData);
@@ -3148,13 +3192,13 @@ var Sheet = React.forwardRef(function (props, ref) {
     }
 
     if (e.key === 'Backspace' || e.key === 'Delete') {
-      var _normalizeSelection2 = normalizeSelection(selection),
-          _normalizeSelection2$ = _normalizeSelection2[0],
-          x1 = _normalizeSelection2$[0],
-          y1 = _normalizeSelection2$[1],
-          _normalizeSelection2$2 = _normalizeSelection2[1],
-          x2 = _normalizeSelection2$2[0],
-          y2 = _normalizeSelection2$2[1];
+      var _normalizeSelection3 = normalizeSelection(selection),
+          _normalizeSelection3$ = _normalizeSelection3[0],
+          x1 = _normalizeSelection3$[0],
+          y1 = _normalizeSelection3$[1],
+          _normalizeSelection3$2 = _normalizeSelection3[1],
+          x2 = _normalizeSelection3$2[0],
+          y2 = _normalizeSelection3$2[1];
 
       if (isRowSelection(selection)) {
         x1 = 0;