@revisium/schema-toolkit-ui 0.6.2 → 0.6.3

package/dist/index.cjs

@@ -7067,7 +7067,11 @@ 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;
 }
@@ -7156,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 = [];
@@ -7588,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) {
@@ -8049,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 };
@@ -8084,8 +8134,9 @@ function buildConditionClause(condition) {
 			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: stripDataFieldPrefix(condition.field),
 		...opClause
@@ -9254,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, {})
@@ -12248,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",
@@ -12266,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))
 		}) }) })]
 	});
 };
@@ -12355,12 +12473,14 @@ const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel,
 					label: "Insert before",
 					valuePrefix: "before",
 					availableFields: insertableFields,
+					allColumns: columnsModel.allColumns,
 					onSelect: handleInsertBefore
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(InsertColumnSubmenu, {
 					label: "Insert after",
 					valuePrefix: "after",
 					availableFields: insertableFields,
+					allColumns: columnsModel.allColumns,
 					onSelect: handleInsertAfter
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})
@@ -12509,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",
@@ -12542,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",
@@ -12927,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, {})
+						})
 					})
-				})
-			]
-		}) }) })
+				]
+			})
+		}) })
 	});
 });
 
@@ -14264,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;