@electerm/electerm-react 2.3.114 → 2.3.126

package/client/components/shortcuts/shortcut-control.jsx

@@ -167,6 +167,16 @@ class ShortcutControl extends React.PureComponent {
     window.store.onNewSsh()
   }, 500)
 
+  toggleAddBtnShortcut = throttle((e) => {
+    e.stopPropagation()
+    const { currentLayoutBatch } = window.store
+    // Find the add button for the active layout (batch)
+    const addBtnElement = document.querySelector(`.v${currentLayoutBatch + 1} .tabs-add-btn`)
+    if (addBtnElement) {
+      addBtnElement.click()
+    }
+  }, 500)
+
   togglefullscreenShortcut = throttle((e) => {
     e.stopPropagation()
     const x = document.querySelector('.term-fullscreen-control') ||

package/client/components/shortcuts/shortcuts-defaults.js

@@ -31,6 +31,11 @@ export default () => {
       shortcut: 'ctrl+n',
       shortcutMac: 'meta+n'
     },
+    {
+      name: 'app_toggleAddBtn',
+      shortcut: 'alt+n',
+      shortcutMac: 'alt+n'
+    },
     {
       name: 'app_togglefullscreen',
       shortcut: 'alt+f',

package/client/components/tabs/add-btn-menu.jsx

@@ -57,8 +57,6 @@ export default function AddBtnMenu ({
     left: menuPosition === 'right'
   }
 
-  console.log('render add btn menu', dragProps)
-
   return (
     <div
       ref={menuRef}

package/client/components/tabs/add-btn.jsx

@@ -46,6 +46,10 @@ export default class AddBtn extends Component {
       document.body.removeChild(this.portalContainer)
       this.portalContainer = null
     }
+    // Clear focus timeout
+    if (this.çƒ) {
+      clearTimeout(this.focusTimeout)
+    }
   }
 
   componentDidUpdate (prevProps, prevState) {
@@ -111,6 +115,17 @@ export default class AddBtn extends Component {
     )
   }
 
+  focusSearchInput = () => {
+    // Focus the search input after the menu renders
+    this.focusTimeout = setTimeout(() => {
+      const searchInput = this.menuRef.current?.querySelector('.ant-input')
+      if (searchInput) {
+        searchInput.focus()
+        searchInput.select()
+      }
+    }, 500)
+  }
+
   handleAddBtnClick = () => {
     if (this.state.open) {
       this.setState({ open: false })
@@ -157,7 +172,7 @@ export default class AddBtn extends Component {
           menuPosition,
           menuTop,
           menuLeft
-        })
+        }, this.focusSearchInput)
 
         window.openTabBatch = this.props.batch
       }

package/client/components/terminal/terminal-command-dropdown.jsx

@@ -120,9 +120,9 @@ export default class TerminalCmdSuggestions extends Component {
 
     // Use bottom position if close to bottom edge
     if (reverse) {
-      position.bottom = h - top + cellHeight
+      position.bottom = h - top + cellHeight * 1.5
     } else {
-      position.top = top
+      position.top = top + cellHeight
     }
     this.setState({
       showSuggestions: true,

package/client/components/text-editor/simple-editor.jsx

@@ -7,6 +7,7 @@ import {
   CopyOutlined
 } from '@ant-design/icons'
 import { copy } from '../../common/clipboard'
+import { escapeRegExp } from 'lodash-es'
 
 export default function SimpleEditor (props) {
   const [searchKeyword, setSearchKeyword] = useState('')
@@ -72,7 +73,8 @@ export default function SimpleEditor (props) {
 
     const matches = []
     const text = props.value || ''
-    const regex = new RegExp(searchKeyword, 'gi')
+    const escapedKeyword = escapeRegExp(searchKeyword)
+    const regex = new RegExp(escapedKeyword, 'gi')
     let match
 
     while ((match = regex.exec(text)) !== null) {

package/client/components/vnc/vnc-session.jsx

@@ -83,7 +83,6 @@ export default class VncSession extends RdpSession {
       username,
       password
     } = tab
-    console.log('vnc tab', tab)
     const opts = clone({
       term: terminalType || config.terminalType,
       tabId: id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "2.3.114",
+  "version": "2.3.126",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",