[6126] Remove DiagramPaletteToolExtensionPoints in favor of a PaletteQuickToolExtensionPoints

Bug: #6126
Signed-off-by: Michaël Charfadi <michael.charfadi@obeosoft.com>

Author: mcharfadi

CHANGELOG.adoc

@@ -19,7 +19,7 @@
 
 === Breaking changes
 
-
+- https://github.com/eclipse-sirius/sirius-web/issues/6126[#6126] [diagram] `DiagramPaletteToolExtensionPoints` has been removed, use `PaletteQuickToolExtensionPoints` instead that supports multiple elements.
 
 
 === Dependency update

packages/diagrams/frontend/sirius-components-diagrams/src/index.ts

@@ -91,6 +91,9 @@ export type {
   DiagramPaletteToolContributionProps,
 } from './renderer/palette/extensions/DiagramPaletteToolContribution.types';
 export { diagramPaletteToolExtensionPoint } from './renderer/palette/extensions/DiagramPaletteToolExtensionPoints';
+export { useDiagramPalette } from './renderer/palette/useDiagramPalette';
+export type { DiagramPanelActionProps } from './renderer/panel/DiagramPanel.types';
+export { diagramPanelActionExtensionPoint } from './renderer/panel/DiagramPanelExtensionPoints';
 export type { DiagramToolbarActionProps } from './renderer/toolbar/DiagramToolbar.types';
 export { diagramToolbarActionExtensionPoint } from './renderer/toolbar/DiagramToolbarExtensionPoints';
 export type { IElementSVGExportHandler } from './renderer/toolbar/experimental-svg-export/SVGExportEngine.types';

packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.tsx

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023, 2025 Obeo.
+ * Copyright (c) 2023, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -183,8 +183,6 @@ export const Palette = ({
               diagramElementIds={diagramElementIds}
               onToolClick={handleToolClick}
               quickAccessTools={palette.quickAccessTools}
-              x={paletteX}
-              y={paletteY}
             />
             <PaletteSearchField onValueChanged={onSearchFieldValueChanged} />
             {state.searchToolValue.length > 0 ? (

packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/extensions/DiagramPaletteToolContribution.types.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024, 2025 Obeo.
+ * Copyright (c) 2024, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -12,14 +12,14 @@
  *******************************************************************************/
 
 import { DataExtension, useData } from '@eclipse-sirius/sirius-components-core';
+import {
+  PaletteQuickToolContributionProps,
+  paletteQuickToolExtensionPoint,
+} from '@eclipse-sirius/sirius-components-palette';
 import Box from '@mui/material/Box';
 import Divider from '@mui/material/Divider';
 import { Theme } from '@mui/material/styles';
-import { Edge, Node, useStoreApi } from '@xyflow/react';
 import { makeStyles } from 'tss-react/mui';
-import { EdgeData, NodeData } from '../../DiagramRenderer.types';
-import { diagramPaletteToolExtensionPoint } from '../extensions/DiagramPaletteToolExtensionPoints';
-import { DiagramPaletteToolContributionProps } from './../extensions/DiagramPaletteToolContribution.types';
 import { PaletteQuickAccessToolBarProps } from './PaletteQuickAccessToolBar.types';
 import { Tool } from './Tool';
 
@@ -40,40 +40,28 @@ export const PaletteQuickAccessToolBar = ({
   diagramElementIds,
   quickAccessTools,
   onToolClick,
-  x,
-  y,
 }: PaletteQuickAccessToolBarProps) => {
   const { classes } = useStyle();
-  const { nodeLookup, edgeLookup } = useStoreApi<Node<NodeData>, Edge<EdgeData>>().getState();
 
   const quickAccessToolComponents: JSX.Element[] = [];
   quickAccessTools.forEach((tool) =>
     quickAccessToolComponents.push(<Tool tool={tool} onClick={onToolClick} key={'tool_' + tool.id} />)
   );
 
-  if (diagramElementIds.length === 1 && diagramElementIds[0]) {
-    const diagramElementId = diagramElementIds[0];
-    let diagramElement = edgeLookup.get(diagramElementId) || nodeLookup.get(diagramElementId);
+  const paletteToolData: DataExtension<PaletteQuickToolContributionProps[]> = useData(paletteQuickToolExtensionPoint);
 
-    const paletteToolData: DataExtension<DiagramPaletteToolContributionProps[]> = useData(
-      diagramPaletteToolExtensionPoint
+  paletteToolData.data
+    .filter((data) => data.canHandle(diagramElementIds))
+    .map((data) => data.component)
+    .forEach((PaletteToolComponent, index) =>
+      quickAccessToolComponents.push(
+        <PaletteToolComponent
+          representationElementIds={diagramElementIds}
+          key={'paletteToolComponents_' + index.toString()}
+        />
+      )
     );
 
-    paletteToolData.data
-      .filter((data) => data.canHandle(diagramElement ?? null))
-      .map((data) => data.component)
-      .forEach((PaletteToolComponent, index) =>
-        quickAccessToolComponents.push(
-          <PaletteToolComponent
-            x={x}
-            y={y}
-            diagramElementId={diagramElementId}
-            key={'paletteToolComponents_' + index.toString()}
-          />
-        )
-      );
-  }
-
   return quickAccessToolComponents.length > 0 ? (
     <>
       <div>

packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/quick-access-tool/PaletteQuickAccessToolBar.tsx

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024, 2025 Obeo.
+ * Copyright (c) 2024, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -14,9 +14,7 @@
 import { GQLTool } from '../Palette.types';
 
 export interface PaletteQuickAccessToolBarProps {
-  x: number;
-  y: number;
   diagramElementIds: string[];
-  onToolClick: (tool: GQLTool) => void;
   quickAccessTools: GQLTool[];
+  onToolClick: (tool: GQLTool) => void;
 }

packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/quick-access-tool/PaletteQuickAccessToolBar.types.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -11,8 +11,11 @@
  *     Obeo - initial API and implementation
  *******************************************************************************/
 
-export interface DiagramPaletteToolComponentProps {
-  x: number;
-  y: number;
-  diagramElementId: string;
+export interface PaletteQuickToolContributionProps {
+  canHandle: (representationElementIds: string[]) => boolean;
+  component: React.ComponentType<PaletteQuickToolContributionComponentProps>;
+}
+
+export interface PaletteQuickToolContributionComponentProps {
+  representationElementIds: string[];
 }

…e/extensions/DiagramPaletteTool.types.ts …ns/PaletteQuickToolContribution.types.tspackages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/extensions/DiagramPaletteTool.types.ts renamed to packages/palette/frontend/sirius-components-palette/src/extensions/PaletteQuickToolContribution.types.ts packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/extensions/DiagramPaletteTool.types.ts renamed to packages/palette/frontend/sirius-components-palette/src/extensions/PaletteQuickToolContribution.types.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024, 2025 Obeo.
+ * Copyright (c) 2024, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -12,17 +12,17 @@
  *******************************************************************************/
 
 import { DataExtensionPoint } from '@eclipse-sirius/sirius-components-core';
-import { DiagramPaletteToolContributionProps } from './DiagramPaletteToolContribution.types';
+import { PaletteQuickToolContributionProps } from './PaletteQuickToolContribution.types';
 
 /**
- * Extension point for diagram palette tools.
+ * Extension point for palette quick tools.
  *
- * This extension point allows the addition of custom tools to the diagram palette.
+ * This extension point allows the addition of custom quick tools to the diagram palette.
  * Each contribution can define how a tool should be rendered and behave.
  *
- * @since v2024.9.0
+ * @since v2026.3.0
  */
-export const diagramPaletteToolExtensionPoint: DataExtensionPoint<Array<DiagramPaletteToolContributionProps>> = {
-  identifier: 'diagramPalette#tool',
+export const paletteQuickToolExtensionPoint: DataExtensionPoint<Array<PaletteQuickToolContributionProps>> = {
+  identifier: 'palette#quickTool',
   fallback: [],
 };

…ns/DiagramPaletteToolExtensionPoints.tsx …ions/PaletteQuickToolExtensionPoints.tsxpackages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/extensions/DiagramPaletteToolExtensionPoints.tsx renamed to packages/palette/frontend/sirius-components-palette/src/extensions/PaletteQuickToolExtensionPoints.tsx packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/extensions/DiagramPaletteToolExtensionPoints.tsx renamed to packages/palette/frontend/sirius-components-palette/src/extensions/PaletteQuickToolExtensionPoints.tsx

@@ -11,6 +11,11 @@
  *     Obeo - initial API and implementation
  *******************************************************************************/
 
+export type {
+  PaletteQuickToolContributionComponentProps,
+  PaletteQuickToolContributionProps,
+} from './extensions/PaletteQuickToolContribution.types';
+export { paletteQuickToolExtensionPoint } from './extensions/PaletteQuickToolExtensionPoints';
 export { PaletteExtensionSection } from './PaletteExtensionSection';
 export type {
   PaletteExtensionSectionComponentProps,

packages/palette/frontend/sirius-components-palette/src/index.ts

@@ -21,12 +21,10 @@ import {
 import {
   ActionProps,
   DiagramNodeActionOverrideContribution,
-  DiagramPaletteToolContributionProps,
   EdgeData,
   NodeData,
   ReactFlowPropsCustomizer,
   diagramNodeActionOverrideContributionExtensionPoint,
-  diagramPaletteToolExtensionPoint,
   diagramRendererReactFlowPropsCustomizerExtensionPoint,
 } from '@eclipse-sirius/sirius-components-diagrams';
 import {
@@ -35,6 +33,10 @@ import {
   OmniboxCommandOverrideContribution,
   omniboxCommandOverrideContributionExtensionPoint,
 } from '@eclipse-sirius/sirius-components-omnibox';
+import {
+  PaletteQuickToolContributionProps,
+  paletteQuickToolExtensionPoint,
+} from '@eclipse-sirius/sirius-components-palette';
 import {
   NavigationBarProps,
   navigationBarCenterContributionExtensionPoint,
@@ -45,7 +47,7 @@ import ListItemButton from '@mui/material/ListItemButton';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import Typography from '@mui/material/Typography';
-import { Edge, Node, ReactFlowProps } from '@xyflow/react';
+import { Edge, Node, ReactFlowProps, useStoreApi } from '@xyflow/react';
 import { PapayaDiagramInformationPanel } from './diagrams/PapayaDiagramInformationPanel';
 import { PapayaComponentLabelDetailNodeActionContribution } from './nodeactions/PapayaComponentLabelDetailNodeActionContribution';
 import { PapayaComponentDiagramToolContribution } from './tools/PapayaComponentDiagramToolContribution';
@@ -100,22 +102,34 @@ const papayaDiagramToolbarExtension: DataExtension<Array<ReactFlowPropsCustomize
   data: [reactFlowPropsCustomizer],
 };
 papayaExtensionRegistry.putData(diagramRendererReactFlowPropsCustomizerExtensionPoint, papayaDiagramToolbarExtension);
-const diagramPaletteToolContributions: DiagramPaletteToolContributionProps[] = [
+const diagramPaletteToolContributions: PaletteQuickToolContributionProps[] = [
   {
-    canHandle: (diagramElement: Node<NodeData> | Edge<EdgeData> | null) => {
-      return diagramElement?.data
-        ? diagramElement.data.targetObjectKind.startsWith('siriusComponents://semantic?domain=papaya&entity=Component')
-        : false;
+    canHandle: (representationElementIds: string[]) => {
+      const store = useStoreApi<Node<NodeData>, Edge<EdgeData>>();
+      return representationElementIds.every((elementId) =>
+        store
+          .getState()
+          .nodeLookup.get(elementId)
+          ?.data.targetObjectKind.startsWith('siriusComponents://semantic?domain=papaya&entity=Component')
+      );
     },
     component: PapayaComponentLabelDetailToolContribution,
   },
   {
-    canHandle: (diagramElement: Node<NodeData> | Edge<EdgeData> | null) => diagramElement === null,
+    canHandle: (representationElementIds: string[]) => {
+      const store = useStoreApi<Node<NodeData>, Edge<EdgeData>>();
+      return !(
+        representationElementIds.length === 1 &&
+        representationElementIds[0] &&
+        (store.getState().nodeLookup.get(representationElementIds[0]) ||
+          store.getState().edgeLookup.get(representationElementIds[0]))
+      );
+    },
     component: PapayaComponentDiagramToolContribution,
   },
 ];
-papayaExtensionRegistry.putData<DiagramPaletteToolContributionProps[]>(diagramPaletteToolExtensionPoint, {
-  identifier: `papaya_${diagramPaletteToolExtensionPoint.identifier}`,
+papayaExtensionRegistry.putData<PaletteQuickToolContributionProps[]>(paletteQuickToolExtensionPoint, {
+  identifier: `papaya_${paletteQuickToolExtensionPoint.identifier}`,
   data: diagramPaletteToolContributions,
 });