@electerm/electerm-react 1.100.56 → 1.100.60

package/client/common/check-skip-src.js

@@ -0,0 +1,16 @@
+/**
+ * Check if install source should skip upgrade check
+ */
+
+import { srcsSkipUpgradeCheck } from './constants'
+
+export const checkSkipSrc = (installSrc) => {
+  if (!installSrc) return false
+  return srcsSkipUpgradeCheck.some(skipSrc => {
+    if (skipSrc === 'skip-upgrade-check') {
+      return installSrc === skipSrc
+    }
+    // For file extensions like '.appx', '.snap', check if installSrc ends with them
+    return installSrc.endsWith(skipSrc)
+  })
+}

package/client/components/common/password.jsx

@@ -49,25 +49,34 @@ export default forwardRef(function Password (props, ref) {
     }
   }, [props.onBlur])
 
-  // Caps lock indicator icon
-  const capsLockIcon = isCapsLockOn
-    ? (
-      <Tag
-        color='red'
-      >
-        A
-      </Tag>
-      )
-    : null
+  // Keep addonBefore as-is from props; must be null when caps lock is off
+  const addonBefore = props.addonBefore ?? null
 
-  // Merge addonBefore with caps lock indicator
-  const addonBefore = capsLockIcon || props.addonBefore || null
+  // Show caps lock indicator inside prefix to avoid remounting the input wrapper
+  let capsPrefix = null
+  if (isCapsLockOn) {
+    capsPrefix = (
+      <Tag color='orange' style={{ marginRight: 4 }}>CAPS</Tag>
+    )
+  }
+
+  // Merge any existing prefix from props with our caps indicator
+  let prefix = capsPrefix
+  if (props.prefix) {
+    prefix = (
+      <>
+        {capsPrefix}
+        {props.prefix}
+      </>
+    )
+  }
 
   return (
     <Input.Password
       {...props}
       ref={ref}
       addonBefore={addonBefore}
+      prefix={prefix}
       onKeyDown={handleKeyEvent}
       onKeyUp={handleKeyEvent}
       onFocus={handleFocus}

package/client/components/main/upgrade.jsx

@@ -9,10 +9,10 @@ import {
   isMac,
   isWin,
   packInfo,
-  srcsSkipUpgradeCheck,
   downloadUpgradeTimeout,
   mirrors
 } from '../../common/constants'
+import { checkSkipSrc } from '../../common/check-skip-src'
 import { debounce } from 'lodash-es'
 import newTerm from '../../common/new-terminal'
 import Markdown from '../common/markdown'
@@ -146,7 +146,7 @@ export default class Upgrade extends PureComponent {
 
   getLatestRelease = async (noSkipVersion = false) => {
     const { installSrc } = this.props
-    if (srcsSkipUpgradeCheck.includes(installSrc)) {
+    if (checkSkipSrc(installSrc)) {
       return
     }
     this.changeProps({
@@ -305,7 +305,7 @@ export default class Upgrade extends PureComponent {
         {this.renderChangeLog()}
       </div>
     )
-    const skip = srcsSkipUpgradeCheck.includes(installSrc)
+    const skip = checkSkipSrc(installSrc)
     return (
       <div className={cls}>
         <div className='upgrade-panel-title fix'>

package/client/components/sidebar/info-modal.jsx

@@ -19,9 +19,9 @@ import { auto } from 'manate/react'
 
 import {
   packInfo,
-  infoTabs,
-  srcsSkipUpgradeCheck
+  infoTabs
 } from '../../common/constants'
+import { checkSkipSrc } from '../../common/check-skip-src'
 import './info.styl'
 
 const e = window.translate
@@ -32,7 +32,7 @@ export default auto(function InfoModal (props) {
   }
 
   const renderCheckUpdate = () => {
-    if (window.et.isWebApp || srcsSkipUpgradeCheck.includes(props.installSrc)) {
+    if (window.et.isWebApp || checkSkipSrc(props.installSrc)) {
       return null
     }
     const {

package/client/entry/basic.js

@@ -38,6 +38,12 @@ async function load () {
     const url = !isDev ? `js/electerm-${version}.js` : 'js/electerm.js'
     rcs.src = url
     rcs.type = 'module'
+    rcs.onload = () => {
+      const loadingEl = document.getElementById('content-loading')
+      if (loadingEl) {
+        document.body.removeChild(loadingEl)
+      }
+    }
     document.body.appendChild(rcs)
   }
   window.getLang = (lang = window.store?.config.language || 'en_us') => {
@@ -50,7 +56,6 @@ async function load () {
   }
   await loadWorker()
   loadScript()
-  document.body.removeChild(document.getElementById('content-loading'))
 }
 
 // window.addEventListener('load', load)

package/package.json

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