@revisium/schema-toolkit-ui 0.6.1 → 0.6.3

package/dist/index.cjs

@@ -6920,6 +6920,88 @@ const SYSTEM_FIELD_IDS = new Set([
 	"schemaHash"
 ]);
 
+//#endregion
+//#region src/table-editor/TableEditor/model/SchemaContext.ts
+const DATA_FIELD = "data";
+function stripDataFieldPrefix(field) {
+	const prefix = `${DATA_FIELD}.`;
+	if (field.startsWith(prefix)) return field.slice(prefix.length);
+	if (field === DATA_FIELD) return "";
+	return field;
+}
+const SYSTEM_REF_SCHEMAS = {
+	[_revisium_schema_toolkit.SystemSchemaIds.File]: _revisium_schema_toolkit.fileSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowId]: _revisium_schema_toolkit.rowIdSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedAt]: _revisium_schema_toolkit.rowCreatedAtSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedId]: _revisium_schema_toolkit.rowCreatedIdSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowVersionId]: _revisium_schema_toolkit.rowVersionIdSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowPublishedAt]: _revisium_schema_toolkit.rowPublishedAtSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowUpdatedAt]: _revisium_schema_toolkit.rowUpdatedAtSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowHash]: _revisium_schema_toolkit.rowHashSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowSchemaHash]: _revisium_schema_toolkit.rowSchemaHashSchema
+};
+function wrapDataSchema(dataSchema) {
+	return {
+		type: "object",
+		properties: { [DATA_FIELD]: dataSchema },
+		additionalProperties: false,
+		required: [DATA_FIELD]
+	};
+}
+function buildRowSchema(wrappedDataSchema) {
+	const systemProperties = {};
+	for (const sf of SYSTEM_FIELDS) systemProperties[sf.id] = { $ref: sf.ref };
+	return {
+		type: "object",
+		properties: {
+			...systemProperties,
+			...wrappedDataSchema.properties
+		},
+		additionalProperties: false,
+		required: [...Object.keys(systemProperties), ...wrappedDataSchema.required]
+	};
+}
+var SchemaContext = class {
+	_allColumns = [];
+	_dataSchema = null;
+	_wrappedDataSchema = null;
+	_fullRefSchemas = {};
+	_rootNode = null;
+	get allColumns() {
+		return this._allColumns;
+	}
+	get sortableFields() {
+		return this._allColumns.filter((col) => !col.isDeprecated && col.fieldType !== FilterFieldType.File);
+	}
+	get filterableFields() {
+		return this.sortableFields;
+	}
+	get dataSchema() {
+		return this._dataSchema;
+	}
+	get wrappedDataSchema() {
+		return this._wrappedDataSchema;
+	}
+	get fullRefSchemas() {
+		return this._fullRefSchemas;
+	}
+	get rootNode() {
+		return this._rootNode;
+	}
+	init(dataSchema, refSchemas) {
+		this._dataSchema = dataSchema;
+		this._fullRefSchemas = {
+			...SYSTEM_REF_SCHEMAS,
+			...refSchemas
+		};
+		const wrapped = wrapDataSchema(dataSchema);
+		this._wrappedDataSchema = wrapped;
+		const rowSchema = buildRowSchema(wrapped);
+		this._rootNode = new _revisium_schema_toolkit.SchemaParser().parse(rowSchema, this._fullRefSchemas);
+		this._allColumns = extractColumns(this._rootNode);
+	}
+};
+
 //#endregion
 //#region src/table-editor/Columns/model/extractColumns.ts
 const NODE_TYPE_TO_FIELD_TYPE = {
@@ -6963,15 +7045,20 @@ function resolveRefColumn(child, fieldPath) {
 	const refValue = child.ref();
 	if (!refValue) return null;
 	const systemDef = SYSTEM_FIELD_BY_REF.get(refValue);
-	if (systemDef) return {
-		field: systemDef.id,
-		label: systemDef.label,
-		fieldType: systemDef.fieldType,
-		isSystem: true,
-		systemFieldId: systemDef.id,
-		isDeprecated: child.metadata().deprecated ?? false,
-		hasFormula: child.hasFormula()
-	};
+	if (systemDef) {
+		const isDeprecated = child.metadata().deprecated ?? false;
+		const hasFormula = child.hasFormula();
+		return {
+			field: systemDef.id,
+			label: systemDef.label,
+			fieldType: systemDef.fieldType,
+			isSystem: true,
+			systemFieldId: systemDef.id,
+			isDeprecated,
+			hasFormula,
+			isSortable: !isDeprecated && !hasFormula
+		};
+	}
 	if (refValue === _revisium_schema_toolkit.SystemSchemaIds.File) return resolveFileRefColumns(child, fieldPath);
 	return null;
 }
@@ -6980,18 +7067,30 @@ function resolveFileRefColumns(child, fieldPath) {
 	if (child.isObject()) for (const subField of child.properties()) {
 		const subFieldPath = buildFieldPath(fieldPath, subField.name());
 		const fieldType = NODE_TYPE_TO_FIELD_TYPE[subField.nodeType()];
-		if (fieldType) result.push(createColumn(subFieldPath, subField, fieldType));
+		if (fieldType) {
+			const subCol = createColumn(subFieldPath, subField, fieldType);
+			subCol.parentFileField = fieldPath;
+			result.push(subCol);
+		}
 	}
 	return result;
 }
+function stripDataPrefix(fieldPath) {
+	if (fieldPath === DATA_FIELD) return DATA_FIELD;
+	if (fieldPath.startsWith(`${DATA_FIELD}.`)) return fieldPath.slice(DATA_FIELD.length + 1);
+	return fieldPath;
+}
 function createColumn(fieldPath, child, fieldType) {
+	const isDeprecated = child.metadata().deprecated ?? false;
+	const hasFormula = child.hasFormula();
 	return {
 		field: fieldPath,
-		label: fieldPath,
+		label: stripDataPrefix(fieldPath),
 		fieldType,
 		isSystem: false,
-		isDeprecated: child.metadata().deprecated ?? false,
-		hasFormula: child.hasFormula()
+		isDeprecated,
+		hasFormula,
+		isSortable: !isDeprecated && !hasFormula && fieldType !== FilterFieldType.File
 	};
 }
 
@@ -7061,6 +7160,9 @@ var ColumnsModel = class {
 	constructor() {
 		(0, mobx.makeAutoObservable)(this, {}, { autoBind: true });
 	}
+	get allColumns() {
+		return this._allColumns;
+	}
 	get visibleColumns() {
 		const lookup = this._columnLookup;
 		const result = [];
@@ -7078,6 +7180,10 @@ var ColumnsModel = class {
 		const visible = this._visibleFieldSet;
 		return this._allColumns.filter((col) => !visible.has(col.field) && !col.isSystem);
 	}
+	get availableFieldsToInsert() {
+		const visible = this._visibleFieldSet;
+		return this._allColumns.filter((col) => !visible.has(col.field));
+	}
 	get availableSystemFieldsToAdd() {
 		const visible = this._visibleFieldSet;
 		return this._allColumns.filter((col) => !visible.has(col.field) && col.isSystem);
@@ -7458,11 +7564,9 @@ var ColumnsModel = class {
 		return this._pinnedColumns.get(neighbor) === pin;
 	}
 	_toViewField(field) {
-		if (this._columnLookup.get(field)?.isSystem) return field;
-		return `data.${field}`;
+		return field;
 	}
 	_fromViewField(viewField) {
-		if (viewField.startsWith("data.")) return viewField.slice(5);
 		return viewField;
 	}
 	_resolveWidthUntracked(field) {
@@ -7491,6 +7595,49 @@ var ColumnsModel = class {
 	}
 };
 
+//#endregion
+//#region src/table-editor/Columns/model/groupFileFields.ts
+function isFileFieldGroup(item) {
+	return "parent" in item && "children" in item;
+}
+function groupFileFields(columns, allColumns) {
+	const allLookup = allColumns ? new Map(allColumns.map((c) => [c.field, c])) : null;
+	const groups = /* @__PURE__ */ new Map();
+	const result = [];
+	for (const col of columns) if (col.fieldType === FilterFieldType.File) {
+		const existing = groups.get(col.field);
+		if (existing) {
+			existing.parent = col;
+			existing.parentVisible = false;
+		} else {
+			const group = {
+				parent: col,
+				children: [],
+				parentVisible: false
+			};
+			groups.set(col.field, group);
+			result.push(group);
+		}
+	} else if (col.parentFileField) {
+		let group = groups.get(col.parentFileField);
+		if (!group) {
+			const parentCol = allLookup?.get(col.parentFileField);
+			if (parentCol) {
+				group = {
+					parent: parentCol,
+					children: [],
+					parentVisible: true
+				};
+				groups.set(col.parentFileField, group);
+				result.push(group);
+			}
+		}
+		if (group) group.children.push(col);
+		else result.push(col);
+	} else result.push(col);
+	return result;
+}
+
 //#endregion
 //#region src/table-editor/Filters/model/utils/operators.ts
 let FilterOperator = /* @__PURE__ */ function(FilterOperator) {
@@ -7952,15 +8099,15 @@ function parseValue(value, fieldType) {
 	}
 	return value;
 }
-function buildOperatorClause(operator, value, fieldType) {
+function buildOperatorClause(operator, value, fieldType, isSystemField) {
 	const parsed = parseValue(value, fieldType);
 	switch (operator) {
 		case FilterOperator.Equals: return { equals: parsed };
 		case FilterOperator.NotEquals: return { not: { equals: parsed } };
-		case FilterOperator.Contains: return { string_contains: value };
-		case FilterOperator.NotContains: return { not: { string_contains: value } };
-		case FilterOperator.StartsWith: return { string_starts_with: value };
-		case FilterOperator.EndsWith: return { string_ends_with: value };
+		case FilterOperator.Contains: return isSystemField ? { contains: value } : { string_contains: value };
+		case FilterOperator.NotContains: return isSystemField ? { not: { contains: value } } : { not: { string_contains: value } };
+		case FilterOperator.StartsWith: return isSystemField ? { startsWith: value } : { string_starts_with: value };
+		case FilterOperator.EndsWith: return isSystemField ? { endsWith: value } : { string_ends_with: value };
 		case FilterOperator.Gt: return { gt: parsed };
 		case FilterOperator.Gte: return { gte: parsed };
 		case FilterOperator.Lt: return { lt: parsed };
@@ -7981,16 +8128,17 @@ function buildConditionClause(condition) {
 			searchType: condition.searchType || "plain"
 		} };
 		return { data: {
-			path: condition.field,
+			path: stripDataFieldPrefix(condition.field),
 			search: condition.value,
 			searchLanguage: condition.searchLanguage || "simple",
 			searchType: condition.searchType || "plain"
 		} };
 	}
-	const opClause = buildOperatorClause(condition.operator, condition.value, condition.fieldType);
-	if (SYSTEM_FIELD_IDS.has(condition.field)) return { [condition.field]: opClause };
+	const isSystemField = SYSTEM_FIELD_IDS.has(condition.field);
+	const opClause = buildOperatorClause(condition.operator, condition.value, condition.fieldType, isSystemField);
+	if (isSystemField) return { [condition.field]: opClause };
 	return { data: {
-		path: condition.field,
+		path: stripDataFieldPrefix(condition.field),
 		...opClause
 	} };
 }
@@ -9157,7 +9305,10 @@ const SearchWidget = (0, mobx_react_lite.observer)(({ model }) => {
 				right: "0",
 				top: "50%",
 				transform: "translateY(-50%)",
-				onClick: () => model.clear(),
+				onClick: () => {
+					model.clear();
+					setExpanded(false);
+				},
 				color: "gray.400",
 				_hover: { color: "black" },
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_pi.PiXBold, {})
@@ -9316,22 +9467,18 @@ var SortModel = class {
 		if (firstAvailable) this.addSort(firstAvailable.field);
 	}
 	serializeToViewSorts() {
-		const lookup = this._fieldLookup;
-		return this.sorts.map((sort) => {
-			return {
-				field: lookup.get(sort.field)?.isSystem ? sort.field : `data.${sort.field}`,
-				direction: sort.direction
-			};
-		});
+		return this.sorts.map((sort) => ({
+			field: sort.field,
+			direction: sort.direction
+		}));
 	}
 	applyViewSorts(viewSorts) {
 		const lookup = this._fieldLookup;
 		const sorts = [];
 		for (const vs of viewSorts) {
-			const field = vs.field.startsWith("data.") ? vs.field.slice(5) : vs.field;
 			const direction = vs.direction === "desc" ? "desc" : "asc";
-			if (lookup.has(field)) sorts.push({
-				field,
+			if (lookup.has(vs.field)) sorts.push({
+				field: vs.field,
 				direction
 			});
 		}
@@ -12155,10 +12302,69 @@ const FieldMenuItem = (0, react.memo)(({ field, name, fieldType, valuePrefix, on
 	});
 });
 
+//#endregion
+//#region src/table-editor/Table/ui/Header/FileFieldSubmenu.tsx
+const FileFieldSubmenu = ({ group, parentVisible, valuePrefix, onClick }) => {
+	if (group.children.length === 0 && !parentVisible) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
+		field: group.parent.field,
+		name: group.parent.label,
+		fieldType: group.parent.fieldType,
+		valuePrefix,
+		onClick
+	});
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Root, {
+		positioning: {
+			placement: "right-start",
+			gutter: 2
+		},
+		lazyMount: true,
+		unmountOnExit: true,
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.TriggerItem, {
+			"data-testid": `file-group-${group.parent.field}`,
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Box, {
+				display: "flex",
+				alignItems: "center",
+				gap: 2,
+				flex: 1,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Box, {
+					as: "span",
+					fontSize: "xs",
+					fontWeight: "medium",
+					color: "gray.400",
+					fontFamily: "mono",
+					minWidth: "20px",
+					children: getFieldTypeIcon(group.parent.fieldType)
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Text, {
+					truncate: true,
+					children: group.parent.label
+				})]
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuChevronRight, {})]
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Portal, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Positioner, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Content, {
+			maxH: "300px",
+			minW: "200px",
+			overflowY: "auto",
+			children: [!parentVisible && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
+				field: group.parent.field,
+				name: group.parent.label,
+				fieldType: group.parent.fieldType,
+				valuePrefix,
+				onClick
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})] }), group.children.map((col) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
+				field: col.field,
+				name: col.label,
+				fieldType: col.fieldType,
+				valuePrefix,
+				onClick
+			}, col.field))]
+		}) }) })]
+	});
+};
+
 //#endregion
 //#region src/table-editor/Table/ui/Header/InsertColumnSubmenu.tsx
