@lvce-editor/explorer-view 6.8.0 → 6.11.0

package/dist/explorerViewWorkerMain.js

@@ -1717,12 +1717,7 @@ const toDisplayDirent = (parentPath, parentDepth, rawDirentType, rawDirentName,
 const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
-  const visibleItems = rawDirents.filter(item => {
-    if (excluded.includes(item.name)) {
-      return false;
-    }
-    return true;
-  });
+  const visibleItems = rawDirents.filter(item => !excluded.includes(item.name));
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
@@ -2781,7 +2776,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
@@ -4288,12 +4282,7 @@ const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey,
   }
   const index = getIndexFromPosition(state, eventX, eventY);
   if (index === -1 || index >= state.items.length) {
-    return {
-      ...state,
-      focused: true,
-      focusedIndex: -1
-      // TODO mark all items as not selected
-    };
+    return focusIndex(state, -1);
   }
   if (shiftKey) {
     return handleClickAtRangeSelection(state, index);
@@ -4534,6 +4523,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';
 };
@@ -4565,6 +4582,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);
@@ -4690,55 +4738,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 {
@@ -4753,14 +4757,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 {
@@ -5176,6 +5176,9 @@ const handleEscape = async state => {
 };
 
 const handleFocus = async state => {
+  if (state.editingIndex !== -1) {
+    return state;
+  }
   return {
     ...state,
     focus: List
@@ -6539,10 +6542,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 => {
@@ -6581,6 +6581,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];
@@ -6665,8 +6673,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);
@@ -6907,6 +6920,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.8.0",
+  "version": "6.11.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",