Merge branch 'develop' into feature/react-admin

resources/scripts/components/server/Console.tsx

@@ -145,23 +145,16 @@ export default () => {
 
             // Add support for capturing keys
             terminal.attachCustomKeyEventHandler((e: KeyboardEvent) => {
-                // Ctrl + C (Copy)
-                if (e.ctrlKey && e.key === 'c') {
+                if (e.metaKey && e.key === 'c') {
                     document.execCommand('copy');
                     return false;
-                }
-
-                // Ctrl + F (Find)
-                if (e.ctrlKey && e.key === 'f') {
+                } else if (e.metaKey && e.key === 'f') {
+                    e.preventDefault();
                     searchBar.show();
                     return false;
-                }
-
-                // Escape
-                if (e.key === 'Escape') {
+                } else if (e.key === 'Escape') {
                     searchBar.hidden();
                 }
-
                 return true;
             });
         }
@@ -213,10 +206,7 @@ export default () => {
                     tw`rounded-t p-2 bg-black w-full`,
                     !canSendCommands && tw`rounded-b`,
                 ]}
-                style={{
-                    minHeight: '16rem',
-                    maxHeight: '32rem',
-                }}
+                style={{ minHeight: '16rem' }}
             >
                 <TerminalDiv id={'terminal'} ref={ref}/>
             </div>