@lvce-editor/explorer-view 6.7.0 → 6.10.0

package/dist/explorerViewWorkerMain.js

@@ -1563,11 +1563,22 @@ const getIndex = (dirents, uri) => {
   return -1;
 };
 
-const getParentFolder = (dirents, index, root) => {
+const isFileLike = type => {
+  return type === File || type === SymLinkFile;
+};
+const getParentFolder = (dirents, index, root, pathSeparator) => {
   if (index < 0) {
     return root;
   }
-  return dirents[index].path;
+  const item = dirents[index];
+  if (!item) {
+    return root;
+  }
+  if (isFileLike(item.type)) {
+    const parentFolder = dirname(pathSeparator, item.path);
+    return parentFolder || root;
+  }
+  return item.path;
 };
 
 const getPathParts = (root, uri, pathSeparator) => {
@@ -2008,7 +2019,7 @@ const acceptCreate = async (state, newDirentType) => {
       editingErrorMessage
     };
   }
-  const parentFolder = getParentFolder(items, focusedIndex, root);
+  const parentFolder = getParentFolder(items, focusedIndex, root, pathSeparator);
   const absolutePath = join2(parentFolder, newFileName);
   const operations = getFileOperationsCreate(editingValue, newDirentType, pathSeparator, absolutePath, root);
   const createErrorMessage = await applyFileOperations(operations);
@@ -2770,7 +2781,6 @@ const diffChildren = (oldChildren, newChildren, patches) => {
     patches.push({
       type: NavigateParent
     });
-    currentChildIndex = -1;
   }
   // Add remove patches in reverse order (highest index first)
   // This ensures indices remain valid as we remove
@@ -4368,6 +4378,10 @@ const handleContextMenu = async (state, button, x, y) => {
   return newState;
 };
 
+const handleContextMenuWelcome = state => {
+  return state;
+};
+
 const handleCopy = async state => {
   // TODO handle multiple files
   // TODO if not file is selected, what happens?
@@ -4519,6 +4533,34 @@ const isDirectoryHandle = fileHandle => {
   return fileHandle.kind === 'directory';
 };
 
+const getErrorCode = error => {
+  if (error && typeof error === 'object' && 'code' in error && typeof error.code === 'string') {
+    return error.code;
+  }
+  return '';
+};
+
+const getErrorMessage = error => {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  if (typeof error === 'string') {
+    return error;
+  }
+  return 'Unknown error';
+};
+
+const getExcluded = () => {
+  const excludedObject = {};
+  const excluded = [];
+  for (const [key, value] of Object.entries(excludedObject)) {
+    if (value) {
+      excluded.push(key);
+    }
+  }
+  return excluded;
+};
+
 const isValid = decoration => {
   return decoration && typeof decoration.decoration === 'string' && typeof decoration.uri === 'string';
 };
@@ -4550,6 +4592,37 @@ const getFileDecorations = async (scheme, root, maybeUris, decorationsEnabled, a
   }
 };
 
+const getFriendlyErrorMessage = (errorMessage, errorCode) => {
+  switch (errorCode) {
+    case 'EACCES':
+    case 'EPERM':
+      return 'permission was denied';
+    case 'EBUSY':
+      return 'the folder is currently in use';
+    case 'ENOENT':
+      return 'the folder does not exist';
+    case 'ENOTDIR':
+      return 'the path is not a folder';
+    default:
+      return errorMessage || 'an unexpected error occurred';
+  }
+};
+
+const getPathSeparator = async root => {
+  return getPathSeparator$1(root);
+};
+
+const getRestoredDeltaY = savedState => {
+  if (savedState && typeof savedState.deltaY === 'number') {
+    return savedState.deltaY;
+  }
+  return 0;
+};
+
+const getSavedRoot = (savedState, workspacePath) => {
+  return workspacePath;
+};
+
 const RE_PROTOCOL = /^[a-z+]:\/\//;
 const getScheme = uri => {
   const match = uri.match(RE_PROTOCOL);
@@ -4675,55 +4748,11 @@ const restoreExpandedState = async (savedState, root, pathSeparator, excluded) =
   return dirents;
 };
 
-const getPathSeparator = root => {
-  return getPathSeparator$1(root);
-};
-const getExcluded = () => {
-  const excludedObject = {};
-  const excluded = [];
-  for (const [key, value] of Object.entries(excludedObject)) {
-    if (value) {
-      excluded.push(key);
-    }
-  }
-  return excluded;
-};
-const getSavedRoot = (savedState, workspacePath) => {
-  return workspacePath;
-};
-const getErrorCode = error => {
-  if (error && typeof error === 'object' && 'code' in error && typeof error.code === 'string') {
-    return error.code;
-  }
-  return '';
-};
-const getErrorMessage = error => {
-  if (error instanceof Error) {
-    return error.message;
-  }
-  if (typeof error === 'string') {
-    return error;
-  }
-  return 'Unknown error';
-};
-const getFriendlyErrorMessage = (errorMessage, errorCode) => {
-  switch (errorCode) {
-    case 'EACCES':
-    case 'EPERM':
-      return 'permission was denied';
-    case 'EBUSY':
-      return 'the folder is currently in use';
-    case 'ENOENT':
-      return 'the folder does not exist';
-    case 'ENOTDIR':
-      return 'the path is not a folder';
-    default:
-      return errorMessage || 'an unexpected error occurred';
-  }
-};
 const loadContent = async (state, savedState) => {
   const {
     assetDir,
+    height,
+    itemHeight,
     platform
   } = state;
   const {
@@ -4738,14 +4767,10 @@ const loadContent = async (state, savedState) => {
     const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
     const excluded = getExcluded();
     const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
-    let minLineY = 0;
-    if (savedState && typeof savedState.minLineY === 'number') {
-      minLineY = savedState.minLineY;
-    }
-    let deltaY = 0;
-    if (savedState && typeof savedState.deltaY === 'number') {
-      deltaY = savedState.deltaY;
-    }
+    const rawDeltaY = getRestoredDeltaY(savedState);
+    const maxDeltaY = Math.max(restoredDirents.length * itemHeight - height, 0);
+    const deltaY = Math.min(Math.max(rawDeltaY, 0), maxDeltaY);
+    const minLineY = Math.round(deltaY / itemHeight);
     const scheme = getScheme(root);
     const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path), sourceControlDecorations, assetDir, platform);
     return {
@@ -5975,6 +6000,7 @@ const HandleButtonClick = 18;
 const HandleClick = 1;
 const HandleClickOpenFolder = 2;
 const HandleContextMenu = 3;
+const HandleContextMenuWelcome = 20;
 const HandleDragEnd = 19;
 const HandleDragLeave = 4;
 const HandleDragOver = 5;
@@ -5997,6 +6023,7 @@ const getExplorerWelcomeVirtualDom = (isWide, dropTargets) => {
   return [{
     childCount: 1,
     className: getClassName$1(dropTargets),
+    onContextMenu: HandleContextMenuWelcome,
     onDragLeave: HandleDragLeave,
     onDragOver: HandleDragOver,
     onDrop: HandleDrop,
@@ -6488,6 +6515,10 @@ const renderEventListeners = () => {
     name: HandleContextMenu,
     params: ['handleContextMenu', Button$3, ClientX, ClientY],
     preventDefault: true
+  }, {
+    name: HandleContextMenuWelcome,
+    params: ['handleContextMenuWelcome'],
+    preventDefault: true
   }, {
     name: HandleWheel,
     params: ['handleWheel', DeltaMode, DeltaY],
@@ -6518,10 +6549,7 @@ const renderEventListeners = () => {
 };
 
 const hasProperty = (object, key) => {
-  if (!object || typeof object !== 'object' || !(key in object)) {
-    return false;
-  }
-  return true;
+  return !!object && typeof object === 'object' && key in object;
 };
 
 const getSavedMinLineY = savedState => {
@@ -6560,6 +6588,14 @@ const restoreState = savedState => {
   };
 };
 
+const isUriWithinRoot = (root, uri, pathSeparator) => {
+  if (uri === root) {
+    return true;
+  }
+  const rootWithSeparator = root.endsWith(pathSeparator) ? root : `${root}${pathSeparator}`;
+  return uri.startsWith(rootWithSeparator);
+};
+
 const getPathPartsToReveal = (root, pathParts, dirents) => {
   for (let i = 0; i < pathParts.length; i++) {
     const pathPart = pathParts[i];
@@ -6644,8 +6680,13 @@ const revealItem = async (state, uri) => {
   object(state);
   string(uri);
   const {
-    items
+    items,
+    pathSeparator,
+    root
   } = state;
+  if (!isUriWithinRoot(root, uri, pathSeparator)) {
+    return state;
+  }
   const index = getIndex(items, uri);
   if (index === -1) {
     return revealItemHidden(state, uri);
@@ -6849,6 +6890,7 @@ const commandMap = {
   'Explorer.handleClickOpenFolder': wrapListItemCommand(handleClickOpenFolder),
   'Explorer.handleContextMenu': wrapListItemCommand(handleContextMenu),
   'Explorer.handleContextMenuKeyboard': wrapListItemCommand(handleContextMenuKeyboard),
+  'Explorer.handleContextMenuWelcome': wrapListItemCommand(handleContextMenuWelcome),
   'Explorer.handleCopy': wrapListItemCommand(handleCopy),
   'Explorer.handleCut': wrapListItemCommand(handleCut),
   'Explorer.handleDoubleClick': wrapListItemCommand(handleDoubleClick),
@@ -6885,6 +6927,7 @@ const commandMap = {
   'Explorer.renderActions2': renderActions,
   'Explorer.renderEventListeners': renderEventListeners,
   'Explorer.restoreState': restoreState,
+  'Explorer.reveal': wrapListItemCommand(revealItem),
   'Explorer.revealItem': wrapListItemCommand(revealItem),
   'Explorer.saveState': wrapGetter(saveState),
   'Explorer.selectAll': wrapListItemCommand(selectAll),

package/package.json

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