Skip to content

Commit d69e631

Browse files
committed
[releng] Bump to @xyflow/react 12.10.1
Signed-off-by: Michaël Charfadi <michael.charfadi@obeosoft.com> Signed-off-by: Florian ROUËNÉ <florian.rouene@obeosoft.com>
1 parent 84d7bb0 commit d69e631

File tree

21 files changed

+423
-399
lines changed

21 files changed

+423
-399
lines changed

CHANGELOG.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ The `TreeItemContextMenuEntryBuilder` subclasses now require a list of key bindi
7070

7171
- [releng] Switch to https://github.com/spring-projects/spring-boot/releases/tag/v3.5.11[Spring Boot 3.5.11]
7272
- [releng] Switch to @ObeoNetwork/gantt-task-react 0.6.3
73+
- [releng] Switch to https://github.com/xyflow/xyflow/releases/tag/@xyflow/react@12.10.1[xyflow 12.10.1]
7374

7475

7576
=== Bug fixes

integration-tests-playwright/playwright/e2e/diagrams/edge-on-edge.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ test.describe('edge on edge', () => {
6060
await page.getByTestId('creationhandle-right').hover();
6161
await page.mouse.down();
6262
const playwrightNode2a = new PlaywrightNode(page, 'Entity2a');
63-
await playwrightNode2a.nodeLocator.hover();
63+
await playwrightNode2a.nodeLocator.hover({ position: { x: 10, y: 10 } });
64+
await playwrightNode2a.nodeLocator.hover({ position: { x: 50, y: 50 } });
6465
await page.mouse.up();
6566
await page.getByTestId('connectorContextualMenu-E1toE2A').click();
6667
await expect(edges).toHaveCount(1);
@@ -70,7 +71,8 @@ test.describe('edge on edge', () => {
7071
await page.getByTestId('creationhandle-bottom').hover();
7172
await page.mouse.down();
7273
const playwrightNode2b = new PlaywrightNode(page, 'Entity2b');
73-
await playwrightNode2b.nodeLocator.hover();
74+
await playwrightNode2b.nodeLocator.hover({ position: { x: 10, y: 10 } });
75+
await playwrightNode2b.nodeLocator.hover({ position: { x: 50, y: 50 } });
7476
await page.mouse.up();
7577
await expect(edges).toHaveCount(2);
7678
//Create node to edge

integration-tests-playwright/playwright/e2e/diagrams/edge-reconnection.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
1313

14-
import { test, expect } from '@playwright/test';
14+
import { expect, test } from '@playwright/test';
1515
import { PlaywrightDetails } from '../../helpers/PlaywrightDetails';
1616
import { PlaywrightEdge } from '../../helpers/PlaywrightEdge';
1717
import { PlaywrightExplorer } from '../../helpers/PlaywrightExplorer';
@@ -53,7 +53,8 @@ test.describe('edge - reconnection', () => {
5353
const sourceReconnectHandle = page.locator(`.react-flow__edgeupdater-source`).first();
5454
await sourceReconnectHandle.hover();
5555
await page.mouse.down();
56-
await page.mouse.move(newSourceNodeXYPosition.x + newSourceNodeXYPosition.width / 2, newSourceNodeXYPosition.y);
56+
await page.mouse.move(newSourceNodeXYPosition.x + newSourceNodeXYPosition.width / 2, newSourceNodeXYPosition.y / 2);
57+
await page.mouse.move(newSourceNodeXYPosition.x + newSourceNodeXYPosition.width / 2, newSourceNodeXYPosition.y + 5);
5758
await page.mouse.up();
5859

5960
await page.waitForFunction(() => !!document.querySelector('[data-testid="DataSource2-toggle"]'));

integration-tests-playwright/playwright/e2e/diagrams/edge.spec.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ test.describe('edge', () => {
4040

4141
test('when a bend point is moved, then the edge path is changed', async ({ page }) => {
4242
const playwrightEdge = new PlaywrightEdge(page);
43+
const playwrightNode = new PlaywrightNode(page, 'CompositeProcessor1');
44+
await playwrightNode.click();
45+
await playwrightNode.move({ x: 200, y: 50 });
4346

4447
await playwrightEdge.click();
4548
await playwrightEdge.isSelected();
@@ -50,7 +53,7 @@ test.describe('edge', () => {
5053
const box = (await lastBendingPoint.boundingBox())!;
5154
await lastBendingPoint.hover();
5255
await page.mouse.down();
53-
await page.mouse.move(box.x - 40, box.y + 40, { steps: 2 });
56+
await page.mouse.move(box.x - 40, box.y + 80, { steps: 2 });
5457
await page.mouse.up();
5558

5659
const edgePathAfter = playwrightEdge.getEdgePath();
@@ -63,7 +66,7 @@ test.describe('edge', () => {
6366
}) => {
6467
const playwrightNode = new PlaywrightNode(page, 'CompositeProcessor1');
6568
await playwrightNode.click();
66-
await playwrightNode.move({ x: 200, y: 50 });
69+
await playwrightNode.move({ x: 200, y: 150 });
6770

6871
const playwrightEdge = new PlaywrightEdge(page);
6972

@@ -104,7 +107,7 @@ test.describe('edge', () => {
104107
const box = (await lastBendingPoint.boundingBox())!;
105108
await lastBendingPoint.hover();
106109
await page.mouse.down();
107-
await page.mouse.move(box.x - 40, box.y + 40, { steps: 2 });
110+
await page.mouse.move(box.x - 40, box.y + 80, { steps: 2 });
108111
await page.mouse.up();
109112

110113
await page.waitForFunction(
@@ -144,7 +147,7 @@ test.describe('edge', () => {
144147
const dataSource = new PlaywrightNode(page, 'DataSource1');
145148
const edge = new PlaywrightEdge(page);
146149
await compositeProcessor.click();
147-
await compositeProcessor.move({ x: 150, y: 50 });
150+
await compositeProcessor.move({ x: 150, y: 150 });
148151

149152
await expect(edge.edgeLocator).toBeAttached();
150153

@@ -392,7 +395,7 @@ test.describe('edge', () => {
392395

393396
const playwrightEdge = new PlaywrightEdge(page);
394397

395-
await playwrightEdge.edgeLocator.locator('path').first().click({ button: 'right' });
398+
await playwrightEdge.edgeLocator.locator('.react-flow__edge-interaction').first().click({ button: 'right' });
396399
await page.getByTestId('toolSection-Appearance').click();
397400
await page.locator('[data-testid="toolSection-Appearance-Edge Type"]').click();
398401
await page.waitForSelector('.MuiMenu-paper');

0 commit comments

Comments
 (0)