@lvce-editor/renderer-process 30.63.0 → 30.63.2

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;
@@ -9287,10 +9293,30 @@ const focusSelector = (viewletId, selector) => {
     }
   }
 };
+const pendingFocusAfterRender = {};
 const focusSelectorAfterRender = (viewletId, selector) => {
+  pendingFocusAfterRender.cancel?.();
+  const instance = get$b(viewletId);
+  let cancelled = false;
+  const cancel = () => {
+    cancelled = true;
+    document.removeEventListener('focusin', cancel, true);
+    if (pendingFocusAfterRender.cancel === cancel) {
+      pendingFocusAfterRender.cancel = undefined;
+    }
+  };
+  pendingFocusAfterRender.cancel = cancel;
+  // A newer focus choice owns focus, even while this viewlet is still rendering.
+  document.addEventListener('focusin', cancel, {
+    capture: true
+  });
   requestAnimationFrame(() => {
     requestAnimationFrame(() => {
-      focusSelector(viewletId, selector);
+      const shouldFocus = !cancelled && get$b(viewletId) === instance;
+      cancel();
+      if (shouldFocus) {
+        focusSelector(viewletId, selector);
+      }
     });
   });
 };
@@ -9572,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 {

package/package.json

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