@marimo-team/islands 0.24.1-dev79 → 0.24.1-dev80

package/src/plugins/impl/data-editor/glide-utils.ts

@@ -10,10 +10,11 @@ import { logNever } from "@/utils/assertNever";
 import { Logger } from "@/utils/Logger";
 import type {
   ColumnEdit,
+  EditorRow,
   Edits,
   ModifiedGridColumn,
   PositionalEdit,
-  RowEdit,
+  RemoveRowEdit,
 } from "./types";
 
 export function getColumnKind(fieldType: DataType): GridCellKind {
@@ -24,7 +25,15 @@ export function getColumnKind(fieldType: DataType): GridCellKind {
       return GridCellKind.Number;
     case "boolean":
       return GridCellKind.Boolean;
+    case "integer":
+    case "date":
+    case "datetime":
+    case "time":
+    case "geometry":
+    case "unknown":
+      return GridCellKind.Text;
     default:
+      logNever(fieldType);
       return GridCellKind.Text;
   }
 }
@@ -52,13 +61,48 @@ export function getColumnHeaderIcon(fieldType: DataType): GridColumnIcon {
   }
 }
 
+export function isValidCellValue(
+  dataType: DataType | undefined,
+  value: unknown,
+): boolean {
+  switch (dataType) {
+    case "number":
+      return Number.isFinite(Number(value));
+    case "integer":
+      if (typeof value === "bigint") {
+        return true;
+      }
+      if (typeof value === "number") {
+        return Number.isFinite(value) && Number.isInteger(value);
+      }
+      if (typeof value === "string") {
+        const normalized = value.trim();
+        return /^[+-]?[0-9]+(?:\.0+)?$/u.test(normalized);
+      }
+      return false;
+    case "boolean":
+      return typeof value === "boolean";
+    case undefined:
+    case "string":
+    case "date":
+    case "datetime":
+    case "time":
+    case "geometry":
+    case "unknown":
+      return true;
+    default:
+      logNever(dataType);
+      return false;
+  }
+}
+
 export function isPositionalEdit(
   edit: Edits["edits"][number],
 ): edit is PositionalEdit {
   return "rowIdx" in edit && "columnId" in edit && "value" in edit;
 }
 
