@likec4/diagram 1.20.1 → 1.20.2

package/src/overlays/relationships-browser/actor.ts

@@ -1,32 +1,49 @@
-import { type BBox, type DiagramView, type Fqn, invariant } from '@likec4/core'
+import { type BBox, type DiagramView, type Fqn, delay, invariant, nonNullable } from '@likec4/core'
 import {
   type EdgeChange,
   type NodeChange,
   type ReactFlowInstance,
   applyEdgeChanges,
   applyNodeChanges,
+  useStoreApi,
 } from '@xyflow/react'
-import { prop } from 'remeda'
+import { type InternalNodeUpdate, getNodeDimensions, getViewportForBounds } from '@xyflow/system'
+import { isNullish, omit, prop } from 'remeda'
 import {
   type ActorLogic,
   type ActorRefFromLogic,
+  type BaseActorRef,
   type MachineSnapshot,
   type SnapshotFrom,
   assign,
   cancel,
   enqueueActions,
+  fromPromise,
   raise,
   setup,
 } from 'xstate'
-import { MinZoom } from '../../base/const'
+import { Base } from '../../base'
+import { MinZoom, ZIndexes } from '../../base/const'
 import { updateEdges } from '../../base/updateEdges'
 import { updateNodes } from '../../base/updateNodes'
+import { centerXYInternalNode } from '../../utils'
 import type { LayoutRelationshipsViewResult } from './-useRelationshipsView'
 import type { RelationshipsBrowserTypes } from './_types'
+import { ViewPadding } from './const'
 import { viewToNodesEdge } from './useViewToNodesEdges'
 
 type XYFLowInstance = ReactFlowInstance<RelationshipsBrowserTypes.Node, RelationshipsBrowserTypes.Edge>
 
+/**
+ * Root node in 'subjects' column
+ */
+const findRootSubject = (nodes: RelationshipsBrowserTypes.Node[]) =>
+  nodes.find((n): n is RelationshipsBrowserTypes.ElementNode | RelationshipsBrowserTypes.CompoundNode =>
+    n.data.column === 'subjects' && isNullish(n.parentId)
+  )
+
+export type XYStoreApi = ReturnType<typeof useStoreApi<RelationshipsBrowserTypes.Node, RelationshipsBrowserTypes.Edge>>
+
 export type Input = {
   subject: Fqn
   scope?: DiagramView | null
@@ -41,15 +58,17 @@ export type Context = Readonly<
     enableNavigationMenu: boolean
     // parentRef: AnyActorRef | null
     xyflow: XYFLowInstance | null
+    xystore: XYStoreApi | null
     initialized: boolean
     layouted: LayoutRelationshipsViewResult | null
+    navigateFromNode: string | null
     xynodes: RelationshipsBrowserTypes.Node[]
     xyedges: RelationshipsBrowserTypes.Edge[]
   }
 >
 
 export type Events =
-  | { type: 'xyflow.init'; instance: XYFLowInstance }
+  | { type: 'xyflow.init'; instance: XYFLowInstance; store: XYStoreApi }
   | { type: 'xyflow.nodeClick'; node: RelationshipsBrowserTypes.Node }
   | { type: 'xyflow.edgeClick'; edge: RelationshipsBrowserTypes.Edge }
   | { type: 'xyflow.applyNodeChages'; changes: NodeChange<RelationshipsBrowserTypes.Node>[] }
@@ -59,85 +78,310 @@ export type Events =
   | { type: 'xyflow.resized' }
   | { type: 'xyflow.edgeMouseEnter'; edge: RelationshipsBrowserTypes.Edge }
   | { type: 'xyflow.edgeMouseLeave'; edge: RelationshipsBrowserTypes.Edge }
+  | { type: 'xyflow.updateNodeInternals' }
   | { type: 'fitDiagram'; duration?: number; bounds?: BBox }
