@lvce-editor/explorer-view 2.13.0 → 2.15.0

package/dist/explorerViewWorkerMain.js

@@ -981,6 +981,10 @@ const getMissingIconRequests = (dirents, fileIconCache) => {
   return missingRequests;
 };
 
+const getPath = dirent => {
+  return dirent.path;
+};
+
 const BlockDevice = 1;
 const CharacterDevice = 2;
 const Directory = 3;
@@ -1037,7 +1041,7 @@ 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 paths = dirents.map(getPath);
   const icons = getIconsCached(paths, newFileIconCache);
   return {
     icons,
@@ -1448,6 +1452,10 @@ const getFocusedDirent$1 = state => {
 };
 
 const copyPath = async state => {
+  const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   // await Command.execute(RendererWorkerCommandType.ClipBoardWriteText, /* text */ path)
   return state;
 };
@@ -1464,6 +1472,9 @@ const writeNativeFiles = async (type, files) => {
 
 const copyRelativePath = async state => {
   const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   const relativePath = dirent.path.slice(1);
   // TODO handle error
   await writeText(relativePath);
@@ -1561,49 +1572,27 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
 };
 
 const RenderItems = 4;
-const RenderEditingIndex = 5;
 const RenderFocus = 6;
 
-const diffType$2 = RenderEditingIndex;
-const isEqual$3 = (oldState, newState) => {
-  return oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType;
-};
-
-const DiffEditingIndex = {
-  __proto__: null,
-  diffType: diffType$2,
-  isEqual: isEqual$3
-};
-
 const diffType$1 = RenderFocus;
 const isEqual$2 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const DiffFocus = {
-  __proto__: null,
-  diffType: diffType$1,
-  isEqual: isEqual$2
-};
-
 const diffType = RenderItems;
 const isEqual$1 = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.width === newState.width && oldState.focused === newState.focused && oldState.dropTargets === newState.dropTargets;
 };
 
-const DiffItems = {
-  __proto__: null,
-  diffType,
-  isEqual: isEqual$1
-};
-
-const modules = [DiffItems, DiffEditingIndex, DiffFocus];
+const modules = [isEqual$1, isEqual$2];
+const numbers = [diffType, diffType$1];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
-  for (const module of modules) {
-    if (!module.isEqual(oldState, newState)) {
-      diffResult.push(module.diffType);
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
     }
   }
   return diffResult;
@@ -2598,12 +2587,14 @@ const handleContextMenuMouseAt = async (state, x, y) => {
   number(x);
   number(y);
   const focusedIndex = getIndexFromPosition(state, x, y);
-  await show(x, y, Explorer$1);
-  return {
+  const newState = {
     ...state,
     focusedIndex,
     focused: false
   };
+  set(state.uid, state, newState);
+  await show(x, y, Explorer$1);
+  return state;
 };
 
 const getContextMenuHandler = button => {
@@ -3072,15 +3063,7 @@ const handleFocus = async state => {
   return state;
 };
 
-const updateIcon = dirent => {
-  return {
-    ...dirent,
-    icon: ''
-  };
-};
-
 const updateIcons = async state => {
-  const newDirents = state.items.map(updateIcon);
   const {
     items,
     minLineY,
@@ -3093,7 +3076,6 @@ const updateIcons = async state => {
   } = await getFileIcons(visible, Object.create(null));
   return {
     ...state,
-    items: newDirents,
     icons,
     fileIconCache: newFileIconCache
   };
@@ -3206,7 +3188,8 @@ const handlePointerDown = (state, button, x, y) => {
     return {
       ...state,
       focused: true,
-      focusedIndex: -1
+      focusedIndex: -1,
+      focus: List
     };
   }
   return state;
@@ -3489,7 +3472,7 @@ const newFolder = state => {
   return newDirent(state, CreateFolder);
 };
 
-const getContaingingFolder = (root, dirents, focusedIndex, pathSeparator) => {
+const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
   if (focusedIndex < 0) {
     return root;
   }
@@ -3499,13 +3482,18 @@ const getContaingingFolder = (root, dirents, focusedIndex, pathSeparator) => {
   const path = `${direntParentPath}`;
   return path;
 };
+
+const openNativeFolder = async path => {
+  await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
+};
+
 const openContainingFolder = async state => {
   const {
     focusedIndex,
     root,
     items} = state;
-  const path = getContaingingFolder(root, items, focusedIndex);
-  await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
+  const path = getContainingFolder(root, items, focusedIndex);
+  await openNativeFolder(path);
   return state;
 };
 
@@ -3515,6 +3503,9 @@ const removeDirent = async state => {
     return state;
   }
   const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   const absolutePath = dirent.path;
   try {
     // TODO handle error
@@ -3587,16 +3578,20 @@ const renameDirent = state => {
   };
 };
 
-const renderEditingIndex = (oldState, newState) => {
-  return ['focusInput', 'ExplorerInput'];
-};
-
 const ExplorerInput = 'ExplorerInput';
 
+const User = 1;
+
 const renderFocus = (oldState, newState) => {
+  if (newState.inputSource === User) {
+    return [];
+  }
   if (newState.focus === Input$1) {
     return ['Viewlet.focusElementByName', ExplorerInput];
   }
+  if (newState.focus === List) {
+    return ['Viewlet.focusSelector', '.ListItems'];
+  }
   // TODO
   // 1. when focused, focus the outer list element
   // 2. when focused, set focus context in renderer worker
@@ -3619,6 +3614,7 @@ const Explorer = 'Explorer';
 const ExplorerDropTarget = 'DropTarget';
 const FileIcon = 'FileIcon';
 const FocusOutline = 'FocusOutline';
+const ListItems = 'ListItems';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
 const InputValidationError = 'InputValidationError';
@@ -3796,14 +3792,20 @@ const getActiveDescendant = focusedIndex => {
 const getClassName = (focused, focusedIndex, dropTarget) => {
   const extraClass1 = focused && focusedIndex === -1 ? FocusOutline : Empty;
   const extraClass2 = dropTarget === dropTargetFull ? ExplorerDropTarget : Empty;
-  const className = mergeClassNames(Viewlet, Explorer, extraClass1, extraClass2);
+  const className = mergeClassNames(ListItems, extraClass1, extraClass2);
   return className;
 };
+const parentNode = {
+  type: Div,
+  childCount: 1,
+  className: mergeClassNames(Viewlet, Explorer),
+  role: 'none'
+};
 const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
   }
-  const dom = [{
+  const dom = [parentNode, {
     type: Div,
     className: getClassName(focused, focusedIndex, dropTargets),
     tabIndex: 0,
@@ -3932,8 +3934,6 @@ const renderItems = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
-    case RenderEditingIndex:
-      return renderEditingIndex;
     case RenderItems:
       return renderItems;
     case RenderFocus:
@@ -4159,6 +4159,18 @@ const getPathParts = (root, uri, pathSeparator) => {
   return parts;
 };
 
+const getPathPartsToReveal = (root, pathParts, dirents) => {
+  for (let i = 0; i < pathParts.length; i++) {
+    const pathPart = pathParts[i];
+    const index = getIndex(dirents, pathPart.path);
+    if (index === -1) {
+      continue;
+    }
+    return pathParts.slice(i);
+  }
+  return pathParts;
+};
+
 const isTopLevel = dirent => {
   return dirent.depth === 1;
 };
@@ -4166,23 +4178,22 @@ const orderDirents = dirents => {
   if (dirents.length === 0) {
     return dirents;
   }
-  // const parentMap = Object.create(null)
-  // for(const dirent of dirents){
-  //   const parentPath = dirent.slice(0, dirent.lastIndexOf('/'))
-  //   parentMap[parentPath]||=[]
-  //   parentMap[parentPath].push(dirent)
-  // }
-  const withDeepChildren = parent => {
+  const withDeepChildren = (parent, processed) => {
+    if (processed.has(parent.path)) {
+      return [];
+    }
+    processed.add(parent.path);
     const children = [];
     for (const dirent of dirents) {
       if (dirent.depth === parent.depth + 1 && dirent.path.startsWith(parent.path)) {
-        children.push(dirent, ...withDeepChildren(dirent));
+        children.push(...withDeepChildren(dirent, processed));
       }
     }
     return [parent, ...children];
   };
   const topLevelDirents = dirents.filter(isTopLevel);
-  const ordered = topLevelDirents.flatMap(withDeepChildren);
+  const processed = new Set();
+  const ordered = topLevelDirents.flatMap(dirent => withDeepChildren(dirent, processed));
   return ordered;
 };
 
@@ -4208,17 +4219,6 @@ const scrollInto = (index, minLineY, maxLineY) => {
   };
 };
 
-const getPathPartsToReveal = (root, pathParts, dirents) => {
-  for (let i = 0; i < pathParts.length; i++) {
-    const pathPart = pathParts[i];
-    const index = getIndex(dirents, pathPart.uri);
-    if (index === -1) {
-      continue;
-    }
-    return pathParts.slice(i);
-  }
-  return pathParts;
-};
 const getPathPartChildren = async pathPart => {
   const children = await getChildDirents(pathPart.pathSeparator, pathPart);
   return children;
@@ -4355,10 +4355,6 @@ const revealItem = async (state, uri) => {
   return revealItemVisible(state, index);
 };
 
-const getPath = dirent => {
-  return dirent.path;
-};
-
 const isExpandedDirectory = dirent => {
   return dirent.type === DirectoryExpanded;
 };
@@ -4390,8 +4386,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const User = 1;
-
 const updateEditingValue = (state, value, inputSource = User) => {
   const editingIcon = '';
   return {

package/package.json

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