From 536d8109b02d1a0f771055c36ff0f45dae08281e Mon Sep 17 00:00:00 2001 From: OlegIvaniv Date: Thu, 13 Apr 2023 18:46:44 +0200 Subject: [PATCH] fix(editor): Only treat as CTRL pressed by default on touch devices for MouseEvent (#5968) --- packages/editor-ui/src/composables/useDeviceSupport.ts | 2 +- packages/editor-ui/src/mixins/deviceSupportHelpers.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor-ui/src/composables/useDeviceSupport.ts b/packages/editor-ui/src/composables/useDeviceSupport.ts index 7c0be6fe6..1c7e5083e 100644 --- a/packages/editor-ui/src/composables/useDeviceSupport.ts +++ b/packages/editor-ui/src/composables/useDeviceSupport.ts @@ -19,7 +19,7 @@ export default function useDeviceSupportHelpers(): DeviceSupportHelpers { const controlKeyCode = ref(isMacOs.value ? 'Meta' : 'Control'); function isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean { - if (isTouchDevice.value === true) { + if (isTouchDevice.value === true && e instanceof MouseEvent) { return true; } if (isMacOs.value) { diff --git a/packages/editor-ui/src/mixins/deviceSupportHelpers.ts b/packages/editor-ui/src/mixins/deviceSupportHelpers.ts index a8506f6ed..6b316bf87 100644 --- a/packages/editor-ui/src/mixins/deviceSupportHelpers.ts +++ b/packages/editor-ui/src/mixins/deviceSupportHelpers.ts @@ -19,7 +19,7 @@ export const deviceSupportHelpers = Vue.extend({ }, methods: { isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean { - if (this.isTouchDevice === true) { + if (this.isTouchDevice === true && e instanceof MouseEvent) { return true; } if (this.isMacOs) {