@lvce-editor/renderer-process 30.63.1 → 30.64.0

package/dist/rendererProcessMain.js

@@ -4703,16 +4703,18 @@ const pendingBatches = new Map();
 const state$9 = {
   nextTransactionId: 1
 };
-const queue = (uid, commands) => {
+const queue = (uid, commands, focusVersion = 0) => {
   const transactionId = state$9.nextTransactionId++;
   pendingBatches.set(transactionId, {
     commands,
     committed: false,
+    focusVersion,
     uid
   });
   return transactionId;
 };
-const take = (uid, transactionId) => {
+const focusCommands = new Set(['Viewlet.focus', 'Viewlet.focusElementByName', 'Viewlet.focusSelector', 'Viewlet.focusSelectorAfterRender']);
+const take = (uid, transactionId, focusVersion = 0) => {
   const batch = pendingBatches.get(transactionId);
   if (!batch) {
     throw new Error(`pending viewlet command transaction not found: ${transactionId}`);
@@ -4729,7 +4731,11 @@ const take = (uid, transactionId) => {
     if (!pendingBatch.committed) {
       break;
     }
-    commands.push(...pendingBatch.commands);
+    for (const command of pendingBatch.commands) {
+      if (pendingBatch.focusVersion === focusVersion || !focusCommands.has(command[0])) {
+        commands.push(command);
+      }
+    }
     pendingBatches.delete(pendingTransactionId);
   }
   return commands;
@@ -9592,11 +9598,25 @@ const attachWindowEvents = () => {
 const sendMultiple = commands => {
   executeCommands(commands);
 };
+const queuedFocus = {
+  listening: false,
+  version: 0
+};
+const getFocusVersion = () => {
+  if (!queuedFocus.listening) {
+    // One observer for this document's lifetime, without retaining focused elements.
+    document.addEventListener('focusin', () => queuedFocus.version++, {
+      capture: true
+    });
+    queuedFocus.listening = true;
+  }
+  return queuedFocus.version;
+};
 const queueCommands = (uid, commands) => {
-  return queue(uid, commands);
+  return queue(uid, commands, getFocusVersion());
 };
 const commitPending = (uid, transactionId) => {
-  executeCommands(take(uid, transactionId));
+  executeCommands(take(uid, transactionId, getFocusVersion()));
 };
 const dispose$4 = id => {
   try {
@@ -12234,7 +12254,7 @@ const flushPendingData = state => {
     terminal
   } = state;
   for (const data of pendingData) {
-    terminal.write(data);
+    if (data?.restore) restore(state, data.restore);else terminal.write(data);
   }
   pendingData.length = 0;
 };
@@ -12266,6 +12286,7 @@ const mountTerminal = async (state, uid) => {
     cols,
     rows
   }) => {
+    if (state.restoring) return;
     resize(uid, {
       columns: cols,
       rows
@@ -12273,6 +12294,7 @@ const mountTerminal = async (state, uid) => {
   });
   terminal.open(state.$Viewlet);
   const resizeObserver = new ResizeObserver(() => {
+    if (state.restoring) return;
     fitAddon.fit();
     focusIfConnected(state);
   });
@@ -12298,6 +12320,7 @@ const create = () => {
     pendingData: [],
     pendingFocus: false,
     resizeObserver: undefined,
+    restoring: false,
     terminal: undefined
   };
 };
@@ -12322,6 +12345,35 @@ const write = (state, data) => {
   }
   terminal.write(data);
 };
+const restore = (state, snapshot) => {
+  if (state.disposed) return;
+  const {
+    columns,
+    data,
+    rows
+  } = snapshot;
+  if (!Number.isSafeInteger(columns) || !Number.isSafeInteger(rows) || columns < 2 || columns > 500 || rows < 1 || rows > 200 || typeof data !== 'string') {
+    throw new Error('Invalid terminal snapshot');
+  }
+  const {
+    terminal
+  } = state;
+  if (!terminal) {
+    state.pendingData.push({
+      restore: snapshot
+    });
+    return;
+  }
+  state.restoring = true;
+  terminal.reset();
+  terminal.resize(columns, rows);
+  terminal.write(data, () => {
+    if (state.disposed) return;
+    state.restoring = false;
+    state.fitAddon.fit();
+    focusIfConnected(state);
+  });
+};
 const focus = state => {
   object(state);
   const {
@@ -12371,6 +12423,7 @@ const ViewletTerminal2 = {
   dispose,
   focus,
   handleMouseDown,
+  restore,
   setTerminal,
   write
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.63.1",
+  "version": "30.64.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"