@eclipse-papyrus/papyrus-web-parent 2026.2.0

package/papyrus-web-components/src/nodes/innerFlag/InnerFlagNode.tsx

@@ -0,0 +1,156 @@
+/*****************************************************************************
+ * Copyright (c) 2024, 2025 CEA LIST, Obeo.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Obeo - Initial API and implementation
+ *****************************************************************************/
+
+import { getCSSColor } from '@eclipse-sirius/sirius-components-core';
+import {
+  ConnectionCreationHandles,
+  ConnectionHandles,
+  ConnectionTargetHandle,
+  DiagramContext,
+  DiagramContextValue,
+  Label,
+  useDrop,
+  useDropNodeStyle,
+  useConnectionLineNodeStyle,
+  useRefreshConnectionHandles,
+  useConnectorNodeStyle,
+  defaultHeight,
+  defaultWidth,
+} from '@eclipse-sirius/sirius-components-diagrams';
+import { Theme, useTheme } from '@mui/material/styles';
+import React, { memo, useContext } from 'react';
+import { Node, NodeProps, NodeResizer, useReactFlow } from '@xyflow/react';
+import { InnerFlagNodeData } from './InnerFlagNode.types';
+
+const resizeLineStyle = (theme: Theme): React.CSSProperties => {
+  return { borderWidth: theme.spacing(0.15) };
+};
+
+const resizeHandleStyle = (theme: Theme): React.CSSProperties => {
+  return {
+    width: theme.spacing(1),
+    height: theme.spacing(1),
+    borderRadius: '100%',
+  };
+};
+
+const innerFlagNodeStyle = (
+  theme: Theme,
+  style: React.CSSProperties,
+  selected: boolean,
+  hovered: boolean,
+  faded: boolean
+): React.CSSProperties => {
+  const innerFlagNodeStyle: React.CSSProperties = {
+    display: 'flex',
+    padding: '0px',
+    width: '100%',
+    height: '100%',
+    opacity: faded ? '0.4' : '',
+    ...style,
+    // No border nor background color: this is handled by the SVG image
+    border: 'none',
+    backgroundColor: 'transparent',
+  };
+
+  if (selected || hovered) {
+    innerFlagNodeStyle.outline = `${theme.palette.selected} solid 1px`;
+  }
+
+  return innerFlagNodeStyle;
+};
+
+const svgPathStyle = (theme: Theme, style: React.CSSProperties, faded: boolean): React.CSSProperties => {
+  const svgPathStyle: React.CSSProperties = {
+    stroke: getCSSColor(String(style.borderColor), theme),
+    fill: getCSSColor(String(style.background), theme),
+    fillOpacity: faded ? '0.4' : '1',
+    strokeOpacity: faded ? '0.4' : '1',
+    strokeWidth: style.borderWidth,
+    vectorEffect: 'non-scaling-stroke',
+  };
+  return svgPathStyle;
+};
+
+export const InnerFlagNode = memo(({ data, id, selected, dragging }: NodeProps<Node<InnerFlagNodeData>>) => {
+  const { readOnly } = useContext<DiagramContextValue>(DiagramContext);
+  const theme = useTheme();
+  const { onDrop, onDragOver } = useDrop();
+  const { style: connectionFeedbackStyle } = useConnectorNodeStyle(id, data.nodeDescription.id);
+  const { style: dropFeedbackStyle } = useDropNodeStyle(data.isDropNodeTarget, data.isDropNodeCandidate, dragging);
+  const { style: connectionLineActiveNodeStyle } = useConnectionLineNodeStyle(data.connectionLinePositionOnNode);
+  const { getNodes } = useReactFlow<Node<InnerFlagNodeData>>();
+  const node = getNodes().find((node) => node.id === id);
+  const nodeHeight = node?.height ?? defaultHeight;
+  const nodeWidth = node?.width ?? defaultWidth;
+
+  const handleOnDrop = (event: React.DragEvent) => {
+    onDrop(event, id);
+  };
+
+  const updatedLabel: any = {
+    ...data.insideLabel,
+    style: {
+      ...data?.insideLabel?.style,
+      paddingLeft: parseInt(data.style.borderWidth?.toString() ?? '0') + 20 + 8 + 'px',
+      paddingTop: parseInt(data.style.borderWidth?.toString() ?? '0') + 8 + 'px',
+      paddingRight: parseInt(data.style.borderWidth?.toString() ?? '1') / 2 + 8 + 'px',
+      paddingBottom: parseInt(data.style.borderWidth?.toString() ?? '0') + 8 + 'px',
+      height: '100%',
+    },
+  };
+
+  useRefreshConnectionHandles(id, data.connectionHandles);
+
+  const borderOffset = data.style.borderWidth ? parseInt(data.style.borderWidth.toString()) / 2 : 0;
+
+  return (
+    <>
+      {data.nodeDescription?.userResizable !== 'NONE' && !readOnly ? (
+        <NodeResizer
+          handleStyle={{ ...resizeHandleStyle(theme) }}
+          lineStyle={{ ...resizeLineStyle(theme) }}
+          color={theme.palette.selected}
+          isVisible={!!selected}
+          keepAspectRatio={data.nodeDescription?.keepAspectRatio}
+        />
+      ) : null}
+      <div
+        style={{
+          ...innerFlagNodeStyle(theme, data.style, !!selected, data.isHovered, data.faded),
+          ...connectionFeedbackStyle,
+          ...dropFeedbackStyle,
+          ...connectionLineActiveNodeStyle,
+        }}
+        onDragOver={onDragOver}
+        onDrop={handleOnDrop}
+        data-testid={`InnerFlag - ${data?.insideLabel?.text}`}>
+        <div style={{ position: 'absolute', inset: '0px' }}>
+          {data.insideLabel ? <Label diagramElementId={id} label={updatedLabel} faded={data.faded} /> : null}
+        </div>
+        {!!selected ? <ConnectionCreationHandles nodeId={id} /> : null}
+        <ConnectionTargetHandle nodeId={id} nodeDescription={data.nodeDescription} isHovered={data.isHovered} />
+        <ConnectionHandles connectionHandles={data.connectionHandles} />
+        <svg viewBox={`0 0 ${nodeWidth} ${nodeHeight}`}>
+          <path
+            style={svgPathStyle(theme, data.style, data.faded)}
+            d={`M ${borderOffset},${borderOffset} H ${nodeWidth - borderOffset} V ${
+              nodeHeight - borderOffset
+            } H ${borderOffset} L ${20}, ${nodeHeight / 2} Z`}
+          />
+        </svg>
+      </div>
+    </>
+  );
+});

