@lvce-editor/renderer-process 30.81.7 → 30.82.0

package/dist/rendererProcessMain.js

@@ -1789,7 +1789,7 @@ const hydrate$4 = async () => {
 };
 
 // TODO needed?
-const dispose$p = async () => {
+const dispose$q = async () => {
   const rpc = state$n.rpc;
   state$n.rpc = undefined;
   await rpc?.dispose();
@@ -1971,7 +1971,7 @@ const initializeLayout = async href => {
   }
   return true;
 };
-const dispose$o = async () => {
+const dispose$p = async () => {
   state$m.stopObserving?.();
   state$m.stopObserving = undefined;
   const client = state$m.client;
@@ -2049,7 +2049,7 @@ const apply = (uid, args) => {
   for (const index of indices) scaled[index] *= view.speed;
   return scaled;
 };
-const dispose$n = uid => {
+const dispose$o = uid => {
   views.delete(uid);
 };
 
@@ -4679,7 +4679,7 @@ const handleMessagePort$1 = async port => {
   }
   await rpc.invokeAndTransfer('DragAndDrop.handleMessagePort', port);
 };
-const dispose$m = async () => {
+const dispose$n = async () => {
   const rpc = state$h.rpc;
   state$h.rpc = undefined;
   await rpc?.dispose();
@@ -5168,7 +5168,7 @@ const create$t = async ({
   // @ts-ignore
   return module.create(options);
 };
-const dispose$l = id => {
+const dispose$m = id => {
   const worker = remove$3(id);
   if (worker) {
     remove$6(worker);
@@ -5323,7 +5323,7 @@ const applyPatch$1 = (element, patches, eventMap = {}, id = 0) => {
   }
   applyPatch$2(element, patches, eventMap, id);
 };
-const dispose$k = root => {
+const dispose$l = root => {
   state$f.renderer?.dispose(root);
 };
 
@@ -5342,6 +5342,10 @@ const state$e = {
   handled: false
 };
 const hasFocus = () => !!document.activeElement && document.activeElement !== document.body && document.activeElement !== document.documentElement;
+const dispose$k = viewletId => {
+  const pending = state$e.pending;
+  if (pending && pending.id === viewletId) pending.cancel();
+};
 
 // The route's composer can arrive after the initial workbench frame.
 const focus$d = viewletId => {
@@ -5356,26 +5360,56 @@ const focus$d = viewletId => {
     return;
   }
   let cancelled = false;
+  let mutations;
+  let sizes;
+  let observed;
   const cancel = () => {
     cancelled = true;
     document.removeEventListener('focusin', cancel, true);
+    mutations?.disconnect();
+    sizes?.disconnect();
+    state$e.pending = undefined;
+  };
+  state$e.pending = {
+    cancel,
+    id: viewletId
   };
   document.addEventListener('focusin', cancel, {
     capture: true
   });
-  requestAnimationFrame(() => {
-    requestAnimationFrame(() => {
-      const shouldFocus = !cancelled && !hasFocus();
+  const tryFocus = () => {
+    if (cancelled) return;
+    const input = get$b(viewletId)?.state.$Viewlet.querySelector(selector);
+    if (hasFocus() || !(input instanceof HTMLTextAreaElement)) {
       cancel();
-      // Resolve the current DOM: startup may have rendered the view again.
-      const input = get$b(viewletId)?.state.$Viewlet.querySelector(selector);
-      if (shouldFocus && input instanceof HTMLTextAreaElement && input.isConnected && input.getClientRects().length > 0) {
-        input.focus({
-          preventScroll: true
-        });
+      return;
+    }
+    if (input.isConnected && input.getClientRects().length > 0) {
+      input.focus({
+        preventScroll: true
+      });
+      if (document.activeElement === input) {
+        cancel();
+        return;
       }
+    }
+    // A detached or hidden first render is not the user's focus opportunity.
+    // Watch actual mounting/layout rather than consuming it after a frame count.
+    mutations ??= new MutationObserver(tryFocus);
+    sizes ??= new ResizeObserver(tryFocus);
+    mutations.observe(document.body, {
+      attributeFilter: ['class', 'style', 'hidden', 'disabled', 'inert'],
+      attributes: true,
+      childList: true,
+      subtree: true
     });
-  });
+    if (observed !== input) {
+      sizes.disconnect();
+      sizes.observe(input);
+      observed = input;
+    }
+  };
+  requestAnimationFrame(() => requestAnimationFrame(tryFocus));
 };
 
 const state$d = {
@@ -7949,7 +7983,7 @@ const getKeyBindingIdentifier = event => {
   const modifierControl = ctrlKey || metaKey ? CtrlCmd : 0;
   const modifierShift = shiftKey ? Shift : 0;
   const modifierAlt = altKey ? Alt : 0;
-  const normalizedKey = normalizeKey(key, code);
+  const normalizedKey = shiftKey && key.length === 1 && !/[a-z0-9]/i.test(key) && code ? code : normalizeKey(key, code);
   const keyCode = getKeyCode(normalizedKey);
   const identifier = modifierControl | modifierShift | modifierAlt | keyCode;
   return identifier;
@@ -10432,11 +10466,12 @@ const commitPending = (uid, transactionId) => {
   executeCommands(take(uid, transactionId, getFocusVersion()));
 };
 const dispose$4 = id => {
+  dispose$k(id);
   try {
     number(id);
     restoreComponentDom(id);
     dispose$j(id);
-    dispose$n(id);
+    dispose$o(id);
     unregisterView(id);
     dispose$i(id);
     const instance = get$b(id);
@@ -10447,7 +10482,7 @@ const dispose$4 = id => {
     if (instance.factory.dispose) {
       instance.factory.dispose(instance.state);
     }
-    dispose$k(instance.state.$Viewlet);
+    dispose$l(instance.state.$Viewlet);
     if (instance.state.$Viewlet?.isConnected) {
       instance.state.$Viewlet.remove();
     }
@@ -10784,9 +10819,9 @@ const restart = async () => {
     const snapshot = await invoke$1('Reload.prepareHotReload');
     set$9(snapshot);
     await invoke$1('Reload.retire');
-    await dispose$o();
     await dispose$p();
-    await dispose$m();
+    await dispose$q();
+    await dispose$n();
     terminateAll();
     clear$2();
     clear$4();
@@ -12850,7 +12885,7 @@ const commandMap = {
   'HotReload.request': request,
   'InitData.getInitData': getInitData,
   'IpcParent.create': create$t,
-  'IpcParent.dispose': dispose$l,
+  'IpcParent.dispose': dispose$m,
   'KeyBindings.setIdentifiers': setIdentifiers,
   'Layout.getBounds': getBounds,
   'Location.getHref': getHref,

package/package.json

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