@lvce-editor/explorer-view 5.3.0 → 5.5.0

package/dist/explorerViewWorkerMain.js

@@ -1773,6 +1773,15 @@ const mergeTrees = (a, b) => {
   };
 };
 
+const refreshWorkspace = async () => {
+  // TODO maybe pass an application id to this?
+  try {
+    await invoke$2('Layout.handleWorkspaceRefresh');
+  } catch {
+    // ignore
+  }
+};
+
 const treeToArrayInternal = (map, root, items, path, depth) => {
   const children = map[path];
   if (!children) {
@@ -1805,7 +1814,6 @@ const treeToArray = (map, root) => {
 
 const EmptyString = '';
 const Slash$1 = '/';
-const Dot = '.';
 const BackSlash = '\\';
 
 const emptyObject = {};
@@ -1829,7 +1837,6 @@ const Delete = 'Delete';
 const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 const FileOrFolderAlreadyExists = 'A file or folder **{PH1}** already exists at this location. Please choose a different name.';
 const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
-const FileCannotStartWithDot = 'A file or folder name cannot start with a dot.';
 const FileCannotStartWithBackSlash = 'A file or folder name cannot start with a backslash.';
 const FilesExplorer = 'Files Explorer';
 const NewFile$1 = 'New File...';
@@ -1840,6 +1847,7 @@ const OpenInIntegratedTerminal = 'Open in integrated Terminal';
 const Paste = 'Paste';
 const RefreshExplorer = 'Refresh Explorer';
 const Rename = 'Rename';
+const TheNameIsNotValid = 'The name **{0}** is not valid as a file or folder name. Please choose a different name.';
 const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
 const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder';
 
@@ -1897,9 +1905,6 @@ const fileOrFolderNameMustBeProvided = () => {
 const fileCannotStartWithSlash = () => {
   return i18nString(FileNameCannotStartWithSlash);
 };
-const fileCannotStartWithDot = () => {
-  return i18nString(FileCannotStartWithDot);
-};
 const fileCannotStartWithBackSlash = () => {
   return i18nString(FileCannotStartWithBackSlash);
 };
@@ -1911,15 +1916,15 @@ const fileOrFolderAlreadyExists = name => {
     PH1: name
   });
 };
+const theNameIsNotValid = () => {
+  return i18nString(TheNameIsNotValid);
+};
 
 const validateFileName2 = (name, siblingFileNames = []) => {
   if (!name) {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
   }
-  if (name.startsWith(Dot)) {
-    return fileCannotStartWithDot();
-  }
   if (name.startsWith(Slash$1)) {
     return fileCannotStartWithSlash();
   }
@@ -1927,6 +1932,16 @@ const validateFileName2 = (name, siblingFileNames = []) => {
     return fileCannotStartWithBackSlash();
   }
 
+  // Disallow reserved directory names
+  if (name === '.' || name === '..' || name === '...') {
+    return theNameIsNotValid();
+  }
+
+  // Disallow any filename starting with ../
+  if (name.startsWith('../')) {
+    return theNameIsNotValid();
+  }
+
   // Check if file already exists
   if (siblingFileNames.includes(name)) {
     return fileOrFolderAlreadyExists(name);
@@ -1969,6 +1984,7 @@ const acceptCreate = async (state, newDirentType) => {
   const newItems = treeToArray(merged, root);
   const dirents = newItems;
   const newFocusedIndex = getIndex(newItems, absolutePath);
+  await refreshWorkspace();
   return {
     ...state,
     items: dirents,
@@ -2088,6 +2104,11 @@ const acceptEdit = async state => {
   }
 };
 
+const getFocusedIndexCancel = (items, editingIndex) => {
+  const newFocusedIndex = editingIndex > items.length ? items.length - 1 : editingIndex;
+  return newFocusedIndex;
+};
+
 const isNormalItem = item => {
   return item.type !== EditingFile && item.type !== EditingFolder;
 };
@@ -2098,10 +2119,11 @@ const cancelEditCreate = async (state, keepFocus) => {
     items
   } = state;
   const filteredItems = items.filter(isNormalItem);
+  const newFocusedIndex = getFocusedIndexCancel(items, editingIndex);
   return {
     ...state,
     items: filteredItems,
-    focusedIndex: editingIndex,
+    focusedIndex: newFocusedIndex,
     focused: keepFocus,
     editingIndex: -1,
     editingValue: '',
@@ -2134,10 +2156,11 @@ const cancelEditRename = (state, keepFocus) => {
     items
   } = state;
   const newItems = getNewDirentsForCancelRename(items, editingIndex);
+  const newFocusedIndex = getFocusedIndexCancel(items, editingIndex);
   return {
     ...state,
     items: newItems,
-    focusedIndex: editingIndex,
+    focusedIndex: newFocusedIndex,
     focused: keepFocus,
     editingIndex: -1,
     editingValue: '',
@@ -2666,7 +2689,7 @@ const isEqual$6 = (oldState, newState) => {
   // TODO compute css more optimized
   // maybe only when items change, and even then not
   // always, but only when it affects the css
-  return oldState.errorMessageLeft === newState.errorMessageLeft && oldState.errorMessageTop === newState.errorMessageTop && oldState.maxIndent === newState.maxIndent && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.visibleExplorerItems === newState.visibleExplorerItems && oldState.editingErrorMessage === newState.editingErrorMessage;
+  return oldState.editingErrorMessage === newState.editingErrorMessage && oldState.errorMessageLeft === newState.errorMessageLeft && oldState.errorMessageTop === newState.errorMessageTop && oldState.maxIndent === newState.maxIndent && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.visibleExplorerItems === newState.visibleExplorerItems && oldState.width === newState.width;
 };
 
 const isEqual$5 = (oldState, newState) => {
@@ -4636,6 +4659,16 @@ const getWorkspacePath = () => {
   return invoke$2('Workspace.getPath');
 };
 
+const isValid = decoration => {
+  return decoration && typeof decoration.decoration === 'string' && typeof decoration.uri === 'string';
+};
+const normalizeDecorations = decorations => {
+  if (!decorations || !Array.isArray(decorations)) {
+    return [];
+  }
+  return decorations.filter(isValid);
+};
+
 const getFileDecorations = async (scheme, root, maybeUris, decorationsEnabled) => {
   try {
     if (!decorationsEnabled) {
@@ -4649,7 +4682,8 @@ const getFileDecorations = async (scheme, root, maybeUris, decorationsEnabled) =
     const providerId = providerIds.at(-1);
     const uris = ensureUris(maybeUris);
     const decorations = await invoke$1('SourceControl.getFileDecorations', providerId, uris);
-    return decorations;
+    const normalized = normalizeDecorations(decorations);
+    return normalized;
   } catch (error) {
     console.error(error);
     return [];
@@ -4840,6 +4874,10 @@ const handleWorkspaceChange = async state => {
   return newState;
 };
 
+const handleWorkspaceRefresh = async state => {
+  return refresh(state);
+};
+
 const sendMessagePortToFileSystemWorker = async port => {
   await sendMessagePortToFileSystemWorker$1(port, 0);
 };
@@ -5418,6 +5456,7 @@ const getInputDom = (isEditing, hasEditingError) => {
     ariaLabel: ariaLabel,
     autocapitalize: 'off',
     autocorrect: 'off',
+    autocomplete: 'off',
     childCount: 0,
     className: getInputClassName(hasEditingError),
     id: 'ExplorerInput',
@@ -6128,6 +6167,7 @@ const commandMap = {
   'Explorer.handleUpload': wrapListItemCommand(handleUpload),
   'Explorer.handleWheel': wrapListItemCommand(handleWheel),
   'Explorer.handleWorkspaceChange': wrapListItemCommand(handleWorkspaceChange),
+  'Explorer.handleWorkspaceRefresh': wrapListItemCommand(handleWorkspaceRefresh),
   'Explorer.loadContent': wrapListItemCommand(loadContent),
   'Explorer.newFile': wrapListItemCommand(newFile),
   'Explorer.newFolder': wrapListItemCommand(newFolder),

package/package.json

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