Minor refactoring to move repeated code into utility class

2 files changed, 4 insertions, 3 deletions

diff --git a/src/features/webControls/components/WebControls.tsx b/src/features/webControls/components/WebControls.tsx
index aee568a7d..25b23cbee 100644
--- a/src/features/webControls/components/WebControls.tsx
+++ b/src/features/webControls/components/WebControls.tsx
@@ -15,6 +15,7 @@ import {
 import withStyles, { type WithStylesProps } from 'react-jss';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
 import Icon from '../../../components/ui/icon';
+import { isEnterKeyPress, isEscapeKeyPress } from '../../../jsUtils';
 
 const messages = defineMessages({
   goHome: {
@@ -215,7 +216,7 @@ class WebControls extends Component<IProps, IState> {
             });
           }}
           onKeyDown={event => {
-            if (event.key === 'Enter') {
+            if (isEnterKeyPress(event.key)) {
               this.setState({
                 editUrl: false,
               });
@@ -224,7 +225,7 @@ class WebControls extends Component<IProps, IState> {
               if (this.inputRef?.current) {
                 this.inputRef.current.blur();
               }
-            } else if (event.key === 'Escape') {
+            } else if (isEscapeKeyPress(event.key)) {
               this.setState({
                 editUrl: false,
                 inputUrl: url,
diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx
index e92bc4b60..4621482bc 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.tsx
+++ b/src/features/workspaces/components/WorkspaceDrawer.tsx
@@ -9,7 +9,7 @@ import {
 } from 'react-intl';
 import withStyles, { type WithStylesProps } from 'react-jss';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
-import type { StoresProps } from 'src/@types/ferdium-components.types';
+import type { StoresProps } from '../../../@types/ferdium-components.types';
 import { H1 } from '../../../components/ui/headline';
 import Icon from '../../../components/ui/icon';
 import workspaceActions from '../actions';