-const InsertColumnSubmenu = ({ label, valuePrefix, availableFields, onSelect }) => {
+const InsertColumnSubmenu = ({ label, valuePrefix, availableFields, allColumns, onSelect }) => {
 	if (availableFields.length === 0) return null;
+	const groupedFields = groupFileFields(availableFields, allColumns);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Root, {
 		positioning: {
 			placement: "right-start",
@@ -12173,13 +12379,18 @@ const InsertColumnSubmenu = ({ label, valuePrefix, availableFields, onSelect })
 			maxH: "300px",
 			minW: "200px",
 			overflowY: "auto",
-			children: availableFields.map((col) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
-				field: col.field,
-				name: col.label,
-				fieldType: col.fieldType,
+			children: groupedFields.map((item) => isFileFieldGroup(item) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FileFieldSubmenu, {
+				group: item,
+				parentVisible: item.parentVisible,
+				valuePrefix,
+				onClick: onSelect
+			}, item.parent.field) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
+				field: item.field,
+				name: item.label,
+				fieldType: item.fieldType,
 				valuePrefix,
 				onClick: onSelect
-			}, col.field))
+			}, item.field))
 		}) }) })]
 	});
 };
@@ -12188,8 +12399,8 @@ const InsertColumnSubmenu = ({ label, valuePrefix, availableFields, onSelect })
 //#region src/table-editor/Table/ui/Header/ColumnHeaderMenu.tsx
 const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel, sortModel, filterModel, onCopyPath, onClose }) => {
 	const canRemove = columnsModel.canRemoveColumn;
-	const availableFields = columnsModel.availableFieldsToAdd;
-	const hasAvailableFields = availableFields.length > 0;
+	const insertableFields = columnsModel.availableFieldsToInsert;
+	const hasInsertableFields = insertableFields.length > 0;
 	const canMove = columnsModel.canMoveLeft(column.field) || columnsModel.canMoveRight(column.field);
 	const isPinned = columnsModel.isPinned(column.field);
 	const canPinLeft = columnsModel.canPinLeft(column.field);
@@ -12227,11 +12438,11 @@ const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel,
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Content, {
 		minW: "180px",
 		children: [
-			sortModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortSubmenu, {
+			sortModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortSubmenu, {
 				field: column.field,
 				sortModel
 			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})] }),
