@lvce-editor/renderer-process 30.35.0 → 30.36.1

package/dist/rendererProcessMain.js

@@ -211,49 +211,6 @@ const showState = async () => {
   info(state);
 };
 
-const rpcs = new Map();
-const viewRpcIds = new Map();
-const get$9 = 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 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 uidSymbol = Symbol('uid');
 
 const getUidTarget = $Element => {
@@ -1313,7 +1270,7 @@ const {
 } = ElementTagMap;
 
 const instances = Object.create(null);
-const get$8 = viewletId => {
+const get$9 = viewletId => {
   return instances[viewletId];
 };
 const set$a = (viewletId, instance) => {
@@ -1348,7 +1305,7 @@ const has$1 = listener => {
 const set$9 = (listener, value) => {
   cache.set(listener, value);
 };
-const get$7 = listener => {
+const get$8 = listener => {
   return cache.get(listener);
 };
 
@@ -1370,7 +1327,7 @@ const getWrappedListener = (listener, returnValue) => {
     nameAnonymousFunction$1(wrapped, listener.name);
     set$9(listener, wrapped);
   }
-  return get$7(listener);
+  return get$8(listener);
 };
 
 const attachedListeners = new WeakMap();
@@ -1604,7 +1561,7 @@ const renderDomElement = (element, eventMap, newEventMap) => {
   return $Element;
 };
 const renderReferenceNode = (element, eventMap, newEventMap) => {
-  const instance = get$8(element.uid);
+  const instance = get$9(element.uid);
   if (!instance || !instance.state) {
     return document.createTextNode('Reference node not found');
   }
@@ -1750,7 +1707,7 @@ const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
   return true;
 };
 const handleSetReferenceNodeUid = (state, patch) => {
-  const instance = get$8(patch.uid);
+  const instance = get$9(patch.uid);
   if (!instance || !instance.state) {
     console.error('Cannot set reference node uid: instance not found', {
       uid: patch.uid
@@ -1966,7 +1923,61 @@ const rememberFocus$1 = ($Viewlet, dom, eventMap, uid = 0) => {
   }
 };
 
-const get$6 = 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);
 };
 
@@ -2893,7 +2904,7 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$5 = id => {
+const get$4 = id => {
   return callbacks[id];
 };
 const remove$4 = id => {
@@ -3083,7 +3094,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$5(id);
+  const fn = get$4(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -3453,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 => {
@@ -3477,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;
 };
@@ -3556,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$4 = name => {
+const get$3 = name => {
   return ipcs[name];
 };
 const remove$2 = name => {
@@ -3793,7 +3804,7 @@ const create$u = async ({
     }
     // TODO rename method
     // TODO avoid cyclic dependency
-    const port = get$4(options.name);
+    const port = get$3(options.name);
     remove$2(options.name);
     await invokeAndTransfer('Transferrable.transfer', options.id, port);
     return;
@@ -4018,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) => {
@@ -4056,10 +4067,6 @@ const create$BackDrop = () => {
   return $BackDrop;
 };
 
-const set$5 = setComponentUid;
-const get$3 = getComponentUid;
-const fromEvent = getComponentUidFromEvent;
-
 const AriaOwns = 'aria-owns';
 const AriaLabelledBy = 'aria-labelledby';
 const AriaDescribedBy = 'aria-describedby';
@@ -4436,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$3($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
@@ -5495,7 +5502,7 @@ const ViewletActivityBar = {
 const executeViewletCommand$1 = 'Viewlet.executeViewletCommand';
 const send = (method, uid, ...args) => {
   if (method === executeViewletCommand$1) {
-    const rpc = get$9(uid);
+    const rpc = get$6(uid);
     if (rpc) {
       rpc.send(method, uid, ...args);
       return;
@@ -5690,8 +5697,8 @@ const applyUidWorkaround = element => {
   if (!editor) {
     throw new Error('no editor found');
   }
-  const editorUid = get$3(editor);
-  set$5(element, editorUid);
+  const editorUid = get$7(editor);
+  set$8(element, editorUid);
 };
 
 const startTracking$1 = ($Target, pointerId, handlePointerMove, handlePointerUp) => {
@@ -7664,7 +7671,7 @@ const handleClickAction$1 = target => {
     console.info('[panel] action command not found');
     return;
   }
-  const childUid = get$3(target);
+  const childUid = get$7(target);
   handleClickAction$2(childUid, index, command);
 };
 const handleHeaderClick$1 = event => {
@@ -7790,7 +7797,7 @@ const setActionsDom$1 = (state, actions, childUid) => {
   const {
     $PanelActions
   } = state;
-  const instance = get$8(childUid);
+  const instance = get$9(childUid);
   if (!instance) {
     throw new Error(`child instance not found`);
   }
@@ -8222,7 +8229,7 @@ const handleMouseDown$1 = event => {
   if (!terminal) {
     return;
   }
-  const terminalUid = get$3(terminal);
+  const terminalUid = get$7(terminal);
   if (!terminalUid) {
     return;
   }
@@ -8526,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 {
@@ -8871,12 +8878,12 @@ const create$2 = (id, uid = id) => {
   if (!module) {
     throw new Error(`module not found: ${id}`);
   }
-  const existing = get$8(id);
+  const existing = get$9(id);
   if (existing?.state.$Viewlet.isConnected) {
     existing.state.$Viewlet.remove();
   }
   const instanceState = module.create();
-  set$5(instanceState.$Viewlet, uid);
+  set$8(instanceState.$Viewlet, uid);
   if (module.attachEvents) {
     module.attachEvents(instanceState);
   }
@@ -8893,14 +8900,14 @@ const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcI
   if (!module) {
     throw new Error(`module not found: ${id}`);
   }
-  const existing = get$8(id);
+  const existing = get$9(id);
   if (existing?.state.$Viewlet.isConnected) {
     existing.state.$Viewlet.remove();
   }
   const instanceState = {
     $Viewlet: document.createElement('div')
   };
-  set$5(instanceState.$Viewlet, uid);
+  set$8(instanceState.$Viewlet, uid);
   registerView(uid, directEventRpcId);
   set$a(uid, {
     factory: module,
@@ -8925,7 +8932,7 @@ const loadModule = async id => {
 };
 const invoke = (viewletId, method, ...args) => {
   string(method);
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance?.factory) {
     if (viewletId && method !== 'setActionsDom') {
       warn$1(`cannot execute ${method} viewlet instance ${viewletId} not found`);
@@ -8943,7 +8950,7 @@ const focus$1 = viewletId => {
     // eslint-disable-next-line no-console
     console.trace(`focus ${viewletId}`);
   }
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (instance.factory?.setFocused) {
     instance.factory.setFocused(instance.state, true);
   } else if (instance?.factory?.focus) {
@@ -8959,7 +8966,7 @@ const focusElementByName = (viewletId, name) => {
     // eslint-disable-next-line no-console
     console.trace(`focusByName ${viewletId} ${name}`);
   }
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
@@ -8974,7 +8981,7 @@ const focusElementByName = (viewletId, name) => {
 };
 const setElementProperty = (viewletId, name, key, value) => {
   const selector = `[name="${name}"]`;
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
@@ -9003,7 +9010,7 @@ const setCheckboxValue = (viewletId, name, value) => {
 };
 const setSelectionByName = (viewletId, name, start, end) => {
   const selector = `[name="${name}"]`;
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
@@ -9018,14 +9025,14 @@ const setSelectionByName = (viewletId, name, start, end) => {
   $Element.selectionEnd = end;
 };
 const setUid = (viewletId, uid) => {
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
   const {
     $Viewlet
   } = instance.state;
-  set$5($Viewlet, uid);
+  set$8($Viewlet, uid);
 };
 const focusCallback = {
   id: 0,
@@ -9036,7 +9043,7 @@ const resetFocusCallback = () => {
   focusCallback.selector = '';
 };
 const focusSelector = (viewletId, selector) => {
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
@@ -9068,7 +9075,7 @@ const focusSelectorAfterRender = (viewletId, selector) => {
  * @deprecated
  */
 const refresh = (viewletId, viewletContext) => {
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (instance) {
     instance.factory.refresh(instance.state, viewletContext);
   } else {
@@ -9087,7 +9094,7 @@ const createPlaceholder = (viewletId, parentId, top, left, width, height) => {
   if (isSpecial(viewletId)) {
     $Placeholder.id = viewletId;
   }
-  const parentInstance = get$8(parentId);
+  const parentInstance = get$9(parentId);
   const $Parent = parentInstance.state.$Viewlet;
   $Parent.append($Placeholder);
   set$a(viewletId, {
@@ -9103,7 +9110,7 @@ const getDragData = () => {
   return getCurrent();
 };
 const setDom = (viewletId, dom) => {
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
@@ -9116,7 +9123,7 @@ const setDom = (viewletId, dom) => {
   renderInto($Viewlet, dom, Events);
 };
 const setDom2 = (viewletId, dom) => {
-  const instance = get$8(viewletId);
+  const instance = get$9(viewletId);
   if (!instance) {
     return;
   }
@@ -9129,14 +9136,14 @@ const setDom2 = (viewletId, dom) => {
   let uid;
   if ($Viewlet) {
     try {
-      uid = get$3($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,
@@ -9147,7 +9154,7 @@ const setDom2 = (viewletId, dom) => {
   });
 };
 const setPatches = (uid, patches) => {
-  const instance = get$8(uid);
+  const instance = get$9(uid);
   if (!instance) {
     return;
   }
@@ -9219,7 +9226,7 @@ const dispose$3 = id => {
   try {
     number(id);
     unregisterView(id);
-    const instance = get$8(id);
+    const instance = get$9(id);
     if (!instance) {
       warn$1(`viewlet instance ${id} not found and cannot be disposed`);
       return;
@@ -9238,7 +9245,7 @@ const dispose$3 = id => {
 };
 const handleError$1 = (id, parentId, message) => {
   info(`[viewlet-error] ${id}: ${message}`);
-  const instance = get$8(id);
+  const instance = get$9(id);
   if (instance?.state.$Viewlet.isConnected) {
     instance.state.$Viewlet.remove();
   }
@@ -9250,7 +9257,7 @@ const handleError$1 = (id, parentId, message) => {
     instance.state.$Viewlet.textContent = String(message);
   }
   // TODO error should bubble up to until highest possible component
-  const parentInstance = get$8(parentId);
+  const parentInstance = get$9(parentId);
   if (parentInstance?.factory?.handleError) {
     parentInstance.factory.handleError(instance.state, message);
   }
@@ -9264,9 +9271,9 @@ const appendViewlet = (parentId, childId, focus) => {
     // TODO
     return;
   }
-  const parentInstanceState = get$8(parentId); // TODO must ensure that parent is already created
+  const parentInstanceState = get$9(parentId); // TODO must ensure that parent is already created
   const parentModule = parentInstanceState.factory;
-  const childInstance = get$8(childId);
+  const childInstance = get$9(childId);
   if (!childInstance) {
     throw new Error(`child instance ${childId} must be defined to be appended to parent ${parentId}`);
   }
@@ -9290,7 +9297,7 @@ const prependChild = ($Parent, $Child) => {
 const appendAfterPreviousReference = (referenceNodes, childIndex, $Child) => {
   for (let i = childIndex - 1; i >= 0; i--) {
     const beforeId = referenceNodes[i];
-    const beforeInstance = get$8(beforeId);
+    const beforeInstance = get$9(beforeId);
     if (beforeInstance) {
       const $ReferenceNode = beforeInstance.state.$Viewlet;
       $ReferenceNode.after($Child);
@@ -9302,7 +9309,7 @@ const appendAfterPreviousReference = (referenceNodes, childIndex, $Child) => {
 const appendBeforeNextReference = (referenceNodes, childIndex, $Child) => {
   for (let i = childIndex + 1; i < referenceNodes.length; i++) {
     const afterId = referenceNodes[i];
-    const afterInstance = get$8(afterId);
+    const afterInstance = get$9(afterId);
     if (afterInstance) {
       const $ReferenceNode = afterInstance.state.$Viewlet;
       $ReferenceNode.before($Child);
@@ -9332,12 +9339,12 @@ const appendWithReferenceNodes = ($Parent, $Child, childId, referenceNodes) => {
 const append = (parentId, childId, referenceNodes) => {
   number(parentId);
   number(childId);
-  const parentInstance = get$8(parentId);
+  const parentInstance = get$9(parentId);
   if (!parentInstance) {
     throw new Error(`cannot append child: instance ${parentId} not found`);
   }
   const $Parent = parentInstance.state.$Viewlet;
-  const childInstance = get$8(childId);
+  const childInstance = get$9(childId);
   if (!childInstance) {
     throw new Error(`cannot append child: child instance not found ${childId}`);
   }
@@ -9356,11 +9363,11 @@ const append = (parentId, childId, referenceNodes) => {
   applyLateFocusMaybe();
 };
 const replaceChildren = (parentId, childIds) => {
-  const parentInstance = get$8(parentId);
+  const parentInstance = get$9(parentId);
   const $Parent = parentInstance.state.$Viewlet;
   const $Fragment = document.createDocumentFragment();
   for (const childId of childIds) {
-    const childInstance = get$8(childId);
+    const childInstance = get$9(childId);
     const $Child = childInstance.state.$Viewlet;
     $Fragment.append($Child);
   }
@@ -9375,7 +9382,7 @@ const applyLateFocusMaybe = () => {
     selector
   } = focusCallback;
   resetFocusCallback();
-  const instance = get$8(id);
+  const instance = get$9(id);
   if (instance) {
     const {
       $Viewlet
@@ -9388,7 +9395,7 @@ const applyLateFocusMaybe = () => {
 };
 const appendToBody = childId => {
   const $Parent = document.body;
-  const childInstance = get$8(childId);
+  const childInstance = get$9(childId);
   const $Child = childInstance.state.$Viewlet;
   $Parent.append($Child);
   applyLateFocusMaybe();
@@ -9401,7 +9408,7 @@ const executeCommands = commands => {
   }
 };
 const show = id => {
-  const instance = get$8(id);
+  const instance = get$9(id);
   const $Viewlet = instance.state.$Viewlet;
   const $Workbench = document.getElementById('Workbench');
   // @ts-expect-error
@@ -9411,7 +9418,7 @@ const show = id => {
   }
 };
 const setBounds$1 = (id, left, top, width, height) => {
-  const instance = get$8(id);
+  const instance = get$9(id);
   if (!instance) {
     return;
   }
@@ -9419,7 +9426,7 @@ const setBounds$1 = (id, left, top, width, height) => {
   setBounds$a($Viewlet, left, top, width, height);
 };
 const setProperty = (id, selector, property, value) => {
-  const instance = get$8(id);
+  const instance = get$9(id);
   if (!instance) {
     return;
   }
@@ -9691,7 +9698,7 @@ const queryAudio = (uid, elementLocator) => {
     // @ts-ignore
     return remoteAudio;
   }
-  const $Viewlet = get$8(uid);
+  const $Viewlet = get$9(uid);
   const remoteAudio = $Viewlet.querySelector(elementLocator);
   if (!remoteAudio) {
     console.error('[webrtc] audio element not found');
@@ -9865,9 +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$6,
+  'FileHandles.get': get$5,
   'FilePicker.showDirectoryPicker': showDirectoryPicker,
   'FilePicker.showFilePicker': showFilePicker,
   'FilePicker.showSaveFilePicker': showSaveFilePicker,
@@ -10260,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');
@@ -10296,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');
@@ -10467,6 +10475,18 @@ const flushPendingData = state => {
   }
   pendingData.length = 0;
 };
+const focusIfConnected = state => {
+  const {
+    $Viewlet,
+    pendingFocus,
+    terminal
+  } = state;
+  if (!pendingFocus || !terminal || !$Viewlet.isConnected) {
+    return;
+  }
+  state.pendingFocus = false;
+  terminal.focus();
+};
 const mountTerminal = async (state, uid) => {
   const {
     fitAddon,
@@ -10491,6 +10511,7 @@ const mountTerminal = async (state, uid) => {
   terminal.open(state.$Viewlet);
   const resizeObserver = new ResizeObserver(() => {
     fitAddon.fit();
+    focusIfConnected(state);
   });
   resizeObserver.observe(state.$Viewlet);
   state.fitAddon = fitAddon;
@@ -10499,10 +10520,7 @@ const mountTerminal = async (state, uid) => {
   state.disposables = [inputDisposable, resizeDisposable];
   fitAddon.fit();
   flushPendingData(state);
-  if (state.pendingFocus) {
-    state.pendingFocus = false;
-    terminal.focus();
-  }
+  focusIfConnected(state);
 };
 const create = () => {
   const $Viewlet = document.createElement('div');
@@ -10546,7 +10564,7 @@ const focus = state => {
   const {
     terminal
   } = state;
-  if (!terminal) {
+  if (!terminal || !state.$Viewlet.isConnected) {
     state.pendingFocus = true;
     return;
   }

package/package.json

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