@lvce-editor/explorer-view 7.29.0 → 7.30.1

package/dist/explorerViewWorkerMain.js

@@ -2653,10 +2653,15 @@ const cancelEditRename = (state, keepFocus) => {
   };
 };
 
-const getUpdatedChildren = (children, oldItems, newUri) => {
+const getUpdatedChildren = (children, previousChildren, oldUri, newUri, renamedChildren) => {
   const setSize = children.length;
+  const previousTypes = new Map(previousChildren.map(child => [child.name, normalizeDirentType(child.type)]));
+  const oldName = getBaseName('/', oldUri);
   return children.toSorted(compareDirent).map((child, index) => {
-    if (oldItems.length > 0 && child.path === newUri && child.type === Directory) {
+    const previousName = child.path === newUri ? oldName : child.name;
+    const previousType = previousTypes.get(previousName);
+    const wasExpanded = previousType === DirectoryExpanded || child.path === newUri && renamedChildren.length > 0;
+    if (wasExpanded && child.type === Directory) {
       return {
         ...child,
         posInSet: index + 1,
@@ -2678,7 +2683,8 @@ const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children,
   const relativeNewUri = newUri.slice(rootLength);
   const update = Object.create(null);
   const oldItems = tree[relativeOldPath] || [];
-  update[relativeDirname] = getUpdatedChildren(children, oldItems, newUri);
+  const previousChildren = tree[relativeDirname] || [];
+  update[relativeDirname] = getUpdatedChildren(children, previousChildren, oldUri, newUri, oldItems);
   update[relativeNewUri] = oldItems;
   for (const [key, value] of Object.entries(tree)) {
     if (!key.startsWith(`${relativeOldPath}/`)) {
@@ -2776,13 +2782,14 @@ const User = 1;
 const Script = 2;
 
 const acceptEdit = async (state, inputSource = Script) => {
-  if (state.isReadonly) {
-    return state;
-  }
   const {
     editingType,
-    inputSource: currentInputSource
+    inputSource: currentInputSource,
+    isReadonly
   } = state;
+  if (isReadonly) {
+    return state;
+  }
   let newState;
   switch (editingType) {
     case CreateFile:
@@ -2887,10 +2894,14 @@ const collapseAll = async state => {
 };
 
 const getFocusedFile = state => {
-  if (state.focusedIndex < 0 || state.focusedIndex >= state.items.length) {
+  const {
+    focusedIndex,
+    items
+  } = state;
+  if (focusedIndex < 0 || focusedIndex >= items.length) {
     return undefined;
   }
-  const item = state.items[state.focusedIndex];
+  const item = items[focusedIndex];
   if (item.type !== File) {
     return undefined;
   }
@@ -2902,14 +2913,17 @@ const openDiff = async (leftUri, rightUri, focus) => {
 };
 
 const compareWithSelected = async state => {
+  const {
+    compareSourceUri
+  } = state;
   const focusedFile = getFocusedFile(state);
   if (!focusedFile) {
     return state;
   }
-  if (!state.compareSourceUri || state.compareSourceUri === focusedFile.path) {
+  if (!compareSourceUri || compareSourceUri === focusedFile.path) {
     return state;
   }
-  await openDiff(state.compareSourceUri, focusedFile.path, true);
+  await openDiff(compareSourceUri, focusedFile.path, true);
   return {
     ...state,
     compareSourceUri: ''
@@ -2926,10 +2940,13 @@ const getFocusedDirent$1 = state => {
 };
 
 const copyPath = async state => {
+  const {
+    root
+  } = state;
   const dirent = getFocusedDirent$1(state);
   // TODO windows paths
   // TODO handle error
-  const path = dirent ? dirent.path : state.root;
+  const path = dirent ? dirent.path : root;
   await writeClipBoardText(path);
   return state;
 };
@@ -2958,11 +2975,15 @@ const getRelativePath = (root, pathSeparator, path) => {
   return path;
 };
 const copyRelativePath = async state => {
+  const {
+    pathSeparator,
+    root
+  } = state;
   const dirent = getFocusedDirent$1(state);
   if (!dirent) {
     return state;
   }
-  const relativePath = getRelativePath(state.root, state.pathSeparator, dirent.path);
+  const relativePath = getRelativePath(root, pathSeparator, dirent.path);
   // TODO handle error
   await writeText(relativePath);
   return state;
@@ -3402,6 +3423,7 @@ const ExplorerDropTarget = 'DropTarget';
 const ExplorerErrorMessage = 'ExplorerErrorMessage';
 const ExplorerInputBox = 'ExplorerInputBox';
 const FileIcon = 'FileIcon';
+const FileIconSlot = 'FileIconSlot';
 const FocusOutline = 'FocusOutline';
 const IconButton = 'IconButton';
 const InputValidationError = 'InputValidationError';
@@ -4081,7 +4103,10 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     x,
     y
   };
-  set(state.uid, state, state);
+  const {
+    uid
+  } = state;
+  set(uid, state, state);
   return state;
 };
 
@@ -4276,7 +4301,10 @@ const expandRecursively = async state => {
 };
 
 const focus = state => {
-  if (state.focus) {
+  const {
+    focus
+  } = state;
+  if (focus) {
     return state;
   }
   return {
@@ -4587,7 +4615,10 @@ const disable = entry => {
   };
 };
 const getWritableEntry = (state, entry) => {
-  if (state.isReadonly) {
+  const {
+    isReadonly
+  } = state;
+  if (isReadonly) {
     return disable(entry);
   }
   return entry;
@@ -4631,6 +4662,9 @@ const getMenuEntriesRoot = state => {
   return entries;
 };
 const getMenuEntries = state => {
+  const {
+    compareSourceUri
+  } = state;
   const focusedDirent = getFocusedDirent(state);
   if (!focusedDirent) {
     return getMenuEntriesRoot(state);
@@ -4639,7 +4673,7 @@ const getMenuEntries = state => {
     case Directory:
       return getMenuEntriesDirectory(state);
     case File:
-      if (state.compareSourceUri && state.compareSourceUri !== focusedDirent.path) {
+      if (compareSourceUri && compareSourceUri !== focusedDirent.path) {
         return getMenuEntriesFileCompareWithSelected(state);
       }
       return getMenuEntriesFile(state);
@@ -4703,7 +4737,11 @@ const getParentStartIndex = (dirents, index) => {
 };
 
 const focusParentFolder = state => {
-  const parentStartIndex = getParentStartIndex(state.items, state.focusedIndex);
+  const {
+    focusedIndex,
+    items
+  } = state;
+  const parentStartIndex = getParentStartIndex(items, focusedIndex);
   if (parentStartIndex === -1) {
     return state;
   }
@@ -5124,7 +5162,11 @@ const newDirent = async (state, editingType, editingIcon = '') => {
 
 // TODO much shared logic with newFolder
 const newFile = state => {
-  if (state.root === '' || state.isReadonly) {
+  const {
+    isReadonly,
+    root
+  } = state;
+  if (root === '' || isReadonly) {
     return Promise.resolve(state);
   }
   return newDirent(state, CreateFile);
@@ -5157,7 +5199,12 @@ const getEditingIcon = async (editingType, value, direntType) => {
 };
 
 const newFolder = async state => {
-  if (state.root === '' || state.isReadonly || state.editingIndex !== -1) {
+  const {
+    editingIndex,
+    isReadonly,
+    root
+  } = state;
+  if (root === '' || isReadonly || editingIndex !== -1) {
     return state;
   }
   const editingIcon = await getEditingIcon(CreateFolder, '');
@@ -5213,6 +5260,13 @@ const refresh = async state => {
     sourceControlIgnoredUris
   };
 };
+const refreshExplorer = async state => {
+  const {
+    editingIndex
+  } = state;
+  const stateWithoutEdit = editingIndex === -1 ? state : await cancelEditInternal(state, true);
+  return refresh(stateWithoutEdit);
+};
 
 const handleButtonClick = async (state, name) => {
   switch (name) {
@@ -5223,7 +5277,7 @@ const handleButtonClick = async (state, name) => {
     case NewFolder$1:
       return newFolder(state);
     case Refresh$1:
-      return refresh(state);
+      return refreshExplorer(state);
     default:
       return state;
   }
@@ -5431,11 +5485,14 @@ const toggleIndividualSelection = async (state, index) => {
 };
 
 const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey, eventX, eventY) => {
+  const {
+    items
+  } = state;
   if (defaultPrevented || button !== LeftClick) {
     return state;
   }
   const index = getIndexFromPosition(state, eventX, eventY);
-  if (index === -1 || index >= state.items.length) {
+  if (index === -1 || index >= items.length) {
     return focusIndex(state, -1);
   }
   if (shiftKey) {
@@ -5448,11 +5505,19 @@ const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey,
 };
 
 const handleClickCurrent = state => {
-  return handleClick(state, state.focusedIndex - state.minLineY, /* keepFocus */false);
+  const {
+    focusedIndex,
+    minLineY
+  } = state;
+  return handleClick(state, focusedIndex - minLineY, /* keepFocus */false);
 };
 
 const handleClickCurrentButKeepFocus = state => {
-  return handleClick(state, state.focusedIndex - state.minLineY, /* keepFocus */true);
+  const {
+    focusedIndex,
+    minLineY
+  } = state;
+  return handleClick(state, focusedIndex - minLineY, /* keepFocus */true);
 };
 
 const openFolder = async () => {
@@ -5496,16 +5561,18 @@ const handleContextMenuAtIndex = async (state, index, x, y) => {
   return newState;
 };
 
-const handleContextMenuKeyboard = async (state, index = state.focusedIndex) => {
+const handleContextMenuKeyboard = async (state, index) => {
   const {
+    focusedIndex,
     itemHeight,
     minLineY,
     x,
     y
   } = state;
+  const actualIndex = index === undefined ? focusedIndex : index;
   const menuX = x;
-  const menuY = y + (index - minLineY + 1) * itemHeight;
-  return handleContextMenuAtIndex(state, index, menuX, menuY);
+  const menuY = y + (actualIndex - minLineY + 1) * itemHeight;
+  return handleContextMenuAtIndex(state, actualIndex, menuX, menuY);
 };
 
 const handleContextMenuMouseAt = async (state, x, y) => {
@@ -5560,15 +5627,16 @@ const getSelectedItems = (items, focusedIndex) => {
 };
 
 const handleCut = async state => {
-  if (state.isReadonly) {
-    return state;
-  }
-  // TODO handle multiple files
-  // TODO if not file is selected, what happens?
   const {
     focusedIndex,
+    isReadonly,
     items
   } = state;
+  if (isReadonly) {
+    return state;
+  }
+  // TODO handle multiple files
+  // TODO if not file is selected, what happens?
   const dirents = getSelectedItems(items, focusedIndex);
   if (dirents.length === 0) {
     return state;
@@ -5586,11 +5654,14 @@ const handleCut = async state => {
 };
 
 const handleDoubleClick = async (state, eventX, eventY) => {
+  const {
+    items
+  } = state;
   const index = getIndexFromPosition(state, eventX, eventY);
   if (index === -1) {
     return newFile(state);
   }
-  const item = state.items[index];
+  const item = items[index];
   const type = normalizeDirentType(item.type);
   if (type === File || type === SymLinkFile) {
     return set$1(state, openUri(item.path, true));
@@ -5680,12 +5751,14 @@ const isEqual = (a, b) => {
 };
 
 const handleDragOverIndex = (state, index) => {
-  if (state.isReadonly && state.root !== '') {
-    return state;
-  }
   const {
-    dropTargets
+    dropTargets,
+    isReadonly,
+    root
   } = state;
+  if (isReadonly && root !== '') {
+    return state;
+  }
   const newDropTargets = getNewDropTargets(state, index);
   if (isEqual(dropTargets, newDropTargets)) {
     return state;
@@ -5697,9 +5770,13 @@ const handleDragOverIndex = (state, index) => {
 };
 
 const handleDragOver = (state, x, y) => {
+  const {
+    isReadonly,
+    root
+  } = state;
   number(x);
   number(y);
-  if (state.isReadonly && state.root !== '') {
+  if (isReadonly && root !== '') {
     return state;
   }
   const index = getIndexFromPosition(state, x, y);
@@ -6146,7 +6223,10 @@ const openDroppedDirectoryAsWorkspace$1 = async (state, fileHandle) => {
   };
 };
 const getFirstDroppedDirectory = (state, fileHandles) => {
-  if (state.root !== '') {
+  const {
+    root
+  } = state;
+  if (root !== '') {
     return undefined;
   }
   for (const item of fileHandles) {
@@ -6229,7 +6309,10 @@ const openDroppedDirectoryAsWorkspace = async (state, path) => {
   };
 };
 const getFirstDroppedDirectoryPath = (state, fileHandles, paths) => {
-  if (state.root !== '') {
+  const {
+    root
+  } = state;
+  if (root !== '') {
     return undefined;
   }
   for (let i = 0; i < fileHandles.length; i++) {
@@ -6394,13 +6477,18 @@ const getModule = isElectron => {
   return handleDrop$2;
 };
 const handleDropRoot = async (state, fileHandles, files, paths) => {
-  if (state.isReadonly && state.root !== '') {
+  const {
+    isReadonly,
+    platform,
+    root
+  } = state;
+  if (isReadonly && root !== '') {
     return state;
   }
   if (fileHandles.length === 0 && paths.length > 0) {
     return handleInternalDrop(state, paths, -1);
   }
-  const isElectron = state.platform === Electron;
+  const isElectron = platform === Electron;
   const fn = getModule(isElectron);
   return fn(state, fileHandles, files, paths);
 };
@@ -6450,15 +6538,16 @@ const handleDropIntoFile = (state, dirent, index, fileHandles, files, paths) =>
   return handleDropIndex(state, fileHandles, files, paths, parentIndex);
 };
 const handleDropIndex = async (state, fileHandles, files, paths, index) => {
-  if (state.isReadonly) {
+  const {
+    isReadonly,
+    items
+  } = state;
+  if (isReadonly) {
     return state;
   }
   if (fileHandles.length === 0 && paths.length > 0) {
     return handleInternalDrop(state, paths, index);
   }
-  const {
-    items
-  } = state;
   const dirent = items[index];
   // TODO if it is a file, drop into the folder of the file
   // TODO if it is a folder, drop into the folder
@@ -6524,20 +6613,26 @@ const getInternalDragPaths = (items, uris) => {
 };
 
 const handleDrop = async (state, x, y, dropIdOrFileIds) => {
-  if (state.isReadonly && state.root !== '') {
+  const {
+    isReadonly,
+    items,
+    platform,
+    root
+  } = state;
+  if (isReadonly && root !== '') {
     if (typeof dropIdOrFileIds === 'number') {
       await discardDrop(dropIdOrFileIds);
     }
     return state;
   }
   try {
-    const isElectron = state.platform === Electron;
+    const isElectron = platform === Electron;
     const {
       fileHandles,
       paths,
       uris
     } = await getDroppedItems(dropIdOrFileIds, isElectron);
-    const internalPaths = getInternalDragPaths(state.items, uris);
+    const internalPaths = getInternalDragPaths(items, uris);
     const droppedPaths = internalPaths.length > 0 ? internalPaths : paths;
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
@@ -6556,7 +6651,10 @@ const handleEscape = async state => {
 };
 
 const handleFocus = async state => {
-  if (state.editingIndex !== -1) {
+  const {
+    editingIndex
+  } = state;
+  if (editingIndex !== -1) {
     return state;
   }
   return {
@@ -6730,14 +6828,17 @@ const scrollInto = (index, minLineY, maxLineY) => {
 
 const adjustScrollAfterPaste = (state, focusedIndex) => {
   const {
+    height,
     itemHeight,
+    items,
     maxLineY,
     minLineY
   } = state;
+  const currentMaxLineY = Math.max(maxLineY, getExplorerMaxLineY(minLineY, height, itemHeight, items.length));
   const {
     newMaxLineY,
     newMinLineY
-  } = scrollInto(focusedIndex, minLineY, maxLineY);
+  } = scrollInto(focusedIndex, minLineY, currentMaxLineY);
   const newDeltaY = newMinLineY * itemHeight;
   return {
     ...state,
@@ -6915,7 +7016,11 @@ const handlePasteCut = async (state, nativeFiles) => {
 const None$1 = 'none';
 
 const handlePaste = async state => {
-  if (state.isReadonly) {
+  const {
+    isReadonly,
+    pasteShouldMove
+  } = state;
+  if (isReadonly) {
     return state;
   }
   const nativeFiles = await readNativeFiles();
@@ -6941,7 +7046,7 @@ const handlePaste = async state => {
   }
 
   // Use the pasteShouldMove flag to determine whether to cut or copy
-  if (state.pasteShouldMove) {
+  if (pasteShouldMove) {
     return handlePasteCut(state, nativeFiles);
   }
   return handlePasteCopy(state, nativeFiles);
@@ -7026,6 +7131,16 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
 };
 
 const handleResize = (state, dimensions) => {
+  const {
+    deltaY: currentDeltaY,
+    height: currentHeight,
+    itemHeight,
+    items,
+    maxLineY: currentMaxLineY,
+    minLineY: currentMinLineY,
+    scrollBarHeight: currentScrollBarHeight,
+    width: currentWidth
+  } = state;
   const {
     height: rawHeight,
     width: rawWidth
@@ -7035,18 +7150,13 @@ const handleResize = (state, dimensions) => {
   }
   const height = Math.max(0, rawHeight);
   const width = Math.max(0, rawWidth);
-  const {
-    deltaY,
-    itemHeight,
-    items
-  } = state;
   const contentHeight = items.length * itemHeight;
   const maxDeltaY = Math.max(contentHeight - height, 0);
-  const newDeltaY = Math.min(Math.max(deltaY, 0), maxDeltaY);
+  const newDeltaY = Math.min(Math.max(currentDeltaY, 0), maxDeltaY);
   const minLineY = Math.round(newDeltaY / itemHeight);
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
   const scrollBarHeight = getScrollBarSize(height, contentHeight, 20);
-  if (state.height === height && state.width === width && state.deltaY === newDeltaY && state.minLineY === minLineY && state.maxLineY === maxLineY && state.scrollBarHeight === scrollBarHeight) {
+  if (currentHeight === height && currentWidth === width && currentDeltaY === newDeltaY && currentMinLineY === minLineY && currentMaxLineY === maxLineY && currentScrollBarHeight === scrollBarHeight) {
     return state;
   }
   return {
@@ -7088,20 +7198,21 @@ const getNewDeltaYPercent = (height, scrollBarHeight, relativeY) => {
 };
 
 const setDeltaY = async (state, deltaY) => {
-  if (!Number.isFinite(deltaY)) {
-    return state;
-  }
   const {
+    deltaY: currentDeltaY,
     height,
     itemHeight,
     items
   } = state;
+  if (!Number.isFinite(deltaY)) {
+    return state;
+  }
   if (deltaY < 0) {
     deltaY = 0;
   } else if (deltaY > items.length * itemHeight - height) {
     deltaY = Math.max(items.length * itemHeight - height, 0);
   }
-  if (state.deltaY === deltaY) {
+  if (currentDeltaY === deltaY) {
     return state;
   }
   const minLineY = Math.round(deltaY / itemHeight);
@@ -7175,13 +7286,14 @@ const handleScrollBarMove = async (state, eventY) => {
 };
 
 const handleUpload = async (state, dirents) => {
-  if (state.isReadonly) {
-    return state;
-  }
   const {
+    isReadonly,
     pathSeparator,
     root
   } = state;
+  if (isReadonly) {
+    return state;
+  }
   for (const dirent of dirents) {
     // TODO switch
     // TODO symlink might not be possible to be copied
@@ -7198,7 +7310,10 @@ const handleUpload = async (state, dirents) => {
 };
 
 const handleWheel = (state, deltaMode, deltaY) => {
-  return setDeltaY(state, state.deltaY + deltaY);
+  const {
+    deltaY: currentDeltaY
+  } = state;
+  return setDeltaY(state, currentDeltaY + deltaY);
 };
 
 const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
@@ -7286,14 +7401,15 @@ const showErrorAlert = async errorMessage => {
 };
 
 const removeDirent = async state => {
-  if (state.isReadonly) {
-    return state;
-  }
   const {
     confirmDelete: confirmDelete$1,
     focusedIndex,
+    isReadonly,
     items
   } = state;
+  if (isReadonly) {
+    return state;
+  }
   const selectedItems = getSelectedItems(items, focusedIndex);
   if (selectedItems.length === 0) {
     return state;
@@ -7356,16 +7472,17 @@ const getRenameSelectionRange = name => {
 };
 
 const renameDirent = async state => {
-  if (state.isReadonly) {
-    return state;
-  }
   const {
     editingSessionId,
     focusedIndex,
     icons,
+    isReadonly,
     items,
     minLineY
   } = state;
+  if (isReadonly) {
+    return state;
+  }
   if (items.length === 0) {
     return state;
   }
@@ -7754,6 +7871,7 @@ const getExplorerItemVirtualDom = (item, editingSessionId = 0) => {
     setSize
   } = item;
   const chevronDom = getChevronVirtualDom(chevron);
+  const fileIconDom = icon ? [getFileIconVirtualDom(icon)] : [];
   return [{
     ariaExpanded,
     ariaLabel: name,
@@ -7771,7 +7889,11 @@ const getExplorerItemVirtualDom = (item, editingSessionId = 0) => {
     role: TreeItem,
     title: getTitle(path),
     type: Div
-  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputDom(isEditing, hasEditingError, editingSessionId), ...getLabelDom(isEditing, name, isCut || isIgnored)];
+  }, ...chevronDom, {
+    childCount: fileIconDom.length,
+    className: FileIconSlot,
+    type: Div
+  }, ...fileIconDom, ...getInputDom(isEditing, hasEditingError, editingSessionId), ...getLabelDom(isEditing, name, isCut || isIgnored)];
 };
 
 const getActiveDescendant = focusedIndex => {
@@ -7905,18 +8027,28 @@ const getMissingFolderMessage = root => {
   return 'Could not open folder because the folder does not exist. It may have been moved or deleted.';
 };
 const getLoadErrorMessage = state => {
-  if (state.hasError) {
-    if (state.errorCode === 'ENOENT') {
-      return getMissingFolderMessage(state.root);
+  const {
+    errorCode,
+    errorMessage,
+    hasError,
+    root
+  } = state;
+  if (hasError) {
+    if (errorCode === 'ENOENT') {
+      return getMissingFolderMessage(root);
     }
-    const code = state.errorCode ? ` (error code: ${state.errorCode})` : '';
-    const reason = state.errorMessage || 'an unexpected error occurred';
+    const code = errorCode ? ` (error code: ${errorCode})` : '';
+    const reason = errorMessage || 'an unexpected error occurred';
     return `Could not open folder due to ${reason}${code}.`;
   }
   return '';
 };
 const shouldShowOpenAnotherFolderButton = state => {
-  return state.hasError && state.errorCode === 'ENOENT';
+  const {
+    errorCode,
+    hasError
+  } = state;
+  return hasError && errorCode === 'ENOENT';
 };
 
 const renderItems = (oldState, newState) => {
@@ -8578,7 +8710,7 @@ const commandMap = {
   'Explorer.newFolder': wrapListItemCommand(newFolder),
   'Explorer.openContainingFolder': wrapListItemCommand(openContainingFolder),
   'Explorer.openInIntegratedTerminal': wrapListItemCommand(openInIntegratedTerminal),
-  'Explorer.refresh': wrapListItemCommand(refresh),
+  'Explorer.refresh': wrapListItemCommand(refreshExplorer),
   'Explorer.removeDirent': wrapListItemCommand(removeDirent),
   'Explorer.renameDirent': wrapListItemCommand(renameDirent),
   'Explorer.render2': render2,

package/package.json

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