-export function isRowEdit(edit: Edits["edits"][number]): edit is RowEdit {
+export function isRowEdit(edit: Edits["edits"][number]): edit is RemoveRowEdit {
   return "rowIdx" in edit && "type" in edit;
 }
 
@@ -66,16 +110,14 @@ export function isColumnEdit(edit: Edits["edits"][number]): edit is ColumnEdit {
   return "columnIdx" in edit && "type" in edit;
 }
 
-export function pasteCells<T>(options: {
+export function pasteCells(options: {
   selection: GridSelection;
-  data: T[];
-  setData: (updater: (prev: T[]) => T[]) => void;
+  data: EditorRow[];
   columns: ModifiedGridColumn[];
   editableColumns: string[] | "all";
   onAddEdits: (edits: Edits["edits"]) => void;
 }) {
-  const { selection, data, setData, onAddEdits, columns, editableColumns } =
-    options;
+  const { selection, data, onAddEdits, columns, editableColumns } = options;
   if (!selection.current) {
     return;
   }
@@ -126,7 +168,7 @@ export function pasteCells<T>(options: {
           const targetColIdx = startCol + colIndex;
 
           // Check if we've exceeded the column bounds
-          if (!columns || targetColIdx >= columns.length) {
+          if (targetColIdx >= columns.length) {
             break;
           }
 
@@ -143,10 +185,19 @@ export function pasteCells<T>(options: {
           let convertedValue: unknown = cellValue;
 
           switch (columnType) {
-            case "integer":
+            case "integer": {
+              const numValue = Number(cellValue);
+              if (!isValidCellValue(columnType, cellValue)) {
+                continue;
+              }
+              convertedValue = Number.isSafeInteger(numValue)
+                ? numValue
+                : cellValue.trim();
+              break;
+            }
             case "number": {
               const numValue = Number(cellValue);
-              if (Number.isNaN(numValue)) {
+              if (!isValidCellValue(columnType, numValue)) {
                 continue;
               }
               convertedValue = numValue;
@@ -157,6 +208,16 @@ export function pasteCells<T>(options: {
               convertedValue = boolValue === "true" || boolValue === "1";
               break;
             }
+            case "string":
+            case "date":
+            case "datetime":
+            case "time":
+            case "geometry":
+            case "unknown":
+              break;
+            default:
+              logNever(columnType);
+              continue;
           }
 
           // Get the column ID from the columns array using the title
@@ -172,27 +233,6 @@ export function pasteCells<T>(options: {
 
       if (edits.length > 0) {
         onAddEdits(edits);
-
-        setData((prev: T[]) => {
-          const newData = [...prev];
-
-          // Apply all edits to the data
-          for (const edit of edits) {
-            if (isPositionalEdit(edit)) {
-              const rowIdx = edit.rowIdx;
-              const columnId = edit.columnId;
-
-              if (rowIdx < newData.length) {
-                const row = newData[rowIdx] as Record<string, unknown>;
-                if (columnId in row) {
-                  row[columnId] = edit.value;
-                }
-              }
-            }
-          }
-
-          return newData;
-        });
       }
     })
     .catch((error) => {

package/src/plugins/impl/data-editor/types.ts

@@ -1,9 +1,16 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import type { GridCellKind, GridColumn } from "@glideapps/glide-data-grid";
-import type { FieldTypesWithExternalType } from "@/components/data-table/types";
+import type { FieldTypes } from "@/components/data-table/types";
 import type { DataType } from "@/core/kernel/messages";
 
+export type EditorRow = Record<string, unknown>;
+
+export interface EditorState {
+  data: EditorRow[];
+  columnFields: FieldTypes;
+}
+
 export interface PositionalEdit {
   rowIdx: number;
   columnId: string;
@@ -16,31 +23,38 @@ export const BulkEdit = {
   Rename: "rename",
 } as const;
 
-type BulkEdit = (typeof BulkEdit)[keyof typeof BulkEdit];
-
-export interface RowEdit {
+export interface RemoveRowEdit {
   rowIdx: number;
-  type: BulkEdit;
+  type: typeof BulkEdit.Remove;
+}
+
+export interface RemoveColumnEdit {
+  columnIdx: number;
+  type: typeof BulkEdit.Remove;
 }
 
-export interface ColumnEdit {
+export interface RenameColumnEdit {
   columnIdx: number;
-  newName?: string;
-  type: BulkEdit;
+  newName: string;
+  type: typeof BulkEdit.Rename;
 }
 
+export interface InsertColumnEdit {
+  columnIdx: number;
+  newName: string;
+  type: typeof BulkEdit.Insert;
+  dataType?: DataType;
+}
+
+export type ColumnEdit = RemoveColumnEdit | RenameColumnEdit | InsertColumnEdit;
+
+export type Edit = PositionalEdit | RemoveRowEdit | ColumnEdit;
+
 export interface Edits {
-  edits: (PositionalEdit | RowEdit | ColumnEdit)[];
+  edits: Edit[];
 }
 
 export type ModifiedGridColumn = GridColumn & {
   kind: GridCellKind;
   dataType: DataType;
 };
-
-export interface DataEditorProps<T> {
-  data: T[];
-  fieldTypes: FieldTypesWithExternalType | null | undefined;
-  onAddEdits: (edits: Edits["edits"]) => void;
-  onAddRows: (newRows: object[]) => void;
-}

package/dist/types-eyYyHvz7.js

@@ -1,72 +0,0 @@
-import { t as e } from "./rolldown-runtime-Cb76FRpK.js";
-import { u as t } from "./dist-wdOJ5T7-.js";
-var n = t("pencil", [["path", {
-	d: "M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z",
-	key: "1a8usu"
-}], ["path", {
-	d: "m15 5 4 4",
-	key: "1mk7zo"
-}]]), r = t("trash", [
-	["path", {
-		d: "M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6",
-		key: "miytrc"
-	}],
-	["path", {
-		d: "M3 6h18",
-		key: "d0wm0j"
-	}],
-	["path", {
-		d: "M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2",
-		key: "e791ji"
-	}]
-]), i = /* @__PURE__ */ e(((e, t) => {
-	t.exports = "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";
-})), a = /* @__PURE__ */ e(((e, t) => {
-	var n = i();
-	function r() {}
-	function a() {}
-	a.resetWarningCache = r, t.exports = function() {
-		function e(e, t, r, i, a, o) {
-			if (o !== n) {
-				var s = /* @__PURE__ */ Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");
-				throw s.name = "Invariant Violation", s;
-			}
-		}
-		e.isRequired = e;
-		function t() {
-			return e;
-		}
-		var i = {
-			array: e,
-			bigint: e,
-			bool: e,
-			func: e,
-			number: e,
-			object: e,
-			string: e,
-			symbol: e,
-			any: e,
-			arrayOf: t,
-			element: e,
-			elementType: e,
-			instanceOf: t,
-			node: e,
-			objectOf: t,
-			oneOf: t,
-			oneOfType: t,
-			shape: t,
-			exact: t,
-			checkPropTypes: a,
-			resetWarningCache: r
-		};
-		return i.PropTypes = i, i;
-	};
-})), o = /* @__PURE__ */ e(((e, t) => {
-	t.exports = a()();
-})), s = {
-	Insert: "insert",
-	Remove: "remove",
-	Rename: "rename"
-};
-//#endregion
-export { n as i, o as n, r, s as t };