@lvce-editor/renderer-process 30.34.2 → 30.36.0

package/dist/rendererProcessMain.js

@@ -211,13 +211,6 @@ const showState = async () => {
   info(state);
 };
 
-const downloadFile = (fileName, url) => {
-  const a = document.createElement('a');
-  a.href = url;
-  a.download = fileName;
-  a.click();
-};
-
 const uidSymbol = Symbol('uid');
 
 const getUidTarget = $Element => {
@@ -1930,7 +1923,61 @@ const rememberFocus$1 = ($Viewlet, dom, eventMap, uid = 0) => {
   }
 };
 
-const get$7 = ids => {
+const set$8 = setComponentUid;
+const get$7 = getComponentUid;
+const fromEvent = getComponentUidFromEvent;
+
+const rpcs = new Map();
+const viewRpcIds = new Map();
+const get$6 = uid => {
+  const rpcId = viewRpcIds.get(uid);
+  return rpcId === undefined ? undefined : rpcs.get(rpcId);
+};
+const getViewUid = rpcId => {
+  let matchingUid;
+  for (const [uid, registeredRpcId] of viewRpcIds) {
+    if (registeredRpcId === rpcId) {
+      matchingUid = uid;
+    }
+  }
+  if (matchingUid === undefined) {
+    throw new Error(`direct view not found: ${rpcId}`);
+  }
+  return matchingUid;
+};
+const getFocusedViewUid = (rpcId, element = document.activeElement) => {
+  const uid = element ? get$7(element) : 0;
+  if (!uid || viewRpcIds.get(uid) !== rpcId) {
+    throw new Error(`focused direct view not found: ${rpcId}`);
+  }
+  return uid;
+};
+const registerRpc = (rpcId, rpc) => {
+  const previous = rpcs.get(rpcId);
+  if (previous && previous !== rpc) {
+    previous.dispose();
+  }
+  rpcs.set(rpcId, rpc);
+};
+const registerView = (uid, rpcId) => {
+  if (rpcId === undefined) {
+    viewRpcIds.delete(uid);
+    return;
+  }
+  viewRpcIds.set(uid, rpcId);
+};
+const unregisterView = uid => {
+  viewRpcIds.delete(uid);
+};
+
+const downloadFile = (fileName, url) => {
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = fileName;
+  a.click();
+};
+
+const get$5 = ids => {
   return getFileHandles$1(ids);
 };
 
@@ -2857,7 +2904,7 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$6 = id => {
+const get$4 = id => {
   return callbacks[id];
 };
 const remove$4 = id => {
@@ -3047,7 +3094,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$6(id);
+  const fn = get$4(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -3417,7 +3464,7 @@ const create$x = async ({
 };
 
 const workers = Object.create(null);
-const set$8 = (id, worker) => {
+const set$7 = (id, worker) => {
   workers[id] = worker;
 };
 const remove$3 = id => {
@@ -3441,7 +3488,7 @@ const create$w = async ({
   });
   const worker = rpc.ipc?._rawIpc;
   if (typeof id === 'number' && raw && worker) {
-    set$8(id, worker);
+    set$7(id, worker);
   }
   return undefined;
 };
@@ -3520,10 +3567,10 @@ const getModule = method => {
 };
 
 const ipcs = Object.create(null);
-const set$7 = (name, ipc) => {
+const set$6 = (name, ipc) => {
   ipcs[name] = ipc;
 };
-const get$5 = name => {
+const get$3 = name => {
   return ipcs[name];
 };
 const remove$2 = name => {
@@ -3757,7 +3804,7 @@ const create$u = async ({
     }
     // TODO rename method
     // TODO avoid cyclic dependency
-    const port = get$5(options.name);
+    const port = get$3(options.name);
     remove$2(options.name);
     await invokeAndTransfer('Transferrable.transfer', options.id, port);
     return;
@@ -3982,14 +4029,14 @@ const dispose$h = id => {
 const state$7 = {
   canvasObjects: Object.create(null)
 };
-const set$6 = (canvasId, canvas) => {
+const set$5 = (canvasId, canvas) => {
   state$7.canvasObjects[canvasId] = canvas;
 };
 
 const create$r = async (canvasId, objectId) => {
   const canvas = document.createElement('canvas');
   const offscreenCanvas = canvas.transferControlToOffscreen();
-  set$6(canvasId, canvas);
+  set$5(canvasId, canvas);
   await invokeAndTransfer('Transferrable.transfer', objectId, offscreenCanvas);
 };
 const create2 = async (canvasId, objectId, width, height) => {
@@ -4020,10 +4067,6 @@ const create$BackDrop = () => {
   return $BackDrop;
 };
 
-const set$5 = setComponentUid;
-const get$4 = getComponentUid;
-const fromEvent = getComponentUidFromEvent;
-
 const AriaOwns = 'aria-owns';
 const AriaLabelledBy = 'aria-labelledby';
 const AriaDescribedBy = 'aria-describedby';
@@ -4400,8 +4443,8 @@ const showControlled = ({
   showMenu(x, y, width, height, items, level);
   const $Menu = state$5.$$Menus.at(-1);
   if ($Parent && $Menu) {
-    const uid = get$4($Parent);
-    set$5($Menu, uid);
+    const uid = get$7($Parent);
+    set$8($Menu, uid);
   }
   // TODO menu should not necessarily know about parent (titleBarMenuBar)
   // it should be the other way around
@@ -4487,7 +4530,7 @@ const prompt = (message, defaultValue) => {
 };
 
 const screenCaptures = Object.create(null);
-const get$3 = id => {
+const get$2 = id => {
   return screenCaptures[id];
 };
 const set$4 = (id, captureStream) => {
@@ -4553,9 +4596,9 @@ class VError extends Error {
   }
 }
 
-const get$2 = id => {
+const get$1 = id => {
   number(id);
-  return get$3(id);
+  return get$2(id);
 };
 const start = async (id, options) => {
   try {
@@ -5212,7 +5255,7 @@ const webViews = Object.create(null);
 const set$3 = (id, webView) => {
   webViews[id] = webView;
 };
-const get$1 = id => {
+const get = id => {
   return webViews[id];
 };
 const remove = id => {
@@ -5232,7 +5275,7 @@ const acquire = objectId => {
 // TODO transfer port directly instead of storing
 // it for a short time in state
 const transferToWebView = objectId => {
-  const $Iframe = get$1(1);
+  const $Iframe = get(1);
   if (!$Iframe) {
     throw new Error(`webview not found`);
   }
@@ -5261,30 +5304,6 @@ const attachEvents$7 = ($Node, eventMap) => {
   }
 };
 
-const rpcs = new Map();
-const viewRpcIds = new Map();
-const get = uid => {
-  const rpcId = viewRpcIds.get(uid);
-  return rpcId === undefined ? undefined : rpcs.get(rpcId);
-};
-const registerRpc = (rpcId, rpc) => {
-  const previous = rpcs.get(rpcId);
-  if (previous && previous !== rpc) {
-    previous.dispose();
-  }
-  rpcs.set(rpcId, rpc);
-};
-const registerView = (uid, rpcId) => {
-  if (rpcId === undefined) {
-    viewRpcIds.delete(uid);
-    return;
-  }
-  viewRpcIds.set(uid, rpcId);
-};
-const unregisterView = uid => {
-  viewRpcIds.delete(uid);
-};
-
 const state$4 = {
   currentDragInfo: undefined
 };
@@ -5483,7 +5502,7 @@ const ViewletActivityBar = {
 const executeViewletCommand$1 = 'Viewlet.executeViewletCommand';
 const send = (method, uid, ...args) => {
   if (method === executeViewletCommand$1) {
-    const rpc = get(uid);
+    const rpc = get$6(uid);
     if (rpc) {
       rpc.send(method, uid, ...args);
       return;
@@ -5678,8 +5697,8 @@ const applyUidWorkaround = element => {
   if (!editor) {
     throw new Error('no editor found');
   }
-  const editorUid = get$4(editor);
-  set$5(element, editorUid);
+  const editorUid = get$7(editor);
+  set$8(element, editorUid);
 };
 
 const startTracking$1 = ($Target, pointerId, handlePointerMove, handlePointerUp) => {
@@ -7652,7 +7671,7 @@ const handleClickAction$1 = target => {
     console.info('[panel] action command not found');
     return;
   }
-  const childUid = get$4(target);
+  const childUid = get$7(target);
   handleClickAction$2(childUid, index, command);
 };
 const handleHeaderClick$1 = event => {
@@ -7831,7 +7850,7 @@ const setScreenCapture = (state, id) => {
     $Viewlet
   } = state;
   const $Video = document.createElement('video');
-  const screenCapture = get$2(id);
+  const screenCapture = get$1(id);
   $Video.srcObject = screenCapture;
   $Video.onloadedmetadata = handleLoadedMetadata;
   $Viewlet.append($Video);
@@ -8210,7 +8229,7 @@ const handleMouseDown$1 = event => {
   if (!terminal) {
     return;
   }
-  const terminalUid = get$4(terminal);
+  const terminalUid = get$7(terminal);
   if (!terminalUid) {
     return;
   }
@@ -8514,7 +8533,7 @@ const addMenu = ($$Menus, change, uid) => {
   const menu = change[1];
   const dom = change[2];
   const $Menu = create$Menu();
-  set$5($Menu, uid);
+  set$8($Menu, uid);
   $Menu.onmouseover = handleMenuMouseOver;
   $Menu.onclick = handleMenuClick;
   const {
@@ -8774,7 +8793,7 @@ const setPort$1 = (state, portId, origin) => {
   });
 };
 const setPosition = (state, id, x, y, width, height) => {
-  const $Iframe = get$1(id);
+  const $Iframe = get(id);
   if (!$Iframe) {
     return;
   }
@@ -8864,7 +8883,7 @@ const create$2 = (id, uid = id) => {
     existing.state.$Viewlet.remove();
   }
   const instanceState = module.create();
-  set$5(instanceState.$Viewlet, uid);
+  set$8(instanceState.$Viewlet, uid);
   if (module.attachEvents) {
     module.attachEvents(instanceState);
   }
@@ -8888,7 +8907,7 @@ const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcI
   const instanceState = {
     $Viewlet: document.createElement('div')
   };
-  set$5(instanceState.$Viewlet, uid);
+  set$8(instanceState.$Viewlet, uid);
   registerView(uid, directEventRpcId);
   set$a(uid, {
     factory: module,
@@ -9013,7 +9032,7 @@ const setUid = (viewletId, uid) => {
   const {
     $Viewlet
   } = instance.state;
-  set$5($Viewlet, uid);
+  set$8($Viewlet, uid);
 };
 const focusCallback = {
   id: 0,
@@ -9117,14 +9136,14 @@ const setDom2 = (viewletId, dom) => {
   let uid;
   if ($Viewlet) {
     try {
-      uid = get$4($Viewlet);
+      uid = get$7($Viewlet);
     } catch {}
   }
   // TODO optimize rendering with virtual DOM diffing
   const $NewViewlet = rememberFocus($Viewlet, dom, Events, viewletId);
   if (uid) {
     // @ts-ignore
-    set$5($NewViewlet, uid);
+    set$8($NewViewlet, uid);
   }
   set$a(viewletId, {
     ...instance,
@@ -9623,12 +9642,12 @@ const create$1 = async (uid, src, sandbox, csp, credentialless, permissionPolicy
   // TODO make make waitForFrameToLoad a separate command
 };
 const loadOnly = async uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   const promise = waitForFrameToLoad($Iframe);
   await promise;
 };
 const appendOnly = async uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   const parent = document.getElementById('Workbench');
   parent.append($Iframe);
 };
@@ -9637,7 +9656,7 @@ const appendOnly = async uid => {
  * @deprecated use loadOnly and appendOnly instead
  */
 const load = async uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   const promise = waitForFrameToLoad($Iframe);
   const parent = document.getElementById('Workbench');
   parent.append($Iframe);
@@ -9646,7 +9665,7 @@ const load = async uid => {
 
 // TODO rename to sendMessage
 const setPort = (uid, port, origin, portType) => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   // TODO use jsonrpc invoke
   const {
     contentWindow
@@ -9661,7 +9680,7 @@ const setPort = (uid, port, origin, portType) => {
   }, origin, [port]);
 };
 const dispose$2 = uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   $Iframe.remove();
   remove(uid);
 };
@@ -9853,8 +9872,10 @@ const commandMap = {
   'Css.addCssStyleSheet': addCssStyleSheet,
   'Css.getSelectionText': getSelectionText,
   'Developer.showState': showState,
+  'DirectView.getFocusedUid': getFocusedViewUid,
+  'DirectView.getUid': getViewUid,
   'Download.downloadFile': downloadFile,
-  'FileHandles.get': get$7,
+  'FileHandles.get': get$5,
   'FilePicker.showDirectoryPicker': showDirectoryPicker,
   'FilePicker.showFilePicker': showFilePicker,
   'FilePicker.showSaveFilePicker': showSaveFilePicker,
@@ -10247,7 +10268,7 @@ const hydrate$1 = async () => {
   } = new MessageChannel();
   // TODO only launch port and send to renderer worker
   const promise = launchEditorWorker(port1);
-  set$7('Editor Worker', port2);
+  set$6('Editor Worker', port2);
   const result = await promise;
   if (isError(result)) {
     remove$2('Editor Worker');
@@ -10283,7 +10304,7 @@ const hydrate = async () => {
   } = new MessageChannel();
   // TODO only launch port and send to renderer worker
   const promise = launchSyntaxHighlightingWorker(port1);
-  set$7('Syntax Highlighting Worker', port2);
+  set$6('Syntax Highlighting Worker', port2);
   const result = await promise;
   if (isError(result)) {
     remove$2('Syntax Highlighting Worker');
@@ -10486,6 +10507,10 @@ const mountTerminal = async (state, uid) => {
   state.disposables = [inputDisposable, resizeDisposable];
   fitAddon.fit();
   flushPendingData(state);
+  if (state.pendingFocus) {
+    state.pendingFocus = false;
+    terminal.focus();
+  }
 };
 const create = () => {
   const $Viewlet = document.createElement('div');
@@ -10498,6 +10523,7 @@ const create = () => {
     mountPromise: undefined,
     mouseDownListener: undefined,
     pendingData: [],
+    pendingFocus: false,
     resizeObserver: undefined,
     terminal: undefined
   };
@@ -10529,8 +10555,10 @@ const focus = state => {
     terminal
   } = state;
   if (!terminal) {
+    state.pendingFocus = true;
     return;
   }
+  state.pendingFocus = false;
   terminal.focus();
 };
 const handleMouseDown = state => {
@@ -10556,6 +10584,7 @@ const dispose = state => {
   }
   state.disposables = [];
   state.pendingData.length = 0;
+  state.pendingFocus = false;
   state.resizeObserver?.disconnect();
   state.resizeObserver = undefined;
   state.terminal?.dispose();

package/package.json

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