@lvce-editor/explorer-view 7.0.0 → 7.3.0

package/dist/explorerViewWorkerMain.js

@@ -1276,6 +1276,7 @@ const DeltaMode = 'event.deltaMode';
 const DeltaY = 'event.deltaY';
 const EventTargetClassName = 'event.target.className';
 const IsTrusted = 'event.isTrusted';
+const Key = 'event.key';
 const ShiftKey = 'event.shiftKey';
 const TargetName = 'event.target.name';
 const TargetValue = 'event.target.value';
@@ -1395,6 +1396,9 @@ const readDirWithFileTypes = async uri => {
 const getPathSeparator$1 = async root => {
   return invoke('FileSystem.getPathSeparator', root);
 };
+const isReadonly = async root => {
+  return invoke('FileSystem.isReadonly', root);
+};
 const getRealPath = async path => {
   return invoke('FileSystem.getRealPath', path);
 };
@@ -2073,22 +2077,32 @@ const acceptCreateFolder = async state => {
   return acceptCreate(state, Directory);
 };
 
-const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children, tree, newUri) => {
-  const rootLength = root.length;
-  const relativeDirname = parentPath.slice(rootLength);
-  const relativeOldPath = oldUri.slice(rootLength);
-  const relativeNewUri = newUri.slice(rootLength);
-  const update = Object.create(null);
-  const oldItems = tree[relativeOldPath] || [];
-  update[relativeDirname] = children.map(child => {
+const getUpdatedChildren = (children, oldItems, newUri) => {
+  const setSize = children.length;
+  return children.toSorted(compareDirent).map((child, index) => {
     if (oldItems.length > 0 && child.path === newUri && child.type === Directory) {
       return {
         ...child,
+        posInSet: index + 1,
+        setSize,
         type: DirectoryExpanded
       };
     }
-    return child;
+    return {
+      ...child,
+      posInSet: index + 1,
+      setSize
+    };
   });
+};
+const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children, tree, newUri) => {
+  const rootLength = root.length;
+  const relativeDirname = parentPath.slice(rootLength);
+  const relativeOldPath = oldUri.slice(rootLength);
+  const relativeNewUri = newUri.slice(rootLength);
+  const update = Object.create(null);
+  const oldItems = tree[relativeOldPath] || [];
+  update[relativeDirname] = getUpdatedChildren(children, oldItems, newUri);
   update[relativeNewUri] = oldItems;
   for (const [key, value] of Object.entries(tree)) {
     if (!key.startsWith(`${relativeOldPath}/`)) {
@@ -2381,21 +2395,40 @@ const copyRelativePath = async state => {
   return state;
 };
 
+const getIconCacheKey = (path, type) => {
+  switch (type) {
+    case DirectoryExpanded:
+    case DirectoryExpanding:
+    case EditingDirectoryExpanded:
+      return `${path}#expanded`;
+    default:
+      return path;
+  }
+};
+
 const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
+  return dirents.map(dirent => {
+    const cacheKey = getIconCacheKey(dirent.path, dirent.type);
+    return fileIconCache[cacheKey];
+  });
 };
 
 const getMissingDirents = (dirents, fileIconCache) => {
   const missingDirents = [];
   for (const dirent of dirents) {
-    if (!(dirent.path in fileIconCache)) {
+    const cacheKey = getIconCacheKey(dirent.path, dirent.type);
+    if (!(cacheKey in fileIconCache)) {
       missingDirents.push(dirent);
     }
   }
   return missingDirents;
 };
 const toIconRequest = dirent => {
+  const cacheKey = getIconCacheKey(dirent.path, dirent.type);
   return {
+    ...(cacheKey !== dirent.path && {
+      expanded: true
+    }),
     name: dirent.name,
     path: dirent.path,
     type: dirent.type
@@ -2407,14 +2440,6 @@ const getMissingIconRequests = (dirents, fileIconCache) => {
   return iconRequests;
 };
 
-const getPath = item => {
-  return item.path;
-};
-
-const getPaths = items => {
-  return items.map(getPath);
-};
-
 const getSimpleIconRequestType = direntType => {
   if ([Directory, DirectoryExpanded, EditingDirectoryExpanded, EditingFolder].includes(direntType)) {
     return 2;
@@ -2424,6 +2449,9 @@ const getSimpleIconRequestType = direntType => {
 
 const toSimpleIconRequest = request => {
   return {
+    ...(request.expanded && {
+      expanded: true
+    }),
     name: request.name,
     type: getSimpleIconRequestType(request.type)
   };
@@ -2448,7 +2476,8 @@ const updateIconCache = (iconCache, missingRequests, newIcons) => {
   for (let i = 0; i < missingRequests.length; i++) {
     const request = missingRequests[i];
     const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
+    const cacheKey = getIconCacheKey(request.path, request.type);
+    newFileIconCache[cacheKey] = icon;
   }
   return newFileIconCache;
 };
@@ -2457,8 +2486,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   const missingRequests = getMissingIconRequests(dirents, fileIconCache);
   const newIcons = await requestFileIcons(missingRequests);
   const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const paths = getPaths(dirents);
-  const icons = getIconsCached(paths, newFileIconCache);
+  const icons = getIconsCached(dirents, newFileIconCache);
   return {
     icons,
     newFileIconCache
@@ -3043,6 +3071,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     initial: true,
     inputSource: 0,
     isPointerDown: false,
+    isReadonly: false,
     itemHeight: ListItem,
     items: [],
     maxIndent: 0,
@@ -3483,6 +3512,7 @@ const getKeyBindings = () => {
 
 const Separator = 1;
 const None$2 = 0;
+const Disabled = 5;
 const RestoreFocus = 6;
 
 const menuEntrySeparator = {
@@ -3564,6 +3594,10 @@ const menuEntryRename = {
   id: 'rename',
   label: rename()
 };
+const menuEntryRenameDisabled = {
+  ...menuEntryRename,
+  flags: Disabled
+};
 const menuEntryDelete = {
   command: 'Explorer.removeDirent',
   flags: None$2,
@@ -3576,7 +3610,6 @@ const menuEntryRemoveFolderFromWorkspace = {
   id: 'removeFolderFromWorkspace',
   label: removeFolderFromWorkspace()
 };
-const ALL_ENTRIES = [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryRename, menuEntryDelete];
 
 // TODO there are two possible ways of getting the focused dirent of explorer
 // 1. directly access state of explorer (bad because it directly accesses state of another component)
@@ -3587,17 +3620,23 @@ const getFocusedDirent = explorerState => {
   }
   return explorerState.items[explorerState.focusedIndex];
 };
-const getMenuEntriesDirectory = () => {
-  return ALL_ENTRIES;
+const getMenuEntryRename = state => {
+  if (state.isReadonly) {
+    return menuEntryRenameDisabled;
+  }
+  return menuEntryRename;
+};
+const getMenuEntriesDirectory = state => {
+  return [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, getMenuEntryRename(state), menuEntryDelete];
 };
-const getMenuEntriesFile = () => {
-  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntrySelectForCompare, menuEntrySeparator, menuEntryRename, menuEntryDelete];
+const getMenuEntriesFile = state => {
+  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntrySelectForCompare, menuEntrySeparator, getMenuEntryRename(state), menuEntryDelete];
 };
-const getMenuEntriesFileCompareWithSelected = () => {
-  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryCompareWithSelected, menuEntrySeparator, menuEntryRename, menuEntryDelete];
+const getMenuEntriesFileCompareWithSelected = state => {
+  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryCompareWithSelected, menuEntrySeparator, getMenuEntryRename(state), menuEntryDelete];
 };
-const getMenuEntriesDefault = () => {
-  return ALL_ENTRIES;
+const getMenuEntriesDefault = state => {
+  return getMenuEntriesDirectory(state);
 };
 const getMenuEntriesRoot = root => {
   const entries = [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath];
@@ -3613,14 +3652,14 @@ const getMenuEntries = state => {
   }
   switch (focusedDirent.type) {
     case Directory:
-      return getMenuEntriesDirectory();
+      return getMenuEntriesDirectory(state);
     case File:
       if (state.compareSourceUri && state.compareSourceUri !== focusedDirent.path) {
-        return getMenuEntriesFileCompareWithSelected();
+        return getMenuEntriesFileCompareWithSelected(state);
       }
-      return getMenuEntriesFile();
+      return getMenuEntriesFile(state);
     default:
-      return getMenuEntriesDefault();
+      return getMenuEntriesDefault(state);
   }
 };
 
@@ -3657,6 +3696,18 @@ const getMouseActions = () => {
   }];
 };
 
+const getTitle$1 = state => {
+  const {
+    pathSeparator,
+    root
+  } = state;
+  if (!root) {
+    return 'Explorer';
+  }
+  const normalizedRoot = root.endsWith(pathSeparator) && root !== pathSeparator ? root.slice(0, -pathSeparator.length) : root;
+  return getBaseName(pathSeparator, normalizedRoot) || normalizedRoot;
+};
+
 const getParentStartIndex = (dirents, index) => {
   const dirent = dirents[index];
   let startIndex = index - 1;
@@ -4011,6 +4062,14 @@ const getPathDirentsMap = async allPaths => {
   return pathToDirents;
 };
 
+const getPath = item => {
+  return item.path;
+};
+
+const getPaths = items => {
+  return items.map(getPath);
+};
+
 const restoreDirentType = (rawDirentType, path, expandedPaths) => {
   if (rawDirentType === Directory && expandedPaths.includes(path)) {
     return DirectoryExpanded;
@@ -4773,7 +4832,9 @@ const loadContent = async (state, savedState) => {
   const root = getSavedRoot(savedState, workspacePath);
   try {
     // TODO path separator could be restored from saved state
-    const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
+    const [pathSeparator, isReadonly$1] = await Promise.all([getPathSeparator(root),
+    // TODO only load path separator once
+    isReadonly(root)]);
     const excluded = getExcluded();
     const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
     const rawDeltaY = getRestoredDeltaY(savedState);
@@ -4792,6 +4853,7 @@ const loadContent = async (state, savedState) => {
       excluded,
       hasError: false,
       initial: false,
+      isReadonly: isReadonly$1,
       items: restoredDirents,
       maxIndent: 10,
       minLineY,
@@ -4809,6 +4871,7 @@ const loadContent = async (state, savedState) => {
       errorMessage,
       hasError: true,
       initial: false,
+      isReadonly: false,
       items: [],
       root,
       useChevrons
@@ -5251,7 +5314,7 @@ const filterByFocusWord = (items, focusedIndex, focusWord) => {
   }
   const matches = [];
   for (let i = 0; i < items.length; i++) {
-    if (items[i].toLowerCase().includes(focusWord)) {
+    if (items[i].toLowerCase().startsWith(focusWord)) {
       matches.push(i);
     }
   }
@@ -5268,19 +5331,22 @@ const filterByFocusWord = (items, focusedIndex, focusWord) => {
   return matches[nextIndex];
 };
 
-const RE_ASCII = /^[a-z]$/;
+const RE_ASCII = /^[a-z]$/i;
 const isAscii = key => {
   return RE_ASCII.test(key);
 };
 
 const typeAheadTimeout = {};
-const handleKeyDown = (state, key) => {
+const handleKeyDown = (state, defaultPrevented, key) => {
   const {
     focusedIndex,
     focusWord,
     focusWordTimeout,
     items
   } = state;
+  if (defaultPrevented) {
+    return state;
+  }
   if (focusWord && key === '') {
     return cancelTypeAhead(state);
   }
@@ -6018,6 +6084,7 @@ const HandleDrop = 6;
 const HandleEditingInput = 7;
 const HandleInputBlur = 8;
 const HandleInputClick = 9;
+const HandleKeyDown = 21;
 const HandleListBlur = 11;
 const HandleListFocus = 12;
 const HandlePointerDown = 14;
@@ -6499,6 +6566,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleListBlur,
     params: ['handleBlur']
+  }, {
+    name: HandleKeyDown,
+    params: ['handleKeyDown', DefaultPrevented, Key]
   }, {
     name: HandleClick,
     params: ['handleClickAt', DefaultPrevented, Button$3, CtrlKey, ShiftKey, ClientX, ClientY],
@@ -6900,6 +6970,7 @@ const commandMap = {
   'Explorer.getMenuEntries': getMenuEntries,
   'Explorer.getMenuEntries2': wrapGetter(getMenuEntries2),
   'Explorer.getMouseActions': getMouseActions,
+  'Explorer.getTitle': wrapGetter(getTitle$1),
   'Explorer.handleArrowLeft': wrapListItemCommand(handleArrowLeft),
   'Explorer.handleArrowRight': wrapListItemCommand(handleArrowRight),
   'Explorer.handleBlur': wrapListItemCommand(handleBlur),

package/package.json

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