@electerm/electerm-react 1.37.16 → 1.37.18

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

@@ -8,6 +8,27 @@ import { throttle } from 'lodash-es'
 function buildConfig (config, filter = d => d) {
   const defs = shortcutsDefaultsGen().filter(filter)
   const { shortcuts = {} } = config
+  return defs.reduce((p, c) => {
+    const propName = isMacJs ? 'shortcutMac' : 'shortcut'
+    if (isMacJs && c.skipMac) {
+      return p
+    }
+    const name = c.name + '_' + propName
+    const [type, func] = c.name.split('_')
+    return {
+      ...p,
+      [name]: {
+        shortcut: c.readonly ? c[propName] : (shortcuts[name] || c[propName]),
+        type,
+        func
+      }
+    }
+  }, {})
+}
+
+function buildConfigForSearch (config) {
+  const defs = shortcutsDefaultsGen()
+  const { shortcuts = {} } = config
   return defs.reduce((p, c) => {
     const propName = isMacJs ? 'shortcutMac' : 'shortcut'
     const name = c.name + '_' + propName
@@ -46,7 +67,7 @@ export function shortcutExtend (Cls) {
       (shiftKey ? 'shift+' : '') +
       (altKey ? 'alt+' : '') +
       codeK.toLowerCase()
-    const shortcutsConfig = buildConfig(this.props.config, d => !d.readonly)
+    const shortcutsConfig = buildConfig(this.props.config, d => !d.hidden)
     const keys = Object.keys(shortcutsConfig)
     const len = keys.length
     for (let i = 0; i < len; i++) {
@@ -55,9 +76,9 @@ export function shortcutExtend (Cls) {
       const funcName = conf.func + 'Shortcut'
       if (conf.shortcut.split(',').includes(r)) {
         if (this[funcName]) {
-          this[funcName](event)
-        } else {
-          return false
+          return this[funcName](event)
+        } else if (this.isTerm) {
+          return true
         }
       }
     }
@@ -67,7 +88,7 @@ export function shortcutExtend (Cls) {
 
 export function shortcutDescExtend (Cls) {
   Cls.prototype.getShortcut = function (name) {
-    const shortcutsConfig = buildConfig(this.props.config)
+    const shortcutsConfig = buildConfigForSearch(this.props.config)
     const propName = isMacJs ? 'shortcutMac' : 'shortcut'
     const n = `${name}_${propName}`
     return shortcutsConfig[n].shortcut

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

@@ -49,18 +49,21 @@ export default () => {
       name: 'terminal_selectAll',
       shortcut: 'ctrl+a,ctrl+shift+a',
       shortcutMac: 'meta+a',
+      skipMac: true,
       readonly: true
     },
     {
       name: 'terminal_copy',
       shortcut: 'ctrl+c,ctrl+shift+c',
       shortcutMac: 'meta+c',
+      skipMac: true,
       readonly: true
     },
     {
       name: 'terminal_paste',
       shortcut: 'ctrl+v,ctrl+shift+v',
       shortcutMac: 'meta+v',
+      hidden: true,
       readonly: true
     },
     {

package/client/components/tabs/tab-title.jsx

@@ -8,7 +8,7 @@ export default function tabTitle (props) {
     ? { color }
     : {}
   return (
-    <span>
+    <span className='tab-title'>
       <span style={styleTag}>♦</span> {tabCount}. {title}
     </span>
   )

package/client/components/terminal/index.jsx

@@ -87,6 +87,8 @@ class Term extends Component {
     }
   }
 
+  isTerm = true
+
   dataCache = ''
 
   componentDidMount () {
@@ -234,15 +236,14 @@ class Term extends Component {
     this.term.selectAll()
   }
 
-  // copyShortcut = (e) => {
-  //   const sel = this.term.getSelection()
-  //   if (sel) {
-  //     e.stopPropagation()
-  //     e.preventDefault()
-  //     this.copySelectionToClipboard()
-  //     return false
-  //   }
-  // }
+  copyShortcut = (e) => {
+    const sel = this.term.getSelection()
+    if (sel) {
+      e.stopPropagation()
+      this.copySelectionToClipboard()
+      return false
+    }
+  }
 
   searchShortcut = (e) => {
     e.stopPropagation()

package/package.json

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