From 67704e5a8f800d83cb59864e8a849dc55df61350 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Fri, 11 Aug 2023 15:16:06 +0200
Subject: [PATCH] fix(core): use os specific key defaults

---
 .../core/src/container/Viewport/Viewport.vue   | 18 +++++++++++++-----
 packages/core/src/store/state.ts               |  6 +++---
 packages/core/src/utils/general.ts             |  2 ++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/container/Viewport/Viewport.vue b/packages/core/src/container/Viewport/Viewport.vue
index dcf2635e..5860b167 100644
--- a/packages/core/src/container/Viewport/Viewport.vue
+++ b/packages/core/src/container/Viewport/Viewport.vue
@@ -7,7 +7,7 @@ import { useEventListener, useResizeObserver } from '@vueuse/core'
 import type { CoordinateExtent, D3ZoomHandler, FlowOptions, ViewportTransform } from '../../types'
 import { PanOnScrollMode } from '../../types'
 import { useKeyPress, useVueFlow, useWindow } from '../../composables'
-import { ErrorCode, VueFlowError, clamp, getDimensions } from '../../utils'
+import { ErrorCode, VueFlowError, clamp, getDimensions, isMacOs } from '../../utils'
 import Pane from '../Pane/Pane.vue'
 import Transform from './Transform.vue'
 
@@ -92,6 +92,7 @@ onMounted(() => {
 
   const constrainedTransform = d3Zoom.constrain()(updatedTransform, extent, translateExtent.value)
   d3Zoom.transform(d3Selection, constrainedTransform)
+  d3Zoom.wheelDelta(wheelDelta)
 
   storeD3Zoom.value = d3Zoom
   storeD3Selection.value = d3Selection
@@ -183,12 +184,13 @@ onMounted(() => {
 
           const currentZoom = d3Selection.property('__zoom').k || 1
 
-          if (event.ctrlKey && zoomOnPinch.value) {
+          if (event.ctrlKey && zoomOnPinch.value && isMacOs()) {
             const point = pointer(event)
-            // taken from https://github.com/d3/d3-zoom/blob/master/src/zoom.js
-            const pinchDelta = -event.deltaY * (event.deltaMode === 1 ? 0.05 : event.deltaMode ? 1 : 0.002) * 10
+            const pinchDelta = wheelDelta(event)
             const zoom = currentZoom * 2 ** pinchDelta
-            d3Zoom.scaleTo(d3Selection, zoom, point)
+
+            // @ts-expect-error d3-zoom types are not up to date
+            d3Zoom.scaleTo(d3Selection, zoom, point, event)
 
             return
           }
@@ -297,6 +299,12 @@ function isRightClickPan(pan: FlowOptions['panOnDrag'], usedButton: number) {
   return usedButton === 2 && Array.isArray(pan) && pan.includes(2)
 }
 
+function wheelDelta(event: any) {
+  const factor = event.ctrlKey && isMacOs() ? 10 : 1
+
+  return -event.deltaY * (event.deltaMode === 1 ? 0.05 : event.deltaMode ? 1 : 0.002) * factor
+}
+
 function viewChanged(prevViewport: ViewportTransform, eventTransform: ZoomTransform) {
   return (
     (prevViewport.x !== eventTransform.x && !isNaN(eventTransform.x)) ||
diff --git a/packages/core/src/store/state.ts b/packages/core/src/store/state.ts
index 7a34cc04..8db87c5a 100644
--- a/packages/core/src/store/state.ts
+++ b/packages/core/src/store/state.ts
@@ -11,7 +11,7 @@ import {
   StepEdge,
   StraightEdge,
 } from '~/components'
-import { isDef } from '~/utils'
+import { isDef, isMacOs } from '~/utils'
 
 export const defaultNodeTypes: DefaultNodeTypes = {
   input: InputNode,
@@ -107,8 +107,8 @@ function defaultState(): State {
     selectNodesOnDrag: true,
     multiSelectionActive: false,
     selectionKeyCode: 'Shift',
-    multiSelectionKeyCode: 'Meta',
-    zoomActivationKeyCode: 'Meta',
+    multiSelectionKeyCode: isMacOs() ? 'Meta' : 'Control',
+    zoomActivationKeyCode: isMacOs() ? 'Meta' : 'Control',
     deleteKeyCode: 'Backspace',
     panActivationKeyCode: 'Space',
 
diff --git a/packages/core/src/utils/general.ts b/packages/core/src/utils/general.ts
index aa724894..0f5b4c71 100644
--- a/packages/core/src/utils/general.ts
+++ b/packages/core/src/utils/general.ts
@@ -28,3 +28,5 @@ export function isBoolean(val: any): val is boolean {
 export function isNumber(val: any): val is number {
   return typeof val === 'number'
 }
+
+export const isMacOs = () => typeof navigator !== 'undefined' && navigator?.userAgent?.indexOf('Mac') >= 0