-			filterModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Item, {
+			filterModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Item, {
 				value: "add-filter",
 				onClick: handleAddFilter,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuFilter, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Text, { children: "Add filter" })]
@@ -12257,17 +12468,19 @@ const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel,
 				}),
 				(canPinLeft || canPinRight) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})
 			] }),
-			hasAvailableFields && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+			hasInsertableFields && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(InsertColumnSubmenu, {
 					label: "Insert before",
 					valuePrefix: "before",
-					availableFields,
+					availableFields: insertableFields,
+					allColumns: columnsModel.allColumns,
 					onSelect: handleInsertBefore
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(InsertColumnSubmenu, {
 					label: "Insert after",
 					valuePrefix: "after",
-					availableFields,
+					availableFields: insertableFields,
+					allColumns: columnsModel.allColumns,
 					onSelect: handleInsertAfter
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})
@@ -12385,11 +12598,11 @@ const ColumnHeader = (0, mobx_react_lite.observer)(({ column, columnsModel, sort
 							field: column.field,
 							columnsModel
 						}),
-						filterModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FilterIndicator, {
+						filterModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FilterIndicator, {
 							field: column.field,
 							filterModel
 						}),
-						sortModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortIndicator, {
+						sortModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortIndicator, {
 							field: column.field,
 							sortModel
 						})
@@ -12416,6 +12629,7 @@ const AddColumnButton = (0, mobx_react_lite.observer)(({ columnsModel }) => {
 	const availableFields = columnsModel.availableFieldsToAdd;
 	const availableSystemFields = columnsModel.availableSystemFieldsToAdd;
 	if (!columnsModel.hasHiddenColumns) return null;
+	const groupedFields = groupFileFields(availableFields, columnsModel.allColumns);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Flex, {
 		alignItems: "center",
 		px: "4px",
@@ -12449,17 +12663,21 @@ const AddColumnButton = (0, mobx_react_lite.observer)(({ columnsModel }) => {
 						onClick: columnsModel.addAll,
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_pi.PiListBullets, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Text, { children: "Add all columns" })]
 					}),
-					availableFields.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.ItemGroup, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.ItemGroupLabel, {
+					groupedFields.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.ItemGroup, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.ItemGroupLabel, {
 						fontWeight: "medium",
 						color: "gray.500",
 						fontSize: "xs",
 						children: "Data fields"
-					}), availableFields.map((col) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
-						field: col.field,
-						name: col.label,
-						fieldType: col.fieldType,
+					}), groupedFields.map((item) => isFileFieldGroup(item) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FileFieldSubmenu, {
+						group: item,
+						parentVisible: item.parentVisible,
+						onClick: columnsModel.showColumn
+					}, item.parent.field) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldMenuItem, {
+						field: item.field,
+						name: item.label,
+						fieldType: item.fieldType,
 						onClick: columnsModel.showColumn
-					}, col.field))] })] }),
+					}, item.field))] })] }),
 					availableSystemFields.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.ItemGroup, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.ItemGroupLabel, {
 						fontWeight: "medium",
 						color: "gray.500",
@@ -12834,45 +13052,48 @@ const SelectionToolbar = (0, mobx_react_lite.observer)(({ selection, allRowIds,
 	const isAllSelected = selection.isAllSelected(allRowIds);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.Root, {
 		open: selection.isSelectionMode,
-		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Portal, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.Positioner, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.ActionBar.Content, {
-			"data-testid": "selection-toolbar",
-			children: [
-				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.ActionBar.SelectionTrigger, { children: [selection.selectedCount, " selected"] }),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.Separator, {}),
-				!isAllSelected && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Button, {
-					variant: "outline",
-					size: "sm",
-					onClick: () => selection.selectAll(allRowIds),
-					"data-testid": "select-all",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_pi.PiCheckSquare, {}), "Select all"]
-				}),
-				onDuplicate && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Button, {
-					variant: "outline",
-					size: "sm",
-					onClick: () => onDuplicate(selection.selectedIds),
-					"data-testid": "duplicate-selected",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuCopy, {}), "Duplicate"]
-				}),
-				onDelete && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Button, {
-					variant: "outline",
-					size: "sm",
-					onClick: () => onDelete(selection.selectedIds),
-					"data-testid": "delete-selected",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuTrash2, {}), "Delete"]
-				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.CloseTrigger, {
-					asChild: true,
-					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Button, {
-						variant: "ghost",
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Portal, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.Positioner, {
+			zIndex: 5,
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.ActionBar.Content, {
+				"data-testid": "selection-toolbar",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.ActionBar.SelectionTrigger, { children: [selection.selectedCount, " selected"] }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.Separator, {}),
+					!isAllSelected && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Button, {
+						variant: "outline",
+						size: "sm",
+						onClick: () => selection.selectAll(allRowIds),
+						"data-testid": "select-all",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_pi.PiCheckSquare, {}), "Select all"]
+					}),
+					onDuplicate && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Button, {
+						variant: "outline",
 						size: "sm",
-						"aria-label": "Exit selection",
-						onClick: () => selection.exitSelectionMode(),
-						"data-testid": "exit-selection",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_pi.PiX, {})
+						onClick: () => onDuplicate(selection.selectedIds),
+						"data-testid": "duplicate-selected",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuCopy, {}), "Duplicate"]
+					}),
+					onDelete && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Button, {
+						variant: "outline",
+						size: "sm",
+						onClick: () => onDelete(selection.selectedIds),
+						"data-testid": "delete-selected",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuTrash2, {}), "Delete"]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.ActionBar.CloseTrigger, {
+						asChild: true,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Button, {
+							variant: "ghost",
+							size: "sm",
+							"aria-label": "Exit selection",
+							onClick: () => selection.exitSelectionMode(),
+							"data-testid": "exit-selection",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_pi.PiX, {})
+						})
 					})