package/papyrus-web-components/src/nodes/innerFlag/InnerFlagNode.types.ts

@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2024, 2025 CEA LIST, Obeo.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Obeo - Initial API and implementation
+ *****************************************************************************/
+import { GQLNodeStyle, NodeData } from '@eclipse-sirius/sirius-components-diagrams';
+
+export interface InnerFlagNodeData extends NodeData {}
+
+export interface GQLInnerFlagNodeStyle extends GQLNodeStyle {
+  background: string;
+  borderColor: string;
+  borderStyle: string;
+  borderSize: number;
+}

package/papyrus-web-components/src/nodes/innerFlag/InnerFlagNodeConverter.ts

@@ -0,0 +1,200 @@
+/*****************************************************************************
+ * Copyright (c) 2024, 2026 CEA LIST, Obeo.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Obeo - Initial API and implementation
+ *****************************************************************************/
+import {
+  BorderNodePosition,
+  ConnectionHandle,
+  GQLDiagram,
+  GQLDiagramDescription,
+  GQLEdge,
+  GQLNode,
+  GQLNodeDescription,
+  GQLNodeLayoutData,
+  GQLNodeStyle,
+  GQLViewModifier,
+  IConvertEngine,
+  INodeConverter,
+  convertHandles,
+  convertLineStyle,
+  convertOutsideLabels,
+  isListLayoutStrategy,
+  convertInsideLabel,
+  GQLHandleLayoutData,
+} from '@eclipse-sirius/sirius-components-diagrams';
+import { Node, XYPosition } from '@xyflow/react';
+import { GQLInnerFlagNodeStyle, InnerFlagNodeData } from './InnerFlagNode.types';
+
+const defaultPosition: XYPosition = { x: 0, y: 0 };
+
+const toInnerFlagNode = (
+  gqlDiagram: GQLDiagram,
+  gqlNode: GQLNode<GQLInnerFlagNodeStyle>,
+  gqlParentNode: GQLNode<GQLNodeStyle> | null,
+  nodeDescription: GQLNodeDescription,
+  isBorderNode: boolean,
+  gqlEdges: GQLEdge[]
+): Node<InnerFlagNodeData> => {
+  const {
+    targetObjectId,
+    targetObjectLabel,
+    targetObjectKind,
+    descriptionId,
+    id,
+    insideLabel,
+    outsideLabels,
+    state,
+    pinned,
+    style,
+    labelEditable,
+    deletable,
+  } = gqlNode;
+
+  const handleLayoutData: GQLHandleLayoutData[] = gqlDiagram.layoutData.nodeLayoutData
+    .filter((nodeLayoutData) => nodeLayoutData.id === id)
+    .flatMap((nodeLayoutData) => nodeLayoutData.handleLayoutData);
+
+  const connectionHandles: ConnectionHandle[] = convertHandles(gqlNode.id, gqlEdges, handleLayoutData);
+  const gqlNodeLayoutData: GQLNodeLayoutData | undefined = gqlDiagram.layoutData.nodeLayoutData.find(
+    (nodeLayoutData) => nodeLayoutData.id === id
+  );
+  const isNew = gqlNodeLayoutData === undefined;
+  const resizedByUser = gqlNodeLayoutData?.resizedByUser ?? false;
+  const movedByUser = gqlNodeLayoutData?.movedByUser ?? false;
+
+  const data: InnerFlagNodeData = {
+    targetObjectId,
+    targetObjectLabel,
+    targetObjectKind,
+    descriptionId,
+    style: {
+      display: 'flex',
+      background: style.background,
+      borderColor: style.borderColor,
+      borderWidth: style.borderSize,
+      borderStyle: convertLineStyle(style.borderStyle),
+    },
+    insideLabel: null,
+    outsideLabels: convertOutsideLabels(outsideLabels, gqlDiagram.layoutData.labelLayoutData),
+    faded: state === GQLViewModifier.Faded,
+    pinned,
+    isBorderNode: isBorderNode,
+    nodeDescription,
+    defaultWidth: gqlNode.defaultWidth,
+    defaultHeight: gqlNode.defaultHeight,
+    borderNodePosition: isBorderNode ? BorderNodePosition.EAST : null,
+    connectionHandles,
+    labelEditable,
+    isNew,
+    resizedByUser,
+    movedByUser,
+    isListChild: isListLayoutStrategy(gqlParentNode?.style.childrenLayoutStrategy),
+    isDraggedNode: false,
+    isDropNodeTarget: false,
+    isDropNodeCandidate: false,
+    isHovered: false,
+    connectionLinePositionOnNode: 'none',
+    nodeAppearanceData: {
+      gqlStyle: style,
+      customizedStyleProperties: [],
+    },
+    minComputedWidth: gqlNodeLayoutData?.minComputedSize.width ?? null,
+    minComputedHeight: gqlNodeLayoutData?.minComputedSize.height ?? null,
+    deletable,
+    isLastNodeSelected: false,
+  };
+
+  data.insideLabel = convertInsideLabel(
+    insideLabel,
+    data,
+    `${style.borderSize}px ${style.borderStyle} ${style.borderColor}`
+  );
+
+  const node: Node<InnerFlagNodeData> = {
+    id,
+    type: 'innerFlagNode',
+    data,
+    position: defaultPosition,
+    hidden: gqlNode.state === GQLViewModifier.Hidden,
+  };
+
+  if (gqlParentNode) {
+    node.parentId = gqlParentNode.id;
+  }
+
+  const nodeLayoutData = gqlDiagram.layoutData.nodeLayoutData.filter((data) => data.id === id)[0];
+  if (nodeLayoutData) {
+    const {
+      position,
+      size: { height, width },
+    } = nodeLayoutData;
+    node.position = position;
+    node.height = height;
+    node.width = width;
+    node.style = {
+      ...node.style,
+      width: `${node.width}px`,
+      height: `${node.height}px`,
+    };
+  }
+
+  return node;
+};
+
+export class InnerFlagNodeConverter implements INodeConverter {
+  canHandle(gqlNode: GQLNode<GQLNodeStyle>) {
+    return gqlNode.style.__typename === 'InnerFlagNodeStyle';
+  }
+
+  handle(
+    convertEngine: IConvertEngine,
+    gqlDiagram: GQLDiagram,
+    gqlNode: GQLNode<GQLInnerFlagNodeStyle>,
+    gqlEdges: GQLEdge[],
+    parentNode: GQLNode<GQLNodeStyle> | null,
+    isBorderNode: boolean,
+    nodes: Node[],
+    diagramDescription: GQLDiagramDescription,
+    nodeDescriptions: GQLNodeDescription[]
+  ) {
+    const nodeDescription = nodeDescriptions.find((description) => description.id === gqlNode.descriptionId);
+    if (nodeDescription) {
+      nodes.push(toInnerFlagNode(gqlDiagram, gqlNode, parentNode, nodeDescription, isBorderNode, gqlEdges));
+    }
+
+    const borderNodeDescriptions: GQLNodeDescription[] = (nodeDescription?.borderNodeDescriptionIds ?? []).flatMap(
+      (nodeDescriptionId) =>
+        diagramDescription.nodeDescriptions.filter((nodeDescription) => nodeDescription.id === nodeDescriptionId)
+    );
+    const childNodeDescriptions: GQLNodeDescription[] = (nodeDescription?.childNodeDescriptionIds ?? []).flatMap(
+      (nodeDescriptionId) =>
+        diagramDescription.nodeDescriptions.filter((nodeDescription) => nodeDescription.id === nodeDescriptionId)
+    );
+
+    convertEngine.convertNodes(
+      gqlDiagram,
+      gqlNode.borderNodes ?? [],
+      gqlNode,
+      nodes,
+      diagramDescription,
+      borderNodeDescriptions
+    );
+    convertEngine.convertNodes(
+      gqlDiagram,
+      gqlNode.childNodes ?? [],
+      gqlNode,
+      nodes,
+      diagramDescription,
+      childNodeDescriptions
+    );
+  }
+}

