@electerm/electerm-react 5.5.66 → 5.5.76

package/client/store/tab.js

@@ -19,6 +19,7 @@ import newTerm, { updateCount } from '../common/new-terminal.js'
 import { action } from 'manate'
 import { shouldCaptureTerminalReloadState } from '../components/terminal/ssh-reload-state.js'
 import dangerousSessionFields from '../common/dangerous-session-fields'
+import { distributeTabsEvenly } from '../common/distribute-tabs'
 
 function captureSshSessionState (tab, config) {
   return shouldCaptureTerminalReloadState(tab, config)
@@ -491,12 +492,45 @@ export default Store => {
     }
     ntb.batch = (currentLayoutBatch + 1) % maxBatch
     if (layout === 'c1') {
-      store.setLayout('c2')
+      store.setLayout('c2', false)
     }
     store.addTab(ntb)
   }
 
-  Store.prototype.setLayout = function (layout) {
+  // Spread tabs over the panes of a layout with more panes.
+  // Only used when leaving the single layout: once more than one pane is on
+  // screen the arrangement is the user's, and is left alone.
+  Store.prototype.distributeTabs = function (newCount) {
+    const { store } = window
+    const { tabs } = store
+    if (tabs.length < 2) {
+      return
+    }
+    // contiguous chunks keep the tab order: [A B C D E] -> [A B] [C D] [E]
+    const batches = distributeTabsEvenly(tabs.length, newCount)
+    tabs.forEach((t, i) => {
+      t.batch = batches[i]
+    })
+  }
+
+  // make sure every pane has a valid active tab
+  Store.prototype.fixActiveTabIds = function (count) {
+    const { store } = window
+    for (let b = 0; b < count; b++) {
+      const inBatch = store.tabs.filter(t => t.batch === b)
+      const key = `activeTabId${b}`
+      if (!inBatch.some(t => t.id === store[key])) {
+        store[key] = inBatch.length ? inBatch[0].id : ''
+      }
+    }
+    const active = store.tabs.find(t => t.id === store.activeTabId)
+    if (active) {
+      store[`activeTabId${active.batch}`] = active.id
+      store.currentLayoutBatch = active.batch
+    }
+  }
+
+  Store.prototype.setLayout = function (layout, redistribute = true) {
     const { store } = window
     const prevLayout = store.layout
     const { activeTabId } = store
@@ -533,6 +567,15 @@ export default Store => {
       if (store.currentLayoutBatch >= newBatchCount) {
         store.currentLayoutBatch = newBatchCount - 1
       }
+    } else if (
+      redistribute &&
+      store.config.autoDistributeTabsWhenLayoutChange &&
+      prevBatchCount === 1 &&
+      newBatchCount > 1
+    ) {
+      // leaving the single layout: hand the tabs out evenly
+      store.distributeTabs(newBatchCount)
+      store.fixActiveTabIds(newBatchCount)
     }
     store.focus()
   }

package/client/store/watch.js

@@ -82,6 +82,14 @@ export default store => {
       }
       return store[name]
     }, schedule)
+    // Make the current store contents the watcher's baseline, so a later
+    // start() diffs against the store rather than a snapshot that no longer
+    // describes it. Needed after a rolled-back import: the store has just been
+    // restored to its pre-import state, and diffing that against the snapshot
+    // taken before the import would be read as "every record was removed".
+    window[`watch${name}`].reseed = () => {
+      refsStatic.add('oldState-' + name, deepCopy(store.getItems(name)) || [])
+    }
     window[`watch${name}`].start()
   }
 

package/package.json

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

package/client/components/terminal/reconnect-overlay.jsx

@@ -1,14 +0,0 @@
-import { memo } from 'react'
-
-const e = window.translate
-
-export default memo(function ReconnectOverlay ({ countdown }) {
-  if (countdown === null || countdown === undefined) {
-    return null
-  }
-  return (
-    <div className='terminal-reconnect-overlay'>
-      {e('autoReconnectTerminal')}: {countdown}s
-    </div>
-  )
-})