@lvce-editor/renderer-process 30.36.0 → 30.36.2

package/dist/editorOnlyRendererProcessMain.js

@@ -1221,13 +1221,14 @@ const unwrapItemString = async item => {
 const unwrapItemFile = async item => {
   // @ts-ignore
   if (item.getAsFileSystemHandle) {
+    const nativeFile = item.getAsFile();
     // @ts-ignore
-    const file = await item.getAsFileSystemHandle();
+    const fileHandle = await item.getAsFileSystemHandle();
     return {
-      file: item.getAsFile(),
+      file: nativeFile,
       kind: 'file',
       type: item.type,
-      value: file
+      value: fileHandle
     };
   }
   const file = item.getAsFile();

package/dist/rendererProcessMain.js

@@ -368,13 +368,14 @@ const unwrapItemString = async item => {
 const unwrapItemFile = async item => {
   // @ts-ignore
   if (item.getAsFileSystemHandle) {
+    const nativeFile = item.getAsFile();
     // @ts-ignore
-    const file = await item.getAsFileSystemHandle();
+    const fileHandle = await item.getAsFileSystemHandle();
     return {
-      file: item.getAsFile(),
+      file: nativeFile,
       kind: 'file',
       type: item.type,
-      value: file
+      value: fileHandle
     };
   }
   const file = item.getAsFile();
@@ -1977,8 +1978,57 @@ const downloadFile = (fileName, url) => {
   a.click();
 };
 
-const get$5 = ids => {
-  return getFileHandles$1(ids);
+const isFile = value => {
+  return value instanceof File;
+};
+
+const getFilePathElectron = async file => {
+  if (!isFile(file)) {
+    throw new TypeError(`file must be of type File`);
+  }
+  if (!globalThis.electronGlobals) {
+    throw new Error(`electron globals are not available`);
+  }
+  const filePath = globalThis.electronGlobals.getPathForFile(file);
+  return filePath;
+};
+
+const isFileSystemFileHandle = value => {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+  const candidate = value;
+  return candidate.kind === 'file' && typeof candidate.getFile === 'function';
+};
+const getNativeFile = async item => {
+  if (item.kind === 'file-legacy') {
+    return item.value instanceof File ? item.value : undefined;
+  }
+  if (item.file instanceof File) {
+    return item.file;
+  }
+  if (isFileSystemFileHandle(item.value)) {
+    return item.value.getFile();
+  }
+  return undefined;
+};
+const addElectronPath = async item => {
+  if (!globalThis.electronGlobals) {
+    return item;
+  }
+  const file = await getNativeFile(item);
+  if (!file) {
+    return item;
+  }
+  const path = await getFilePathElectron(file);
+  return {
+    ...item,
+    path
+  };
+};
+const get$5 = async ids => {
+  const items = await getFileHandles$1(ids);
+  return Promise.all(items.map(addElectronPath));
 };
 
 const showDirectoryPicker = options => {
@@ -9576,21 +9626,6 @@ const unmock = () => {
   Element.prototype.releasePointerCapture = originalPointerCapture.releasePointerCapture;
 };
 
-const isFile = value => {
-  return value instanceof File;
-};
-
-const getFilePathElectron = async file => {
-  if (!isFile(file)) {
-    throw new TypeError(`file must be of type File`);
-  }
-  if (!globalThis.electronGlobals) {
-    throw new Error(`electron globals are not available`);
-  }
-  const filePath = globalThis.electronGlobals.getPathForFile(file);
-  return filePath;
-};
-
 const forwardRendererWorkerCommand = (method, ...params) => {
   send$1(method, ...params);
 };
@@ -10475,6 +10510,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,
@@ -10499,6 +10546,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;
@@ -10507,10 +10555,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');
@@ -10554,7 +10599,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.36.0",
+  "version": "30.36.2",
   "keywords": [
     "lvce-editor",
     "renderer-process"