package/papyrus-web-components/src/nodes/innerFlag/InnerFlagNodeLayoutHandler.ts

@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * Copyright (c) 2024, 2025 CEA LIST, Obeo.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Obeo - Initial API and implementation
+ *****************************************************************************/
+import {
+  Diagram,
+  DiagramNodeType,
+  ILayoutEngine,
+  INodeLayoutHandler,
+  NodeData,
+  applyRatioOnNewNodeSizeValue,
+  computePreviousSize,
+  findNodeIndex,
+  getBorderNodeExtent,
+  getChildNodePosition,
+  getDefaultOrMinHeight,
+  getDefaultOrMinWidth,
+  setBorderNodesPosition,
+  ForcedDimensions,
+  getHeaderHeightFootprint,
+  getInsideLabelWidthConstraint,
+} from '@eclipse-sirius/sirius-components-diagrams';
+import { Node } from '@xyflow/react';
+import { InnerFlagNodeData } from './InnerFlagNode.types';
+
+export class InnerFlagNodeLayoutHandler implements INodeLayoutHandler<NodeData> {
+  canHandle(node: Node<NodeData, DiagramNodeType>) {
+    return node.type === 'innerFlagNode';
+  }
+
+  handle(
+    layoutEngine: ILayoutEngine,
+    previousDiagram: Diagram | null,
+    node: Node<InnerFlagNodeData, 'innerFlagNode'>,
+    visibleNodes: Node<NodeData, DiagramNodeType>[],
+    directChildren: Node<NodeData, DiagramNodeType>[],
+    newlyAddedNodes: Node<NodeData, DiagramNodeType>[],
+    forceWidth?: ForcedDimensions
+  ) {
+    layoutEngine.layoutNodes(previousDiagram, visibleNodes, directChildren, newlyAddedNodes);
+
+    const nodeIndex = findNodeIndex(visibleNodes, node.id);
+
+    const nodeElement = document.getElementById(`${node.id}-innerFlagNode-${nodeIndex}`)?.children[0];
+    const borderWidth = nodeElement ? parseFloat(window.getComputedStyle(nodeElement).borderWidth) : 0;
+
+    const labelElement = document.getElementById(`${node.id}-label-${nodeIndex}`);
+    // 16px for left and right padding, 20px for the left gap corresponding to the inner flag shape.
+    const labelWidth = getInsideLabelWidthConstraint(node.data.insideLabel, labelElement) + borderWidth * 2 + 16 + 20;
+    const labelHeight = getHeaderHeightFootprint(labelElement, node.data.insideLabel, 'TOP');
+
+    const borderNodes = directChildren.filter((node) => node.data.isBorderNode);
+    const directNodesChildren = directChildren.filter((child) => !child.data.isBorderNode);
+
+    // Update children position to be under the label and at the right padding.
+    directNodesChildren.forEach((child, index) => {
+      const previousNode = (previousDiagram?.nodes ?? []).find((previouseNode) => previouseNode.id === child.id);
+
+      const createdNode = newlyAddedNodes.find((node) => node?.id === child.id);
+
+      if (!!createdNode) {
+        child.position = createdNode.position;
+      } else if (previousNode) {
+        child.position = previousNode.position;
+      } else {
+        child.position = child.position = getChildNodePosition(visibleNodes, child, labelHeight, borderWidth);
+        const previousSibling = directNodesChildren[index - 1];
+        if (previousSibling) {
+          child.position = getChildNodePosition(visibleNodes, child, labelHeight, borderWidth, previousSibling);
+        }
+      }
+    });
+
+    const nodeMinComputeWidth = labelWidth;
+    const nodeMinComputeHeight = labelHeight + borderWidth * 2;
+
+    const nodeWith = forceWidth?.width ?? getDefaultOrMinWidth(nodeMinComputeWidth, node); // WARN: not sure yet for the
+    // forceWidth to be here.
+    const nodeHeight = getDefaultOrMinHeight(nodeMinComputeHeight, node);
+
+    const previousNode = (previousDiagram?.nodes ?? []).find((previouseNode) => previouseNode.id === node.id);
+    const previousDimensions = computePreviousSize(previousNode, node);
+    if (node.data.resizedByUser) {
+      if (nodeMinComputeWidth > previousDimensions.width) {
+        node.width = nodeMinComputeWidth;
+      } else {
+        node.width = previousDimensions.width;
+      }
+      if (nodeMinComputeHeight > previousDimensions.height) {
+        node.height = nodeMinComputeHeight;
+      } else {
+        node.height = previousDimensions.height;
+      }
+    } else {
+      node.width = nodeWith;
+      node.height = nodeHeight;
+    }
+
+    if (node.data.nodeDescription?.keepAspectRatio) {
+      applyRatioOnNewNodeSizeValue(node);
+    }
+
+    // Update border nodes positions
+    borderNodes.forEach((borderNode) => {
+      borderNode.extent = getBorderNodeExtent(node, borderNode);
+    });
+    setBorderNodesPosition(borderNodes, node, previousDiagram);
+  }
+}

