@gridsheet/react-core 2.0.1 → 2.0.3

package/dist/index.js

@@ -255,15 +255,17 @@ const putMatrix = (dst, src, dstArea, filter = () => true) => {
   for (let y = top; y <= bottom; y++) {
     const lostRow = [];
     for (let x = left; x <= right; x++) {
+      const srcPoint = { y: y - top, x: x - left };
+      const dstPoint = { y, x };
       const value = src[y - top][x - left];
       if (y < dstNumRows - 1 && x < dstNumCols - 1) {
-        if (filter(value, dst[y][x], { y, x })) {
+        if (filter({ srcValue: value, dstValue: dst[y][x], srcPoint, dstPoint })) {
           dst[y][x] = value;
         }
         continue;
       }
       if (lostRow.length === 0) {
-        lostRows[p2a({ y, x })] = [lostRow];
+        lostRows[p2a(dstPoint)] = [lostRow];
       }
       lostRow.push(value);
     }
@@ -2613,13 +2615,13 @@ class PasteAction extends CoreAction {
     const { wire } = dstTable;
     const { copyingSheetId, copyingZone, cutting } = wire;
     const srcTable = dstTable.getTableBySheetId(copyingSheetId);
-    if (!srcTable) {
-      return store;
-    }
     let selectingArea = zoneToArea(selectingZone);
     const copyingArea = zoneToArea(copyingZone);
     const { matrix, onlyValue } = payload;
     if (cutting) {
+      if (!srcTable) {
+        return store;
+      }
       const src = copyingArea;
       const { height: h, width: w } = areaShape(copyingArea);
       const dst = selectingArea.top !== -1 ? {
@@ -2692,6 +2694,9 @@ class PasteAction extends CoreAction {
         }
       });
     } else {
+      if (srcTable == null) {
+        return store;
+      }
       let { height, width } = areaShape(copyingArea);
       if (selectingArea.top !== -1) {
         y = selectingArea.top;
@@ -3703,10 +3708,14 @@ function parseStyleString(element) {
   const styleString = element.getAttribute("style") ?? "";
   const styleObj = {};
   styleString.split(";").forEach((d) => {
-    const [rawKey, rawValue] = d.split(":");
+    let [rawKey, rawValue] = d.split(":");
     if (!rawKey || !rawValue) {
       return;
     }
+    rawKey = rawKey.trim();
+    if (rawKey === "height" || rawKey === "width") {
+      return;
+    }
     const key = rawKey.trim().replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
     if (key === "float" || key === "display" || key.startsWith("padding")) {
       return;
@@ -8337,7 +8346,7 @@ class Table {
     const matrixTo = this.getIdMatrixFromArea(dst);
     const diffBefore = {};
     const preserver = new ReferencePreserver(this);
-    const lostRows = putMatrix(this.idMatrix, matrixFrom, dst, (srcId, dstId, point) => {
+    const lostRows = putMatrix(this.idMatrix, matrixFrom, dst, ({ srcValue: srcId, dstValue: dstId }) => {
       var _a;
       if (srcId == null || dstId == null) {
         return false;
@@ -8377,8 +8386,11 @@ class Table {
     });
     const srcTableRaw = srcTable.__raw__;
     const srcContext = this.wire.contextsBySheetId[srcTableRaw.sheetId];
-    putMatrix(srcTableRaw.idMatrix, matrixNew, src, (newId, srcId) => {
+    putMatrix(srcTableRaw.idMatrix, matrixNew, src, ({ srcValue: newId, dstValue: srcId, dstPoint: srcPoint }) => {
       var _a;
+      if (among(dst, srcPoint) && srcTable === this) {
+        return false;
+      }
       preserver.map[srcId] = newId;
       const srcCell = srcTableRaw.wire.data[srcId];
       if (operator === "USER" && hasOperation(srcCell == null ? void 0 : srcCell.prevention, MoveFrom)) {
@@ -8408,7 +8420,9 @@ class Table {
     Object.assign(diffBefore, resolvedDiff);
     if (srcTable !== this && srcContext !== null) {
       const { dispatch } = srcContext;
-      dispatch(updateTable(srcTableRaw));
+      requestAnimationFrame(() => {
+        dispatch(updateTable(srcTableRaw));
+      });
     }
     if (historicize) {
       this.pushHistory({