@electerm/electerm-react 2.4.18 → 2.4.28

package/client/components/shortcuts/shortcut-handler.js

@@ -65,10 +65,6 @@ export function shortcutExtend (Cls) {
     if (isInAntdInput()) {
       return
     }
-    if (this.cmdAddon) {
-      this.cmdAddon.handleKey(event)
-    }
-
     if (
       this.term &&
       key === 'Backspace' &&

package/client/components/terminal/terminal.jsx

@@ -247,6 +247,14 @@ class Term extends Component {
         }
       }
     }
+    if (
+      !prevSftpFollow &&
+      currSftpFollow &&
+      this.isLocal() &&
+      isWin
+    ) {
+      return this.warnSftpFollowUnsupported()
+    }
   }
 
   timers = {}
@@ -325,6 +333,14 @@ class Term extends Component {
     })
   }
 
+  warnSftpFollowUnsupported = () => {
+    message.warning(
+      <span>
+        Fish shell/windows shell is not supported for SFTP follow SSH path feature. See: <ExternalLink to='https://github.com/electerm/electerm/wiki/Warning-about-sftp-follow-ssh-path-function'>wiki</ExternalLink>
+      </span>
+      , 7)
+  }
+
   pasteShortcut = (e) => {
     if (this.pasteTextTooLong()) {
       this.askUserConfirm()
@@ -1080,6 +1096,7 @@ class Term extends Component {
     term.onData(this.onData)
     this.term = term
     term.onSelectionChange(this.onSelectionChange)
+    term.attachCustomKeyEventHandler(this.handleKeyboardEvent.bind(this))
     await this.remoteInit(term)
   }
 
@@ -1221,11 +1238,7 @@ class Term extends Component {
     this.shellType = shellType
     if (shellType === 'fish') {
       if (this.props.sftpPathFollowSsh) {
-        message.warning(
-          <span>
-            Fish shell is not supported for SFTP follow SSH path. See: <ExternalLink to='https://github.com/electerm/electerm/wiki/Warning-about-sftp-follow-ssh-path-function'>wiki</ExternalLink>
-          </span>
-          , 7)
+        this.warnSftpFollowUnsupported()
       }
       return Promise.resolve()
     }

package/package.json

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