@stll/workspace-ui 0.10.5 → 0.11.1

package/dist/conditions/builder.js

@@ -120,7 +120,7 @@ const ConditionGutter = ({ index, combinator, onCombinator }) => {
 		value: combinator,
 		children: [/* @__PURE__ */ jsx(SelectTrigger, {
 			"aria-label": labels.match,
-			className: "h-7 min-h-0 w-20 min-w-0 shrink-0 text-xs",
+			className: "h-7 min-h-0 w-20 min-w-0 shrink-0",
 			size: "sm",
 			children: /* @__PURE__ */ jsx(SelectValue, {})
 		}), /* @__PURE__ */ jsxs(SelectPopup, { children: [/* @__PURE__ */ jsx(SelectItem, {
@@ -218,7 +218,7 @@ const LeafRow = ({ node, capabilities, index, combinator, onChange, onRemove, on
 						},
 						value: String(fieldIndex),
 						children: [/* @__PURE__ */ jsx(SelectTrigger, {
-							className: "h-7 min-h-0 w-auto max-w-56 text-xs",
+							className: "h-7 min-h-0 w-auto max-w-56",
 							size: "sm",
 							children: /* @__PURE__ */ jsx(SelectValue, {
 								placeholder: labels.fieldPlaceholder,
@@ -332,7 +332,7 @@ const OperatorSelect = ({ field, node, operator, operators, onChange }) => {
 		},
 		value: operator,
 		children: [/* @__PURE__ */ jsx(SelectTrigger, {
-			className: "h-7 min-h-0 w-auto min-w-24 text-xs",
+			className: "h-7 min-h-0 w-auto min-w-24",
 			size: "sm",
 			children: /* @__PURE__ */ jsx(SelectValue, { children: () => labels.operator(field.valueType, operator) })
 		}), /* @__PURE__ */ jsx(SelectPopup, {
@@ -357,7 +357,7 @@ const OperatorSelectFormula = ({ node, operand, operator, operators, onChange })
 		},
 		value: operator,
 		children: [/* @__PURE__ */ jsx(SelectTrigger, {
-			className: "h-7 min-h-0 w-auto min-w-24 text-xs",
+			className: "h-7 min-h-0 w-auto min-w-24",
 			size: "sm",
 			children: /* @__PURE__ */ jsx(SelectValue, { children: () => labels.operator(FORMULA_VALUE_TYPE, operator) })
 		}), /* @__PURE__ */ jsx(SelectPopup, {
@@ -405,7 +405,7 @@ const LeafValueEditor = ({ capabilities, editorKind, field, node, operator, onCh
 		},
 		value: isMultiValue(operator) ? leafValueList(node) : leafValueString(node),
 		children: [/* @__PURE__ */ jsx(SelectTrigger, {
-			className: "h-7 min-h-0 w-auto min-w-28 text-xs",
+			className: "h-7 min-h-0 w-auto min-w-28",
 			size: "sm",
 			children: /* @__PURE__ */ jsx(SelectValue, { placeholder: labels.valuePlaceholder })
 		}), /* @__PURE__ */ jsx(SelectPopup, {

package/dist/view-switcher.d.ts

@@ -25,8 +25,12 @@ export type WorkspaceViewSwitcherProps<View extends WorkspaceViewSwitcherItem> =
   onViewChange: (viewId: string) => void;
   onViewContextMenu?: (view: View, event: React.MouseEvent<HTMLElement>) => void;
   onViewDoubleClick?: (view: View, event: React.MouseEvent<HTMLElement>) => void;
-  renderActions?: (view: View) => React.ReactNode;
+  actionMenu?: {
+    label: string;
+    renderItems: (view: View) => React.ReactNode;
+    onOpenChange?: (view: View, open: boolean) => void;
+  };
   renderIcon: (view: View) => React.ReactNode;
 };
-export declare const WorkspaceViewSwitcher: <View extends WorkspaceViewSwitcherItem>({ activeViewId, ariaLabel, direction, reorder, views, addControl, editing, onViewChange, onViewContextMenu, onViewDoubleClick, renderActions, renderIcon }: WorkspaceViewSwitcherProps<View>) => import("react").JSX.Element;
+export declare const WorkspaceViewSwitcher: <View extends WorkspaceViewSwitcherItem>({ activeViewId, ariaLabel, direction, reorder, views, addControl, editing, onViewChange, onViewContextMenu, onViewDoubleClick, actionMenu, renderIcon }: WorkspaceViewSwitcherProps<View>) => import("react").JSX.Element;
 //#endregion

package/dist/view-switcher.js

@@ -1,5 +1,8 @@
 "use client";
 import { reorderWorkspaceViewIds, toWorkspaceViewDropPosition } from "./view-switcher.logic.js";
+import { EllipsisVerticalIcon } from "lucide-react";
+import { Button } from "@stll/ui/button";
+import { Menu, MenuPopup, MenuTrigger } from "@stll/ui/menu";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { cn } from "@stll/ui/utils";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -19,13 +22,34 @@ const useLatestCallback = (callback) => {
 	}, [callback]);
 	return useCallback((...args) => latest.current(...args), []);
 };
-const WorkspaceViewSwitcher = ({ activeViewId, ariaLabel, direction, reorder, views, addControl, editing, onViewChange, onViewContextMenu, onViewDoubleClick, renderActions, renderIcon }) => {
+const WorkspaceViewSwitcher = ({ activeViewId, ariaLabel, direction, reorder, views, addControl, editing, onViewChange, onViewContextMenu, onViewDoubleClick, actionMenu, renderIcon }) => {
+	const [openMenuId, setOpenMenuId] = useState(null);
 	const canReorder = reorder !== null;
-	const viewTabs = views.map((view) => ({
-		view,
-		actions: renderActions?.(view)
-	}));
-	const reserveActionSpace = viewTabs.some(({ actions }) => actions !== null && actions !== void 0 && typeof actions !== "boolean");
+	const viewTabs = views.map((view) => {
+		const items = actionMenu?.renderItems(view);
+		return {
+			view,
+			actions: actionMenu && items !== null && items !== void 0 && typeof items !== "boolean" ? /* @__PURE__ */ jsxs(Menu, {
+				onOpenChange: (open) => {
+					setOpenMenuId((currentId) => {
+						if (open) return view.id;
+						return currentId === view.id ? null : currentId;
+					});
+					actionMenu.onOpenChange?.(view, open);
+				},
+				children: [/* @__PURE__ */ jsx(MenuTrigger, {
+					"aria-label": actionMenu.label,
+					render: /* @__PURE__ */ jsx(Button, {
+						draggable: false,
+						size: "icon-xs",
+						variant: "ghost"
+					}),
+					children: /* @__PURE__ */ jsx(EllipsisVerticalIcon, {})
+				}), /* @__PURE__ */ jsx(MenuPopup, { children: items })]
+			}) : null
+		};
+	});
+	const reserveActionSpace = viewTabs.some(({ actions }) => actions !== null);
 	const [instanceId] = useState(Symbol);
 	const [stripContainer, setStripContainer] = useState(null);
 	useEffect(() => {
@@ -78,7 +102,7 @@ const WorkspaceViewSwitcher = ({ activeViewId, ariaLabel, direction, reorder, vi
 							direction,
 							getDragData: reorder?.getDragData,
 							getDropData: reorder?.getDropData,
-							isDragBlocked: reorder?.isBlocked ?? false,
+							isDragBlocked: openMenuId !== null || (reorder?.isBlocked ?? false),
 							instanceId,
 							onContextMenu: onViewContextMenu,
 							onDoubleClick: onViewDoubleClick,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/workspace-ui",
-  "version": "0.10.5",
+  "version": "0.11.1",
   "description": "Reusable workspace presentation components and view helpers for Stella.",
   "keywords": [
     "calculations",
@@ -117,9 +117,9 @@
   },
   "dependencies": {
     "@stll/calculations": "^0.1.1",
-    "@stll/conditions": "^0.3.1",
+    "@stll/conditions": "^0.4.0",
     "@stll/money": "^0.2.0",
-    "@stll/ui": "^0.27.0",
+    "@stll/ui": "^0.29.0",
     "better-result": "3.0.1",
     "lucide-react": "1.41.0",
     "temporal-polyfill": "1.0.4",