@dxos/react-ui-table 0.12.0-next-73daef452f1464b62efdbca75fb0067c1066f264 → 0.13.0

package/dist/lib/chunk-types.mjs

@@ -1,8 +1,7 @@
 import { Annotation, DXN, JsonSchema, Obj, Ref, Type, View } from "@dxos/echo";
-import { SchemaAST } from "@dxos/effect";
 import { ViewAnnotation } from "@dxos/schema";
 import * as Schema from "effect/Schema";
-import { FormInputAnnotation, LabelAnnotation } from "@dxos/echo/Annotation";
+import * as SchemaAST from "@dxos/effect/SchemaAST";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -22,12 +21,12 @@ var Table_exports = /* @__PURE__ */ __exportAll({
 });
 var Table = class extends Type.makeObject(DXN.make("org.dxos.type.table", "0.1.0"))(Schema.Struct({
 	name: Schema.String.pipe(Schema.optional),
-	view: Ref.Ref(View.View).pipe(FormInputAnnotation.set(false)),
-	sizes: Schema.Record(Schema.String, Schema.Number).pipe(Schema.mutableKey, FormInputAnnotation.set(false))
-}).pipe(LabelAnnotation.set(["name"]), ViewAnnotation.set(["view"]), Annotation.IconAnnotation.set({
+	view: Ref.Ref(View.View).pipe(Annotation.FormInputAnnotation.set(false)),
+	sizes: Schema.Record(Schema.String, Schema.Number).pipe(Schema.mutableKey, Annotation.FormInputAnnotation.set(false))
+}).pipe(Annotation.LabelAnnotation.set(["name"]), ViewAnnotation.set(["view"]), Annotation.IconAnnotation.set({
 	icon: "ph--table--regular",
 	hue: "green"
-}))) {};
+}), Annotation.UserType.set())) {};
 /**
 * Make a table as a view of a data set.
 */

