@lvce-editor/renderer-process 30.71.1 → 30.72.1

package/dist/rendererProcessMain.js

@@ -629,7 +629,7 @@ class CommandNotFoundError extends Error {
   }
 }
 const commands = Object.create(null);
-const register = commandMap => {
+const register$1 = commandMap => {
   Object.assign(commands, commandMap);
 };
 const getCommand = key => {
@@ -1164,7 +1164,7 @@ const create$F = async ({
   window
 }) => {
   // TODO create a commandMap per rpc instance
-  register(commandMap);
+  register$1(commandMap);
   const ipc = IpcChildWithElectronWindow$1.wrap(window);
   handleIpc(ipc);
   const rpc = createRpc(ipc);
@@ -1177,7 +1177,7 @@ const create$E = async ({
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
-  register(commandMap);
+  register$1(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1$1.create({
     isMessagePortOpen,
     messagePort
@@ -1199,7 +1199,7 @@ const create$D = async ({
   url
 }) => {
   // TODO create a commandMap per rpc instance
-  register(commandMap);
+  register$1(commandMap);
   const worker = await IpcParentWithModuleWorker$1$1.create({
     name,
     url
@@ -1220,7 +1220,7 @@ const create$C = async ({
   url
 }) => {
   // TODO create a commandMap per rpc instance
-  register(commandMap);
+  register$1(commandMap);
   const worker = await IpcParentWithModuleWorker$1$1.create({
     name,
     url
@@ -1783,7 +1783,7 @@ const hydrate$4 = async () => {
 };
 
 // TODO needed?
-const dispose$n = async () => {
+const dispose$o = async () => {
   const rpc = state$l.rpc;
   state$l.rpc = undefined;
   await rpc?.dispose();
@@ -1965,7 +1965,7 @@ const initializeLayout = async href => {
   }
   return true;
 };
-const dispose$m = async () => {
+const dispose$n = async () => {
   state$k.stopObserving?.();
   state$k.stopObserving = undefined;
   const client = state$k.client;
@@ -4160,7 +4160,7 @@ const handleMessagePort$1 = async port => {
   }
   await rpc.invokeAndTransfer('DragAndDrop.handleMessagePort', port);
 };
-const dispose$l = async () => {
+const dispose$m = async () => {
   const rpc = state$g.rpc;
   state$g.rpc = undefined;
   await rpc?.dispose();
@@ -4179,6 +4179,7 @@ const clear$4 = () => {
   rpcs.clear();
   viewRpcIds.clear();
 };
+const getRpcId = uid => viewRpcIds.get(uid);
 const get$8 = uid => {
   const rpcId = viewRpcIds.get(uid);
   return rpcId === undefined ? undefined : rpcs.get(rpcId);
@@ -4659,7 +4660,7 @@ const create$u = async ({
   // @ts-ignore
   return module.create(options);
 };
-const dispose$k = id => {
+const dispose$l = id => {
   const worker = remove$3(id);
   if (worker) {
     remove$5(worker);
@@ -4778,7 +4779,7 @@ const applyPatch$1 = (element, patches, eventMap = {}, id = 0) => {
   }
   applyPatch$2(element, patches, eventMap, id);
 };
-const dispose$j = root => {
+const dispose$k = root => {
   state$e.renderer?.dispose(root);
 };
 
@@ -4931,6 +4932,89 @@ const info = (...args) => {
   console.info(...args);
 };
 
+const executeViewletCommand$1 = 'Viewlet.executeViewletCommand';
+const send = (method, uid, ...args) => {
+  // Editor shortcuts still execute through renderer-worker. Keep their input
+  // events on the same port so typing cannot overtake a preceding shortcut.
+  if (method === executeViewletCommand$1 && getRpcId(uid) !== 'Editor') {
+    const rpc = get$8(uid);
+    if (rpc) {
+      rpc.send(method, uid, ...args);
+      return;
+    }
+  }
+  send$1(method, uid, ...args);
+};
+
+const ViewletEventRouter = {
+  __proto__: null,
+  send
+};
+
+const executeViewletCommand = (uid, command, ...args) => {
+  number(uid);
+  send('Viewlet.executeViewletCommand', uid, command, ...args);
+};
+
+const cleanups = new Map();
+const dispose$j = uid => {
+  cleanups.get(uid)?.();
+  cleanups.delete(uid);
+};
+
+// The owner controls the lifetime; events can target the component owning a widget.
+const register = (uid, targetUid, listeners) => {
+  dispose$j(uid);
+  const root = get$b(uid)?.state.$Viewlet;
+  if (!root) {
+    return;
+  }
+  let active = true;
+  const removals = [];
+  const isInside = (target, selectors) => {
+    if (!(target instanceof Element)) {
+      return false;
+    }
+    if (get$b(uid)?.state.$Viewlet.contains(target)) {
+      return true;
+    }
+    const parentRoot = get$b(targetUid)?.state.$Viewlet;
+    return selectors.some(selector => {
+      const match = target.closest(selector);
+      return match && parentRoot?.contains(match);
+    });
+  };
+  for (const listener of listeners) {
+    const {
+      event,
+      ignoreSelectors,
+      params
+    } = listener;
+    const notify = target => {
+      if (active && !isInside(target, ignoreSelectors)) {
+        executeViewletCommand(targetUid, params[0], ...params.slice(1));
+      }
+    };
+    const handleEvent = event => {
+      if (event.type === 'focusout') {
+        // DOM replacement can briefly clear focus before a following focus command.
+        queueMicrotask(() => notify(document.activeElement));
+      } else {
+        notify(event.target);
+      }
+    };
+    const target = event === 'focusout' ? root : document;
+    target.addEventListener(event, handleEvent);
+    removals.push(() => target.removeEventListener(event, handleEvent));
+  }
+  cleanups.set(uid, () => {
+    active = false;
+    for (const remove of removals) {
+      remove();
+    }
+  });
+};
+
 const pendingBatches = new Map();
 const state$a = {
   nextTransactionId: 1
@@ -5326,28 +5410,6 @@ const ViewletActivityBar = {
   Events: Events$6
 };
 
-const executeViewletCommand$1 = 'Viewlet.executeViewletCommand';
-const send = (method, uid, ...args) => {
-  if (method === executeViewletCommand$1) {
-    const rpc = get$8(uid);
-    if (rpc) {
-      rpc.send(method, uid, ...args);
-      return;
-    }
-  }
-  send$1(method, uid, ...args);
-};
-
-const ViewletEventRouter = {
-  __proto__: null,
-  send
-};
-
-const executeViewletCommand = (uid, command, ...args) => {
-  number(uid);
-  send('Viewlet.executeViewletCommand', uid, command, ...args);
-};
-
 const nameAnonymousFunction = (fn, name) => {
   Object.defineProperty(fn, 'name', {
     value: name
@@ -9421,7 +9483,7 @@ const create$4 = (id, uid = id) => {
     state: instanceState
   });
 };
-const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcId) => {
+const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcId, eventTargetUid = uid) => {
   let module = state$5.modules[id];
   if (hasFunctionalEvents) {
     module ||= {};
@@ -9429,7 +9491,8 @@ const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcI
   if (!module) {
     throw new Error(`module not found: ${id}`);
   }
-  const existing = get$b(id);
+  const existing = get$b(uid);
+  dispose$j(uid);
   if (existing?.state.$Viewlet.isConnected) {
     existing.state.$Viewlet.remove();
   }
@@ -9438,6 +9501,7 @@ const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcI
   };
   set$a(instanceState.$Viewlet, uid);
   if (existing) dispose$i(uid);
+  set$a(instanceState.$Viewlet, eventTargetUid);
   registerView(uid, directEventRpcId);
   set$c(uid, {
     factory: module,
@@ -9931,6 +9995,7 @@ const dispose$4 = id => {
   try {
     number(id);
     restoreComponentDom(id);
+    dispose$j(id);
     unregisterView(id);
     dispose$i(id);
     const instance = get$b(id);
@@ -9941,7 +10006,7 @@ const dispose$4 = id => {
     if (instance.factory.dispose) {
       instance.factory.dispose(instance.state);
     }
-    dispose$j(instance.state.$Viewlet);
+    dispose$k(instance.state.$Viewlet);
     if (instance.state.$Viewlet?.isConnected) {
       instance.state.$Viewlet.remove();
     }
@@ -10220,6 +10285,7 @@ const commandHandlers = {
   'Viewlet.move': move,
   'Viewlet.patchCss': patchCssStyleSheet,
   'Viewlet.registerEventListeners': registerEventListeners,
+  'Viewlet.registerOutsideEventListeners': register,
   'Viewlet.removeKeyBindings': removeKeyBindings,
   'Viewlet.renderCanvas': renderCanvas,
   'Viewlet.replaceChildren': replaceChildren,
@@ -10276,9 +10342,9 @@ const restart = async () => {
     const snapshot = await invoke$1('Reload.prepareHotReload');
     set$9(snapshot);
     await invoke$1('Reload.retire');
-    await dispose$m();
     await dispose$n();
-    await dispose$l();
+    await dispose$o();
+    await dispose$m();
     terminateAll();
     clear$2();
     clear$4();
@@ -12327,7 +12393,7 @@ const commandMap = {
   'HotReload.request': request,
   'InitData.getInitData': getInitData,
   'IpcParent.create': create$u,
-  'IpcParent.dispose': dispose$k,
+  'IpcParent.dispose': dispose$l,
   'KeyBindings.setIdentifiers': setIdentifiers,
   'Layout.getBounds': getBounds,
   'Location.getHref': getHref,

package/package.json

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