From 801276cbb7875de69dae7d7c3b9ce7278eefd666 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com> Date: Fri, 11 Apr 2025 23:35:40 -0300 Subject: [PATCH] fix: revert "feat: adds pan and pinch nav mode like figma" (#7603) Revert "feat: adds pan and pinch nav mode like figma (#7410)" This reverts commit a2c5090c7aa54ebefda5f3d6861d4c060af61b1e. --- .../FlowPage/components/PageComponent/index.tsx | 9 +++------ src/frontend/tests/core/features/group.spec.ts | 12 +++++++++--- .../tests/core/features/saveComponents.spec.ts | 2 +- .../tests/core/features/toolModeGroup.spec.ts | 8 ++++++-- .../core/regression/generalBugs-shard-5.spec.ts | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx index 6cf199ce6..8d3448721 100644 --- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx @@ -30,7 +30,6 @@ import { ReactFlow, reconnectEdge, SelectionDragHandler, - SelectionMode, } from "@xyflow/react"; import _, { cloneDeep } from "lodash"; import { @@ -571,9 +570,7 @@ export default function Page({ onNodeDragStop={onNodeDragStop} onDrop={onDrop} onSelectionChange={onSelectionChange} - selectionMode={SelectionMode.Partial} deleteKeyCode={[]} - multiSelectionKeyCode={["Shift"]} fitView={isEmptyFlow.current ? false : true} fitViewOptions={{ minZoom: 0.2, @@ -582,9 +579,9 @@ export default function Page({ className="theme-attribution" minZoom={0.2} maxZoom={3} - panOnDrag={[1, 2]} - panOnScroll={!view} - selectionOnDrag={!view} + zoomOnScroll={!view} + zoomOnPinch={!view} + panOnDrag={!view} panActivationKeyCode={""} proOptions={{ hideAttribution: true }} onPaneClick={onPaneClick} diff --git a/src/frontend/tests/core/features/group.spec.ts b/src/frontend/tests/core/features/group.spec.ts index 0e3358fe9..67a88d18b 100644 --- a/src/frontend/tests/core/features/group.spec.ts +++ b/src/frontend/tests/core/features/group.spec.ts @@ -17,9 +17,15 @@ test.describe("group node test", () => { await page.getByTestId("fit_view").first().click(); await page.getByTestId("title-OpenAI").click(); - await page.getByTestId("title-OpenAI").click({ modifiers: ["Shift"] }); - await page.getByTestId("title-Prompt").click({ modifiers: ["Shift"] }); - await page.getByTestId("title-OpenAI").click({ modifiers: ["Shift"] }); + await page + .getByTestId("title-OpenAI") + .click({ modifiers: ["ControlOrMeta"] }); + await page + .getByTestId("title-Prompt") + .click({ modifiers: ["ControlOrMeta"] }); + await page + .getByTestId("title-OpenAI") + .click({ modifiers: ["ControlOrMeta"] }); await page.getByRole("button", { name: "Group" }).click(); await page.getByTestId("title-Group").click(); diff --git a/src/frontend/tests/core/features/saveComponents.spec.ts b/src/frontend/tests/core/features/saveComponents.spec.ts index 1de621cc8..f164a4dd6 100644 --- a/src/frontend/tests/core/features/saveComponents.spec.ts +++ b/src/frontend/tests/core/features/saveComponents.spec.ts @@ -55,7 +55,7 @@ test.describe("save component tests", () => { await zoomOut(page, 2); await page.getByTestId("title-Agent Initializer").click({ - modifiers: ["Shift"], + modifiers: ["Control"], }); await page.getByRole("button", { name: "Group" }).click(); diff --git a/src/frontend/tests/core/features/toolModeGroup.spec.ts b/src/frontend/tests/core/features/toolModeGroup.spec.ts index 71dd6ae53..5d71983e9 100644 --- a/src/frontend/tests/core/features/toolModeGroup.spec.ts +++ b/src/frontend/tests/core/features/toolModeGroup.spec.ts @@ -16,8 +16,12 @@ test.describe("group node test", () => { .click(); await page.getByTestId("fit_view").first().click(); - await page.getByTestId("title-OpenAI").click({ modifiers: ["Shift"] }); - await page.getByTestId("title-Prompt").click({ modifiers: ["Shift"] }); + await page + .getByTestId("title-OpenAI") + .click({ modifiers: ["ControlOrMeta"] }); + await page + .getByTestId("title-Prompt") + .click({ modifiers: ["ControlOrMeta"] }); await page.getByRole("button", { name: "Group" }).click(); await page.getByTestId("title-Group").click(); diff --git a/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts b/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts index c2773b555..55a9e1a60 100644 --- a/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts +++ b/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts @@ -170,7 +170,7 @@ test( await page .getByTestId("title-Combine Text") .first() - .click({ modifiers: ["Shift"] }); + .click({ modifiers: ["ControlOrMeta"] }); await page.waitForSelector('[data-testid="group-node"]', { timeout: 3000,