@gridsheet/preact-core 2.0.2 → 2.0.4

package/dist/components/FormulaBar.d.ts

@@ -1,2 +1,6 @@
-export declare const FormulaBar: () => JSX.Element;
+type FormulaBarProps = {
+    ready: boolean;
+};
+export declare const FormulaBar: ({ ready }: FormulaBarProps) => JSX.Element;
+export {};
 //# sourceMappingURL=FormulaBar.d.ts.map

package/dist/index.js

@@ -256,15 +256,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);
     }
@@ -8345,7 +8347,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;
@@ -8385,8 +8387,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)) {
@@ -8416,7 +8421,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({
@@ -10409,7 +10416,7 @@ const embedStyle = () => {
   style.setAttribute("data-modified-at", `${LAST_MODIFIED}`);
   style.innerText = CSS;
 };
-const FormulaBar = () => {
+const FormulaBar = ({ ready }) => {
   var _a;
   const { store, dispatch } = useContext(Context);
   const [before, setBefore] = useState("");
@@ -10458,7 +10465,6 @@ const FormulaBar = () => {
   }, []);
   const largeInput = largeEditorRef.current;
   const handleInput = useCallback((e) => {
-    console.log("e.currentTarget.value", e.currentTarget.value);
     dispatch(setInputting(e.currentTarget.value));
   }, []);
   const updateScroll = useCallback(() => {
@@ -10550,14 +10556,15 @@ const FormulaBar = () => {
     },
     [table, choosing, before, writeCell, updateScroll]
   );
+  const style = ready ? {} : { visibility: "hidden" };
   if (!table) {
-    return /* @__PURE__ */ jsxs("label", { className: "gs-formula-bar gs-hidden", children: [
+    return /* @__PURE__ */ jsxs("label", { className: "gs-formula-bar gs-hidden", style, children: [
       /* @__PURE__ */ jsx("div", { className: "gs-selecting-address" }),
       /* @__PURE__ */ jsx("div", { className: "gs-fx", children: "Fx" }),
       /* @__PURE__ */ jsx("div", { className: "gs-formula-bar-editor-inner", children: /* @__PURE__ */ jsx("textarea", {}) })
     ] });
   }
-  return /* @__PURE__ */ jsxs("label", { className: "gs-formula-bar", children: [
+  return /* @__PURE__ */ jsxs("label", { className: "gs-formula-bar", "data-sheet-id": store.sheetId, style, children: [
     /* @__PURE__ */ jsx(ScrollHandle, { style: { position: "absolute", left: 0, top: 0, zIndex: 2 }, vertical: -1 }),
     /* @__PURE__ */ jsx("div", { className: "gs-selecting-address", children: address }),
     /* @__PURE__ */ jsx("div", { className: "gs-fx", children: "Fx" }),
@@ -10845,7 +10852,7 @@ function GridSheet({
         /* @__PURE__ */ jsx(ScrollHandle, { style: { position: "fixed", top: 0, left: 0 } }),
         /* @__PURE__ */ jsx(ScrollHandle, { style: { position: "absolute", zIndex: 4, right: 0, top: 0, width: 5 }, horizontal: 1 }),
         /* @__PURE__ */ jsx(ScrollHandle, { style: { position: "absolute", zIndex: 4, left: 0, bottom: 0, height: 5 }, vertical: 1 }),
-        typeof store.searchQuery === "undefined" ? showFormulaBar && /* @__PURE__ */ jsx(FormulaBar, {}) : /* @__PURE__ */ jsx(SearchBar, {}),
+        typeof store.searchQuery === "undefined" ? showFormulaBar && /* @__PURE__ */ jsx(FormulaBar, { ready: wire.ready }) : /* @__PURE__ */ jsx(SearchBar, {}),
         /* @__PURE__ */ jsxs(
           "div",
           {