sheet-happens 0.0.19 → 0.0.21

package/dist/index.d.ts

@@ -15,6 +15,10 @@ export interface Change {
     x: number;
     y: number;
     value: string | number | null;
+    source?: {
+        x: number;
+        y: number;
+    };
 }
 export interface CellContentItem {
     content: HTMLImageElement | string | number;
@@ -52,6 +56,7 @@ export interface SheetProps {
     editData?: CellProperty<string>;
     editKeys?: CellProperty<string>;
     sheetStyle?: SheetStyle;
+    dontCommitEditOnSelectionChange?: boolean;
     inputComponent?: (x: number, y: number, props: SheetInputProps, commitEditingCell?: () => void) => ReactElement | undefined;
     onSelectionChanged?: (x1: number, y1: number, x2: number, y2: number) => void;
     onRightClick?: (e: SheetMouseEvent) => void;

package/dist/index.js

@@ -583,14 +583,10 @@ function renderOnCanvas(context, rowSizes, columnSizes, cellStyle, cellWidth, ce
 
     if (rowSelectionActive) {
       var p1x = Math.max(-100, p1.x);
-      var p1y = Math.max(-100, p1.y);
-      context.fillRect(p1x, p1y, 100000, p2.y - p1.y);
+      context.fillRect(p1x, p1.y, 100000, p2.y - p1.y);
     } else if (colSelectionActive) {
-      var _p1x = Math.max(-100, p1.x);
-
-      var _p1y = Math.max(-100, p1.y);
-
-      context.fillRect(_p1x, _p1y, p2.x - p1.x, 100000);
+      var p1y = Math.max(0, p1.y);
+      context.fillRect(p1.x, p1y, p2.x - p1.x, 100000);
     } else {
       context.fillRect(p1.x, p1.y, p2.x - p1.x, p2.y - p1.y);
     }
@@ -717,17 +713,13 @@ function renderOnCanvas(context, rowSizes, columnSizes, cellStyle, cellWidth, ce
     context.beginPath();
 
     if (rowSelectionActive) {
-      var _p1x2 = Math.max(-100, p1.x);
-
-      var _p1y2 = Math.max(-100, p1.y);
+      var _p1x = Math.max(-100, p1.x);
 
-      context.rect(_p1x2, _p1y2, 100000, p2.y - p1.y);
+      context.rect(_p1x, p1.y, 100000, p2.y - p1.y);
     } else if (colSelectionActive) {
-      var _p1x3 = Math.max(-100, p1.x);
-
-      var _p1y3 = Math.max(-100, p1.y);
+      var _p1y = Math.max(-100, p1.y);
 
-      context.rect(_p1x3, _p1y3, p2.x - p1.x, 100000);
+      context.rect(p1.x, _p1y, p2.x - p1.x, 100000);
     } else {
       context.rect(p1.x, p1.y, p2.x - p1.x, p2.y - p1.y);
     }
@@ -1336,12 +1328,12 @@ function Sheet(props) {
     var clipboardData = e.clipboardData || window.clipboardData;
     var types = clipboardData.types;
 
-    if (types.includes('text/rtf') && types.includes('text/plain') || types.includes('text/plain') && !types.includes('text/html')) {
-      var text = clipboardData.getData('text/plain');
-      parsePastedText(text);
-    } else if (types.includes('text/html')) {
+    if (types.includes('text/html')) {
       var pastedHtml = clipboardData.getData('text/html');
       parsePastedHtml(pastedHtml);
+    } else if (types.includes('text/plain')) {
+      var text = clipboardData.getData('text/plain');
+      parsePastedText(text);
     }
   };
 
@@ -1422,12 +1414,12 @@ function Sheet(props) {
                   var p = td.children[0];
 
                   if (p.children.length !== 0 && p.children[0].nodeName === 'FONT') {
-                    str = p.children[0].innerHTML;
+                    str = p.children[0].textContent.trim();
                   } else {
-                    str = p.innerHTML;
+                    str = p.textContent.trim();
                   }
                 } else {
-                  str = td.innerHTML;
+                  str = td.textContent.trim();
                 }
 
                 str = str.replaceAll('\n', '');
@@ -1780,7 +1772,9 @@ function Sheet(props) {
     } : _extends({}, sel2);
 
     if (editMode) {
-      commitEditingCell();
+      if (!props.dontCommitEditOnSelectionChange) {
+        commitEditingCell();
+      }
     }
 
     var scrollToP2 = true;
@@ -1805,11 +1799,14 @@ function Sheet(props) {
 
     setSelectionInProgress(true);
     changeSelection(sel1.x, sel1.y, sel2.x, sel2.y, scrollToP2);
-    setEditCell({
-      x: -1,
-      y: -1
-    });
-    setEditKey('');
+
+    if (!props.dontCommitEditOnSelectionChange) {
+      setEditCell({
+        x: -1,
+        y: -1
+      });
+      setEditKey('');
+    }
   };
 
   var onMouseUp = function onMouseUp(e) {
@@ -1873,7 +1870,11 @@ function Sheet(props) {
             changes.push({
               x: x,
               y: y,
-              value: value
+              value: value,
+              source: {
+                x: x,
+                y: srcY
+              }
             });
           }
 
@@ -1906,7 +1907,11 @@ function Sheet(props) {
             changes.push({
               x: _x3,
               y: _y2,
-              value: _value
+              value: _value,
+              source: {
+                x: srcX,
+                y: _y2
+              }
             });
           }
 
@@ -2123,6 +2128,11 @@ function Sheet(props) {
 
     var editCell = absCoordianteToCell(x, y, rowSizes, columnSizes);
     setArrowKeyCommitMode(false);
+
+    if (editMode) {
+      commitEditingCell();
+    }
+
     startEditingCell(editCell);
   };