@electerm/electerm-react 3.15.186 → 3.15.187

package/client/common/default-setting.js

@@ -78,5 +78,6 @@ export default {
   startDirectoryLocal: '',
   allowMultiInstance: false,
   disableDeveloperTool: false,
-  dragDropBehavior: 'ask'
+  dragDropBehavior: 'ask',
+  switchTabOnHover: false
 }

package/client/components/setting-panel/setting-common.jsx

@@ -603,6 +603,7 @@ export default class SettingCommon extends Component {
             'hideIP',
             'allowMultiInstance',
             'disableDeveloperTool',
+            'switchTabOnHover',
             'debug'
           ].map(this.renderToggle)
         }

package/client/components/tabs/tab.jsx

@@ -121,6 +121,21 @@ class Tab extends Component {
     window.store.clickTab(this.props.tab.id, this.props.batch)
   }
 
+  onMouseEnter = () => {
+    const {
+      tab,
+      batch,
+      currentBatchTabId
+    } = this.props
+    if (document.querySelector('.' + onDragCls)) {
+      return
+    }
+    if (tab.id === currentBatchTabId) {
+      return
+    }
+    window.store.clickTab(tab.id, batch)
+  }
+
   onDrag = () => {
     addClass(this.tabRef.current, onDragCls)
   }
@@ -441,7 +456,8 @@ class Tab extends Component {
     const {
       isLast,
       tab,
-      currentBatchTabId
+      currentBatchTabId,
+      config
     } = this.props
     const {
       id,
@@ -499,6 +515,7 @@ class Tab extends Component {
           data-id={id}
           {...pick(this, [
             'onDrag',
+            ...(config && config.switchTabOnHover ? ['onMouseEnter'] : []),
             'onDragEnter',
             'onDragExit',
             'onDragLeave',

package/client/components/terminal/terminal.jsx

@@ -668,6 +668,7 @@ class Term extends Component {
   // long-press detection here.
   longPressTimer = null
   touchStartPos = null
+  longPressFired = false
   longPressThreshold = 500 // ms
   longPressMoveTolerance = 10 // px
 
@@ -681,6 +682,7 @@ class Term extends Component {
       clientY: touch.clientY,
       target: e.currentTarget
     }
+    this.longPressFired = false
     clearTimeout(this.longPressTimer)
     this.longPressTimer = setTimeout(() => {
       this.handleLongPress()
@@ -702,15 +704,27 @@ class Term extends Component {
   }
 
   onTouchEnd = () => {
+    const wasTap = this.touchStartPos && !this.longPressFired
     clearTimeout(this.longPressTimer)
     this.longPressTimer = null
     this.touchStartPos = null
+    // xterm's own touch (Gesture) handler calls preventDefault()/stopPropagation()
+    // on touchstart/touchend, which suppresses the synthesised mousedown xterm
+    // relies on to focus its hidden helper textarea. As a result a tap never
+    // focuses the terminal on touch devices, so the soft keyboard never opens
+    // and you cannot type. Focus explicitly on a clean tap (not a long-press,
+    // not a scroll) so mobile input works. The focus() runs synchronously inside
+    // this user-gesture handler, so iOS/Android will show the keyboard.
+    if (wasTap && this.term) {
+      this.term.focus()
+    }
   }
 
   handleLongPress = () => {
     if (!this.touchStartPos || this.state.loading) {
       return
     }
+    this.longPressFired = true
     const { clientX, clientY, target } = this.touchStartPos
 
     // Select the word at the touch position (same as desktop right-click word

package/client/components/terminal-info/format-disks.js

@@ -0,0 +1,45 @@
+/**
+ * parse `df` output into disk list
+ */
+
+export default function formatDisks (str) {
+  if (!str) {
+    return {
+      disks: []
+    }
+  }
+  const r = str.split('\n')
+    .slice(1)
+    .reduce((acc, s) => {
+      if (!s.trim()) {
+        return acc
+      }
+      const arr = s.trim().split(/ +/)
+      // df wraps long filesystem names (e.g. nfs "host:/very/long/export/path")
+      // onto a second line that starts with spaces and only holds the numeric
+      // columns. Merge such continuation lines back into the previous entry, so
+      // those disks (commonly nfs) are listed instead of dropped.
+      if (/^\s/.test(s) && acc.length) {
+        const prev = acc[acc.length - 1]
+        prev.size = arr[0]
+        prev.used = arr[1]
+        prev.avail = arr[2]
+        prev.usedPercent = arr[3]
+        prev.mount = arr[4]
+        return acc
+      }
+      acc.push({
+        filesystem: arr[0],
+        size: arr[1],
+        used: arr[2],
+        avail: arr[3],
+        usedPercent: arr[4],
+        mount: arr[5]
+      })
+      return acc
+    }, [])
+    .filter(d => d.filesystem && d.mount)
+  return {
+    disks: r
+  }
+}

package/client/components/terminal-info/run-cmd.jsx

@@ -6,6 +6,7 @@ import { runCmd } from '../terminal/terminal-apis'
 import { useEffect } from 'react'
 import wait from '../../common/wait'
 import parseInt10 from '../../common/parse-int10'
+import formatDisks from './format-disks'
 
 function formatActivities (str) {
   if (!str) {
@@ -31,31 +32,6 @@ function formatActivities (str) {
   }
 }
 
-function formatDisks (str) {
-  if (!str) {
-    return {
-      disks: []
-    }
-  }
-  const r = str.split('\n')
-    .slice(1)
-    .map(s => {
-      const arr = s.split(/ +/)
-      return {
-        filesystem: arr[0],
-        size: arr[1],
-        used: arr[2],
-        avail: arr[3],
-        usedPercent: arr[4],
-        mount: arr[5]
-      }
-    })
-    .filter(d => d.filesystem)
-  return {
-    disks: r
-  }
-}
-
 function formatCpu (str) {
   if (!str) {
     return {

package/package.json

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