-				})
-			]
-		}) }) })
+				]
+			})
+		}) })
 	});
 });
 
@@ -13505,67 +13726,6 @@ var ViewSettingsBadgeModel = class {
 	}
 };
 
-//#endregion
-//#region src/table-editor/TableEditor/model/SchemaContext.ts
-const SYSTEM_REF_SCHEMAS = {
-	[_revisium_schema_toolkit.SystemSchemaIds.File]: _revisium_schema_toolkit.fileSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowId]: _revisium_schema_toolkit.rowIdSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedAt]: _revisium_schema_toolkit.rowCreatedAtSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedId]: _revisium_schema_toolkit.rowCreatedIdSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowVersionId]: _revisium_schema_toolkit.rowVersionIdSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowPublishedAt]: _revisium_schema_toolkit.rowPublishedAtSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowUpdatedAt]: _revisium_schema_toolkit.rowUpdatedAtSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowHash]: _revisium_schema_toolkit.rowHashSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowSchemaHash]: _revisium_schema_toolkit.rowSchemaHashSchema
-};
-function buildRowSchema(dataSchema) {
-	const systemProperties = {};
-	for (const sf of SYSTEM_FIELDS) systemProperties[sf.id] = { $ref: sf.ref };
-	return {
-		type: "object",
-		properties: {
-			...systemProperties,
-			...dataSchema.properties
-		},
-		additionalProperties: false,
-		required: [...Object.keys(systemProperties), ...dataSchema.required ?? []]
-	};
-}
-var SchemaContext = class {
-	_allColumns = [];
-	_dataSchema = null;
-	_fullRefSchemas = {};
-	_rootNode = null;
-	get allColumns() {
-		return this._allColumns;
-	}
-	get sortableFields() {
-		return this._allColumns.filter((col) => !col.isDeprecated && col.fieldType !== FilterFieldType.File);
-	}
-	get filterableFields() {
-		return this.sortableFields;
-	}
-	get dataSchema() {
-		return this._dataSchema;
-	}
-	get fullRefSchemas() {
-		return this._fullRefSchemas;
-	}
-	get rootNode() {
-		return this._rootNode;
-	}
-	init(dataSchema, refSchemas) {
-		this._dataSchema = dataSchema;
-		this._fullRefSchemas = {
-			...SYSTEM_REF_SCHEMAS,
-			...refSchemas
-		};
-		const rowSchema = buildRowSchema(dataSchema);
-		this._rootNode = new _revisium_schema_toolkit.SchemaParser().parse(rowSchema, this._fullRefSchemas);
-		this._allColumns = extractColumns(this._rootNode);
-	}
-};
-
 //#endregion
 //#region src/table-editor/TableEditor/model/TableEditorCore.ts
 const DEFAULT_PAGE_SIZE = 50;
