sheet-happens 0.0.33 → 0.0.35

package/dist/index.js

@@ -429,7 +429,7 @@ var findInDisplayData = function findInDisplayData(displayData, start, direction
   return maxXY(cell, [0, 0]);
 };
 
-var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editData, sourceData, canSizeColumn, canSizeRow, canOrderColumn, canOrderRow, cellLayout, visibleCells, sheetStyle, onEdit, onCommit, onKnobAreaChange, onDragOffsetChange, onDropTargetChange, onSelectionChange, onInvalidateColumn, onInvalidateRow, onChange, onColumnOrderChange, onRowOrderChange, onCellWidthChange, onCellHeightChange, onRightClick, dontCommitEditOnSelectionChange) {
+var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editData, sourceData, cellReadOnly, canSizeColumn, canSizeRow, canOrderColumn, canOrderRow, cellLayout, visibleCells, sheetStyle, onEdit, onCommit, onKnobAreaChange, onDragOffsetChange, onDropTargetChange, onSelectionChange, onInvalidateColumn, onInvalidateRow, onChange, onColumnOrderChange, onRowOrderChange, onCellWidthChange, onCellHeightChange, onRightClick, dontCommitEditOnSelectionChange) {
   var _useState = React.useState(null),
       hitTarget = _useState[0],
       setHitTarget = _useState[1];
@@ -499,6 +499,7 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
     sourceData: sourceData,
     cellLayout: cellLayout,
     visibleCells: visibleCells,
+    hitTarget: hitTarget,
     knobPosition: knobPosition,
     columnResize: columnResize,
     rowResize: rowResize,
@@ -574,6 +575,7 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
 
     if (hitTarget) {
       setHitTarget(hitTarget);
+      ref.current.hitTarget = hitTarget;
       return;
     }
 
@@ -765,6 +767,8 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
     onSelectionChange === null || onSelectionChange === void 0 ? void 0 : onSelectionChange([anchor, head], scrollTo, true);
   }, [getMousePosition, getScrollPosition, getMouseHit, onColumnOrderChange, onRowOrderChange, onCellWidthChange, onCellHeightChange, onKnobAreaChange, onSelectionChange, onCommit, canSizeColumn, canSizeRow, canOrderColumn, canOrderRow]);
   var onPointerUp = React.useCallback(function (e) {
+    var _getMouseHit;
+
     var _ref$current2 = ref.current,
         knobArea = _ref$current2.knobArea,
         selection = _ref$current2.selection,
@@ -773,6 +777,7 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
         columnDrag = _ref$current2.columnDrag,
         rowDrag = _ref$current2.rowDrag,
         draggingKnob = _ref$current2.draggingKnob,
+        hitTarget = _ref$current2.hitTarget,
         _ref$current2$cellLay = _ref$current2.cellLayout,
         pixelToColumn = _ref$current2$cellLay.pixelToColumn,
         pixelToRow = _ref$current2$cellLay.pixelToRow,
@@ -780,7 +785,7 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
         getIndentY = _ref$current2$cellLay.getIndentY;
 
     if (knobArea && draggingKnob) {
-      var changes = parseKnobOperation(knobArea, selection, sourceData, editData);
+      var changes = parseKnobOperation(knobArea, selection, sourceData, editData, cellReadOnly);
       onChange === null || onChange === void 0 ? void 0 : onChange(changes);
       onSelectionChange === null || onSelectionChange === void 0 ? void 0 : onSelectionChange(knobArea, true, true);
       onKnobAreaChange === null || onKnobAreaChange === void 0 ? void 0 : onKnobAreaChange(null);
@@ -843,8 +848,10 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
     setRowDrag(null);
     if (!xy || !hitTarget) return;
     setHitTarget(null);
+    var previousRect = JSON.stringify(hitTarget.rect);
+    var currentRect = JSON.stringify((_getMouseHit = getMouseHit(xy)) === null || _getMouseHit === void 0 ? void 0 : _getMouseHit.rect);
 
-    if (hitTarget === getMouseHit(xy)) {
+    if (previousRect === currentRect) {
       var _obj$onClick;
 
       var obj = hitTarget.obj;
@@ -1175,7 +1182,7 @@ var useMouse = function useMouse(hitmapRef, selection, knobArea, editMode, editD
   };
 };
 
-var parseKnobOperation = function parseKnobOperation(knobArea, selection, sourceData, editData) {
+var parseKnobOperation = function parseKnobOperation(knobArea, selection, sourceData, editData, cellReadOnly) {
   var _normalizeSelection6 = normalizeSelection(knobArea),
       _normalizeSelection6$ = _normalizeSelection6[0],
       kx1 = _normalizeSelection6$[0],
@@ -1218,15 +1225,18 @@ var parseKnobOperation = function parseKnobOperation(knobArea, selection, source
     for (var y = fy1; y <= fy2; y++) {
       for (var x = fx1; x <= fx2; x++) {
         var value = sourceData(x, srcY);
-        changes.push({
-          x: x,
-          y: y,
-          value: value,
-          source: {
+
+        if (!cellReadOnly(x, y)) {
+          changes.push({
             x: x,
-            y: srcY
-          }
-        });
+            y: y,
+            value: value,
+            source: {
+              x: x,
+              y: srcY
+            }
+          });
+        }
       }
 
       srcY = srcY + 1;
@@ -1256,15 +1266,17 @@ var parseKnobOperation = function parseKnobOperation(knobArea, selection, source
       for (var _y2 = fy1; _y2 <= fy2; _y2++) {
         var _value = sourceData(srcX, _y2);
 
-        changes.push({
-          x: _x2,
-          y: _y2,
-          value: _value,
-          source: {
-            x: srcX,
-            y: _y2
-          }
-        });
+        if (!cellReadOnly(_x2, _y2)) {
+          changes.push({
+            x: _x2,
+            y: _y2,
+            value: _value,
+            source: {
+              x: srcX,
+              y: _y2
+            }
+          });
+        }
       }
 
       srcX = srcX + 1;
@@ -2806,7 +2818,7 @@ var Sheet = React.forwardRef(function (props, ref) {
   useClipboardPaste(textAreaRef, selection, changeSelection, props.onChange);
   var onScroll = useScroll(dataOffset, maxScroll, cellLayout, setDataOffset, setMaxScroll);
 
-  var _useMouse = useMouse(hitmapRef, selection, knobArea, editMode, editData, sourceData, canSizeColumn, canSizeRow, canOrderColumn, canOrderRow, cellLayout, visibleCells, sheetStyle, startEditingCell, commitEditingCell, setKnobArea, setDragOffset, setDropTarget, changeSelection, props.cacheLayout ? columnLayout.clearAfter : undefined, props.cacheLayout ? rowLayout.clearAfter : undefined, props.onChange, props.onColumnOrderChange, props.onRowOrderChange, props.onCellWidthChange, props.onCellHeightChange, props.onRightClick, props.dontCommitEditOnSelectionChange),
+  var _useMouse = useMouse(hitmapRef, selection, knobArea, editMode, editData, sourceData, cellReadOnly, canSizeColumn, canSizeRow, canOrderColumn, canOrderRow, cellLayout, visibleCells, sheetStyle, startEditingCell, commitEditingCell, setKnobArea, setDragOffset, setDropTarget, changeSelection, props.cacheLayout ? columnLayout.clearAfter : undefined, props.cacheLayout ? rowLayout.clearAfter : undefined, props.onChange, props.onColumnOrderChange, props.onRowOrderChange, props.onCellWidthChange, props.onCellHeightChange, props.onRightClick, props.dontCommitEditOnSelectionChange),
       mouseHandlers = _useMouse.mouseHandlers,
       knobPosition = _useMouse.knobPosition;
 
@@ -2887,11 +2899,13 @@ var Sheet = React.forwardRef(function (props, ref) {
 
       for (var y = y1; y <= y2; y++) {
         for (var x = x1; x <= x2; x++) {
-          changes.push({
-            x: x,
-            y: y,
-            value: null
-          });
+          if (!cellReadOnly(x, y)) {
+            changes.push({
+              x: x,
+              y: y,
+              value: null
+            });
+          }
         }
       }