From 3724a332962ece60f4ea6eeeb76d218b3e66b523 Mon Sep 17 00:00:00 2001 From: Joseph Izang Date: Wed, 7 Aug 2024 21:49:21 +0100 Subject: [PATCH] adjustments --- .../src/lib/components/file-explorer.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx index 48edc96f52..27d48ffc78 100644 --- a/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx +++ b/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx @@ -266,49 +266,48 @@ export const FileExplorer = (props: FileExplorerProps) => { if ((window as any).navigator.platform === 'MacIntel') { CopyComboHandler = async (eve: KeyboardEvent) => { if (eve.metaKey && eve.code === 'KeyC') { - feWindow._paq.push(['trackEvent', 'fileExplorer', 'f2ToRename', 'RenamePath']) await performCopy() + feWindow._paq.push(['trackEvent', 'fileExplorer', 'f2ToRename', 'RenamePath']) return } } CutHandler = async (eve: KeyboardEvent) => { if (eve.metaKey && eve.code === 'KeyX') { - feWindow._paq.push(['trackEvent', 'fileExplorer', 'f2ToRename', 'RenamePath']) await performCut() + feWindow._paq.push(['trackEvent', 'fileExplorer', 'f2ToRename', 'RenamePath']) return } } pasteHandler = async (eve: KeyboardEvent) => { if (eve.metaKey && eve.code === 'KeyV') { - feWindow._paq.push(['trackEvent', 'fileExplorer', 'metaVToPaste', 'PasteCopiedContent']) performPaste() + feWindow._paq.push(['trackEvent', 'fileExplorer', 'metaVToPaste', 'PasteCopiedContent']) return } } - } - if ((window as any).navigator.platform === 'Linux x86_64' || (window as any).navigator.platform === 'Win32') { + } else { pcCopyHandler = async (eve: KeyboardEvent) => { - if (eve.ctrlKey && (eve.key === 'c' || eve.key === 'C')) { - feWindow._paq.push(['trackEvent', 'fileExplorer', 'CtrlCToCopy', 'CopyPath']) + if (eve.ctrlKey && eve.key === 'c') { await performCopy() + feWindow._paq.push(['trackEvent', 'fileExplorer', 'CtrlCToCopy', 'CopyPath']) return } } pcCutHandler = async (eve: KeyboardEvent) => { if (eve.ctrlKey && eve.code === 'KeyX') { - feWindow._paq.push(['trackEvent', 'fileExplorer', 'CtrlXToCut', 'CutPath']) await performCut() + feWindow._paq.push(['trackEvent', 'fileExplorer', 'CtrlXToCut', 'CutPath']) return } } pcPasteHandler = async (eve: KeyboardEvent) => { if (eve.key === 'Control' && eve.code === 'KeyV') { - feWindow._paq.push(['trackEvent', 'fileExplorer', 'ctrlVToPaste', 'PasteCopiedContent']) performPaste() + feWindow._paq.push(['trackEvent', 'fileExplorer', 'ctrlVToPaste', 'PasteCopiedContent']) return } }