@@ -13712,7 +13872,10 @@ var TableEditorCore = class {
 	_buildQuery(after = null) {
 		return {
 			where: this.filters.hasActiveFilters ? this.filters.buildCurrentWhereClause() : null,
-			orderBy: this.sorts.serializeToViewSorts(),
+			orderBy: this.sorts.serializeToViewSorts().map((s) => ({
+				field: stripDataFieldPrefix(s.field),
+				direction: s.direction
+			})),
 			search: this.search.debouncedQuery,
 			first: this._pageSize,
 			after
@@ -13747,14 +13910,14 @@ var TableEditorCore = class {
 		this._updateNavigationContext();
 	}
 	_createRowVMs(rawRows) {
-		const dataSchema = this._schemaContext.dataSchema;
-		if (!dataSchema) return [];
+		const wrappedSchema = this._schemaContext.wrappedDataSchema;
+		if (!wrappedSchema) return [];
 		const tableModel = (0, _revisium_schema_toolkit.createTableModel)({
 			tableId: this._tableId,
-			schema: dataSchema,
+			schema: wrappedSchema,
 			rows: rawRows.map((r) => ({
 				rowId: r.rowId,
-				data: r.data
+				data: { data: r.data }
 			})),
 			refSchemas: this._schemaContext.fullRefSchemas
 		});
@@ -13768,10 +13931,14 @@ var TableEditorCore = class {
 			id: rawRow.rowId
 		};
 	}
+	_toPatchField(field) {
+		return stripDataFieldPrefix(field);
+	}
 	async _commitCell(rowId, field, value, previousValue) {
+		const patchField = this._toPatchField(field);
 		const result = (await this._dataSource.patchCells([{
 			rowId,
-			field,
+			field: patchField,
 			value
 		}]))[0];
 		if (result && !result.ok) (0, mobx.runInAction)(() => {
@@ -13851,7 +14018,7 @@ var MockDataSource = class {
 	static createRow(rowId, data, systemFields) {
 		const row = {
 			rowId,
-			data: { ...data }
+			data: data && typeof data === "object" && !Array.isArray(data) ? { ...data } : data
 		};
 		if (systemFields) row.systemFields = systemFields;
 		return row;
@@ -13870,16 +14037,23 @@ var MockDataSource = class {
 		let rows = [...this._allRows];
 		if (query.search) {
 			const lower = query.search.toLowerCase();
-			rows = rows.filter((row) => Object.values(row.data).some((val) => typeof val === "string" && val.toLowerCase().includes(lower)));
+			rows = rows.filter((row) => {
+				const data = row.data;
+				if (data && typeof data === "object") return Object.values(data).some((val) => typeof val === "string" && val.toLowerCase().includes(lower));
+				if (typeof data === "string") return data.toLowerCase().includes(lower);
+				return false;
+			});
 		}
 		if (query.orderBy.length > 0) {
 			const firstOrder = query.orderBy[0];
 			if (firstOrder) {
-				const field = firstOrder.field.startsWith("data.") ? firstOrder.field.slice(5) : firstOrder.field;
+				const field = firstOrder.field;
 				const dir = firstOrder.direction === "desc" ? -1 : 1;
 				rows.sort((a, b) => {
-					const aVal = a.data[field];
-					const bVal = b.data[field];
+					const aData = a.data;
+					const bData = b.data;
+					const aVal = aData?.[field];
+					const bVal = bData?.[field];
 					if (aVal === bVal) return 0;
 					if (aVal == null) return 1;
 					if (bVal == null) return -1;
@@ -13915,7 +14089,7 @@ var MockDataSource = class {
 				error: "Mock failure"
 			};
 			const row = this._allRows.find((r) => r.rowId === patch.rowId);
-			if (row) row.data[patch.field] = patch.value;
+			if (row?.data && typeof row.data === "object" && !Array.isArray(row.data)) row.data[patch.field] = patch.value;
 			return {
 				rowId: patch.rowId,
 				field: patch.field,
@@ -14218,6 +14392,8 @@ exports.getDefaultOperator = getDefaultOperator;
 exports.getLabelByRef = getLabelByRef;
 exports.getOperatorLabel = getOperatorLabel;
 exports.getOperatorsForType = getOperatorsForType;
+exports.groupFileFields = groupFileFields;
+exports.isFileFieldGroup = isFileFieldGroup;
 exports.operatorRequiresValue = operatorRequiresValue;
 exports.selectDefaultColumns = selectDefaultColumns;
 exports.typeMenuGroups = typeMenuGroups;