Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ It has long been unused by Sirius Web itself (since the transition to MUI).

=== Dependency update

- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.5.1]
- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.5.2].
- [releng] Update to https://github.com/spring-projects/spring-boot/releases/tag/v4.0.7[Spring Boot 4.0.7].
- [releng] Update to https://github.com/xyflow/xyflow/releases/tag/@xyflow/react@12.10.2[xyflow 12.10.2].
- [releng] Update to https://github.com/vitejs/vite/releases/tag/v8.0.14[Vite 8.0.14] and https://github.com/vitejs/vite-plugin-react/releases/tag/plugin-react%406.0.2[`@vitejs/plugin-react` 6.0.2].
- [releng] Switch to `@fontsource/roboto` v5.2.10.

Expand Down
88 changes: 44 additions & 44 deletions frontend/syson-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
},
"peerDependencies": {
"@apollo/client": "3.10.4",
"@eclipse-sirius/sirius-components-browser": "2026.5.1",
"@eclipse-sirius/sirius-components-charts": "2026.5.1",
"@eclipse-sirius/sirius-components-core": "2026.5.1",
"@eclipse-sirius/sirius-components-datatree": "2026.5.1",
"@eclipse-sirius/sirius-components-deck": "2026.5.1",
"@eclipse-sirius/sirius-components-diagrams": "2026.5.1",
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.1",
"@eclipse-sirius/sirius-components-forms": "2026.5.1",
"@eclipse-sirius/sirius-components-gantt": "2026.5.1",
"@eclipse-sirius/sirius-components-impactanalysis": "2026.5.1",
"@eclipse-sirius/sirius-components-omnibox": "2026.5.1",
"@eclipse-sirius/sirius-components-palette": "2026.5.1",
"@eclipse-sirius/sirius-components-portals": "2026.5.1",
"@eclipse-sirius/sirius-components-selection": "2026.5.1",
"@eclipse-sirius/sirius-components-tables": "2026.5.1",
"@eclipse-sirius/sirius-components-trees": "2026.5.1",
"@eclipse-sirius/sirius-components-tsconfig": "2026.5.1",
"@eclipse-sirius/sirius-components-validation": "2026.5.1",
"@eclipse-sirius/sirius-components-widget-reference": "2026.5.1",
"@eclipse-sirius/sirius-components-widget-table": "2026.5.1",
"@eclipse-sirius/sirius-web-application": "2026.5.1",
"@eclipse-sirius/sirius-components-browser": "2026.5.2",
"@eclipse-sirius/sirius-components-charts": "2026.5.2",
"@eclipse-sirius/sirius-components-core": "2026.5.2",
"@eclipse-sirius/sirius-components-datatree": "2026.5.2",
"@eclipse-sirius/sirius-components-deck": "2026.5.2",
"@eclipse-sirius/sirius-components-diagrams": "2026.5.2",
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.2",
"@eclipse-sirius/sirius-components-forms": "2026.5.2",
"@eclipse-sirius/sirius-components-gantt": "2026.5.2",
"@eclipse-sirius/sirius-components-impactanalysis": "2026.5.2",
"@eclipse-sirius/sirius-components-omnibox": "2026.5.2",
"@eclipse-sirius/sirius-components-palette": "2026.5.2",
"@eclipse-sirius/sirius-components-portals": "2026.5.2",
"@eclipse-sirius/sirius-components-selection": "2026.5.2",
"@eclipse-sirius/sirius-components-tables": "2026.5.2",
"@eclipse-sirius/sirius-components-trees": "2026.5.2",
"@eclipse-sirius/sirius-components-tsconfig": "2026.5.2",
"@eclipse-sirius/sirius-components-validation": "2026.5.2",
"@eclipse-sirius/sirius-components-widget-reference": "2026.5.2",
"@eclipse-sirius/sirius-components-widget-table": "2026.5.2",
"@eclipse-sirius/sirius-web-application": "2026.5.2",
"@lexical/code": "0.42.0",
"@lexical/react": "0.42.0",
"@mui/icons-material": "7.3.10",
Expand All @@ -61,7 +61,7 @@
"@ObeoNetwork/react-trello": "2.4.11",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@xyflow/react": "12.6.0",
"@xyflow/react": "12.10.2",
"d3": "7.0.0",
"elkjs": "0.11.0",
"export-to-csv": "1.3.0",
Expand All @@ -85,27 +85,27 @@
},
"devDependencies": {
"@apollo/client": "3.10.4",
"@eclipse-sirius/sirius-components-browser": "2026.5.1",
"@eclipse-sirius/sirius-components-charts": "2026.5.1",
"@eclipse-sirius/sirius-components-core": "2026.5.1",
"@eclipse-sirius/sirius-components-datatree": "2026.5.1",
"@eclipse-sirius/sirius-components-deck": "2026.5.1",
"@eclipse-sirius/sirius-components-diagrams": "2026.5.1",
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.1",
"@eclipse-sirius/sirius-components-forms": "2026.5.1",
"@eclipse-sirius/sirius-components-gantt": "2026.5.1",
"@eclipse-sirius/sirius-components-impactanalysis": "2026.5.1",
"@eclipse-sirius/sirius-components-omnibox": "2026.5.1",
"@eclipse-sirius/sirius-components-palette": "2026.5.1",
"@eclipse-sirius/sirius-components-portals": "2026.5.1",
"@eclipse-sirius/sirius-components-selection": "2026.5.1",
"@eclipse-sirius/sirius-components-tables": "2026.5.1",
"@eclipse-sirius/sirius-components-trees": "2026.5.1",
"@eclipse-sirius/sirius-components-tsconfig": "2026.5.1",
"@eclipse-sirius/sirius-components-validation": "2026.5.1",
"@eclipse-sirius/sirius-components-widget-reference": "2026.5.1",
"@eclipse-sirius/sirius-components-widget-table": "2026.5.1",
"@eclipse-sirius/sirius-web-application": "2026.5.1",
"@eclipse-sirius/sirius-components-browser": "2026.5.2",
"@eclipse-sirius/sirius-components-charts": "2026.5.2",
"@eclipse-sirius/sirius-components-core": "2026.5.2",
"@eclipse-sirius/sirius-components-datatree": "2026.5.2",
"@eclipse-sirius/sirius-components-deck": "2026.5.2",
"@eclipse-sirius/sirius-components-diagrams": "2026.5.2",
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.2",
"@eclipse-sirius/sirius-components-forms": "2026.5.2",
"@eclipse-sirius/sirius-components-gantt": "2026.5.2",
"@eclipse-sirius/sirius-components-impactanalysis": "2026.5.2",
"@eclipse-sirius/sirius-components-omnibox": "2026.5.2",
"@eclipse-sirius/sirius-components-palette": "2026.5.2",
"@eclipse-sirius/sirius-components-portals": "2026.5.2",
"@eclipse-sirius/sirius-components-selection": "2026.5.2",
"@eclipse-sirius/sirius-components-tables": "2026.5.2",
"@eclipse-sirius/sirius-components-trees": "2026.5.2",
"@eclipse-sirius/sirius-components-tsconfig": "2026.5.2",
"@eclipse-sirius/sirius-components-validation": "2026.5.2",
"@eclipse-sirius/sirius-components-widget-reference": "2026.5.2",
"@eclipse-sirius/sirius-components-widget-table": "2026.5.2",
"@eclipse-sirius/sirius-web-application": "2026.5.2",
"@lexical/code": "0.42.0",
"@lexical/react": "0.42.0",
"@mui/icons-material": "7.3.10",
Expand All @@ -119,7 +119,7 @@
"@types/react-router-dom": "5.3.3",
"@vitejs/plugin-react": "6.0.2",
"@vitest/coverage-v8": "3.2.4",
"@xyflow/react": "12.6.0",
"@xyflow/react": "12.10.2",
"d3": "7.0.0",
"elkjs": "0.11.0",
"export-to-csv": "1.3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -66,7 +66,7 @@ export class SysMLImportedPackageNodeLayoutHandler implements INodeLayoutHandler
const minNodeWidth: number = node.data.resizedByUser ? 75 : node.data.defaultWidth ?? 75;
const minNodeHeight: number = Math.max(labelHeight, node.data.resizedByUser ? 50 : node.data.defaultHeight ?? 50);

const previousNode: Node<NodeData, string> | undefined = (previousDiagram?.nodes ?? []).find(
const previousNode: Node<NodeData, DiagramNodeType> | undefined = (previousDiagram?.nodes ?? []).find(
(prevNode) => prevNode.id === node.id
);
const previousDimensions: Dimensions = computePreviousSize(previousNode, node);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ export class SysMLPackageNodeLayoutHandler implements INodeLayoutHandler<SysMLPa
layoutEngine.layoutNodes(previousDiagram, visibleNodes, directChildren, newlyAddedNodes);

const headerHeightFootprint: number = getHeaderHeightFootprint(node.data.insideLabel, 'TOP', borderWidth);
const borderNodes: Node<NodeData, string>[] = directChildren.filter((node) => node.data.isBorderNode);
const directNodesChildren: Node<NodeData, string>[] = directChildren.filter((child) => !child.data.isBorderNode);
const borderNodes: Node<NodeData, DiagramNodeType>[] = directChildren.filter((node) => node.data.isBorderNode);
const directNodesChildren: Node<NodeData, DiagramNodeType>[] = directChildren.filter(
(child) => !child.data.isBorderNode
);

// Update children position to be under the label and at the right padding.
directNodesChildren.forEach((child, index) => {
Expand Down Expand Up @@ -183,7 +185,7 @@ export class SysMLPackageNodeLayoutHandler implements INodeLayoutHandler<SysMLPa
const nodeWidth: number = forceDimensions?.width ?? getDefaultOrMinWidth(nodeMinComputeWidth, node);
const nodeHeight: number = getDefaultOrMinHeight(nodeMinComputeHeight, node);

const previousNode: Node<NodeData, string> | undefined = (previousDiagram?.nodes ?? []).find(
const previousNode: Node<NodeData, DiagramNodeType> | undefined = (previousDiagram?.nodes ?? []).find(
(prevNode) => prevNode.id === node.id
);
const previousDimensions: Dimensions = computePreviousSize(previousNode, node);
Expand Down Expand Up @@ -230,7 +232,7 @@ export class SysMLPackageNodeLayoutHandler implements INodeLayoutHandler<SysMLPa
const minNodeWidth: number = node.data.resizedByUser ? 75 : node.data.defaultWidth ?? 75;
const minNodeHeight: number = Math.max(labelHeight, node.data.resizedByUser ? 50 : node.data.defaultHeight ?? 50);

const previousNode: Node<NodeData, string> | undefined = (previousDiagram?.nodes ?? []).find(
const previousNode: Node<NodeData, DiagramNodeType> | undefined = (previousDiagram?.nodes ?? []).find(
(prevNode) => prevNode.id === node.id
);
const previousDimensions: Dimensions = computePreviousSize(previousNode, node);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ export class SysMLViewFrameNodeLayoutHandler implements INodeLayoutHandler<SysML
layoutEngine.layoutNodes(previousDiagram, visibleNodes, directChildren, newlyAddedNodes);

const headerHeightFootprint: number = getHeaderHeightFootprint(node.data.insideLabel, 'TOP', borderWidth);
const borderNodes: Node<NodeData, string>[] = directChildren.filter((node) => node.data.isBorderNode);
const directNodesChildren: Node<NodeData, string>[] = directChildren.filter((child) => !child.data.isBorderNode);
const borderNodes: Node<NodeData, DiagramNodeType>[] = directChildren.filter((node) => node.data.isBorderNode);
const directNodesChildren: Node<NodeData, DiagramNodeType>[] = directChildren.filter(
(child) => !child.data.isBorderNode
);

// Update children position to be under the label and at the right padding.
directNodesChildren.forEach((child, index) => {
Expand Down Expand Up @@ -180,7 +182,7 @@ export class SysMLViewFrameNodeLayoutHandler implements INodeLayoutHandler<SysML
const nodeWidth: number = forceDimensions?.width ?? getDefaultOrMinWidth(nodeMinComputeWidth, node);
const nodeHeight: number = getDefaultOrMinHeight(nodeMinComputeHeight, node);

const previousNode: Node<NodeData, string> | undefined = (previousDiagram?.nodes ?? []).find(
const previousNode: Node<NodeData, DiagramNodeType> | undefined = (previousDiagram?.nodes ?? []).find(
(prevNode) => prevNode.id === node.id
);
const previousDimensions: Dimensions = computePreviousSize(previousNode, node);
Expand Down Expand Up @@ -227,7 +229,7 @@ export class SysMLViewFrameNodeLayoutHandler implements INodeLayoutHandler<SysML
const minNodeWidth: number = node.data.resizedByUser ? 75 : node.data.defaultWidth ?? 75;
const minNodeHeight: number = Math.max(labelHeight, node.data.resizedByUser ? 50 : node.data.defaultHeight ?? 50);

const previousNode: Node<NodeData, string> | undefined = (previousDiagram?.nodes ?? []).find(
const previousNode: Node<NodeData, DiagramNodeType> | undefined = (previousDiagram?.nodes ?? []).find(
(prevNode) => prevNode.id === node.id
);
const previousDimensions: Dimensions = computePreviousSize(previousNode, node);
Expand Down
46 changes: 23 additions & 23 deletions frontend/syson/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,29 @@
"private": true,
"dependencies": {
"@apollo/client": "3.10.4",
"@eclipse-sirius/sirius-components-browser": "2026.5.1",
"@eclipse-sirius/sirius-components-charts": "2026.5.1",
"@eclipse-sirius/sirius-components-core": "2026.5.1",
"@eclipse-sirius/sirius-components-datatree": "2026.5.1",
"@eclipse-sirius/sirius-components-deck": "2026.5.1",
"@eclipse-sirius/sirius-components-diagrams": "2026.5.1",
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.1",
"@eclipse-sirius/sirius-components-forms": "2026.5.1",
"@eclipse-sirius/sirius-components-gantt": "2026.5.1",
"@eclipse-sirius/sirius-components-impactanalysis": "2026.5.1",
"@eclipse-sirius/sirius-components-omnibox": "2026.5.1",
"@eclipse-sirius/sirius-components-palette": "2026.5.1",
"@eclipse-sirius/sirius-components-portals": "2026.5.1",
"@eclipse-sirius/sirius-components-selection": "2026.5.1",
"@eclipse-sirius/sirius-components-tables": "2026.5.1",
"@eclipse-sirius/sirius-components-trees": "2026.5.1",
"@eclipse-sirius/sirius-components-tsconfig": "2026.5.1",
"@eclipse-sirius/sirius-components-validation": "2026.5.1",
"@eclipse-sirius/sirius-components-widget-reference": "2026.5.1",
"@eclipse-sirius/sirius-components-widget-table": "2026.5.1",
"@eclipse-sirius/sirius-web-application": "2026.5.1",
"@eclipse-sirius/sirius-components-browser": "2026.5.2",
"@eclipse-sirius/sirius-components-charts": "2026.5.2",
"@eclipse-sirius/sirius-components-core": "2026.5.2",
"@eclipse-sirius/sirius-components-datatree": "2026.5.2",
"@eclipse-sirius/sirius-components-deck": "2026.5.2",
"@eclipse-sirius/sirius-components-diagrams": "2026.5.2",
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.2",
"@eclipse-sirius/sirius-components-forms": "2026.5.2",
"@eclipse-sirius/sirius-components-gantt": "2026.5.2",
"@eclipse-sirius/sirius-components-impactanalysis": "2026.5.2",
"@eclipse-sirius/sirius-components-omnibox": "2026.5.2",
"@eclipse-sirius/sirius-components-palette": "2026.5.2",
"@eclipse-sirius/sirius-components-portals": "2026.5.2",
"@eclipse-sirius/sirius-components-selection": "2026.5.2",
"@eclipse-sirius/sirius-components-tables": "2026.5.2",
"@eclipse-sirius/sirius-components-trees": "2026.5.2",
"@eclipse-sirius/sirius-components-tsconfig": "2026.5.2",
"@eclipse-sirius/sirius-components-validation": "2026.5.2",
"@eclipse-sirius/sirius-components-widget-reference": "2026.5.2",
"@eclipse-sirius/sirius-components-widget-table": "2026.5.2",
"@eclipse-sirius/sirius-web-application": "2026.5.2",
"@eclipse-syson/syson-components": "2026.5.1",
"@fontsource/roboto": "5.2.10",
"@lexical/code": "0.42.0",
"@lexical/react": "0.42.0",
"@mui/icons-material": "7.3.10",
Expand All @@ -44,11 +45,10 @@
"@ObeoNetwork/react-trello": "2.4.11",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@xyflow/react": "12.6.0",
"@xyflow/react": "12.10.2",
"d3": "7.0.0",
"elkjs": "0.11.0",
"export-to-csv": "1.3.0",
"@fontsource/roboto": "5.2.10",
"graphql": "16.8.1",
"html-to-image": "1.11.11",
"i18next-http-backend": "3.0.2",
Expand Down
Loading
Loading