@lvce-editor/explorer-view 2.11.0 → 2.13.0

package/dist/explorerViewWorkerMain.js

@@ -861,46 +861,6 @@ const WebWorkerRpcClient = {
   create: create$1
 };
 
-const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
-const compareStringNumeric = (a, b) => {
-  if (RE_CHARACTERS.test(a) && RE_CHARACTERS.test(b)) {
-    return a < b ? -1 : 1;
-  }
-  return a.localeCompare(b, 'en', {
-    numeric: true
-  });
-};
-
-const BlockDevice = 1;
-const CharacterDevice = 2;
-const Directory = 3;
-const DirectoryExpanded = 4;
-const DirectoryExpanding = 5;
-const File = 7;
-const Socket = 8;
-const Symlink = 9;
-const SymLinkFile = 10;
-const SymLinkFolder = 11;
-const Unknown = 12;
-
-const priorityMapFoldersFirst = {
-  [Directory]: 1,
-  [SymLinkFolder]: 1,
-  [File]: 0,
-  [SymLinkFile]: 0,
-  [Unknown]: 0,
-  [Socket]: 0
-};
-const compareDirentType = (direntA, direntB) => {
-  return priorityMapFoldersFirst[direntB.type] - priorityMapFoldersFirst[direntA.type];
-};
-const compareDirentName = (direntA, direntB) => {
-  return compareStringNumeric(direntA.name, direntB.name);
-};
-const compareDirent = (direntA, direntB) => {
-  return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
-};
-
 const None$5 = 0;
 const CreateFile = 1;
 const CreateFolder = 2;
