fix(editor): Implement canvas zoom UX improvements

cypress/e2e/12-canvas.cy.ts

@@ -14,8 +14,11 @@ const WorkflowPage = new WorkflowPageClass();
 const DEFAULT_ZOOM_FACTOR = 1;
 const ZOOM_IN_X1_FACTOR = 1.25; // Zoom in factor after one click
 const ZOOM_IN_X2_FACTOR = 1.5625; // Zoom in factor after two clicks
-const ZOOM_OUT_X1_FACTOR = 0.8;
-const ZOOM_OUT_X2_FACTOR = 0.64;
+const ZOOM_OUT_X1_FACTOR = 0.75;
+const ZOOM_OUT_X2_FACTOR = 0.5625;
+
+const PINCH_ZOOM_IN_FACTOR = 1.32;
+const PINCH_ZOOM_OUT_FACTOR = 0.4752;
 const RENAME_NODE_NAME = 'Something else';
 
 describe('Canvas Node Manipulation and Navigation', () => {
@@ -203,6 +206,26 @@ describe('Canvas Node Manipulation and Navigation', () => {
 			);
 	});
 
+	it.only('should zoom using pinch to zoom', () => {
+		WorkflowPage.actions.pinchToZoom(2, 'zoomIn');
+		WorkflowPage.getters
+			.nodeView()
+			.should(
+				'have.css',
+				'transform',
+				`matrix(${PINCH_ZOOM_IN_FACTOR}, 0, 0, ${PINCH_ZOOM_IN_FACTOR}, 0, 0)`,
+			);
+
+		WorkflowPage.actions.pinchToZoom(4, 'zoomOut');
+		WorkflowPage.getters
+			.nodeView()
+			.should(
+				'have.css',
+				'transform',
+				`matrix(${PINCH_ZOOM_OUT_FACTOR}, 0, 0, ${PINCH_ZOOM_OUT_FACTOR}, 0, 0)`,
+			);
+	});
+
 	it('should reset zoom', () => {
 		// Reset zoom should not appear until zoom level changed
 		WorkflowPage.getters.resetZoomButton().should('not.exist');

cypress/pages/workflow.ts

@@ -143,11 +143,14 @@ export class WorkflowPage extends BasePage {
 			this.getters.nodeCreatorSearchBar().type('{enter}');
 			if (opts?.action) {
 				// Expand actions category if it's collapsed
-				nodeCreator.getters.getCategoryItem('Actions').parent().then(($el) => {
-					if ($el.attr('data-category-collapsed') === 'true') {
-						nodeCreator.getters.getCategoryItem('Actions').click();
-					}
-				});
+				nodeCreator.getters
+					.getCategoryItem('Actions')
+					.parent()
+					.then(($el) => {
+						if ($el.attr('data-category-collapsed') === 'true') {
+							nodeCreator.getters.getCategoryItem('Actions').click();
+						}
+					});
 				nodeCreator.getters.getCreatorItem(opts.action).click();
 			} else if (!opts?.keepNdvOpen) {
 				cy.get('body').type('{esc}');
@@ -249,6 +252,17 @@ export class WorkflowPage extends BasePage {
 		zoomToFit: () => {
 			cy.getByTestId('zoom-to-fit').click();
 		},
+		pinchToZoom: (steps: number, mode: 'zoomIn' | 'zoomOut' = 'zoomIn') => {
+			// Pinch-to-zoom simulates a 'wheel' event with ctrlKey: true (same as zooming by scrolling)
+			this.getters.nodeViewBackground().trigger('wheel', {
+				force: true,
+				bubbles: true,
+				ctrlKey: true,
+				pageX: cy.window().innerWidth / 2,
+				pageY: cy.window().innerHeight / 2,
+				deltaY: mode === 'zoomOut' ? 16 * steps : -16 * steps,
+			});
+		},
 		hitUndo: () => {
 			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('z');
 		},
@@ -311,10 +325,7 @@ export class WorkflowPage extends BasePage {
 			this.getters.stickies().dblclick().find('textarea').clear().type(content).type('{esc}');
 		},
 		shouldHaveWorkflowName: (name: string) => {
-			this.getters
-			.workflowNameInputContainer()
-			.invoke('attr', 'title')
-			.should('include', name);
+			this.getters.workflowNameInputContainer().invoke('attr', 'title').should('include', name);
 		},
 	};
 }

packages/editor-ui/package.json

@@ -64,7 +64,6 @@
     "luxon": "^3.3.0",
     "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "normalize-wheel": "^1.0.1",
     "pinia": "^2.1.6",
     "prettier": "^3.0.3",
     "qrcode.vue": "^3.3.4",

packages/editor-ui/src/Interface.ts

@@ -1258,6 +1258,7 @@ export interface IRestApiContext {
 export interface IZoomConfig {
 	scale: number;
 	offset: XYPosition;
+	origin?: XYPosition;
 }
 
 export interface IBounds {

packages/editor-ui/src/stores/canvas.store.ts

@@ -1,7 +1,6 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
 import { v4 as uuid } from 'uuid';
-import normalizeWheel from 'normalize-wheel';
 import {
 	useWorkflowsStore,
 	useNodeTypesStore,
@@ -10,7 +9,14 @@ import {
 	useSourceControlStore,
 } from '@/stores';
 import type { INodeUi, XYPosition } from '@/Interface';
-import { scaleBigger, scaleReset, scaleSmaller } from '@/utils';
+import {
+	applyScale,
+	getScaleFromWheelEventDelta,
+	normalizeWheelEventDelta,
+	scaleBigger,
+	scaleReset,
+	scaleSmaller,
+} from '@/utils';
 import { START_NODE_TYPE } from '@/constants';
 import type {
 	BeforeStartEventParams,
@@ -31,6 +37,7 @@ import {
 	CONNECTOR_PAINT_STYLE_DEFAULT,
 	CONNECTOR_PAINT_STYLE_PRIMARY,
 	CONNECTOR_ARROW_OVERLAYS,
+	getMousePosition,
 } from '@/utils/nodeViewUtils';
 import type { PointXY } from '@jsplumb/util';
 
@@ -64,7 +71,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 	});
 
 	const setRecenteredCanvasAddButtonPosition = (offset?: XYPosition) => {
-		const position = getMidCanvasPosition(nodeViewScale.value, offset || [0, 0]);
+		const position = getMidCanvasPosition(nodeViewScale.value, offset ?? [0, 0]);
 
 		position[0] -= PLACEHOLDER_TRIGGER_NODE_SIZE / 2;
 		position[1] -= PLACEHOLDER_TRIGGER_NODE_SIZE / 2;
@@ -125,29 +132,30 @@ export const useCanvasStore = defineStore('canvas', () => {
 		setZoomLevel(zoomLevel, offset);
 	};
 
-	const wheelMoveWorkflow = (e: WheelEvent) => {
-		const normalized = normalizeWheel(e);
+	const wheelMoveWorkflow = (deltaX: number, deltaY: number, shiftKeyPressed = false) => {
 		const offsetPosition = uiStore.nodeViewOffsetPosition;
-		const nodeViewOffsetPositionX =
-			offsetPosition[0] - (e.shiftKey ? normalized.pixelY : normalized.pixelX);
-		const nodeViewOffsetPositionY =
-			offsetPosition[1] - (e.shiftKey ? normalized.pixelX : normalized.pixelY);
+		const nodeViewOffsetPositionX = offsetPosition[0] - (shiftKeyPressed ? deltaY : deltaX);
+		const nodeViewOffsetPositionY = offsetPosition[1] - (shiftKeyPressed ? deltaX : deltaY);
 		uiStore.nodeViewOffsetPosition = [nodeViewOffsetPositionX, nodeViewOffsetPositionY];
 	};
 
 	const wheelScroll = (e: WheelEvent) => {
-		//* Control + scroll zoom
-		if (e.ctrlKey) {
-			if (e.deltaY > 0) {
-				zoomOut();
-			} else {
-				zoomIn();
-			}
+		// Prevent browser back/forward gesture, default pinch to zoom etc.
+		e.preventDefault();
+
+		const { deltaX, deltaY } = normalizeWheelEventDelta(e);
 
-			e.preventDefault();
+		if (e.ctrlKey || e.metaKey) {
+			const scaleFactor = getScaleFromWheelEventDelta(deltaY);
+			const { scale, offset } = applyScale(scaleFactor)({
+				scale: nodeViewScale.value,
+				offset: uiStore.nodeViewOffsetPosition,
+				origin: getMousePosition(e),
+			});
+			setZoomLevel(scale, offset);
 			return;
 		}
-		wheelMoveWorkflow(e);
+		wheelMoveWorkflow(deltaX, deltaY, e.shiftKey);
 	};
 
 	function initInstance(container: Element) {

packages/editor-ui/src/utils/canvasUtils.ts

@@ -13,47 +13,40 @@ import type { Route } from 'vue-router';
 	'@/utils'.
 */
 
-export const scaleSmaller = ({ scale, offset: [xOffset, yOffset] }: IZoomConfig): IZoomConfig => {
-	scale /= 1.25;
-	xOffset /= 1.25;
-	yOffset /= 1.25;
-	xOffset += window.innerWidth / 10;
-	yOffset += window.innerHeight / 10;
-
-	return {
-		scale,
-		offset: [xOffset, yOffset],
-	};
+const SCALE_INCREASE_FACTOR = 1.25;
+const SCALE_DECREASE_FACTOR = 0.75;
+const MIN_SCALE = 0.2;
+const MAX_SCALE = 10;
+
+const clamp = (min: number, max: number) => (num: number) => {
+	return Math.max(min, Math.min(max, num));
 };
 
-export const scaleBigger = ({ scale, offset: [xOffset, yOffset] }: IZoomConfig): IZoomConfig => {
-	scale *= 1.25;
-	xOffset -= window.innerWidth / 10;
-	yOffset -= window.innerHeight / 10;
-	xOffset *= 1.25;
-	yOffset *= 1.25;
+const clampScale = clamp(MIN_SCALE, MAX_SCALE);
+
+export const applyScale =
+	(scale: number) =>
+	({ scale: initialScale, offset: [xOffset, yOffset], origin }: IZoomConfig): IZoomConfig => {
+		const newScale = clampScale(initialScale * scale);
+		const scaleChange = newScale / initialScale;
+
+		const xOrigin = origin?.[0] ?? window.innerWidth / 2;
+		const yOrigin = origin?.[1] ?? window.innerHeight / 2;
+		xOffset = scaleChange * (xOffset - xOrigin) + xOrigin;
+		yOffset = scaleChange * (yOffset - yOrigin) + yOrigin;
 
-	return {
-		scale,
-		offset: [xOffset, yOffset],
+		return {
+			scale: newScale,
+			offset: [xOffset, yOffset],
+		};
 	};
-};
 
-export const scaleReset = (config: IZoomConfig): IZoomConfig => {
-	if (config.scale > 1) {
-		// zoomed in
-		while (config.scale > 1) {
-			config = scaleSmaller(config);
-		}
-	} else {
-		while (config.scale < 1) {
-			config = scaleBigger(config);
-		}
-	}
+export const scaleBigger = applyScale(SCALE_INCREASE_FACTOR);
 
-	config.scale = 1;
+export const scaleSmaller = applyScale(SCALE_DECREASE_FACTOR);
 
-	return config;
+export const scaleReset = (config: IZoomConfig): IZoomConfig => {
+	return applyScale(1 / config.scale)(config);
 };
 
 export const closestNumberDivisibleBy = (inputNumber: number, divisibleBy: number): number => {
@@ -112,3 +105,19 @@ export const getConnectionInfo = (
 	}
 	return null;
 };
+
+export const normalizeWheelEventDelta = (event: WheelEvent): { deltaX: number; deltaY: number } => {
+	const factorByMode: Record<number, number> = {
+		[WheelEvent.DOM_DELTA_PIXEL]: 1,
+		[WheelEvent.DOM_DELTA_LINE]: 8,
+		[WheelEvent.DOM_DELTA_PAGE]: 24,
+	};
+
+	const factor = factorByMode[event.deltaMode] ?? 1;
+
+	return { deltaX: event.deltaX * factor, deltaY: event.deltaY * factor };
+};
+
+export const getScaleFromWheelEventDelta = (delta: number): number => {
+	return 1 - delta / 100;
+};

packages/editor-ui/vite.config.ts

@@ -12,7 +12,6 @@ const vendorChunks = ['vue', 'vue-router'];
 const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
 const ignoreChunks = [
 	'@fontsource/open-sans',
-	'normalize-wheel',
 	'@vueuse/components',
 	// TODO: remove this. It's currently required by xml2js in NodeErrors
 	'stream-browserify',