From 8908617563485786927adbd0a3d638fd3ec5e135 Mon Sep 17 00:00:00 2001 From: 3t8 <62209650+3t8@users.noreply.github.com> Date: Mon, 31 Oct 2022 12:58:17 +0100 Subject: [PATCH] Improve toast message shortcut on component deletion (#4513) * Improve toast message shortcut * Improved user agent check Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> * Improved user agent check Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> --- frontend/src/Editor/Editor.jsx | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx index a6d5e32be2..3e4f7fca8d 100644 --- a/frontend/src/Editor/Editor.jsx +++ b/frontend/src/Editor/Editor.jsx @@ -578,10 +578,16 @@ class EditorComponent extends React.Component { const selectedComponents = this.state?.selectedComponents; removeSelectedComponent(newDefinition, selectedComponents); - - toast('Selected components deleted! (⌘Z to undo)', { - icon: '🗑️', - }); + const platform = navigator?.userAgentData?.platform || navigator?.platform || 'unknown'; + if (platform.toLowerCase().indexOf('mac') > -1) { + toast('Selected components deleted! (⌘ + Z to undo)', { + icon: '🗑️', + }); + } else { + toast('Selected components deleted! (ctrl + Z to undo)', { + icon: '🗑️', + }); + } this.appDefinitionChanged(newDefinition, { skipAutoSave: this.isVersionReleased(), }); @@ -613,9 +619,16 @@ class EditorComponent extends React.Component { }); delete newDefinition.components[component.id]; - toast('Component deleted! (⌘Z to undo)', { - icon: '🗑️', - }); + const platform = navigator?.userAgentData?.platform || navigator?.platform || 'unknown'; + if (platform.toLowerCase().indexOf('mac') > -1) { + toast('Component deleted! (⌘ + Z to undo)', { + icon: '🗑️', + }); + } else { + toast('Component deleted! (ctrl + Z to undo)', { + icon: '🗑️', + }); + } this.appDefinitionChanged(newDefinition, { skipAutoSave: this.isVersionReleased(), });