sheet-happens 0.0.8 → 0.0.11

package/dist/index.modern.js

@@ -638,45 +638,49 @@ function Sheet(props) {
       editValue = _useState6[0],
       setEditValue = _useState6[1];
 
-  var _useState7 = useState(false),
-      arrowKeyCommitMode = _useState7[0],
-      setArrowKeyCommitMode = _useState7[1];
+  var _useState7 = useState(''),
+      editKey = _useState7[0],
+      setEditKey = _useState7[1];
 
   var _useState8 = useState(false),
-      shiftKeyDown = _useState8[0],
-      setShiftKeyDown = _useState8[1];
+      arrowKeyCommitMode = _useState8[0],
+      setArrowKeyCommitMode = _useState8[1];
 
   var _useState9 = useState(false),
-      knobDragInProgress = _useState9[0],
-      setKnobDragInProgress = _useState9[1];
+      shiftKeyDown = _useState9[0],
+      setShiftKeyDown = _useState9[1];
 
   var _useState10 = useState(false),
-      selectionInProgress = _useState10[0],
-      setSelectionInProgress = _useState10[1];
+      knobDragInProgress = _useState10[0],
+      setKnobDragInProgress = _useState10[1];
 
-  var _useState11 = useState(null),
-      columnResize = _useState11[0],
-      setColumnResize = _useState11[1];
+  var _useState11 = useState(false),
+      selectionInProgress = _useState11[0],
+      setSelectionInProgress = _useState11[1];
 
   var _useState12 = useState(null),
-      rowResize = _useState12[0],
-      setRowResize = _useState12[1];
+      columnResize = _useState12[0],
+      setColumnResize = _useState12[1];
 
-  var _useState13 = useState(false),
-      rowSelectionInProgress = _useState13[0],
-      setRowSelectionInProgress = _useState13[1];
+  var _useState13 = useState(null),
+      rowResize = _useState13[0],
+      setRowResize = _useState13[1];
 
   var _useState14 = useState(false),
-      columnSelectionInProgress = _useState14[0],
-      setColumnSelectionInProgress = _useState14[1];
+      rowSelectionInProgress = _useState14[0],
+      setRowSelectionInProgress = _useState14[1];
 
-  var _useState15 = useState({
+  var _useState15 = useState(false),
+      columnSelectionInProgress = _useState15[0],
+      setColumnSelectionInProgress = _useState15[1];
+
+  var _useState16 = useState({
     x: -1,
     y: -1,
     hitTarget: null
   }),
-      buttonClickMouseDownCoordinates = _useState15[0],
-      setButtonClickMouseDownCoordinates = _useState15[1];
+      buttonClickMouseDownCoordinates = _useState16[0],
+      setButtonClickMouseDownCoordinates = _useState16[1];
 
   var _useResizeObserver = useResizeObserver({
     ref: canvasRef
@@ -712,9 +716,23 @@ function Sheet(props) {
   var editData = useMemo(function () {
     return createCellPropFunction(props.editData, '');
   }, [props.editData]);
+  var editKeys = useMemo(function () {
+    return createCellPropFunction(props.editKeys, '');
+  }, [props.editKeys]);
   var cellStyle = useMemo(function () {
     return createCellPropFunction(props.cellStyle, defaultCellStyle);
   }, [props.cellStyle]);
+  useEffect(function () {
+    var currEditKey = editKeys ? editKeys(editCell.x, editCell.y) : '';
+
+    if (currEditKey !== editKey) {
+      setEditCell({
+        x: -1,
+        y: -1
+      });
+      setEditKey('');
+    }
+  }, [editKeys]);
   var columnSizes = useMemo(function () {
     return calculateRowsOrColsSizes(freezeColumns, cellWidth, rowHeaderWidth, dataOffset.x, canvasWidth);
   }, [props.freezeColumns, cellWidth, dataOffset.x, canvasWidth]);
@@ -1111,10 +1129,26 @@ function Sheet(props) {
               var td = _step18.value;
 
               if (td.nodeName === 'TD') {
+                var str = '';
+
+                if (td.children.length !== 0 && td.children[0].nodeName === 'P') {
+                  var p = td.children[0];
+
+                  if (p.children.length !== 0 && p.children[0].nodeName === 'FONT') {
+                    str = p.children[0].innerHTML;
+                  } else {
+                    str = p.innerHTML;
+                  }
+                } else {
+                  str = td.innerHTML;
+                }
+
+                str = str.replaceAll('\n', '');
+                str = str.replaceAll(/\s\s+/g, ' ');
                 changes.push({
                   y: y,
                   x: x,
-                  value: td.innerHTML
+                  value: str
                 });
                 x++;
               }
@@ -1246,6 +1280,7 @@ function Sheet(props) {
       x: -1,
       y: -1
     });
+    setEditKey('');
   };
 
   var startEditingCell = function startEditingCell(editCell) {
@@ -1260,7 +1295,9 @@ function Sheet(props) {
       val = editDataValue;
     }
 
+    var editDataKey = editKeys ? editKeys(editCell.x, editCell.y) : '';
     setEditCell(editCell);
+    setEditKey(editDataKey);
     setEditValue(val);
   };
 
@@ -1396,7 +1433,7 @@ function Sheet(props) {
     var scrollToP2 = true;
 
     if (x < rowHeaderWidth) {
-      sel2.x = 100;
+      sel2.x = dataOffset.x + 100;
       scrollToP2 = false;
       setRowSelectionInProgress(true);
     } else {
@@ -1404,7 +1441,7 @@ function Sheet(props) {
     }
 
     if (y < columnHeaderHeight) {
-      sel2.y = 100;
+      sel2.y = dataOffset.y + 100;
       scrollToP2 = false;
       setColumnSelectionInProgress(true);
     } else {
@@ -1417,6 +1454,7 @@ function Sheet(props) {
       x: -1,
       y: -1
     });
+    setEditKey('');
   };
 
   var onMouseUp = function onMouseUp(e) {
@@ -1540,7 +1578,7 @@ function Sheet(props) {
       var hitTarget = buttonClickMouseDownCoordinates.hitTarget;
 
       if (hitTarget.x <= _x4 && _x4 <= hitTarget.x + hitTarget.w && hitTarget.y <= _y3 && _y3 <= hitTarget.y + hitTarget.h) {
-        hitTarget.onClick();
+        hitTarget.onClick(e);
       }
 
       setButtonClickMouseDownCoordinates({
@@ -1662,7 +1700,14 @@ function Sheet(props) {
         y2 = selection.y1;
       }
 
-      if (Math.abs(cell.x - (x1 + x2) * 0.5) < Math.abs(cell.y - (y1 + y2) * 0.5)) {
+      var xCellDiff = 0;
+      if (cell.x < x1) xCellDiff = cell.x - x1;
+      if (cell.x > x2) xCellDiff = x2 - cell.x;
+      var yCellDiff = 0;
+      if (cell.y < y1) yCellDiff = cell.y - y1;
+      if (cell.y > y2) yCellDiff = y2 - cell.y;
+
+      if (xCellDiff > yCellDiff) {
         if (cell.y < y1) {
           y1 = cell.y;
         } else {
@@ -1686,7 +1731,9 @@ function Sheet(props) {
   };
 
   var onDoubleClick = function onDoubleClick(e) {
-    if (!e.target || !(e.target instanceof Element)) {
+    e.preventDefault();
+
+    if (!e.target || !(e.target instanceof Element) || shiftKeyDown) {
       return;
     }
 
@@ -1717,6 +1764,7 @@ function Sheet(props) {
         x: -1,
         y: -1
       });
+      setEditKey('');
       return;
     }
 
@@ -1890,6 +1938,18 @@ function Sheet(props) {
         y1 = selection.y1,
         y2 = selection.y2;
 
+    if (x1 > x2) {
+      var _ref = [x2, x1];
+      x1 = _ref[0];
+      x2 = _ref[1];
+    }
+
+    if (y1 > y2) {
+      var _ref2 = [y2, y1];
+      y1 = _ref2[0];
+      y2 = _ref2[1];
+    }
+
     if (!(y > columnHeaderHeight && x > rowHeaderWidth)) {
       return;
     }