@electerm/electerm-react 1.37.96 → 1.37.110

package/client/common/constants.js

@@ -37,7 +37,6 @@ export const contextMenuWidth = 280
 export const contextMenuPaddingTop = 10
 export const sftpControlHeight = 28 + 42 + 33 + 46
 export const sidebarWidth = 43
-export const sidebarPanelWidth = 300
 export const maxHistory = 50
 export const maxTransport = 5
 export const maxSftpHistory = 20
@@ -298,6 +297,7 @@ export const rendererTypes = {
   webGL: 'webGL'
 }
 export const mirrors = {
+  'download-electerm': 'download-electerm',
   github: 'github',
   sourceforge: 'sourceforge'
 }

package/client/common/default-setting.js

@@ -8,7 +8,7 @@ export default {
   scrollback: 3000,
   onStartSessions: [],
   fontSize: 16,
-  fontFamily: 'mono, courier-new, courier, monospace',
+  fontFamily: 'Fira Code, mono, courier-new, courier, monospace',
   execWindows: 'System32/WindowsPowerShell/v1.0/powershell.exe',
   execMac: 'zsh',
   execLinux: 'bash',

package/client/common/download-mirrors.js

@@ -1,4 +1,8 @@
 export default [
+  {
+    name: 'homepage',
+    url: 'https://electerm.html5beta.com'
+  },
   {
     name: 'github',
     url: 'https://github.com/electerm/electerm/releases'

package/client/components/main/upgrade.jsx

@@ -29,7 +29,7 @@ const c = prefix('common')
 export default class Upgrade extends PureComponent {
   state = {
     showCount: 0,
-    mirror: mirrors.github
+    mirror: mirrors['download-electerm']
   }
 
   downloadTimer = null
@@ -114,7 +114,7 @@ export default class Upgrade extends PureComponent {
   timeout = () => {
     const { mirror } = this.state
     this.cancel()
-    const next = mirror === mirrors.github
+    const next = mirror !== mirrors.sourceforge
       ? this.doUpgrade
       : undefined
     const nextMirror = mirror === mirrors.github

package/client/components/session/session.jsx

@@ -299,11 +299,16 @@ export default class SessionWrapper extends Component {
       infoPanelPinned,
       showInfo
     } = this.state
-    if (!infoPanelPinned || !showInfo) {
-      return this.props.width
-    }
-    const { rightSidebarWidth, width } = this.props
-    return width - rightSidebarWidth
+    const { rightSidebarWidth, width, leftSidebarWidth, pinned, openedSideBar } = this.props
+    const rt = infoPanelPinned && showInfo ? rightSidebarWidth : 0
+    const lt = pinned && openedSideBar ? leftSidebarWidth : 0
+    return width - rt - lt - 42
+  }
+
+  getWidthSftp = () => {
+    const { width, leftSidebarWidth, pinned, openedSideBar } = this.props
+    const lt = pinned && openedSideBar ? leftSidebarWidth : 0
+    return width - lt - 42
   }
 
   renderTerminals = () => {
@@ -402,7 +407,8 @@ export default class SessionWrapper extends Component {
       height,
       sessionId,
       pane,
-      ...this.props
+      ...this.props,
+      width: this.getWidthSftp()
     }
     return (
       <div className={cls}>

package/client/components/session/sessions.jsx

@@ -350,7 +350,10 @@ class Sessions extends Component {
           'tabsHeight',
           'appPath',
           'topMenuHeight',
-          'rightSidebarWidth'
+          'rightSidebarWidth',
+          'leftSidebarWidth',
+          'pinned',
+          'openedSideBar'
         ]),
         config,
         ...pick(this, [
@@ -411,7 +414,7 @@ class Sessions extends Component {
 
   renderSessionsWrap = () => {
     const { leftSidebarWidth, openedSideBar } = this.props.store
-    const w = leftSidebarWidth + 43
+    const w = leftSidebarWidth + 42
     const ptp = openedSideBar
       ? {
           className: 'sessions',

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

@@ -56,13 +56,24 @@ export function shortcutExtend (Cls) {
       type,
       key
     } = event
-    if (this.isTerm && key === 'Backspace' && this.isTerm && type === 'keydown') {
+    if (
+      this.term &&
+      key === 'Backspace' &&
+      type === 'keydown' &&
+      !altKey &&
+      !ctrlKey
+    ) {
       this.props.onDelKeyPressed()
       const delKey = this.props.config.backspaceMode === '^?' ? 8 : 127
       const altDelDelKey = delKey === 8 ? 127 : 8
       const char = String.fromCharCode(shiftKey ? delKey : altDelDelKey)
       this.socket.send(char)
       return false
+    } else if (
+      this.term &&
+      this.term.buffer.active.type === 'alternate'
+    ) {
+      return true
     }
     const codeName = event instanceof window.WheelEvent
       ? (wheelDeltaY > 0 ? 'mouseWheelUp' : 'mouseWheelDown')
@@ -87,13 +98,14 @@ export function shortcutExtend (Cls) {
       if (conf.shortcut.split(',').includes(r)) {
         if (this[funcName]) {
           return this[funcName](event)
-        } else if (this.isTerm && conf.readonly) {
+        } else if (this.term && conf.readonly) {
           return true
         } else {
           return false
         }
       }
     }
+    return !!this.term
   }
   return Cls
 }

package/client/components/sidebar/side-panel.jsx

@@ -19,6 +19,7 @@ export default class SidePanel extends PureComponent {
       nw = 600
     }
     this.props.setLeftSidePanelWidth(nw)
+    window.store.onResize()
     window.removeEventListener('mouseup', this.handleMouseup)
     window.removeEventListener('mousemove', this.handleMousemove)
   }

package/client/components/tabs/app-drag.jsx

@@ -5,10 +5,11 @@ export default function AppDrag (props) {
     const {
       target
     } = e
+    const { classList = [] } = target || {}
     if (
-      target instanceof window.SVGElement ||
-      target.classList.contains('tab-title') ||
-      target.classList.contains('ant-tooltip-inner')
+      !classList.contains('app-drag') &&
+      !classList.contains('tabs-inner') &&
+      !classList.contains('tabs-wrapper')
     ) {
       window.pre.runSync('windowMove', false)
       return false
@@ -17,6 +18,7 @@ export default function AppDrag (props) {
   }
 
   function onMouseDown (e) {
+    e.stopPropagation()
     if (canOperate(e)) {
       window.pre.runSync('windowMove', true)
     }
@@ -27,8 +29,9 @@ export default function AppDrag (props) {
   }
 
   function onDoubleClick (e) {
+    e.stopPropagation()
     if (!canOperate(e)) {
-      return window.pre.runSync('windowMove', false)
+      return
     }
     const {
       isMaximized

package/client/components/tabs/index.jsx

@@ -240,7 +240,7 @@ export default class Tabs extends React.Component {
       ? '100%'
       : tabsWidthAll
     const style = {
-      width: width - windowControlWidth - 86
+      width: width - windowControlWidth - 136
     }
     return (
       <div

package/client/components/terminal/index.jsx

@@ -76,8 +76,6 @@ class Term extends Component {
     }
   }
 
-  isTerm = true
-
   componentDidMount () {
     this.initTerminal()
     this.initEvt()

package/client/components/terminal-info/content.jsx

@@ -110,7 +110,7 @@ export default class TerminalInfoContent extends PureComponent {
       draggable: false,
       style: {
         width: props.rightSidebarWidth,
-        top: props.topMenuHeight + props.tabsHeight + termControlHeight - 4
+        top: props.topMenuHeight + props.tabsHeight + termControlHeight
       }
     }
     return (

package/client/entry/index.jsx

@@ -2,6 +2,7 @@ import { render } from 'react-dom'
 import 'antd/dist/reset.css'
 import 'xterm/css/xterm.css'
 import '../common/trzsz'
+import 'firacode/distr/fira_code.css'
 import Main from '../components/main/index.jsx'
 import { notification } from 'antd'
 notification.config({

package/client/store/index.js

@@ -31,8 +31,6 @@ import { uniq } from 'lodash-es'
 import copy from 'json-deep-copy'
 import {
   settingMap,
-  sidebarWidth,
-  sidebarPanelWidth,
   paneMap,
   settingSyncId,
   settingShortcutsId,
@@ -93,8 +91,7 @@ class Store {
   }
 
   get width () {
-    return window.store.innerWidth - sidebarWidth -
-      (window.store.pinned ? sidebarPanelWidth : 0)
+    return window.store.innerWidth
   }
 
   get currentQuickCommands () {
@@ -226,7 +223,7 @@ class Store {
   }
 
   get topMenuHeight () {
-    return window.store.config.useSystemTitleBar ? 0 : 15
+    return 0
   }
 
   get tabsHeight () {

package/client/store/init-state.js

@@ -25,7 +25,7 @@ import * as ls from '../common/safe-local-storage'
 
 const { prefix } = window
 const t = prefix('terminalThemes')
-const e = prefix('control')
+const e = prefix('common')
 const newQuickCommand = 'newQuickCommand'
 const q = prefix('quickCommands')
 

package/package.json

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