@dxos/react-ui-table 0.8.4-main.2e9d522 → 0.8.4-main.548089c

package/dist/lib/browser/{chunk-5XLSHLOG.mjs → chunk-GS2UNGJK.mjs}

@@ -1,11 +1,11 @@
 import {
-  TableView
-} from "./chunk-L2LSB6KV.mjs";
+  schema_exports
+} from "./chunk-2PFAPQL4.mjs";
 
 // src/util/dynamic-table.ts
-import { Obj } from "@dxos/echo";
-import { getTypename, toJsonSchema } from "@dxos/echo-schema";
-import { createView, getSchemaFromPropertyDefinitions, ProjectionModel } from "@dxos/schema";
+import { Filter, Obj, Query } from "@dxos/echo";
+import { getTypename, toJsonSchema } from "@dxos/echo/internal";
+import { ProjectionModel, View, getSchemaFromPropertyDefinitions } from "@dxos/schema";
 var getBaseSchema = ({ typename, properties, jsonSchema, schema }) => {
   if (typename && properties) {
     const schema2 = getSchemaFromPropertyDefinitions(typename, properties);
@@ -27,12 +27,12 @@ var getBaseSchema = ({ typename, properties, jsonSchema, schema }) => {
     throw new Error("invalid properties");
   }
 };
-var makeDynamicTable = ({ typename, jsonSchema, properties }) => {
-  const table = Obj.make(TableView, {
+var makeDynamicTable = ({ jsonSchema, properties }) => {
+  const table = Obj.make(schema_exports.Table, {
     sizes: {}
   });
-  const view = createView({
-    typename,
+  const view = View.make({
+    query: Query.select(Filter.everything()),
     jsonSchema,
     presentation: table,
     ...properties && {
@@ -40,6 +40,7 @@ var makeDynamicTable = ({ typename, jsonSchema, properties }) => {
     }
   });
   const projection = new ProjectionModel(jsonSchema, view.projection);
+  projection.normalizeView();
   if (properties && projection.fields) {
     setProperties(view, projection, table, properties);
   }
@@ -67,7 +68,7 @@ var setProperties = (view, projection, table, properties) => {
       }
       if (property.sort) {
         const fieldId = field.id;
-        view.query.sort = [
+        view.sort = [
           {
             fieldId,
             direction: property.sort
@@ -81,40 +82,6 @@ var setProperties = (view, projection, table, properties) => {
 // src/util/signals.ts
 var touch = (value) => value;
 
-// src/util/table.ts
-import { Match } from "effect";
-import { Obj as Obj2 } from "@dxos/echo";
-import { toEffectSchema } from "@dxos/echo-schema";
-import { createViewFromSpace, getSchemaProperties } from "@dxos/schema";
-var createTable = async ({ sizes, ...props }) => {
-  const table = Obj2.make(TableView, {
-    sizes: {}
-  });
-  const { jsonSchema, view } = await createViewFromSpace({
-    ...props,
-    presentation: table
-  });
-  const schema = toEffectSchema(jsonSchema);
-  const shouldIncludeId = props.fields?.find((field) => field === "id") !== void 0;
-  const properties = getSchemaProperties(schema.ast, {}, shouldIncludeId);
-  for (const property of properties) {
-    if (sizes?.[property.name]) {
-      table.sizes[property.name] = sizes[property.name];
-      continue;
-    }
-    Match.type().pipe(Match.when("boolean", () => {
-      table.sizes[property.name] = 100;
-    }), Match.when("number", () => {
-      table.sizes[property.name] = 100;
-    }), Match.orElse(() => {
-    }))(property.type);
-  }
-  return {
-    jsonSchema,
-    view
-  };
-};
-
 // src/util/table-buttons.ts
 var BUTTON_IDENTIFIERS = {
   columnSettings: "data-table-column-settings-button",
@@ -124,10 +91,9 @@ var BUTTON_IDENTIFIERS = {
   saveDraftRow: "data-table-save-draft-row-button",
   sort: "data-table-sort-button"
 };
-var createButton = ({ attr, data, disabled = false, icon, testId, type = "primary" }) => {
+var createButton = ({ attr, data, disabled = false, icon, testId, type: _type = "primary" }) => {
   const dataAttrs = Object.entries(data).map(([k, v]) => `${k}="${v}"`).join(" ");
-  const positionClass = type === "primary" ? "inline-end-2" : "inline-end-9";
-  return `<button ${attr} data-testid="${testId}" class="dx-button is-6 pli-0.5 min-bs-0 absolute inset-block-1 ${positionClass}" ${dataAttrs} ${disabled ? "disabled" : ""}><svg data-size="4"><use href="/icons.svg#${icon}"/></svg></button>`;
+  return `<button ${attr} data-testid="${testId}" class="dx-button is-6 aspect-square pli-0.5 min-bs-0" ${dataAttrs} ${disabled ? "disabled" : ""} data-dx-grid-action="accessory"><svg data-size="4"><use href="/icons.svg#${icon}"/></svg></button>`;
 };
 var addColumnButton = {
   attr: BUTTON_IDENTIFIERS.newColumn,
@@ -153,7 +119,8 @@ var columnSettingsButton = {
       attr: BUTTON_IDENTIFIERS.columnSettings,
       icon: columnSettingsButton.icon,
       data: {
-        "data-field-id": fieldId
+        "data-field-id": fieldId,
+        "data-variant": "ghost"
       },
       testId: "table-column-settings-button"
     });
@@ -213,7 +180,8 @@ var saveDraftRowButton = {
       icon: saveDraftRowButton.icon,
       disabled,
       data: {
-        "data-row-index": rowIndex.toString()
+        "data-row-index": rowIndex.toString(),
+        "data-variant": "primary"
       },
       testId: "table-save-draft-row-button"
     });
@@ -232,6 +200,7 @@ var tableButtons = {
 };
 
 // src/util/table-controls.ts
+import { accessoryHandlesPointerdownAttrs } from "@dxos/lit-grid";
 var CONTROL_IDENTIFIERS = {
   checkbox: "data-table-checkbox",
   switch: "data-table-switch"
@@ -244,7 +213,7 @@ var renderAttributes = (data) => {
   return Object.entries(data).map(([k, v]) => `${k}="${v}"`).join(" ");
 };
 var renderInput = (baseClass, attrs, checked = false, disabled = false, preventToggle = false, testId) => {
-  return `<input type="checkbox" class="${baseClass}" ${renderAttributes(attrs)} ${checked ? "checked" : ""} ${preventToggle ? 'onclick="return false"' : ""} ${disabled ? "disabled" : ""} data-testid="${testId}"/>`;
+  return `<input type="checkbox" class="${baseClass}" ${renderAttributes(attrs)} ${checked ? "checked" : ""} ${preventToggle ? 'onclick="return false"' : ""} ${disabled ? "disabled" : ""} data-testid="${testId}" data-dx-grid-action="accessory"/>`;
 };
 var CheckboxStory = ({ rowIndex, header = false, checked = false, disabled = false }) => {
   const attrs = {
@@ -260,7 +229,8 @@ var SwitchStory = ({ colIndex, rowIndex, checked = false, disabled = false }) =>
   const attrs = {
     [CONTROL_IDENTIFIERS.switch]: "",
     "data-row-index": rowIndex.toString(),
-    "data-col-index": colIndex.toString()
+    "data-col-index": colIndex.toString(),
+    ...accessoryHandlesPointerdownAttrs
   };
   return renderInput(BASE_CLASSES.switch, attrs, checked, disabled, true, "table-switch");
 };
@@ -286,14 +256,14 @@ var tableControls = {
 };
 
 // src/util/schema.ts
-import { Schema } from "effect";
-import { isTypeLiteral, TypeLiteral } from "effect/SchemaAST";
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
 var narrowSchema = (schema, paths) => {
   const ast = schema?.ast;
-  if (isTypeLiteral(ast)) {
+  if (SchemaAST.isTypeLiteral(ast)) {
     const propertySignatures = ast.propertySignatures.filter((signature) => paths.includes(signature.name.toString()));
     if (propertySignatures.length > 0) {
-      const narrowType = new TypeLiteral(propertySignatures, []);
+      const narrowType = new SchemaAST.TypeLiteral(propertySignatures, []);
       return Schema.make(narrowType);
     }
   }
@@ -303,67 +273,59 @@ var narrowSchema = (schema, paths) => {
 // src/model/table-model.ts
 import { computed as computed3, effect as effect2, signal as signal3 } from "@preact/signals-core";
 import { Resource as Resource2 } from "@dxos/context";
-import { Obj as Obj3, Ref } from "@dxos/echo";
-import { FormatEnum as FormatEnum2, getValue as getValue2, setValue, getSnapshot, getSchema, toEffectSchema as toEffectSchema2 } from "@dxos/echo-schema";
+import { Obj as Obj2, Ref } from "@dxos/echo";
+import { FormatEnum as FormatEnum2, getSchema, getValue as getValue2, setValue, toEffectSchema } from "@dxos/echo/internal";
 import { invariant } from "@dxos/invariant";
 import { ObjectId } from "@dxos/keys";
-import { isLiveObject } from "@dxos/live-object";
-import { fullyQualifiedId } from "@dxos/react-client/echo";
+import { getSnapshot, isLiveObject } from "@dxos/live-object";
 import { formatForEditing, parseValue } from "@dxos/react-ui-form";
 import { ProjectionModel as ProjectionModel2, validateSchema } from "@dxos/schema";
 
+// src/util/tag.ts
+var TAG_PATTERN_REGEX = /\[([^\]]+)\]\(([^)]+)\)/g;
+var extractTagIds = (value) => {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const ids = [];
+  let match;
+  while ((match = TAG_PATTERN_REGEX.exec(value)) !== null) {
+    if (match[2]) {
+      ids.push(match[2]);
+    }
+  }
+  return ids.length > 0 ? ids : void 0;
+};
+
 // src/model/selection-model.ts
 import { computed, effect, signal } from "@preact/signals-core";
 import { Resource } from "@dxos/context";
 var SelectionModel = class extends Resource {
+  _rows;
+  _selectionMode;
+  _initialSelection;
+  _onSelectionChanged;
+  _selection;
+  _validSelectedIds = computed(() => {
+    const rows = this._rows.value;
+    if (!rows) {
+      return /* @__PURE__ */ new Set();
+    }
+    const validIds = new Set(rows.map((row) => row.id));
+    return new Set([
+      ...this._selection.value
+    ].filter((id) => validIds.has(id)));
+  });
+  _hasSelection = computed(() => this._validSelectedIds.value.size > 0);
+  _allSelected = computed(() => {
+    const rows = this._rows.value;
+    if (rows.length === 0) {
+      return false;
+    }
+    return rows.every((row) => this._selection.value.has(row.id));
+  });
   constructor(_rows, _selectionMode, _initialSelection, _onSelectionChanged) {
-    super(), this._rows = _rows, this._selectionMode = _selectionMode, this._initialSelection = _initialSelection, this._onSelectionChanged = _onSelectionChanged, this._validSelectedIds = computed(() => {
-      const rows = this._rows.value;
-      if (!rows) {
-        return /* @__PURE__ */ new Set();
-      }
-      const validIds = new Set(rows.map((row) => row.id));
-      return new Set([
-        ...this._selection.value
-      ].filter((id) => validIds.has(id)));
-    }), this._hasSelection = computed(() => this._validSelectedIds.value.size > 0), this._allSelected = computed(() => {
-      const rows = this._rows.value;
-      if (rows.length === 0) {
-        return false;
-      }
-      return rows.every((row) => this._selection.value.has(row.id));
-    }), this.getSelectedRows = () => {
-      const selectedIds = this._validSelectedIds.value;
-      return this._rows.value.filter((row) => selectedIds.has(row.id));
-    }, this.isRowIndexSelected = (rowIndex) => {
-      const row = this._rows.value[rowIndex];
-      return this._selection.value.has(row.id);
-    }, this.isObjectSelected = (object) => {
-      return this._selection.value.has(object.id);
-    }, this.toggleSelectionForRowIndex = (rowIndex) => {
-      const row = this._rows.value[rowIndex];
-      const newSelection = new Set(this._selection.value);
-      if (newSelection.has(row.id)) {
-        newSelection.delete(row.id);
-      } else {
-        if (this._selectionMode === "single") {
-          newSelection.clear();
-        }
-        newSelection.add(row.id);
-      }
-      this._selection.value = newSelection;
-    }, this.setSelection = (mode) => {
-      switch (mode) {
-        case "all": {
-          this._selection.value = new Set(this._rows.value.map((row) => row.id));
-          break;
-        }
-        case "none": {
-          this._selection.value = /* @__PURE__ */ new Set();
-          break;
-        }
-      }
-    };
+    super(), this._rows = _rows, this._selectionMode = _selectionMode, this._initialSelection = _initialSelection, this._onSelectionChanged = _onSelectionChanged;
     this._selection = signal(new Set(this._initialSelection));
   }
   async _open() {
@@ -388,23 +350,67 @@ var SelectionModel = class extends Resource {
   get selectionMode() {
     return this._selectionMode;
   }
+  getSelectedRows = () => {
+    const selectedIds = this._validSelectedIds.value;
+    return this._rows.value.filter((row) => selectedIds.has(row.id));
+  };
+  isRowIndexSelected = (rowIndex) => {
+    const row = this._rows.value[rowIndex];
+    return this._selection.value.has(row.id);
+  };
+  isObjectSelected = (object) => {
+    return this._selection.value.has(object.id);
+  };
+  //
+  // Manipulation
+  //
+  toggleSelectionForRowIndex = (rowIndex) => {
+    const row = this._rows.value[rowIndex];
+    const newSelection = new Set(this._selection.value);
+    if (newSelection.has(row.id)) {
+      newSelection.delete(row.id);
+    } else {
+      if (this._selectionMode === "single") {
+        newSelection.clear();
+      }
+      newSelection.add(row.id);
+    }
+    this._selection.value = newSelection;
+  };
+  setSelection = (mode) => {
+    switch (mode) {
+      case "all": {
+        this._selection.value = new Set(this._rows.value.map((row) => row.id));
+        break;
+      }
+      case "none": {
+        this._selection.value = /* @__PURE__ */ new Set();
+        break;
+      }
+    }
+  };
 };
 
 // src/model/table-sorting.ts
 import { computed as computed2, signal as signal2 } from "@preact/signals-core";
 import orderBy from "lodash.orderby";
-import { getValue, FormatEnum, TypeEnum } from "@dxos/echo-schema";
+import { FormatEnum, TypeEnum, getValue } from "@dxos/echo/internal";
 import { formatForDisplay } from "@dxos/react-ui-form";
 var TableSorting = class {
+  _view;
+  _projection;
+  _displayToDataIndex = /* @__PURE__ */ new Map();
+  _rows;
+  _localSort = signal2(void 0);
+  _isDirty;
+  sortedRows;
   constructor(rows, _view, _projection) {
     this._view = _view;
     this._projection = _projection;
-    this._displayToDataIndex = /* @__PURE__ */ new Map();
-    this._localSort = signal2(void 0);
     this._rows = rows;
     this._isDirty = computed2(() => {
       const local = this._localSort.value;
-      const viewSort = this._view.query.sort?.[0];
+      const viewSort = this._view.sort?.[0];
       if (local?.type === "cleared") {
         return viewSort !== void 0;
       }
@@ -430,7 +436,7 @@ var TableSorting = class {
     if (local?.type === "active") {
       return local.sort;
     }
-    return this._view.query.sort?.[0];
+    return this._view.sort?.[0];
   }
   /**
   * @reactive
@@ -474,11 +480,11 @@ var TableSorting = class {
   save() {
     if (this._localSort.value !== void 0) {
       if (this._localSort.value.type === "active") {
-        this._view.query.sort = [
+        this._view.sort = [
           this._localSort.value.sort
         ];
       } else {
-        this._view.query.sort = [];
+        this._view.sort = [];
       }
       this._localSort.value = void 0;
     }
@@ -555,22 +561,6 @@ var TableSorting = class {
   }
 };
 
-// src/util/tag.ts
-var TAG_PATTERN_REGEX = /\[([^\]]+)\]\(([^)]+)\)/g;
-var extractTagIds = (value) => {
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const ids = [];
-  let match;
-  while ((match = TAG_PATTERN_REGEX.exec(value)) !== null) {
-    if (match[2]) {
-      ids.push(match[2]);
-    }
-  }
-  return ids.length > 0 ? ids : void 0;
-};
-
 // src/model/table-model.ts
 var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-table/src/model/table-model.ts";
 var defaultFeatures = {
@@ -582,231 +572,48 @@ var defaultFeatures = {
   schemaEditable: false
 };
 var TableModel = class extends Resource2 {
+  _view;
+  _projection;
+  _table;
+  _visibleRange = signal3({
+    start: {
+      row: 0,
+      col: 0
+    },
+    end: {
+      row: 0,
+      col: 0
+    }
+  });
+  _onInsertRow;
+  _onDeleteRows;
+  _onDeleteColumn;
+  _onCellUpdate;
+  _onRowOrderChange;
+  _onRowAction;
+  _rowActions;
+  _features;
+  _rows = signal3([]);
+  _draftRows = signal3([]);
+  _sorting;
+  _pinnedRows;
+  _selection;
+  _columnMeta;
   constructor({ view, schema, projection, features = {}, sorting = [], initialSelection = [], pinnedRows = {
     top: [],
     bottom: []
   }, rowActions = [], onCellUpdate, onDeleteColumn, onDeleteRows, onInsertRow, onRowOrderChange, onRowAction }) {
     super();
-    this._visibleRange = signal3({
-      start: {
-        row: 0,
-        col: 0
-      },
-      end: {
-        row: 0,
-        col: 0
-      }
-    });
-    this._rows = signal3([]);
-    this._draftRows = signal3([]);
-    //
-    // Data
-    //
-    this.setRows = (obj) => {
-      this._rows.value = obj;
-    };
-    this.getRowCount = () => this._rows.value.length;
-    /**
-    * @reactive
-    */
-    this.getDraftRowCount = () => this._draftRows.value.length;
-    this.getColumnCount = () => this._projection?.fields.length ?? 0;
-    this.insertRow = () => {
-      const result = this._onInsertRow?.();
-      if (result === false && this._draftRows.value.length === 0) {
-        this.createDraftRow();
-      }
-    };
-    this.commitDraftRow = (draftRowIndex) => {
-      if (draftRowIndex < 0 || draftRowIndex >= this._draftRows.value.length) {
-        return false;
-      }
-      const draftRow = this._draftRows.value[draftRowIndex];
-      if (!draftRow.valid) {
-        return false;
-      }
-      const success = this._onInsertRow?.(draftRow.data);
-      if (success) {
-        const newDraftRows = this._draftRows.value.filter((_, index) => index !== draftRowIndex);
-        this._draftRows.value = newDraftRows;
-      }
-      return success ?? false;
-    };
-    this.deleteRow = (rowIndex) => {
-      const row = this._sorting.getDataIndex(rowIndex);
-      const obj = this._rows.value[row];
-      const objectsToDelete = [];
-      if (this.features.selection.enabled && this._selection.hasSelection.value) {
-        const selectedRows = this._selection.getSelectedRows();
-        objectsToDelete.push(...selectedRows);
-      } else {
-        objectsToDelete.push(obj);
-      }
-      this._onDeleteRows?.(row, objectsToDelete);
-    };
-    this.handleRowAction = (actionId, rowIndex) => {
-      if (!this._onRowAction) {
-        return;
-      }
-      const row = this._sorting.getDataIndex(rowIndex);
-      const data = this._rows.value[row];
-      if (data) {
-        this._onRowAction(actionId, data);
-      }
-    };
-    this.getCellData = (cell) => {
-      const { col, row, plane } = cell;
-      const fields = this._projection?.fields ?? [];
-      if (col < 0 || col >= fields.length) {
-        return void 0;
-      }
-      const field = fields[col];
-      let value;
-      if (plane === "frozenRowsEnd") {
-        if (row >= 0 && row < this._draftRows.value.length) {
-          value = getValue2(this._draftRows.value[row].data, field.path);
-        } else {
-          return void 0;
-        }
-      } else {
-        const dataIndex = this._sorting.getDataIndex(row);
-        value = getValue2(this._rows.value[dataIndex], field.path);
-      }
-      if (value == null) {
-        return "";
-      }
-      const { props } = this._projection.getFieldProjection(field.id);
-      switch (props.format) {
-        case FormatEnum2.Ref: {
-          if (!field.referencePath) {
-            return "";
-          }
-          return getValue2(value.target, field.referencePath);
-        }
-        default: {
-          return formatForEditing({
-            type: props.type,
-            format: props.format,
-            value
-          });
-        }
-      }
-    };
-    this.validateCellData = async ({ col, row, plane }, value) => {
-      const fields = this._projection?.fields ?? [];
-      if (col < 0 || col >= fields.length) {
-        return {
-          valid: false,
-          error: "Invalid column index"
-        };
-      }
-      const field = fields[col];
-      const { props } = this._projection.getFieldProjection(field.id);
-      const transformedValue = editorTextToCellValue(props, value);
-      const isDraftRow = plane === "frozenRowsEnd";
-      if (isDraftRow) {
-        const isInvalidDraftRowIndex = row < 0 || row >= this._draftRows.value.length;
-        if (isInvalidDraftRowIndex) {
-          return {
-            valid: false,
-            error: "Invalid draft row index"
-          };
-        }
-        const draftRow = this._draftRows.value[row];
-        const snapshot = {
-          ...draftRow.data
-        };
-        setValue(snapshot, field.path, transformedValue);
-        const validationErrors = this.validateDraftRowData(snapshot);
-        if (validationErrors.length > 0) {
-          const error = validationErrors.find((err) => err.path === field.path);
-          if (error) {
-            return {
-              valid: false,
-              error: error.message
-            };
-          }
-        }
-        return {
-          valid: true
-        };
-      } else {
-        const rowIdx = this._sorting.getDataIndex(row);
-        const currentRow = this._rows.value[rowIdx];
-        invariant(currentRow, "Invalid row index", {
-          F: __dxlog_file,
-          L: 510,
-          S: this,
-          A: [
-            "currentRow",
-            "'Invalid row index'"
-          ]
-        });
-        const snapshot = getSnapshot(currentRow);
-        setValue(snapshot, field.path, transformedValue);
-        const schema = getSchema(currentRow);
-        invariant(schema, void 0, {
-          F: __dxlog_file,
-          L: 516,
-          S: this,
-          A: [
-            "schema",
-            ""
-          ]
-        });
-        const validationResult = validateSchema(schema, snapshot);
-        if (validationResult && validationResult.length > 0) {
-          const error = validationResult[0];
-          invariant(error.path === field.path, void 0, {
-            F: __dxlog_file,
-            L: 521,
-            S: this,
-            A: [
-              "error.path === field.path",
-              ""
-            ]
-          });
-          return {
-            valid: false,
-            error: error.message
-          };
-        }
-        return {
-          valid: true
-        };
-      }
-    };
-    this.setCellData = (cell, value) => {
-      const { col, row, plane } = cell;
-      const fields = this._projection?.fields ?? [];
-      if (col < 0 || col >= fields.length) {
-        return;
-      }
-      const field = fields[col];
-      const { props } = this._projection.getFieldProjection(field.id);
-      const transformedValue = editorTextToCellValue(props, value);
-      if (props.format === FormatEnum2.Ref && !isLiveObject(value)) {
-        return;
-      }
-      if (plane === "frozenRowsEnd") {
-        if (row >= 0 && row < this._draftRows.value.length) {
-          setValue(this._draftRows.value[row].data, field.path, transformedValue);
-          this.validateDraftRow(row);
-        }
-      } else {
-        const rowIdx = this._sorting.getDataIndex(row);
-        setValue(this._rows.value[rowIdx], field.path, transformedValue);
-      }
-    };
     this._view = view;
     this._projection = projection ?? new ProjectionModel2(schema, view.projection);
+    this._projection.normalizeView();
     this._features = {
       ...defaultFeatures,
       ...features
     };
     invariant(!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === "single"), "Single selection is not compatible with editable tables.", {
       F: __dxlog_file,
-      L: 139,
+      L: 148,
       S: this,
       A: [
         "!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')",
@@ -829,7 +636,7 @@ var TableModel = class extends Resource2 {
     this._onRowAction = onRowAction;
   }
   get id() {
-    return fullyQualifiedId(this._view);
+    return Obj2.getDXN(this._view).toString();
   }
   get view() {
     return this._view;
@@ -837,7 +644,7 @@ var TableModel = class extends Resource2 {
   get table() {
     invariant(this._table, "Model not initialized", {
       F: __dxlog_file,
-      L: 177,
+      L: 186,
       S: this,
       A: [
         "this._table",
@@ -876,7 +683,7 @@ var TableModel = class extends Resource2 {
   get columnMeta() {
     invariant(this._columnMeta, void 0, {
       F: __dxlog_file,
-      L: 216,
+      L: 225,
       S: this,
       A: [
         "this._columnMeta",
@@ -900,12 +707,12 @@ var TableModel = class extends Resource2 {
   //
   async _open() {
     const presentation = this._view.presentation.target ?? await this._view.presentation.load();
-    invariant(Obj3.instanceOf(TableView, presentation), void 0, {
+    invariant(Obj2.instanceOf(schema_exports.Table, presentation), void 0, {
       F: __dxlog_file,
-      L: 239,
+      L: 248,
       S: this,
       A: [
-        "Obj.instanceOf(TableView, presentation)",
+        "Obj.instanceOf(Table.Table, presentation)",
         ""
       ]
     });
@@ -934,7 +741,7 @@ var TableModel = class extends Resource2 {
         },
         frozenColsEnd: {
           0: {
-            size: 40,
+            size: 32,
             resizeable: false
           }
         }
@@ -970,6 +777,17 @@ var TableModel = class extends Resource2 {
     });
     this._ctx.onDispose(draftRowsWatcher);
   }
+  //
+  // Data
+  //
+  setRows = (obj) => {
+    this._rows.value = obj;
+  };
+  getRowCount = () => this._rows.value.length;
+  /**
+  * @reactive
+  */
+  getDraftRowCount = () => this._draftRows.value.length;
   // TODO(ZaymonFC): Return .value instead of exposing the signal.
   get draftRows() {
     return this._draftRows;
@@ -988,6 +806,14 @@ var TableModel = class extends Resource2 {
     const validationErrors = draftRow.validationErrors || [];
     return validationErrors.some((error) => error.path === fieldPath);
   }
+  getColumnCount = () => this._projection?.fields.length ?? 0;
+  insertRow = () => {
+    const result = this._onInsertRow?.();
+    if (result === "draft" && this._draftRows.value.length === 0) {
+      this.createDraftRow();
+    }
+    return result ?? "final";
+  };
   createDraftRow() {
     if (!this._projection) {
       return;
@@ -1024,9 +850,190 @@ var TableModel = class extends Resource2 {
     this._draftRows.value = newDraftRows;
   }
   validateDraftRowData(data) {
-    const schema = toEffectSchema2(this._projection.baseSchema);
+    const schema = toEffectSchema(this._projection.baseSchema);
     return validateSchema(schema, data) || [];
   }
+  commitDraftRow = (draftRowIndex) => {
+    if (draftRowIndex < 0 || draftRowIndex >= this._draftRows.value.length) {
+      return false;
+    }
+    const draftRow = this._draftRows.value[draftRowIndex];
+    if (!draftRow.valid) {
+      return false;
+    }
+    const insertRowResult = this._onInsertRow?.(draftRow.data);
+    if (insertRowResult === "final") {
+      const newDraftRows = this._draftRows.value.filter((_, index) => index !== draftRowIndex);
+      this._draftRows.value = newDraftRows;
+    }
+    return insertRowResult === "final";
+  };
+  deleteRow = (rowIndex) => {
+    const row = this._sorting.getDataIndex(rowIndex);
+    const obj = this._rows.value[row];
+    const objectsToDelete = [];
+    if (this.features.selection.enabled && this._selection.hasSelection.value) {
+      const selectedRows = this._selection.getSelectedRows();
+      objectsToDelete.push(...selectedRows);
+    } else {
+      objectsToDelete.push(obj);
+    }
+    this._onDeleteRows?.(row, objectsToDelete);
+  };
+  handleRowAction = (actionId, rowIndex) => {
+    if (!this._onRowAction) {
+      return;
+    }
+    const row = this._sorting.getDataIndex(rowIndex);
+    const data = this._rows.value[row];
+    if (data) {
+      this._onRowAction(actionId, data);
+    }
+  };
+  getCellData = (cell) => {
+    const { col, row, plane } = cell;
+    const fields = this._projection?.fields ?? [];
+    if (col < 0 || col >= fields.length) {
+      return void 0;
+    }
+    const field = fields[col];
+    let value;
+    if (plane === "frozenRowsEnd") {
+      if (row >= 0 && row < this._draftRows.value.length) {
+        value = getValue2(this._draftRows.value[row].data, field.path);
+      } else {
+        return void 0;
+      }
+    } else {
+      const dataIndex = this._sorting.getDataIndex(row);
+      value = getValue2(this._rows.value[dataIndex], field.path);
+    }
+    if (value == null) {
+      return "";
+    }
+    const { props } = this._projection.getFieldProjection(field.id);
+    switch (props.format) {
+      case FormatEnum2.Ref: {
+        if (!field.referencePath) {
+          return "";
+        }
+        return getValue2(value.target, field.referencePath);
+      }
+      default: {
+        return formatForEditing({
+          type: props.type,
+          format: props.format,
+          value
+        });
+      }
+    }
+  };
+  validateCellData = async ({ col, row, plane }, value) => {
+    const fields = this._projection?.fields ?? [];
+    if (col < 0 || col >= fields.length) {
+      return {
+        valid: false,
+        error: "Invalid column index"
+      };
+    }
+    const field = fields[col];
+    const { props } = this._projection.getFieldProjection(field.id);
+    const transformedValue = editorTextToCellValue(props, value);
+    const isDraftRow = plane === "frozenRowsEnd";
+    if (isDraftRow) {
+      const isInvalidDraftRowIndex = row < 0 || row >= this._draftRows.value.length;
+      if (isInvalidDraftRowIndex) {
+        return {
+          valid: false,
+          error: "Invalid draft row index"
+        };
+      }
+      const draftRow = this._draftRows.value[row];
+      const snapshot = {
+        ...draftRow.data
+      };
+      setValue(snapshot, field.path, transformedValue);
+      const validationErrors = this.validateDraftRowData(snapshot);
+      if (validationErrors.length > 0) {
+        const error = validationErrors.find((err) => err.path === field.path);
+        if (error) {
+          return {
+            valid: false,
+            error: error.message
+          };
+        }
+      }
+      return {
+        valid: true
+      };
+    } else {
+      const rowIdx = this._sorting.getDataIndex(row);
+      const currentRow = this._rows.value[rowIdx];
+      invariant(currentRow, "Invalid row index", {
+        F: __dxlog_file,
+        L: 525,
+        S: this,
+        A: [
+          "currentRow",
+          "'Invalid row index'"
+        ]
+      });
+      const snapshot = getSnapshot(currentRow);
+      setValue(snapshot, field.path, transformedValue);
+      const schema = getSchema(currentRow);
+      invariant(schema, void 0, {
+        F: __dxlog_file,
+        L: 531,
+        S: this,
+        A: [
+          "schema",
+          ""
+        ]
+      });
+      const validationResult = validateSchema(schema, snapshot);
+      if (validationResult && validationResult.length > 0) {
+        const error = validationResult[0];
+        invariant(error.path === field.path, void 0, {
+          F: __dxlog_file,
+          L: 536,
+          S: this,
+          A: [
+            "error.path === field.path",
+            ""
+          ]
+        });
+        return {
+          valid: false,
+          error: error.message
+        };
+      }
+      return {
+        valid: true
+      };
+    }
+  };
+  setCellData = (cell, value) => {
+    const { col, row, plane } = cell;
+    const fields = this._projection?.fields ?? [];
+    if (col < 0 || col >= fields.length) {
+      return;
+    }
+    const field = fields[col];
+    const { props } = this._projection.getFieldProjection(field.id);
+    const transformedValue = editorTextToCellValue(props, value);
+    if (props.format === FormatEnum2.Ref && !isLiveObject(value)) {
+      return;
+    }
+    if (plane === "frozenRowsEnd") {
+      if (row >= 0 && row < this._draftRows.value.length) {
+        setValue(this._draftRows.value[row].data, field.path, transformedValue);
+        this.validateDraftRow(row);
+      }
+    } else {
+      const rowIdx = this._sorting.getDataIndex(row);
+      setValue(this._rows.value[rowIdx], field.path, transformedValue);
+    }
+  };
   /**
   * Updates a cell's value using a transform function.
   * @param {DxGridPlanePosition} position - The position of the cell to update.
@@ -1141,102 +1148,83 @@ var editorTextToCellValue = (props, value) => {
 
 // src/model/modal-controller.ts
 import { signal as signal4 } from "@preact/signals-core";
-import { log } from "@dxos/log";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/react-ui-table/src/model/modal-controller.ts";
 var ModalController = class {
-  constructor() {
-    this._state = signal4({
-      type: "closed"
-    });
-    this._triggerRef = {
-      current: null
-    };
-    this.setTrigger = (trigger) => {
-      this._triggerRef.current = trigger;
-    };
-    this.showRowMenu = (rowIndex) => {
-      this._state.value = {
-        type: "row",
-        rowIndex
-      };
-    };
-    this.showColumnMenu = (fieldId) => {
-      this._state.value = {
-        type: "column",
-        fieldId
-      };
-    };
-    this.showColumnCreator = () => {
-      this._state.value = {
-        type: "columnSettings",
-        mode: {
-          type: "create"
-        }
-      };
+  _state = signal4({
+    type: "closed"
+  });
+  _triggerRef = {
+    current: null
+  };
+  get state() {
+    return this._state;
+  }
+  get trigger() {
+    return this._triggerRef;
+  }
+  setTrigger = (trigger) => {
+    this._triggerRef.current = trigger;
+  };
+  showRowMenu = (rowIndex) => {
+    this._state.value = {
+      type: "row",
+      rowIndex
     };
-    this.showReferencePanel = (targetId, schemaId) => {
-      this._state.value = {
-        type: "refPanel",
-        targetId,
-        typename: schemaId
-      };
+  };
+  showColumnMenu = (fieldId) => {
+    this._state.value = {
+      type: "column",
+      fieldId
     };
-    this.openColumnSettings = () => {
-      if (this._state.value.type === "column") {
-        const fieldId = this._state.value.fieldId;
-        requestAnimationFrame(() => {
-          this._state.value = {
-            type: "columnSettings",
-            mode: {
-              type: "edit",
-              fieldId
-            }
-          };
-        });
+  };
+  showColumnCreator = () => {
+    this._state.value = {
+      type: "columnSettings",
+      mode: {
+        type: "create"
       }
     };
-    this.openCreateRef = (typename, anchorCell, initialValues, onCreate) => {
-      if (anchorCell) {
-        this._triggerRef.current = anchorCell;
+  };
+  showReferencePanel = (targetId, schemaId) => {
+    this._state.value = {
+      type: "refPanel",
+      targetId,
+      typename: schemaId
+    };
+  };
+  openColumnSettings = () => {
+    if (this._state.value.type === "column") {
+      const fieldId = this._state.value.fieldId;
+      requestAnimationFrame(() => {
         this._state.value = {
-          type: "createRefPanel",
-          typename,
-          initialValues,
-          onCreate
+          type: "columnSettings",
+          mode: {
+            type: "edit",
+            fieldId
+          }
         };
-      } else {
-        log.warn("anchor cell not found while creating new ref", void 0, {
-          F: __dxlog_file2,
-          L: 86,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    };
-    this.close = () => {
-      this._state.value = {
-        type: "closed"
-      };
+      });
+    }
+  };
+  close = () => {
+    this._state.value = {
+      type: "closed"
     };
-  }
-  get state() {
-    return this._state;
-  }
-  get trigger() {
-    return this._triggerRef;
-  }
+  };
 };
 
 // src/model/table-presentation.ts
 import { signal as signal5 } from "@preact/signals-core";
-import { isNotNullable } from "effect/Predicate";
-import { Obj as Obj4 } from "@dxos/echo";
-import { FormatEnum as FormatEnum3, getValue as getValue3, TypeEnum as TypeEnum2 } from "@dxos/echo-schema";
+import * as Predicate from "effect/Predicate";
+import { Obj as Obj3 } from "@dxos/echo";
+import { FormatEnum as FormatEnum3, TypeEnum as TypeEnum2, getValue as getValue3 } from "@dxos/echo/internal";
 import { cellClassesForFieldType, formatForDisplay as formatForDisplay2 } from "@dxos/react-ui-form";
 import { toPlaneCellIndex } from "@dxos/react-ui-grid";
 import { mx } from "@dxos/react-ui-theme";
 import { VIEW_FIELD_LIMIT } from "@dxos/schema";
 var TablePresentation = class {
+  model;
+  _visibleRange;
+  fieldProjectionCache = /* @__PURE__ */ new Map();
   constructor(model, _visibleRange = signal5({
     start: {
       row: 0,
@@ -1249,7 +1237,6 @@ var TablePresentation = class {
   })) {
     this.model = model;
     this._visibleRange = _visibleRange;
-    this.fieldProjectionCache = /* @__PURE__ */ new Map();
   }
   getCells(range, plane) {
     this.fieldProjectionCache.clear();
@@ -1277,6 +1264,9 @@ var TablePresentation = class {
       case "frozenRowsEnd":
         cells = this.getDraftRowCells(range);
         break;
+      case "fixedEndStart":
+        cells = this.getDraftIconCells(range);
+        break;
       case "fixedEndEnd":
         cells = this.getDraftActionCells(range);
         break;
@@ -1335,10 +1325,7 @@ var TablePresentation = class {
       }
     };
     const classes = [];
-    const formatClasses = cellClassesForFieldType({
-      type: props.type,
-      format: props.format
-    });
+    const formatClasses = cellClassesForFieldType(props);
     if (formatClasses) {
       classes.push(formatClasses);
     }
@@ -1346,9 +1333,7 @@ var TablePresentation = class {
     if (rowSelectionClasses) {
       classes.push(rowSelectionClasses);
     }
-    if (classes.length > 0) {
-      cell.className = mx(classes.flat());
-    }
+    cell.className = mx(classes);
     if (props.type === TypeEnum2.Array) {
       const targetArray = getValue3(obj, field.path);
       if (targetArray && Array.isArray(targetArray)) {
@@ -1370,7 +1355,7 @@ var TablePresentation = class {
           }
           return "Object";
         };
-        const tags = targetArray.map(getLabel).filter(isNotNullable).map((title) => {
+        const tags = targetArray.map(getLabel).filter(Predicate.isNotNullable).map((title) => {
           return `<span class="dx-tag" data-hue="neutral">${title}</span>`;
         }).join("");
         cell.accessoryHtml = `<div role='none' class="flex flex-row gap-1 overflow-x-auto">${tags}</div>`;
@@ -1379,8 +1364,8 @@ var TablePresentation = class {
     if (props.format === FormatEnum3.Ref && props.referenceSchema) {
       const targetObj = getValue3(obj, field.path)?.target;
       if (targetObj) {
-        const dxn = Obj4.getDXN(targetObj)?.toString();
-        cell.accessoryHtml = `<dx-ref-tag refId=${dxn} class="dx-button is-6 pli-[3px] pbe-[2px] min-bs-0 absolute inline-end-1"><dx-icon icon="ph--link-simple--regular"/></dx-ref-tag>`;
+        const dxn = Obj3.getDXN(targetObj)?.toString();
+        cell.accessoryHtml = `<div role="none" class="absolute inline-end-0 inset-block-0 p-[--dx-grid-cell-content-padding-block]"><dx-anchor refId=${dxn} class="dx-button is-6 aspect-square min-bs-0" data-dx-grid-action="accessory"><dx-icon icon="ph--link-simple--regular"/></dx-anchor></div>`;
       }
     }
     if (props.format === FormatEnum3.Boolean) {
@@ -1442,24 +1427,37 @@ var TablePresentation = class {
     const cells = {};
     const fields = this.model.projection?.fields ?? [];
     const draftRows = this.model.draftRows.value;
-    for (let row = range.start.row; row <= range.end.row && row < draftRows.length; row++) {
-      const draftRow = draftRows[row];
+    if (draftRows.length === 0) {
       for (let col = range.start.col; col <= range.end.col && col < fields.length; col++) {
-        const field = fields[col];
-        if (!field) {
-          continue;
-        }
-        this.createDataCell(cells, draftRow.data, field, col, row);
-        if (this.model.hasDraftRowValidationError(row, field.path)) {
+        cells[toPlaneCellIndex({
+          col,
+          row: 0
+        })] = {
+          value: "",
+          readonly: true,
+          className: "dx-grid__row--cta__cell"
+        };
+      }
+    } else {
+      for (let row = range.start.row; row <= range.end.row && row < draftRows.length; row++) {
+        const draftRow = draftRows[row];
+        for (let col = range.start.col; col <= range.end.col && col < fields.length; col++) {
           const cellIndex = toPlaneCellIndex({
             col,
             row
           });
-          const cellValue = cells[cellIndex];
-          if (cellValue) {
-            const existingClasses = cellValue.className || "";
-            const draftClasses = "dx-grid__cell--flagged";
-            cellValue.className = existingClasses ? `${existingClasses} ${draftClasses}` : draftClasses;
+          const field = fields[col];
+          if (!field) {
+            continue;
+          }
+          this.createDataCell(cells, draftRow.data, field, col, row);
+          if (this.model.hasDraftRowValidationError(row, field.path)) {
+            const cellValue = cells[cellIndex];
+            if (cellValue) {
+              const existingClasses = cellValue.className || "";
+              const draftClasses = "dx-grid__cell--flagged";
+              cellValue.className = existingClasses ? `${existingClasses} ${draftClasses}` : draftClasses;
+            }
           }
         }
       }
@@ -1478,10 +1476,10 @@ var TablePresentation = class {
         row: 0
       })] = {
         // TODO(burdon): Use same logic as form for fallback title.
-        value: props.title ?? field.path,
-        readonly: true,
+        value: "",
         resizeHandle: "col",
         accessoryHtml: `
+          <span class="grow min-is-0 truncate">${props.title ?? field.path}</span>
           ${direction !== void 0 ? tableButtons.sort.render({
           fieldId: field.id,
           direction
@@ -1490,7 +1488,7 @@ var TablePresentation = class {
           fieldId: field.id
         })}
         `,
-        className: "!bg-toolbarSurface"
+        className: "!bg-toolbarSurface !text-description [&>div]:flex [&>div]:items-stretch"
       };
     }
     return cells;
@@ -1581,19 +1579,46 @@ var TablePresentation = class {
   getDraftActionCells(range) {
     const cells = {};
     const draftRows = this.model.draftRows.value;
-    for (let row = range.start.row; row <= range.end.row && row < draftRows.length; row++) {
-      const draftRow = draftRows[row];
-      const disabled = !draftRow.valid;
+    if (draftRows.length === 0) {
+      cells[toPlaneCellIndex({
+        col: 0,
+        row: 0
+      })] = {
+        value: "",
+        className: "dx-grid__row--cta__cell",
+        readonly: true
+      };
+    } else {
+      for (let row = range.start.row; row <= range.end.row && row < draftRows.length; row++) {
+        const draftRow = draftRows[row];
+        const disabled = !draftRow.valid;
+        cells[toPlaneCellIndex({
+          col: 0,
+          row
+        })] = {
+          value: "",
+          readonly: true,
+          accessoryHtml: tableButtons.saveDraftRow.render({
+            rowIndex: row,
+            disabled
+          })
+        };
+      }
+    }
+    return cells;
+  }
+  getDraftIconCells(range) {
+    const cells = {};
+    const draftRows = this.model.draftRows.value;
+    for (let row = range.start.row; row <= range.end.row; row++) {
       cells[toPlaneCellIndex({
         col: 0,
         row
       })] = {
         value: "",
         readonly: true,
-        accessoryHtml: tableButtons.saveDraftRow.render({
-          rowIndex: row,
-          disabled
-        })
+        accessoryHtml: '<dx-icon icon="ph--plus--regular" class="contents"></dx-icon>',
+        className: mx("[&>div]:grid [&>div]:place-content-center", draftRows.length < 1 && "dx-grid__row--cta__cell")
       };
     }
     return cells;
@@ -1626,13 +1651,13 @@ import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
 import { effect as effect3 } from "@preact/signals-core";
 import orderBy2 from "lodash.orderby";
 import { useEffect, useMemo, useState } from "react";
-import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
+import { Obj as Obj4 } from "@dxos/echo";
 import { useSelected, useSelectionActions } from "@dxos/react-ui-attention";
 import { isNonNullable } from "@dxos/util";
 var useTableModel = ({ view, schema, projection, rows, rowActions, features, onSelectionChanged, onRowAction, ...props }) => {
   var _effect = _useSignals();
   try {
-    const selected = useSelected(view && fullyQualifiedId2(view), "multi");
+    const selected = useSelected(view && Obj4.getDXN(view).toString(), "multi");
     const initialSelection = useMemo(() => selected, [
       view
     ]);
@@ -1717,12 +1742,12 @@ var useAddRow = ({ space, schema }) => {
     if (space && schema) {
       try {
         space.db.add(Obj5.make(schema, data ?? {}));
-        return true;
+        return "final";
       } catch (error) {
-        return false;
+        return "draft";
       }
     }
-    return false;
+    return "final";
   }, [
     space,
     schema
@@ -1733,7 +1758,6 @@ export {
   getBaseSchema,
   makeDynamicTable,
   touch,
-  createTable,
   BUTTON_IDENTIFIERS,
   tableButtons,
   CONTROL_IDENTIFIERS,
@@ -1748,4 +1772,4 @@ export {
   useTableModel,
   useAddRow
 };
-//# sourceMappingURL=chunk-5XLSHLOG.mjs.map
+//# sourceMappingURL=chunk-GS2UNGJK.mjs.map