@tutti-os/workbench-surface 0.0.254 → 0.0.256

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WorkbenchFrame as WorkbenchFrame$1, WorkbenchSnapshotDisplayModeV1, WorkbenchSnapshot, WorkbenchSnapshotNode, WorkbenchSnapshotLayoutBasisV1 } from '@tutti-os/workbench-snapshot';
+import { WorkbenchFrame as WorkbenchFrame$1, WorkbenchSnapshotDisplayModeV1, WorkbenchSnapshotLockedLayoutV1, WorkbenchSnapshotLayoutPresetV1, WorkbenchSnapshot, WorkbenchSnapshotNode, WorkbenchSnapshotLayoutBasisV1 } from '@tutti-os/workbench-snapshot';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { HTMLAttributes, ReactNode, CSSProperties } from 'react';
 import { I18nRuntime } from '@tutti-os/ui-i18n-runtime';
@@ -19,13 +19,7 @@ interface WorkbenchSafeArea {
 type WorkbenchDisplayMode = WorkbenchSnapshotDisplayModeV1;
 type WorkbenchSnapTarget = "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | null;
 type WorkbenchQuickLayoutTarget = "left" | "right" | "top" | "bottom" | "center" | "top-left" | "top-right" | "bottom-left" | "bottom-right";
-type WorkbenchLayoutPreset = {
-    kind: "balanced";
-} | {
-    kind: "row";
-} | {
-    kind: "column";
-};
+type WorkbenchLayoutPreset = WorkbenchSnapshotLayoutPresetV1;
 /**
  * A layout preset that stays "locked" onto a set of nodes: whenever the surface
  * is resized the layout is re-applied to these nodes so they keep scaling
@@ -33,16 +27,7 @@ type WorkbenchLayoutPreset = {
  * locked node moves the shared grid dividers; the lock is only released
  * explicitly (titlebar button) or by programmatic moves.
  */
-interface WorkbenchLockedLayout {
-    preset: WorkbenchLayoutPreset;
-    nodeIDs: string[];
-    /**
-     * Custom slot geometry created when the user resizes a locked window,
-     * normalized (0..1) against the safe layout rect. When present it takes
-     * precedence over the preset frames; when absent the slots derive from the
-     * preset.
-     */
-    normalizedFrames?: Record<string, WorkbenchFrame>;
+interface WorkbenchLockedLayout extends WorkbenchSnapshotLockedLayoutV1 {
 }
 interface WorkbenchNode<TData = unknown> {
     id: string;
@@ -714,6 +699,11 @@ interface WorkbenchHostNodeBodyContext<TExternalNodeState = unknown, TExternalWo
      * False while minimized, Genie-hidden, or inside Mission Control.
      */
     isVisible: boolean;
+    /**
+     * True when a non-normal Workbench presentation currently paints this node.
+     * Omitted by direct hosts that do not use a Workbench presentation.
+     */
+    isPresentationVisible?: boolean;
     /** Current host presentation mode; null for the normal window layout. */
     presentationMode?: WorkbenchSurfacePresentation["mode"] | null;
     node: WorkbenchNode<WorkbenchHostNodeData>;
@@ -927,8 +917,8 @@ interface CreateWorkbenchSnapshotFromStateOptions {
 }
 declare function createWorkbenchNode<TData = unknown>(input: CreateWorkbenchNodeInput<TData>): WorkbenchNode<TData>;
 declare function createWorkbenchNodeFromSnapshot<TData = unknown>(snapshotNode: WorkbenchSnapshotNode): WorkbenchNode<TData>;
-declare function createWorkbenchStateFromSnapshot<TData = unknown>(snapshot: WorkbenchSnapshot): Pick<WorkbenchState<TData>, "nodeStack" | "nodes">;
-declare function createWorkbenchSnapshotFromState<TData = unknown>(state: Pick<WorkbenchState<TData>, "nodeStack" | "nodes"> & Partial<Pick<WorkbenchState<TData>, "layoutConstraints" | "surfaceSize">>, options?: CreateWorkbenchSnapshotFromStateOptions): WorkbenchSnapshot;
+declare function createWorkbenchStateFromSnapshot<TData = unknown>(snapshot: WorkbenchSnapshot): Pick<WorkbenchState<TData>, "lockedLayout" | "nodeStack" | "nodes">;
+declare function createWorkbenchSnapshotFromState<TData = unknown>(state: Pick<WorkbenchState<TData>, "nodeStack" | "nodes"> & Partial<Pick<WorkbenchState<TData>, "layoutConstraints" | "lockedLayout" | "surfaceSize">>, options?: CreateWorkbenchSnapshotFromStateOptions): WorkbenchSnapshot;
 declare function createWorkbenchSnapshotLayoutBasis(state: Partial<Pick<WorkbenchState, "layoutConstraints" | "surfaceSize">>): WorkbenchSnapshotLayoutBasisV1 | undefined;
 
 interface WorkbenchHostNodeIdentityInput {

package/dist/index.js

@@ -6773,7 +6773,8 @@ function createWorkbenchStateFromSnapshot(snapshot) {
   );
   return {
     nodes,
-    nodeStack: normalized.nodeStack ?? nodes.map((node) => node.id)
+    nodeStack: normalized.nodeStack ?? nodes.map((node) => node.id),
+    lockedLayout: normalized.lockedLayout ?? null
   };
 }
 function createWorkbenchSnapshotFromState(state, options = {}) {
@@ -6795,6 +6796,7 @@ function createWorkbenchSnapshotFromState(state, options = {}) {
     spaces: options.spaces,
     activeSpaceId: options.activeSpaceId,
     layoutBasis: createWorkbenchSnapshotLayoutBasis(state),
+    lockedLayout: state.lockedLayout ?? void 0,
     metadata: options.metadata
   });
 }
@@ -7218,22 +7220,24 @@ function createProjectedNodeID(typeId, instanceId) {
   return createWorkbenchHostProjectedNodeId({ instanceId, typeId });
 }
 function persistedWorkbenchState(state, nodeDefinitionByType) {
+  const nodes = state.nodes.filter((node) => {
+    return nodeDefinitionByType.get(node.data.typeId)?.window?.persists !== false;
+  }).map((node) => ({
+    ...node,
+    data: {
+      dockEntryId: node.data.dockEntryId ?? null,
+      ...node.data.snapshotNodeState === void 0 ? {} : { snapshotNodeState: node.data.snapshotNodeState },
+      instanceId: node.data.instanceId,
+      instanceKey: node.data.instanceKey ?? null,
+      ...node.data.isProjected === true ? { isProjected: true } : {},
+      typeId: node.data.typeId
+    }
+  }));
   return {
     layoutConstraints: state.layoutConstraints,
+    lockedLayout: restrictLockedLayoutToNodes(state.lockedLayout, nodes),
     nodeStack: state.nodeStack,
-    nodes: state.nodes.filter((node) => {
-      return nodeDefinitionByType.get(node.data.typeId)?.window?.persists !== false;
-    }).map((node) => ({
-      ...node,
-      data: {
-        dockEntryId: node.data.dockEntryId ?? null,
-        ...node.data.snapshotNodeState === void 0 ? {} : { snapshotNodeState: node.data.snapshotNodeState },
-        instanceId: node.data.instanceId,
-        instanceKey: node.data.instanceKey ?? null,
-        ...node.data.isProjected === true ? { isProjected: true } : {},
-        typeId: node.data.typeId
-      }
-    })),
+    nodes,
     surfaceSize: state.surfaceSize
   };
 }
@@ -7288,7 +7292,7 @@ function stateFromSnapshotOrDefinitions(snapshot, nodeDefinitions, projectedNode
       nodeStack.push(node.id);
     }
   }
-  return mergeProjectedNodesIntoState(
+  const restoredState = mergeProjectedNodesIntoState(
     {
       nodeStack,
       nodes
@@ -7299,6 +7303,36 @@ function stateFromSnapshotOrDefinitions(snapshot, nodeDefinitions, projectedNode
       snapshot
     }
   );
+  return {
+    ...restoredState,
+    lockedLayout: restrictLockedLayoutToNodes(
+      snapshotState.lockedLayout,
+      restoredState.nodes ?? []
+    )
+  };
+}
+function restrictLockedLayoutToNodes(lockedLayout, nodes) {
+  if (!lockedLayout) {
+    return null;
+  }
+  const knownNodeIDs = new Set(nodes.map((node) => node.id));
+  const nodeIDs = lockedLayout.nodeIDs.filter(
+    (nodeID) => knownNodeIDs.has(nodeID)
+  );
+  if (nodeIDs.length < 2) {
+    return null;
+  }
+  if (!lockedLayout.normalizedFrames) {
+    return { preset: { ...lockedLayout.preset }, nodeIDs };
+  }
+  const normalizedFrames = Object.fromEntries(
+    nodeIDs.map((nodeID) => [nodeID, lockedLayout.normalizedFrames[nodeID]])
+  );
+  return {
+    preset: { ...lockedLayout.preset },
+    nodeIDs,
+    normalizedFrames
+  };
 }
 function restoredSnapshotNodesByID(snapshot, nodeDefinitions) {
   if (!snapshot) {
@@ -7784,6 +7818,7 @@ function sanitizeWorkbenchHostSnapshot(snapshot) {
     spaces: normalized.spaces?.map(sanitizeSpace),
     activeSpaceId: normalized.activeSpaceId,
     layoutBasis: normalized.layoutBasis,
+    lockedLayout: normalized.lockedLayout,
     metadata: sanitizeMetadata(normalized.metadata)
   });
 }
@@ -14592,7 +14627,7 @@ function WorkbenchHostNodeBodyRenderer(input) {
 function areWorkbenchHostNodeBodyRendererPropsEqual(previous, next) {
   const previousContext = previous.context;
   const nextContext = next.context;
-  if (previous.definition !== next.definition || previousContext.activation !== nextContext.activation || previousContext.displayMode !== nextContext.displayMode || previousContext.externalNodeState !== nextContext.externalNodeState || previousContext.externalWorkspaceState !== nextContext.externalWorkspaceState || previousContext.host !== nextContext.host || previousContext.instanceId !== nextContext.instanceId || previousContext.instanceKey !== nextContext.instanceKey || previousContext.isDragging !== nextContext.isDragging || previousContext.isFocused !== nextContext.isFocused || previousContext.isResizing !== nextContext.isResizing || previousContext.isVisible !== nextContext.isVisible || previousContext.presentationMode !== nextContext.presentationMode || !areWorkbenchOptionalSizesEqual(
+  if (previous.definition !== next.definition || previousContext.activation !== nextContext.activation || previousContext.displayMode !== nextContext.displayMode || previousContext.externalNodeState !== nextContext.externalNodeState || previousContext.externalWorkspaceState !== nextContext.externalWorkspaceState || previousContext.host !== nextContext.host || previousContext.instanceId !== nextContext.instanceId || previousContext.instanceKey !== nextContext.instanceKey || previousContext.isDragging !== nextContext.isDragging || previousContext.isFocused !== nextContext.isFocused || previousContext.isResizing !== nextContext.isResizing || previousContext.isVisible !== nextContext.isVisible || previousContext.isPresentationVisible !== nextContext.isPresentationVisible || previousContext.presentationMode !== nextContext.presentationMode || !areWorkbenchOptionalSizesEqual(
     previousContext.previewViewport,
     nextContext.previewViewport
   )) {
@@ -14686,6 +14721,7 @@ function createWorkbenchHostNodeBodyContext({
     isFocused: selectFocusedWorkbenchNode(host.getSnapshot())?.id === context.node.id,
     isResizing: context.isResizing,
     isVisible,
+    isPresentationVisible: context.layout.presentation?.mode === "mission-control" && context.layout.presentation.visibleNodeIds.has(context.node.id),
     presentationMode: context.layout.presentation?.mode ?? null,
     node: context.node,
     setNodeRuntimeState(state) {
@@ -14853,10 +14889,26 @@ function useWorkbenchHostSurfaceRenderers(input) {
     ]
   );
   const captureNodePreviewImage = useCallback14(
-    async (node) => await captureNodeDefinitionPreviewImage(node) ?? await Promise.resolve(
-      input.captureNodePreviewImage?.(node) ?? null
-    ).catch(() => null),
-    [captureNodeDefinitionPreviewImage, input.captureNodePreviewImage]
+    async (node) => {
+      const definitionPreviewImageUrl = await captureNodeDefinitionPreviewImage(node);
+      if (definitionPreviewImageUrl !== null) {
+        return definitionPreviewImageUrl;
+      }
+      if (input.captureNodePreviewImage) {
+        return await Promise.resolve(input.captureNodePreviewImage(node)).catch(
+          () => null
+        );
+      }
+      const previewImages = await Promise.resolve(
+        input.captureNodePreviewImages?.(node) ?? null
+      ).catch(() => null);
+      return previewImages?.dockPreviewImageUrl ?? null;
+    },
+    [
+      captureNodeDefinitionPreviewImage,
+      input.captureNodePreviewImage,
+      input.captureNodePreviewImages
+    ]
   );
   const captureNodePreviewImages = useCallback14(
     async (node) => {