fixed node bounds calculations if it is an internal node

packages/react/src/hooks/useReactFlow.ts

@@ -6,6 +6,7 @@ import {
   getBoundsOfBoxes,
   getElementsToRemove,
   getOverlappingArea,
+  isInternalNodeBase,
   isRectObject,
   NodeRemoveChange,
   nodeToBox,
@@ -233,7 +234,7 @@ export function useReactFlow<NodeType extends Node = Node, EdgeType extends Edge
           options
         );
       },
-      getNodesBounds: (nodes: (NodeType | string)[]): Rect => {
+      getNodesBounds: (nodes: (NodeType | InternalNode | string)[]): Rect => {
         if (nodes.length === 0) {
           return { x: 0, y: 0, width: 0, height: 0 };
         }
@@ -243,7 +244,11 @@ export function useReactFlow<NodeType extends Node = Node, EdgeType extends Edge
         const box = nodes.reduce(
           (currBox, node) => {
             const internalNode =
-              typeof node === 'string' ? nodeLookup.get(node) : node.parentId ? nodeLookup.get(node.id) : node;
+              typeof node === 'string'
+                ? nodeLookup.get(node)
+                : !isInternalNodeBase(node)
+                ? nodeLookup.get(node.id)
+                : node;
 
             const nodeBox = internalNode ? nodeToBox(internalNode, nodeOrigin) : { x: 0, y: 0, x2: 0, y2: 0 };
             return getBoundsOfBoxes(currBox, nodeBox);

packages/svelte/src/lib/hooks/useSvelteFlow.ts

@@ -17,7 +17,8 @@ import {
   nodeHasDimensions,
   nodeToBox,
   getBoundsOfBoxes,
-  boxToRect
+  boxToRect,
+  isInternalNodeBase
 } from '@xyflow/system';
 
 import { useStore } from '$lib/store';
@@ -240,7 +241,7 @@ export function useSvelteFlow(): {
    *
    * @returns the bounds of the given nodes
    */
-  getNodesBounds: (nodes: (Node | string)[]) => Rect;
+  getNodesBounds: (nodes: (Node | InternalNode | string)[]) => Rect;
 } {
   const {
     zoomIn,
@@ -532,7 +533,7 @@ export function useSvelteFlow(): {
           const internalNode =
             typeof node === 'string'
               ? _nodeLookup.get(node)
-              : node.parentId
+              : !isInternalNodeBase(node)
                 ? _nodeLookup.get(node.id)
                 : node;
 

packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte

@@ -1,11 +1,12 @@
 <script lang="ts">
   import { getContext } from 'svelte';
-  import { getNodesBounds, Position, getNodeToolbarTransform } from '@xyflow/system';
+  import { Position, getNodeToolbarTransform } from '@xyflow/system';
   import portal from '$lib/actions/portal';
   import type { InternalNode } from '$lib/types';
   import { useStore } from '$lib/store';
 
   import type { NodeToolbarProps } from './types';
+  import { useSvelteFlow } from '$lib/hooks/useSvelteFlow';
 
   type $$Props = NodeToolbarProps;
 
@@ -15,7 +16,8 @@
   export let offset: $$Props['offset'] = undefined;
   export let isVisible: $$Props['isVisible'] = undefined;
 
-  const { domNode, viewport, nodeLookup, nodes, nodeOrigin } = useStore();
+  const { domNode, viewport, nodeLookup, nodes } = useStore();
+  const { getNodesBounds } = useSvelteFlow();
   const contextNodeId = getContext<string>('svelteflow__node_id');
 
   let transform: string;
@@ -42,7 +44,7 @@
   }
 
   $: {
-    const nodeRect = getNodesBounds(toolbarNodes, { nodeOrigin: $nodeOrigin });
+    const nodeRect = getNodesBounds(toolbarNodes);
 
     if (nodeRect) {
       transform = getNodeToolbarTransform(nodeRect, $viewport, _position, _offset, _align);