package/dist/lib/chunk-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"chunk-types.mjs","names":[],"sources":["../../src/types/Table.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\n// QueryAST is referenced indirectly through `Type.InstanceType<typeof TableSchema>`\n// (Ref.Ref(View.View) → View.View → QueryAST.Query) in the emitted .d.ts; the\n// namespace import keeps the inferred types portable.\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport { Annotation, DXN, JsonSchema, Obj, QueryAST, Ref, Type, View } from '@dxos/echo';\nimport { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/Annotation';\nimport { type JsonSchema as JsonSchemaType } from '@dxos/echo/JsonSchema';\nimport { SchemaAST, SchemaEx } from '@dxos/effect';\nimport { ViewAnnotation } from '@dxos/schema';\n\n// TODO(wittjosiah): Try to clean up this type inference.\nexport class Table extends Type.makeObject<Table>(DXN.make('org.dxos.type.table', '0.1.0'))(\n  Schema.Struct({\n    name: Schema.String.pipe(Schema.optional),\n\n    view: Ref.Ref(View.View).pipe(FormInputAnnotation.set(false)),\n\n    // TODO(wittjosiah): Key should be JsonPath.\n    sizes: Schema.Record(Schema.String, Schema.Number).pipe(Schema.mutableKey, FormInputAnnotation.set(false)),\n  }).pipe(\n    LabelAnnotation.set(['name']),\n    ViewAnnotation.set(['view']),\n    Annotation.IconAnnotation.set({ icon: 'ph--table--regular', hue: 'green' }),\n  ),\n) {}\n\ntype MakeProps = {\n  name?: string;\n  sizes?: Record<string, number>;\n  view: View.View;\n  /** Required to auto-size columns. */\n  jsonSchema?: JsonSchemaType;\n};\n\n/**\n * Make a table as a view of a data set.\n */\nexport const make = ({ name, sizes = {}, view, jsonSchema }: MakeProps): Table => {\n  // Preset sizes are computed before construction: Effect 4 records are readonly at the type level,\n  // so the defaults go in as initial props rather than being assigned onto the live object.\n  const initialSizes: Record<string, number> = { ...sizes };\n  if (jsonSchema) {\n    const schema = JsonSchema.toEffectSchema(jsonSchema);\n    for (const property of SchemaAST.getPropertySignatures(schema.ast)) {\n      const name = property.name.toString() as SchemaEx.JsonPath;\n      if (initialSizes[name] !== undefined) {\n        continue;\n      }\n\n      // A plain switch rather than `Match.when({ _tag })`: matching an object pattern against\n      // Effect 4's mutually recursive AST union expands into a mapped type the checker cannot resolve.\n      switch (property.type._tag) {\n        case 'Boolean':\n        case 'Number':\n          initialSizes[name] = 100;\n          break;\n      }\n    }\n  }\n\n  return Obj.make(Table, { name, view: Ref.make(view), sizes: initialSizes } as Obj.MakeProps<typeof Table>);\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAiBA,IAAa,QAAb,cAA2B,KAAK,WAAkB,IAAI,KAAK,uBAAuB,OAAO,CAAC,CAAC,CACzF,OAAO,OAAO;CACZ,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ;CAExC,MAAM,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,oBAAoB,IAAI,KAAK,CAAC;CAG5D,OAAO,OAAO,OAAO,OAAO,QAAQ,OAAO,MAAM,CAAC,CAAC,KAAK,OAAO,YAAY,oBAAoB,IAAI,KAAK,CAAC;AAC3G,CAAC,CAAC,CAAC,KACD,gBAAgB,IAAI,CAAC,MAAM,CAAC,GAC5B,eAAe,IAAI,CAAC,MAAM,CAAC,GAC3B,WAAW,eAAe,IAAI;CAAE,MAAM;CAAsB,KAAK;AAAQ,CAAC,CAC5E,CACF,CAAC,CAAC,CAAC;;;;AAaH,IAAa,QAAQ,EAAE,MAAM,QAAQ,CAAC,GAAG,MAAM,iBAAmC;CAGhF,MAAM,eAAuC,EAAE,GAAG,MAAM;CACxD,IAAI,YAAY;EACd,MAAM,SAAS,WAAW,eAAe,UAAU;EACnD,KAAK,MAAM,YAAY,UAAU,sBAAsB,OAAO,GAAG,GAAG;GAClE,MAAM,OAAO,SAAS,KAAK,SAAS;GACpC,IAAI,aAAa,UAAU,KAAA,GACzB;GAKF,QAAQ,SAAS,KAAK,MAAtB;IACE,KAAK;IACL,KAAK,UACH,aAAa,QAAQ;GAEzB;EACF;CACF;CAEA,OAAO,IAAI,KAAK,OAAO;EAAE;EAAM,MAAM,IAAI,KAAK,IAAI;EAAG,OAAO;CAAa,CAAgC;AAC3G"}
+{"version":3,"file":"chunk-types.mjs","names":[],"sources":["../../src/types/Table.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\n// QueryAST is referenced indirectly through `Type.InstanceType<typeof TableSchema>`\n// (Ref.Ref(View.View) → View.View → QueryAST.Query) in the emitted .d.ts; the\n// namespace import keeps the inferred types portable.\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport { Annotation, DXN, JsonSchema, Obj, QueryAST, Ref, Type, View } from '@dxos/echo';\nimport * as SchemaAST from '@dxos/effect/SchemaAST';\nimport * as SchemaEx from '@dxos/effect/SchemaEx';\nimport { ViewAnnotation } from '@dxos/schema';\n\n// TODO(wittjosiah): Try to clean up this type inference.\nexport class Table extends Type.makeObject<Table>(DXN.make('org.dxos.type.table', '0.1.0'))(\n  Schema.Struct({\n    name: Schema.String.pipe(Schema.optional),\n\n    view: Ref.Ref(View.View).pipe(Annotation.FormInputAnnotation.set(false)),\n\n    // TODO(wittjosiah): Key should be JsonPath.\n    sizes: Schema.Record(Schema.String, Schema.Number).pipe(\n      Schema.mutableKey,\n      Annotation.FormInputAnnotation.set(false),\n    ),\n  }).pipe(\n    Annotation.LabelAnnotation.set(['name']),\n    ViewAnnotation.set(['view']),\n    Annotation.IconAnnotation.set({ icon: 'ph--table--regular', hue: 'green' }),\n    Annotation.UserType.set(),\n  ),\n) {}\n\ntype MakeProps = {\n  name?: string;\n  sizes?: Record<string, number>;\n  view: View.View;\n  /** Required to auto-size columns. */\n  jsonSchema?: JsonSchema.JsonSchema;\n};\n\n/**\n * Make a table as a view of a data set.\n */\nexport const make = ({ name, sizes = {}, view, jsonSchema }: MakeProps): Table => {\n  // Preset sizes are computed before construction: Effect 4 records are readonly at the type level,\n  // so the defaults go in as initial props rather than being assigned onto the live object.\n  const initialSizes: Record<string, number> = { ...sizes };\n  if (jsonSchema) {\n    const schema = JsonSchema.toEffectSchema(jsonSchema);\n    for (const property of SchemaAST.getPropertySignatures(schema.ast)) {\n      const name = property.name.toString() as SchemaEx.JsonPath;\n      if (initialSizes[name] !== undefined) {\n        continue;\n      }\n\n      // A plain switch rather than `Match.when({ _tag })`: matching an object pattern against\n      // Effect 4's mutually recursive AST union expands into a mapped type the checker cannot resolve.\n      switch (property.type._tag) {\n        case 'Boolean':\n        case 'Number':\n          initialSizes[name] = 100;\n          break;\n      }\n    }\n  }\n\n  return Obj.make(Table, { name, view: Ref.make(view), sizes: initialSizes } as Obj.MakeProps<typeof Table>);\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAgBA,IAAa,QAAb,cAA2B,KAAK,WAAkB,IAAI,KAAK,uBAAuB,OAAO,CAAC,CAAC,CACzF,OAAO,OAAO;CACZ,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ;CAExC,MAAM,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,WAAW,oBAAoB,IAAI,KAAK,CAAC;CAGvE,OAAO,OAAO,OAAO,OAAO,QAAQ,OAAO,MAAM,CAAC,CAAC,KACjD,OAAO,YACP,WAAW,oBAAoB,IAAI,KAAK,CAC1C;AACF,CAAC,CAAC,CAAC,KACD,WAAW,gBAAgB,IAAI,CAAC,MAAM,CAAC,GACvC,eAAe,IAAI,CAAC,MAAM,CAAC,GAC3B,WAAW,eAAe,IAAI;CAAE,MAAM;CAAsB,KAAK;AAAQ,CAAC,GAC1E,WAAW,SAAS,IAAI,CAC1B,CACF,CAAC,CAAC,CAAC;;;;AAaH,IAAa,QAAQ,EAAE,MAAM,QAAQ,CAAC,GAAG,MAAM,iBAAmC;CAGhF,MAAM,eAAuC,EAAE,GAAG,MAAM;CACxD,IAAI,YAAY;EACd,MAAM,SAAS,WAAW,eAAe,UAAU;EACnD,KAAK,MAAM,YAAY,UAAU,sBAAsB,OAAO,GAAG,GAAG;GAClE,MAAM,OAAO,SAAS,KAAK,SAAS;GACpC,IAAI,aAAa,UAAU,KAAA,GACzB;GAKF,QAAQ,SAAS,KAAK,MAAtB;IACE,KAAK;IACL,KAAK,UACH,aAAa,QAAQ;GAEzB;EACF;CACF;CAEA,OAAO,IAAI,KAAK,OAAO;EAAE;EAAM,MAAM,IAAI,KAAK,IAAI;EAAG,OAAO;CAAa,CAAgC;AAC3G"}

package/dist/lib/chunk-useTableModel.mjs

@@ -1,15 +1,13 @@
-import * as Atom from "effect/unstable/reactivity/Atom";
+import * as Atom from "effect/reactivity/Atom";
 import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { RegistryContext } from "@effect/atom-react/RegistryContext";
-import { useAsyncEffect } from "@dxos/react-ui";
 import { ViewState, useManagerOptional, useSelection, useSelectionActions } from "@dxos/react-ui-attention";
 import { toPlaneCellIndex } from "@dxos/react-ui-grid";
 import { mx } from "@dxos/ui-theme";
 import { Resource } from "@dxos/context";
 import { Format, Obj, Order, Query, QueryAST, Ref, Type } from "@dxos/echo";
-import { toEffectSchema } from "@dxos/echo/JsonSchema";
-import { getSnapshot } from "@dxos/echo/Obj";
-import { SchemaEx } from "@dxos/effect";
+import * as JsonSchema$1 from "@dxos/echo/JsonSchema";
+import * as SchemaEx from "@dxos/effect/SchemaEx";
 import { invariant } from "@dxos/invariant";
 import { EntityId } from "@dxos/keys";
 import { cellClassesForFieldType, parseValue } from "@dxos/react-ui-form";
@@ -18,6 +16,7 @@ import * as Schema from "effect/Schema";
 import { accessoryHandlesPointerdownAttrs } from "@dxos/lit-grid";
 import * as Predicate from "effect/Predicate";
 import { Format as Format$1, TypeEnum } from "@dxos/echo/Format";
+import * as Hooks from "@dxos/react-ui/Hooks";
 //#region src/util/query-ast.ts
 /**
 * Extracts order clauses from a query AST.
@@ -76,7 +75,7 @@ var BUTTON_IDENTIFIERS = {
 	sort: "data-table-sort-button"
 };
 var createButton = ({ attr, data, disabled = false, icon, testId, type: _type = "primary" }) => {
-	return `<div role="none" class="dx-grid__cell__block"><button ${attr} data-testid="${testId}" class="dx-button w-6 aspect-square px-0.5 min-h-0" ${Object.entries(data).map(([k, v]) => `${k}="${v}"`).join(" ")} ${disabled ? "disabled" : ""} data-dx-grid-action="accessory"><svg data-size="4"><use href="/icons.svg#${icon}"/></svg></button></div>`;
+	return `<div role="none" class="dx-grid__cell__block"><button ${attr} data-testid="${testId}" class="dx-control dx-button dx-button-square" data-size="sm" ${Object.entries(data).map(([k, v]) => `${k}="${v}"`).join(" ")} ${disabled ? "disabled" : ""} data-dx-grid-action="accessory"><svg data-size="4"><use href="/icons.svg#${icon}"/></svg></button></div>`;
 };
 var addColumnButton = {
 	attr: BUTTON_IDENTIFIERS.newColumn,
@@ -182,8 +181,8 @@ var CONTROL_IDENTIFIERS = {
 	switch: "data-table-switch"
 };
 var BASE_CLASSES = {
-	checkbox: "dx-checkbox",
-	switch: "dx-checkbox--switch"
+	checkbox: "dx-checkbox-native",
+	switch: "dx-switch-native"
 };
 var renderAttributes = (data) => {
 	return Object.entries(data).map(([k, v]) => `${k}="${v}"`).join(" ");
@@ -442,7 +441,7 @@ var TableModel = class extends Resource {
 		invariant(!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === "single"), "Single selection is not compatible with editable tables.", {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 209,
+			L: 213,
 			S: this,
 			A: ["!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')", "'Single selection is not compatible with editable tables.'"]
 		});
@@ -515,7 +514,7 @@ var TableModel = class extends Resource {
 		invariant(view, "Table model not initialized", {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 329,
+			L: 333,
 			S: this,
 			A: ["view", "'Table model not initialized'"]
 		});
@@ -632,7 +631,7 @@ var TableModel = class extends Resource {
 		invariant(this._columnMeta, void 0, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 471,
+			L: 475,
 			S: this,
 			A: ["this._columnMeta", ""]
 		});
@@ -654,7 +653,7 @@ var TableModel = class extends Resource {
 		invariant(this._object.view.target, "View must be loaded before initializing column meta", {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 495,
+			L: 499,
 			S: this,
 			A: ["this._object.view.target", "'View must be loaded before initializing column meta'"]
 		});
@@ -782,7 +781,7 @@ var TableModel = class extends Resource {
 		this._registry.set(this._draftRows, newDraftRows);
 	}
 	validateDraftRowData(data) {
-		const schema = toEffectSchema(this._projection.baseSchema);
+		const schema = JsonSchema$1.toEffectSchema(this._projection.baseSchema);
 		return validateSchema(schema, data) || [];
 	}
 	commitDraftRow = (draftRowIndex) => {
@@ -868,17 +867,17 @@ var TableModel = class extends Resource {
 			invariant(currentRow, "Invalid row index", {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file,
-				L: 814,
+				L: 818,
 				S: this,
 				A: ["currentRow", "'Invalid row index'"]
 			});
-			const snapshot = { ...getSnapshot(currentRow) };
+			const snapshot = { ...Obj.getSnapshot(currentRow) };
 			SchemaEx.setValue(snapshot, field.path, transformedValue);
 			const type = Obj.getType(currentRow);
 			invariant(type, void 0, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file,
-				L: 821,
+				L: 825,
 				S: this,
 				A: ["type", ""]
 			});
@@ -1170,18 +1169,18 @@ var TablePresentation = class {
 					return "Object";
 				};
 				cell.accessoryHtml = `<div class="flex flex-row gap-1 overflow-x-auto">${targetArray.map(getLabel).filter(Predicate.isNotNullish).map((title) => {
-					return `<span class="dx-tag" data-hue="neutral">${title}</span>`;
+					return `<span class="dx-tag dx-tag-inline" data-hue="neutral">${title}</span>`;
 				}).join("")}</div>`;
 			}
 		}
 		if (props.format === Format$1.TypeFormat.Ref && props.referenceSchema) {
 			const targetObj = SchemaEx.getValue(obj, field.path)?.target;
-			if (targetObj) cell.accessoryHtml = `<div role="none" class="dx-grid__cell__block"><dx-anchor uri=${Obj.getURI(targetObj)} class="dx-button w-6 aspect-square min-h-0" data-dx-grid-action="accessory"><dx-icon icon="ph--link-simple--regular"/></dx-anchor></div>`;
+			if (targetObj) cell.accessoryHtml = `<div role="none" class="dx-grid__cell__block"><dx-anchor eid=${Obj.getURI(targetObj)} class="dx-control dx-button dx-button-square" data-size="sm" data-variant="ghost" data-dx-grid-action="accessory"><dx-icon icon="ph--link-simple--regular"/></dx-anchor></div>`;
 		}
 		if (props.format === Format$1.TypeFormat.URL) {
 			const value = SchemaEx.getValue(obj, field.path);
 			const href = typeof value === "string" ? safeHttpUrl(value) : void 0;
-			if (href) cell.accessoryHtml = `<div role="none" class="dx-grid__cell__block"><a href="${escapeHtmlAttribute(href)}" target="_blank" rel="noopener noreferrer" class="dx-button w-6 aspect-square min-h-0" data-dx-grid-action="accessory"><dx-icon icon="ph--arrow-square-out--regular"/></a></div>`;
+			if (href) cell.accessoryHtml = `<div role="none" class="dx-grid__cell__block"><a href="${escapeHtmlAttribute(href)}" target="_blank" rel="noopener noreferrer" class="dx-control dx-button dx-button-square" data-size="sm" data-variant="ghost" data-dx-grid-action="accessory"><dx-icon icon="ph--arrow-square-out--regular"/></a></div>`;
 		}
 		if (props.format === Format$1.TypeFormat.Boolean) {
 			const value = SchemaEx.getValue(obj, field.path);
@@ -1198,7 +1197,7 @@ var TablePresentation = class {
 			const options = this.model.projection.getFieldProjection(field.id).props.options;
 			if (options) {
 				const option = options.find((o) => o.id === value);
-				if (option) cell.accessoryHtml = `<span class="dx-tag" data-hue="${option.color}">${option.title}</span>`;
+				if (option) cell.accessoryHtml = `<span class="dx-tag dx-tag-inline" data-hue="${option.color}">${option.title}</span>`;
 			}
 		}
 		if (props.format === Format$1.TypeFormat.MultiSelect) {
@@ -1207,7 +1206,7 @@ var TablePresentation = class {
 			if (options && values && values.length > 0) {
 				const tags = values.map((value) => {
 					const option = options.find((o) => o.id === value);
-					if (option) return `<span class="dx-tag" data-hue="${option.color}">${option.title}</span>`;
+					if (option) return `<span class="dx-tag dx-tag-inline" data-hue="${option.color}">${option.title}</span>`;
 					return null;
 				}).filter(Boolean).join("");
 				if (tags) cell.accessoryHtml = tags;
@@ -1509,7 +1508,7 @@ var useAddRow = ({ db, schema }) => {
 //#region src/hooks/useProjectionModel.ts
 var useProjectionModel = (schema, table, registry) => {
 	const [projection, setProjection] = useState();
-	useAsyncEffect(async () => {
+	Hooks.useAsyncEffect(async () => {
 		if (schema && table) {
 			const view = await table.view.load();
 			const jsonSchema = schema.jsonSchema;