@pixerate/editor-react 0.10.1 → 0.10.2

package/dist/index.d.cts

@@ -223,7 +223,7 @@ declare function useSpreadsheetEditor(options?: SpreadsheetControllerOptions): {
     registerDataSource: (ds: SpreadsheetDataSource) => void;
     setPrimaryDataSource: (id: string | undefined) => void;
     recalculateAll: () => void;
-    exportToTsv: () => string;
+    exportToTsv: (range?: CellRange | null) => string;
     importFromTsv: (data: string) => void;
     undo: () => void;
     redo: () => void;

package/dist/index.d.ts

@@ -223,7 +223,7 @@ declare function useSpreadsheetEditor(options?: SpreadsheetControllerOptions): {
     registerDataSource: (ds: SpreadsheetDataSource) => void;
     setPrimaryDataSource: (id: string | undefined) => void;
     recalculateAll: () => void;
-    exportToTsv: () => string;
+    exportToTsv: (range?: CellRange | null) => string;
     importFromTsv: (data: string) => void;
     undo: () => void;
     redo: () => void;

package/dist/index.js

@@ -616,41 +616,37 @@ import {
 } from "@pixerate/editor";
 
 // src/spreadsheet/useSpreadsheetEditor.ts
-import { useState as useState4, useMemo as useMemo4, useCallback as useCallback4 } from "react";
+import { useState as useState4, useRef as useRef5, useCallback as useCallback4 } from "react";
 import {
   SpreadsheetController
 } from "@pixerate/editor";
 function useSpreadsheetEditor(options = {}) {
-  const [doc, setDoc] = useState4(() => ({
-    id: options.document?.id || `sheet_${Date.now()}`,
-    name: options.document?.name || "Sheet 1",
-    columns: options.document?.columns || [],
-    rows: options.document?.rows || [],
-    cells: options.document?.cells || {},
-    createdAt: options.document?.createdAt || Date.now(),
-    updatedAt: options.document?.updatedAt || Date.now()
-  }));
-  const [activeCell, setActiveCell] = useState4(null);
-  const [selectedRange, setSelectedRange] = useState4(null);
-  const [editingCell, setEditingCell] = useState4(null);
-  const [draftValue, setDraftValue] = useState4("");
-  const controller = useMemo4(() => {
-    return new SpreadsheetController({
+  const optionsRef = useRef5(options);
+  optionsRef.current = options;
+  const settersRef = useRef5({});
+  const [controller] = useState4(
+    () => new SpreadsheetController({
       ...options,
       onDocumentChange: (updated) => {
-        setDoc({ ...updated });
-        options.onDocumentChange?.(updated);
+        settersRef.current.setDoc?.({ ...updated });
+        optionsRef.current.onDocumentChange?.(updated);
       },
       onSelectionChange: (active, range) => {
-        setActiveCell(active);
-        setSelectedRange(range);
-        options.onSelectionChange?.(active, range);
+        settersRef.current.setActiveCell?.(active);
+        settersRef.current.setSelectedRange?.(range);
+        optionsRef.current.onSelectionChange?.(active, range);
       },
       onCellCommit: (rowId, colId, raw, value) => {
-        options.onCellCommit?.(rowId, colId, raw, value);
+        optionsRef.current.onCellCommit?.(rowId, colId, raw, value);
       }
-    });
-  }, []);
+    })
+  );
+  const [doc, setDoc] = useState4(() => ({ ...controller.document }));
+  const [activeCell, setActiveCell] = useState4(controller.activeCell);
+  const [selectedRange, setSelectedRange] = useState4(controller.selectedRange);
+  const [editingCell, setEditingCell] = useState4(null);
+  const [draftValue, setDraftValue] = useState4("");
+  settersRef.current = { setDoc, setActiveCell, setSelectedRange };
   const setCellValue = useCallback4((rowId, colId, raw) => {
     controller.setCellValue(rowId, colId, raw);
     setDoc({ ...controller.document });
@@ -768,7 +764,7 @@ function useSpreadsheetEditor(options = {}) {
     registerDataSource,
     setPrimaryDataSource,
     recalculateAll,
-    exportToTsv: () => controller.exportToTsv(),
+    exportToTsv: (range) => controller.exportToTsv(range),
     importFromTsv: (data) => {
       controller.importFromTsv(data);
       setDoc({ ...controller.document });
@@ -779,7 +775,7 @@ function useSpreadsheetEditor(options = {}) {
 }
 
 // src/spreadsheet/SpreadsheetEditor.tsx
-import { useRef as useRef5, useState as useState5, useMemo as useMemo5, useEffect as useEffect5, useCallback as useCallback5 } from "react";
+import { useRef as useRef6, useState as useState5, useMemo as useMemo4, useEffect as useEffect5, useCallback as useCallback5 } from "react";
 import {
   indexToColName
 } from "@pixerate/editor";
@@ -794,23 +790,42 @@ var SpreadsheetEditor = ({
 }) => {
   const defaultState = useSpreadsheetEditor();
   const state = externalState || defaultState;
-  const gridRef = useRef5(null);
+  const gridRef = useRef6(null);
   const [resizingColId, setResizingColId] = useState5(null);
   const [hoveredColId, setHoveredColId] = useState5(null);
   const [resizeStartX, setResizeStartX] = useState5(0);
   const [resizeStartWidth, setResizeStartWidth] = useState5(0);
-  const activeRawValue = useMemo5(() => {
+  const activeRawValue = useMemo4(() => {
     if (!state.activeCell) return "";
     const row = state.document.rows[state.activeCell.row];
     const col = state.document.columns[state.activeCell.col];
     if (!row || !col) return "";
     return state.getCell(row.id, col.id).raw;
   }, [state.activeCell, state.document]);
-  const coordLabel = useMemo5(() => {
+  const coordLabel = useMemo4(() => {
     if (!state.activeCell) return "--";
     const colName = indexToColName(state.activeCell.col);
     return `${colName}${state.activeCell.row + 1}`;
   }, [state.activeCell]);
+  const [formulaDraft, setFormulaDraft] = useState5(null);
+  const activeColumn = state.activeCell ? state.document.columns[state.activeCell.col] : void 0;
+  const formulaBarReadOnly = readOnly || !state.activeCell || !!activeColumn?.readOnly;
+  useEffect5(() => {
+    setFormulaDraft(null);
+  }, [state.activeCell?.row, state.activeCell?.col]);
+  const commitFormulaBar = () => {
+    if (state.editingCell) {
+      state.commitEditing();
+      return;
+    }
+    if (formulaDraft === null || !state.activeCell) return;
+    const row = state.document.rows[state.activeCell.row];
+    const col = state.document.columns[state.activeCell.col];
+    if (row && col && !formulaBarReadOnly && formulaDraft !== activeRawValue) {
+      state.setCellValue(row.id, col.id, formulaDraft);
+    }
+    setFormulaDraft(null);
+  };
   const handleCellClick = useCallback5((rIdx, cIdx, e) => {
     if (state.editingCell && (state.editingCell.row !== rIdx || state.editingCell.col !== cIdx)) {
       state.commitEditing();
@@ -869,16 +884,19 @@ var SpreadsheetEditor = ({
         e.preventDefault();
         state.setCellValue(row.id, col.id, "");
       }
-    } else if ((e.metaKey || e.ctrlKey) && e.key === "z") {
+    } else if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "z") {
       e.preventDefault();
       if (e.shiftKey) {
         state.redo();
       } else {
         state.undo();
       }
-    } else if ((e.metaKey || e.ctrlKey) && e.key === "c") {
+    } else if (e.ctrlKey && !e.metaKey && e.key.toLowerCase() === "y") {
+      e.preventDefault();
+      state.redo();
+    } else if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "c") {
       e.preventDefault();
-      const tsv = state.exportToTsv();
+      const tsv = state.exportToTsv(state.selectedRange);
       navigator.clipboard?.writeText(tsv);
     } else if (!readOnly && e.key.length === 1 && !e.ctrlKey && !e.metaKey && !e.altKey) {
       const col = state.document.columns[state.activeCell.col];
@@ -887,6 +905,10 @@ var SpreadsheetEditor = ({
       }
     }
   }, [readOnly, state]);
+  const stateRef = useRef6(state);
+  stateRef.current = state;
+  const onColumnResizeRef = useRef6(onColumnResize);
+  onColumnResizeRef.current = onColumnResize;
   useEffect5(() => {
     if (!resizingColId) return;
     if (typeof document !== "undefined") {
@@ -905,7 +927,7 @@ var SpreadsheetEditor = ({
       if (rafId === null) {
         rafId = requestAnimationFrame(() => {
           rafId = null;
-          state.setColumnWidth(resizingColId, pendingWidth);
+          stateRef.current.setColumnWidth(resizingColId, pendingWidth);
         });
       }
     };
@@ -915,11 +937,8 @@ var SpreadsheetEditor = ({
         rafId = null;
       }
       if (hasDragged) {
-        state.setColumnWidth(resizingColId, pendingWidth);
-        const col = state.document.columns.find((c) => c.id === resizingColId);
-        if (col && onColumnResize) {
-          onColumnResize(col.id, col.width || pendingWidth);
-        }
+        stateRef.current.setColumnWidth(resizingColId, pendingWidth);
+        onColumnResizeRef.current?.(resizingColId, pendingWidth);
       }
       setResizingColId(null);
       if (typeof document !== "undefined") {
@@ -940,7 +959,7 @@ var SpreadsheetEditor = ({
       window.removeEventListener("mousemove", handleMouseMove);
       window.removeEventListener("mouseup", handleMouseUp);
     };
-  }, [resizingColId, resizeStartX, resizeStartWidth, state, onColumnResize]);
+  }, [resizingColId, resizeStartX, resizeStartWidth]);
   const measureElementContentWidth = useCallback5((el, container) => {
     if (typeof document === "undefined") return 0;
     let maxW = el.scrollWidth || 0;
@@ -1072,25 +1091,29 @@ var SpreadsheetEditor = ({
               type: "text",
               className: "flex-1 bg-transparent px-2 py-0.5 outline-none font-sans text-xs text-foreground placeholder:text-muted-foreground/60 focus:bg-background focus:ring-1 focus:ring-primary rounded",
               placeholder: "Enter a value or formula (e.g. =SUM(A1:A5))",
-              value: state.editingCell ? state.draftValue : activeRawValue,
+              "aria-label": "Formula bar",
+              readOnly: formulaBarReadOnly,
+              value: state.editingCell ? state.draftValue : formulaDraft ?? activeRawValue,
+              onFocus: () => {
+                if (!state.editingCell) setFormulaDraft(activeRawValue);
+              },
               onChange: (e) => {
-                if (state.activeCell) {
+                if (state.editingCell) {
                   state.setDraftValue(e.target.value);
+                } else if (state.activeCell) {
+                  setFormulaDraft(e.target.value);
                 }
               },
+              onBlur: () => commitFormulaBar(),
               onKeyDown: (e) => {
+                e.stopPropagation();
                 if (e.key === "Enter") {
                   e.preventDefault();
-                  if (state.activeCell) {
-                    const row = state.document.rows[state.activeCell.row];
-                    const col = state.document.columns[state.activeCell.col];
-                    if (row && col) {
-                      state.setCellValue(row.id, col.id, e.target.value);
-                    }
-                  }
+                  commitFormulaBar();
                 } else if (e.key === "Escape") {
                   e.preventDefault();
-                  state.cancelEditing();
+                  setFormulaDraft(null);
+                  if (state.editingCell) state.cancelEditing();
                 }
               }
             }
@@ -1216,7 +1239,7 @@ var SpreadsheetEditor = ({
 };
 
 // src/slots.tsx
-import { createContext, useContext, useMemo as useMemo6 } from "react";
+import { createContext, useContext, useMemo as useMemo5 } from "react";
 import { jsx as jsx4, jsxs as jsxs2 } from "react/jsx-runtime";
 var defaultSlots = {
   Button: (props) => /* @__PURE__ */ jsx4(
@@ -1240,7 +1263,7 @@ var defaultSlots = {
 };
 var EditorSlotsContext = createContext(defaultSlots);
 function EditorSlotsProvider({ slots, children }) {
-  const mergedSlots = useMemo6(() => ({ ...defaultSlots, ...slots }), [slots]);
+  const mergedSlots = useMemo5(() => ({ ...defaultSlots, ...slots }), [slots]);
   return /* @__PURE__ */ jsx4(EditorSlotsContext.Provider, { value: mergedSlots, children });
 }
 function useEditorSlots() {