@@ -991,28 +951,140 @@ const fileOrFolderNameMustBeProvided = () => {
 const List = 1;
 const Input$1 = 2;
 
+// TODO optimize this function to return the minimum number
+// of visible items needed, e.g. when not scrolled 5 items with
+// 20px fill 100px but when scrolled 6 items are needed
+const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
+};
+
+const getExplorerMaxLineY = (minLineY, height, itemHeight, direntsLength) => {
+  const maxLineY = minLineY + Math.min(getNumberOfVisibleItems(height, itemHeight), direntsLength);
+  return maxLineY;
+};
+
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent]);
+};
+
+const getMissingIconRequests = (dirents, fileIconCache) => {
+  const missingRequests = [];
+  for (const dirent of dirents) {
+    if (!(dirent.path in fileIconCache)) {
+      missingRequests.push({
+        type: dirent.type,
+        name: dirent.name,
+        path: dirent.path
+      });
+    }
+  }
+  return missingRequests;
+};
+
+const BlockDevice = 1;
+const CharacterDevice = 2;
+const Directory = 3;
+const DirectoryExpanded = 4;
+const DirectoryExpanding = 5;
+const File = 7;
+const Socket = 8;
+const Symlink = 9;
+const SymLinkFile = 10;
+const SymLinkFolder = 11;
+const Unknown = 12;
+
+const RendererWorker = 1;
+
+const rpcs = Object.create(null);
+const set$1 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$1 = id => {
+  return rpcs[id];
+};
+
+const invoke = (method, ...params) => {
+  const rpc = get$1(RendererWorker);
+  // @ts-ignore
+  return rpc.invoke(method, ...params);
+};
+
+const requestFileIcons = async requests => {
+  const promises = requests.map(request => request.type === File ? invoke('IconTheme.getFileIcon', {
+    name: request.name
+  }) : invoke('IconTheme.getFolderIcon', {
+    name: request.name
+  }));
+  return Promise.all(promises);
+};
+
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getFileIcons = async (dirents, fileIconCache) => {
+  const missingRequests = getMissingIconRequests(dirents, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const paths = dirents.map(dirent => dirent.path);
+  const icons = getIconsCached(paths, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
+const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
+const compareStringNumeric = (a, b) => {
+  if (RE_CHARACTERS.test(a) && RE_CHARACTERS.test(b)) {
+    return a < b ? -1 : 1;
+  }
+  return a.localeCompare(b, 'en', {
+    numeric: true
+  });
+};
+
+const priorityMapFoldersFirst = {
+  [Directory]: 1,
+  [SymLinkFolder]: 1,
+  [File]: 0,
+  [SymLinkFile]: 0,
+  [Unknown]: 0,
+  [Socket]: 0
+};
+const compareDirentType = (direntA, direntB) => {
+  return priorityMapFoldersFirst[direntB.type] - priorityMapFoldersFirst[direntA.type];
+};
+const compareDirentName = (direntA, direntB) => {
+  return compareStringNumeric(direntA.name, direntB.name);
+};
+const compareDirent = (direntA, direntB) => {
+  return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
+};
+
 const getParentFolder = (dirents, index, root) => {
   if (index < 0) {
     return root;
   }
   return dirents[index].path;
 };
-const acceptCreate = async (state, newDirentType, createFn) => {
+const getNewDirentsAccept = async (state, newDirentType, createFn) => {
   const {
     focusedIndex,
     editingValue
   } = state;
   const newFileName = editingValue;
-  if (!newFileName) {
-    // TODO show error message that file name must not be empty
-    // below input box
-    // await ErrorHandling.showErrorDialog(new Error('file name must not be empty'))
-    const editingErrorMessage = fileOrFolderNameMustBeProvided();
-    return {
-      ...state,
-      editingErrorMessage
-    };
-  }
   const parentFolder = getParentFolder(state.items, focusedIndex, state.root);
   const absolutePath = [parentFolder, newFileName].join(state.pathSeparator);
   // TODO better handle error
@@ -1021,7 +1093,10 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   } catch (error) {
     console.error(new VError(error, `Failed to create file`));
     // TODO display error
-    return state;
+    return {
+      dirents: state.items,
+      newFocusedIndex: state.focusedIndex
+    };
   }
   const parentDirent = focusedIndex >= 0 ? state.items[focusedIndex] : {
     depth: 0};
@@ -1073,34 +1148,54 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   // @ts-ignore
   items.splice(insertIndex + 1, 0, newDirent);
   const newDirents = [...items];
-  const newMaxlineY = Math.max(state.maxLineY, newDirents.length);
+  return {
+    dirents: newDirents,
+    newFocusedIndex: insertIndex + 1
+  };
+};
+
+const acceptCreate = async (state, newDirentType, createFn) => {
+  const {
+    editingValue,
+    minLineY,
+    height,
+    itemHeight,
+    fileIconCache
+  } = state;
+  const newFileName = editingValue;
+  if (!newFileName) {
+    // TODO show error message that file name must not be empty
+    // below input box
+    // await ErrorHandling.showErrorDialog(new Error('file name must not be empty'))
+    const editingErrorMessage = fileOrFolderNameMustBeProvided();
+    return {
+      ...state,
+      editingErrorMessage
+    };
+  }
+  const {
+    dirents,
+    newFocusedIndex
+  } = await getNewDirentsAccept(state, newDirentType, createFn);
+  const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, dirents.length);
+  const visible = dirents.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, fileIconCache);
   return {
     ...state,
-    items: newDirents,
+    items: dirents,
     editingIndex: -1,
-    focusedIndex: insertIndex + 1,
+    focusedIndex: newFocusedIndex,
     editingType: None$5,
-    maxLineY: newMaxlineY,
-    focus: List
+    maxLineY,
+    focus: List,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
-const RendererWorker = 1;
-
-const rpcs = Object.create(null);
-const set$1 = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get$1 = id => {
-  return rpcs[id];
-};
-
-const invoke = (method, ...params) => {
-  const rpc = get$1(RendererWorker);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-
 const remove = async dirent => {
   return invoke('FileSystem.remove', dirent);
 };
@@ -1263,9 +1358,8 @@ const acceptRename = async state => {
     const oldParentPath = dirname(pathSeparator, oldAbsolutePath);
     const newAbsolutePath = [oldParentPath, editingValue].join(pathSeparator);
     await rename(oldAbsolutePath, newAbsolutePath);
-  } catch {
-    // TODO
-    // await ErrorHandling.showErrorDialog(error)
+  } catch (error) {
+    console.error(new VError(error, `Failed to rename file`));
     return state;
   }
   const {
@@ -1422,7 +1516,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     icons: [],
     platform,
     focus: 0,
-    editingErrorMessage: ''
+    editingErrorMessage: '',
+    inputSource: 0
   };
   set(uid, state, state);
 };
@@ -1458,7 +1553,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     icons: [],
     platform,
     focus: 0,
-    editingErrorMessage: ''
+    editingErrorMessage: '',
+    inputSource: 0
   };
   set(state.uid, state, state);
   return state;
@@ -1635,72 +1731,6 @@ const getChildDirents = async (pathSeparator, parentDirent, excluded = []) => {
   return displayDirents;
 };
 
-// TODO optimize this function to return the minimum number
-// of visible items needed, e.g. when not scrolled 5 items with
-// 20px fill 100px but when scrolled 6 items are needed
-const getNumberOfVisibleItems = (listHeight, itemHeight) => {
-  return Math.ceil(listHeight / itemHeight) + 1;
-};
-
-const getExplorerMaxLineY = (minLineY, height, itemHeight, direntsLength) => {
-  const maxLineY = minLineY + Math.min(getNumberOfVisibleItems(height, itemHeight), direntsLength);
-  return maxLineY;
-};
-
-const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
-};
-
-const getMissingIconRequests = (dirents, fileIconCache) => {
-  const missingRequests = [];
-  for (const dirent of dirents) {
-    if (!(dirent.path in fileIconCache)) {
-      missingRequests.push({
-        type: dirent.type,
-        name: dirent.name,
-        path: dirent.path
-      });
-    }
-  }
-  return missingRequests;
-};
-
-const requestFileIcons = async requests => {
-  const promises = requests.map(request => request.type === File ? invoke('IconTheme.getFileIcon', {
-    name: request.name
-  }) : invoke('IconTheme.getFolderIcon', {
-    name: request.name
-  }));
-  return Promise.all(promises);
-};
-
-const updateIconCache = (iconCache, missingRequests, newIcons) => {
-  if (missingRequests.length === 0) {
-    return iconCache;
-  }
-  const newFileIconCache = {
-    ...iconCache
-  };
-  for (let i = 0; i < missingRequests.length; i++) {
-    const request = missingRequests[i];
-    const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
-  }
-  return newFileIconCache;
-};
-
-const getFileIcons = async (dirents, fileIconCache) => {
-  const missingRequests = getMissingIconRequests(dirents, fileIconCache);
-  const newIcons = await requestFileIcons(missingRequests);
-  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const paths = dirents.map(dirent => dirent.path);
-  const icons = getIconsCached(paths, newFileIconCache);
-  return {
-    icons,
-    newFileIconCache
-  };
-};
-
 const expandAll = async state => {
   const {
     items,
@@ -3670,27 +3700,31 @@ const getFileIconVirtualDom = icon => {
   };
 };
 
-const label = {
-  type: Div,
-  className: Label,
-  childCount: 1
-};
 const getClassName$1 = hasEditingError => {
   if (hasEditingError) {
     return mergeClassNames(InputBox, InputValidationError);
   }
   return InputBox;
 };
+const getInputDom = hasEditingError => {
+  return [{
+    type: Input,
+    className: getClassName$1(hasEditingError),
+    id: 'ExplorerInput',
+    onInput: HandleEditingInput,
+    childCount: 0,
+    name: ExplorerInput
+  }];
+};
+
+const label = {
+  type: Div,
+  className: Label,
+  childCount: 1
+};
 const getInputOrLabelDom = (isEditing, hasEditingError, name) => {
   if (isEditing) {
-    return [{
-      type: Input,
-      className: getClassName$1(hasEditingError),
-      id: 'ExplorerInput',
-      onInput: HandleEditingInput,
-      childCount: 0,
-      name: ExplorerInput
-    }];
+    return getInputDom(hasEditingError);
   }
   return [label, text(name)];
 };
@@ -4356,7 +4390,9 @@ const terminate = () => {
   globalThis.close();
 };
 
-const updateEditingValue = (state, value) => {
+const User = 1;
+
+const updateEditingValue = (state, value, inputSource = User) => {
   const editingIcon = '';
   return {
     ...state,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",