-  | { type: 'navigate.to'; subject: Fqn }
+  | { type: 'navigate.to'; subject: Fqn; fromNode?: string | undefined }
+  | {
+    type: 'update.xydata'
+    xynodes: RelationshipsBrowserTypes.Node[]
+    xyedges: RelationshipsBrowserTypes.Edge[]
+  }
   | { type: 'update.view'; layouted: LayoutRelationshipsViewResult }
   | { type: 'close' }
 
 export const relationshipsBrowserActor = setup({
   types: {
     context: {} as Context,
+    tags: '' as 'active',
     input: {} as Input,
     events: {} as Events,
   },
   actions: {
+    'xyflow:updateNodeInternals': ({ context }) => {
+      invariant(context.xystore, 'xystore is not initialized')
+      const { domNode, updateNodeInternals } = context.xystore.getState()
+      const nodeIds = new Set(context.xyedges.flatMap((e) => [e.source, e.target]))
+
+      if (nodeIds.size === 0 || !domNode) {
+        return
+      }
+
+      const updates = new Map<string, InternalNodeUpdate>()
+
+      for (const updateId of nodeIds) {
+        const nodeElement = domNode.querySelector(`.react-flow__node[data-id="${updateId}"]`) as HTMLDivElement
+        if (nodeElement) {
+          updates.set(updateId, { id: updateId, nodeElement, force: true })
+        }
+      }
+
+      requestAnimationFrame(() => updateNodeInternals(updates, { triggerFitView: false }))
+    },
     'xyflow:fitDiagram': ({ context }, params?: { duration?: number; bounds?: BBox }) => {
-      const {
+      let {
         duration = 450,
         bounds,
       } = params ?? {}
-      const { xyflow } = context
+      const { xyflow, xystore } = context
       invariant(xyflow, 'xyflow is not initialized')
+      invariant(xystore, 'xystore is not initialized')
+      bounds ??= context.layouted?.bounds
+      const maxZoom = Math.max(xyflow.getZoom(), 1)
       if (bounds) {
-        xyflow.fitBounds(bounds, duration > 0 ? { duration } : undefined)
+        const { width, height } = xystore.getState()
+        const viewport = getViewportForBounds(bounds, width, height, MinZoom, maxZoom, ViewPadding)
+        requestAnimationFrame(() => xyflow.setViewport(viewport, duration > 0 ? { duration } : undefined))
       } else {
-        const maxZoom = Math.max(xyflow.getZoom(), 1)
-        xyflow.fitView({
-          minZoom: MinZoom,
-          maxZoom,
-          padding: 0.1,
-          ...(duration > 0 && { duration }),
-        })
+        requestAnimationFrame(() =>
+          xyflow.fitView({
+            minZoom: MinZoom,
+            maxZoom,
+            padding: ViewPadding,
+            ...(duration > 0 && { duration }),
+          })
+        )
       }
     },
   },
   guards: {
     'enable: navigate.to': () => true,
+    'closeable': ({ context }) => context.closeable,
+  },
+  actors: {
+    layouter: fromPromise<{
+      xyedges: RelationshipsBrowserTypes.Edge[]
+      xynodes: RelationshipsBrowserTypes.Node[]
+    }, {
+      subjectId: Fqn
+      navigateFromNode: string | null
+      xyflow: XYFLowInstance
+      xystore: XYStoreApi
+      update: LayoutRelationshipsViewResult
+    }>(async ({ input, self, signal }) => {
+      const {
+        subjectId,
+        navigateFromNode,
+        xyflow,
+        xystore,
+        update,
+      } = input
+      let {
+        nodes: currentNodes,
+        setNodes,
+        setEdges,
+        width,
+        height,
+      } = xystore.getState()
+      const next = viewToNodesEdge(update)
+
+      const updateXYData = () => {
+        const { nodes, edges } = xystore.getState()
+        return {
+          xynodes: updateNodes(nodes, next.xynodes),
+          xyedges: updateEdges(edges, next.xyedges),
+        }
+      }
+      const parent = nonNullable(self._parent) as BaseActorRef<Events>
+
+      let zoom = xyflow.getZoom()
+      const maxZoom = Math.max(zoom, 1)
+      const nextviewport = getViewportForBounds(update.bounds, width, height, MinZoom, maxZoom, ViewPadding)
+
+      const nextSubjectNode = next.xynodes.find(n =>
+        n.type !== 'empty' && n.data.column === 'subjects' && n.data.fqn === subjectId
+      ) ?? findRootSubject(next.xynodes)
+      const currentSubjectNode = findRootSubject(currentNodes)
+
+      const existingNode = navigateFromNode
+        ? currentNodes.find(n => n.id === navigateFromNode)
+        : currentNodes.find(n => n.type !== 'empty' && n.data.column !== 'subjects' && n.data.fqn === subjectId)
+
+      if (
+        !nextSubjectNode || !existingNode || nextSubjectNode.type === 'empty' || !currentSubjectNode ||
+        nextSubjectNode.data.fqn === currentSubjectNode.data.fqn
+      ) {
+        xyflow.setViewport(nextviewport)
+        return updateXYData()
+      }
+
+      const nextSubjectCenter = {
+        x: nextSubjectNode.position.x + (nextSubjectNode.initialWidth ?? 0) / 2,
+        y: nextSubjectNode.position.y + (nextSubjectNode.initialHeight ?? 0) / 2,
+      }
+
+      // Center of current subject
+      const currentSubjectInternalNode = xyflow.getInternalNode(currentSubjectNode.id)!
+      const currentSubjectCenter = centerXYInternalNode(currentSubjectInternalNode)
+
+      // Move to center of existing node
+      const existingInternalNode = xyflow.getInternalNode(existingNode.id)!
+      const existingDimensions = getNodeDimensions(existingInternalNode)
+
+      // Dim all nodes except the existing node
+      // Hide nested nodes
+      const nested = new Set<string>()
+      currentNodes.forEach(n => {
+        if (n.id === existingNode.id) {
+          return
+        }
+        if (n.data.column === 'subjects') {
+          nested.add(n.id)
+          return
+        }
+        if (n.parentId && (n.parentId === existingNode.id || nested.has(n.parentId))) {
+          nested.add(n.id)
+        }
+      })
+      currentNodes = updateNodes(
+        currentNodes,
+        currentNodes.flatMap(n => {
+          if (nested.has(n.id)) {
+            return []
+          }
+          if (n.id !== existingNode.id) {
+            return {
+              ...n,
+              data: {
+                ...n.data,
+                dimmed: n.data.column === 'subjects' ? 'immediate' : true,
+              },
+            } as RelationshipsBrowserTypes.Node
+          }
+          // Move existing node
+          return {
+            ...omit(n, ['parentId']),
+            position: {
+              x: currentSubjectCenter.x - existingDimensions.width / 2,
+              y: currentSubjectCenter.y - existingDimensions.height / 2,
+            },
+            zIndex: ZIndexes.Max,
+            hidden: false,
+            data: {
+              ...n.data,
+              dimmed: false,
+            },
+          } as RelationshipsBrowserTypes.Node
+        }),
+      )
+      parent.send({
+        type: 'update.xydata',
+        xynodes: currentNodes,
+        xyedges: [],
+      })
+
+      // Pick the smaller zoom level
+      zoom = Math.min(
+        zoom,
+        nextviewport.zoom,
+      )
+      // allow framer to render
+      await delay(180)
+      next.xynodes = next.xynodes.map(Base.setDimmed(false))
+
+      if (signal.aborted) {
+        return updateXYData()
+      }
+      await xyflow.setCenter(currentSubjectCenter.x, currentSubjectCenter.y, { zoom, duration: 350 })
+      xyflow.setCenter(nextSubjectCenter.x, nextSubjectCenter.y, { zoom })
+      return updateXYData()
+    }),
   },
 }).createMachine({
-  initial: 'waiting-data',
+  initial: 'initializing',
   context: ({ input }) => ({
     ...input,
     closeable: input.closeable ?? true,
     enableNavigationMenu: input.enableNavigationMenu ?? true,
     initialized: false,
     xyflow: null,
+    xystore: null,
     layouted: null,
+    navigateFromNode: null,
     xynodes: [],
     xyedges: [],
   }),
   states: {
-    'waiting-data': {
+    'initializing': {
       on: {
-        'update.view': {
-          actions: assign(({ event }) => {
-            return {
-              layouted: event.layouted,
-              ...viewToNodesEdge(event.layouted),
-            }
-          }),
-          target: 'opening',
+        'xyflow.init': {
+          actions: [
+            assign({
+              initialized: true,
+              xyflow: ({ event }) => event.instance,
+              xystore: ({ event }) => event.store,
+            }),
+          ],
+          target: 'waiting-data',
+        },
+        'close': {
+          target: 'closed',
         },
       },
     },
-    'opening': {
+    'waiting-data': {
       on: {
-        'xyflow.init': {
-          actions: assign({
-            initialized: true,
-            xyflow: ({ event }) => event.instance,
-          }),
+        'update.view': {
+          actions: [
+            assign(({ event }) => {
+              return {
+                layouted: event.layouted,
+                ...viewToNodesEdge(event.layouted),
+              }
+            }),
+            raise({ type: 'fitDiagram', duration: 0 }),
+          ],
           target: 'active',
         },
-        'close': {
-          target: 'closed',
-        },
       },
     },
     'active': {
-      entry: {
-        type: 'xyflow:fitDiagram',
-        params: { duration: 0 },
+      initial: 'idle',
+      tags: ['active'],
+      states: {
+        'idle': {},
+        'layouting': {
+          invoke: {
+            id: 'layouter',
+            src: 'layouter',
+            input: ({ context }) => {
+              return {
+                subjectId: context.subject,
+                navigateFromNode: context.navigateFromNode,
+                xyflow: nonNullable(context.xyflow),
+                xystore: nonNullable(context.xystore),
+                update: nonNullable(context.layouted),
+              }
+            },
+            onDone: {
+              target: 'idle',
+              actions: [
+                assign({
+                  xynodes: ({ event }) => event.output.xynodes,
+                  xyedges: ({ event }) => event.output.xyedges,
+                  navigateFromNode: null,
+                }),
+                raise({ type: 'fitDiagram' }, { id: 'fitDiagram', delay: 80 }),
+                raise({ type: 'xyflow.updateNodeInternals' }, { delay: 100 }),
+                raise({ type: 'xyflow.updateNodeInternals' }, { delay: 250 }),
+                raise({ type: 'xyflow.updateNodeInternals' }, { delay: 500 }),
+              ],
+            },
+          },
+          on: {
+            'update.xydata': {
+              actions: assign({
+                xynodes: ({ event }) => event.xynodes,
+                xyedges: ({ event }) => event.xyedges,
+              }),
+            },
+            'xyflow.applyEdgeChages': {
+              // actions: log('layouting: ignore xyflow.applyEdgeChages'),
+            },
+            'xyflow.applyNodeChages': {
+              // actions: log('layouting: ignore xyflow.applyNodeChages'),
+            },
+          },
+        },
       },
       on: {
         'xyflow.nodeClick': {
@@ -145,8 +389,10 @@ export const relationshipsBrowserActor = setup({
           actions: enqueueActions(({ event, enqueue }) => {
             if ('fqn' in event.node.data) {
               const fqn = event.node.data.fqn
-              enqueue.assign({
+              enqueue.raise({
+                type: 'navigate.to',
                 subject: fqn,
+                fromNode: event.node.id,
               })
             }
           }),
@@ -156,6 +402,7 @@ export const relationshipsBrowserActor = setup({
           actions: [
             assign({
               subject: ({ event }) => event.subject,
+              navigateFromNode: ({ event }) => event.fromNode ?? null,
             }),
           ],
         },
@@ -163,24 +410,35 @@ export const relationshipsBrowserActor = setup({
           actions: 'xyflow:fitDiagram',
         },
         'update.view': {
-          actions: enqueueActions(({ context, event, enqueue }) => {
-            const updated = viewToNodesEdge(event.layouted)
-            enqueue.assign({
-              layouted: event.layouted,
-              xynodes: updateNodes(context.xynodes, updated.xynodes),
-              xyedges: updateEdges(context.xyedges, updated.xyedges),
-            })
-            enqueue.raise({ type: 'fitDiagram' }, { delay: 50 })
+          actions: assign({
+            layouted: ({ event }) => event.layouted,
           }),
+          target: '.layouting',
+        },
+        'xyflow.updateNodeInternals': {
+          actions: 'xyflow:updateNodeInternals',
+        },
+        'fitDiagram': {
+          actions: {
+            type: 'xyflow:fitDiagram',
+            params: prop('event'),
+          },
+        },
+        'xyflow.resized': {
+          actions: [
+            cancel('fitDiagram'),
+            raise({ type: 'fitDiagram' }, { id: 'fitDiagram', delay: 300 }),
+          ],
         },
         'close': {
-          guard: ({ context }) => context.closeable,
+          guard: 'closeable',
           target: 'closed',
         },
       },
       exit: assign({
         initialized: false,
         xyflow: null,
+        xystore: null,
       }),
     },
     'closed': {
@@ -188,31 +446,32 @@ export const relationshipsBrowserActor = setup({
     },
   },
   on: {
-    'fitDiagram': {
-      actions: {
-        type: 'xyflow:fitDiagram',
-        params: prop('event'),
-      },
-    },
-    'xyflow.resized': {
-      actions: [
-        cancel('fitDiagram'),
-        raise({ type: 'fitDiagram' }, { id: 'fitDiagram', delay: 200 }),
-      ],
-    },
     'xyflow.applyNodeChages': {
       actions: assign({
-        xynodes: ({ context, event }) => applyNodeChanges(event.changes, context.xynodes),
+        xynodes: ({ context, event }) => {
+          return applyNodeChanges(event.changes, context.xynodes)
+        },
       }),
     },
     'xyflow.applyEdgeChages': {
       actions: assign({
-        xyedges: ({ context, event }) => applyEdgeChanges(event.changes, context.xyedges),
+        xyedges: ({ context, event }) => {
+          return applyEdgeChanges(event.changes, context.xyedges)
+        },
       }),
     },
   },
 }) as unknown as ActorLogic<
-  MachineSnapshot<Context, Events, any, 'opening' | 'active' | 'closed', any, any, any, any>,
+  MachineSnapshot<
+    Context,
+    Events,
+    any,
+    'initializing' | 'waiting-data' | 'closed' | { active: 'idle' | 'layouting' },
+    'active',
+    any,
+    any,
+    any
+  >,
   Events,
   Input,
   any,

package/src/overlays/relationships-browser/const.ts

@@ -0,0 +1 @@
+export const ViewPadding = 0.08

package/src/overlays/relationships-browser/custom/ElementActions.tsx

@@ -31,7 +31,7 @@ export const ElementActions = (props: ElementActionsProps) => {
       icon: <IconTransform />,
       onClick: (e) => {
         e.stopPropagation()
-        browser.navigateTo(fqn)
+        browser.navigateTo(fqn, props.id)
       },
     })
   }

package/src/overlays/relationships-browser/custom/edgeTypes.tsx

@@ -8,17 +8,36 @@ export const edgeTypes = {
   relationships: customEdge<RelationshipsBrowserTypes.EdgeData>((props) => {
     const { enableNavigateTo } = useEnabledFeature('NavigateTo')
     const {
-      sourceX,
-      targetY,
-      data: { navigateTo },
+      data: {
+        navigateTo,
+        relations,
+      },
     } = props
     const [svgPath, labelX, labelY] = getBezierPath(props)
     const diagram = useDiagram()
+
+    const edgeProps = relations.length > 1
+      ? {
+        ...props,
+        data: {
+          ...props.data,
+          line: 'solid',
+          color: 'amber',
+        } satisfies RelationshipsBrowserTypes.EdgeData,
+      }
+      : props
+
     return (
-      <EdgeContainer {...props}>
-        <EdgePath {...props} svgPath={svgPath} />
+      <EdgeContainer {...edgeProps}>
+        <EdgePath
+          {...edgeProps}
+          svgPath={svgPath}
+          {...relations.length > 1 && {
+            strokeWidth: 5,
+          }}
+        />
         <EdgeLabel
-          edgeProps={props}
+          edgeProps={edgeProps}
           labelPosition={{
             x: labelX,
             y: labelY,

package/src/overlays/relationships-browser/custom/nodeTypes.tsx

@@ -1,5 +1,6 @@
 import { Handle } from '@xyflow/react'
 import { Position } from '@xyflow/system'
+import { m } from 'framer-motion'
 import type { NodeProps } from '../../../base'
 import {
   CompoundNodeContainer,
@@ -16,7 +17,7 @@ import { EmptyNode } from './EmptyNode'
 export const nodeTypes = {
   element: customNode<RelationshipsBrowserTypes.ElementNodeData>((props) => {
     return (
-      <ElementNodeContainer nodeProps={props}>
+      <ElementNodeContainer component={m.div} layoutId={props.id} nodeProps={props}>
         <ElementShape {...props} />
         <ElementTitle {...props} iconSize={40} />
         <ElementActions {...props} />
@@ -27,7 +28,7 @@ export const nodeTypes = {
 
   compound: customNode<RelationshipsBrowserTypes.CompoundNodeData>((props) => {
     return (
-      <CompoundNodeContainer nodeProps={props}>
+      <CompoundNodeContainer component={m.div} layoutId={props.id} nodeProps={props}>
         <CompoundTitle {...props} />
         <CompoundPorts {...props} />
       </CompoundNodeContainer>

package/src/overlays/relationships-browser/hooks.ts

@@ -1,6 +1,7 @@
 import { type Fqn, nonNullable } from '@likec4/core'
 import { useCallbackRef } from '@mantine/hooks'
 import { useSelector } from '@xstate/react'
+import { useStoreApi } from '@xyflow/react'
 import { shallowEqual } from 'fast-equals'
 import { createContext, useContext, useMemo, useTransition } from 'react'
 import type { RelationshipsBrowserActorRef, RelationshipsBrowserSnapshot } from './actor'
@@ -26,11 +27,12 @@ export function useRelationshipsBrowser() {
   return useMemo(() => ({
     getState: () => actor.getSnapshot().context,
     send: actor.send,
-    navigateTo: (subject: Fqn) => {
+    navigateTo: (subject: Fqn, fromNode?: string) => {
       startTransition(() => {
         actor.send({
           type: 'navigate.to',
           subject,
+          fromNode,
         })
       })
     },

package/src/overlays/relationships-browser/useViewToNodesEdges.ts

@@ -163,18 +163,24 @@ export function viewToNodesEdge(
       continue
     }
 
+    if (!hasAtLeast(edge.relations, 1)) {
+      console.error('edge should have at least 1 relation', edge)
+      continue
+    }
+
     xyedges.push({
       id,
       type: 'relationships',
       source: ns + source,
       target: ns + target,
-      sourceHandle: ns + target,
-      targetHandle: ns + source,
+      sourceHandle: edge.sourceHandle,
+      targetHandle: edge.targetHandle,
       zIndex: ZIndexes.Edge,
       // selectable: selectable,
       // hidden: !visiblePredicate(edge),
       deletable: false,
       data: {
+        relations: edge.relations,
         color: edge.color ?? 'gray',
         label: edge.label,
         navigateTo: edge.navigateTo ?? null,