package/papyrus-web-components/src/nodes/note/NoteLabel.tsx

@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * Copyright (c) 2024, 2025 CEA LIST, Obeo, Artal Technologies.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Obeo - initial API and implementation
+ *  Titouan BOUETE-GIRAUD (Artal Technologies) - Issue 224
+ *******************************************************************************/
+
+// Adapted from https://github.com/eclipse-sirius/sirius-web/blob/master/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/Label.tsx
+
+import { getCSSColor, IconOverlay } from '@eclipse-sirius/sirius-components-core';
+import { Theme, useTheme } from '@mui/material/styles';
+import { memo, useContext } from 'react';
+import { DiagramContext } from '@eclipse-sirius/sirius-components-diagrams';
+import { DiagramContextValue } from '@eclipse-sirius/sirius-components-diagrams';
+import { Label, NoteLabelProps } from './NoteNode.types';
+import { useDiagramDirectEdit } from '@eclipse-sirius/sirius-components-diagrams';
+import { DiagramDirectEditInput } from '@eclipse-sirius/sirius-components-diagrams';
+import { useViewport } from '@xyflow/react';
+import { useRef } from 'react';
+
+const isDisplayTopHeaderSeparator = (label: Label): boolean => {
+  if ('displayHeaderSeparator' in label) {
+    return label.displayHeaderSeparator && label.headerPosition === 'BOTTOM';
+  }
+  return false;
+};
+
+const isDisplayBottomHeaderSeparator = (label: Label): boolean => {
+  if ('displayHeaderSeparator' in label) {
+    return label.displayHeaderSeparator && label.headerPosition === 'TOP';
+  }
+  return false;
+};
+
+const getHeaderSeparatorStyle = (label: Label): React.CSSProperties | undefined => {
+  if ('headerSeparatorStyle' in label) {
+    return label.headerSeparatorStyle;
+  }
+  return undefined;
+};
+
+const labelStyle = (theme: Theme, style: React.CSSProperties, faded: Boolean): React.CSSProperties => {
+  return {
+    maxHeight: '100%',
+    opacity: faded ? '0.4' : '',
+    pointerEvents: 'all',
+    display: 'flex',
+    whiteSpace: 'pre-line',
+    ...style,
+    color: style.color ? getCSSColor(String(style.color), theme) : undefined,
+  };
+};
+
+const labelContentStyle = (theme: Theme, label: Label): React.CSSProperties => {
+  const labelContentStyle: React.CSSProperties = {
+    display: 'flex',
+    overflow: 'normal',
+    height: '100%',
+  };
+
+  return {
+    ...labelContentStyle,
+    ...label.contentStyle,
+    background: label.contentStyle.background ? getCSSColor(String(label.contentStyle.background), theme) : undefined,
+    borderColor: label.contentStyle.borderColor
+      ? getCSSColor(String(label.contentStyle.borderColor), theme)
+      : undefined,
+  };
+};
+
+const labelOverflowStyle = (): React.CSSProperties => {
+  const style: React.CSSProperties = {};
+  style.overflow = 'auto';
+  style.overflowWrap = 'anywhere';
+
+  return style;
+};
+
+const minWidth = 130;
+
+const directEditInputWidth = (element: HTMLDivElement | null, zoom: number): number => {
+  let result = minWidth;
+  if (element) {
+    result = element.getBoundingClientRect().width / zoom;
+  }
+  return Math.max(minWidth, result);
+};
+
+export const NoteLabel = memo(({ diagramElementId, label, faded }: NoteLabelProps) => {
+  const theme: Theme = useTheme();
+  const { currentlyEditedLabelId, editingKey, resetDirectEdit } = useDiagramDirectEdit();
+  const { readOnly } = useContext<DiagramContextValue>(DiagramContext);
+  const labelElementRef = useRef<HTMLDivElement>(null);
+  const { zoom } = useViewport();
+
+  const handleClose = () => {
+    resetDirectEdit();
+    const diagramElement = document.querySelector(`[data-id="${diagramElementId}"]`);
+    if (diagramElement instanceof HTMLElement) {
+      diagramElement.focus();
+    }
+  };
+
+  const content: JSX.Element =
+    label.id === currentlyEditedLabelId && !readOnly ? (
+      <DiagramDirectEditInput
+        editingKey={editingKey}
+        onClose={handleClose}
+        labelId={label.id}
+        width={Math.max(minWidth, directEditInputWidth(labelElementRef.current, zoom))}
+      />
+    ) : (
+      <div
+        data-id={`${label.id}-content`}
+        data-testid={`NoteLabel content - ${label.text}`}
+        style={labelContentStyle(theme, label)}>
+        <IconOverlay iconURLs={label.iconURL} alt={label.text} customIconStyle={{ marginRight: theme.spacing(1) }} />
+        <div style={labelOverflowStyle()}>{label.text}</div>
+      </div>
+    );
+  return (
+    <>
+      {isDisplayTopHeaderSeparator(label) && (
+        <div data-testid={`NoteLabel top separator - ${label.text}`} style={getHeaderSeparatorStyle(label)} />
+      )}
+      <div
+        data-id={label.id}
+        data-testid={`NoteLabel - ${label.text}`}
+        style={labelStyle(theme, label.style, faded)}
+        className="nopan">
+        {content}
+      </div>
+      {isDisplayBottomHeaderSeparator(label) && (
+        <div data-testid={`NoteLabel bottom separator - ${label.text}`} style={getHeaderSeparatorStyle(label)} />
+      )}
+    </>
+  );
+});