@lvce-editor/explorer-view 4.7.0 → 4.8.0

package/dist/explorerViewWorkerMain.js

@@ -1727,6 +1727,22 @@ const getPathPartsChildren = async pathparts => {
   return orderedPathParts;
 };
 
+const getSiblingFileNames = (items, focusedIndex, root, pathSeparator) => {
+  if (focusedIndex < 0 || focusedIndex >= items.length) {
+    // If no focused item or invalid index, get root level items
+    return items.filter(item => item.depth === 0).map(item => item.name);
+  }
+  const focusedItem = items[focusedIndex];
+  const focusedItemParentPath = focusedItem.path.slice(0, -(focusedItem.name.length + 1));
+
+  // Find all items that are direct children of the same parent as the focused item
+  const siblingItems = items.filter(item => {
+    const itemParentPath = item.path.slice(0, -(item.name.length + 1));
+    return itemParentPath === focusedItemParentPath;
+  });
+  return siblingItems.map(item => item.name);
+};
+
 const mergeTrees = (a, b) => {
   return {
     ...a,
@@ -1788,6 +1804,7 @@ const CopyRelativePath = 'Copy Relative Path';
 const Cut = 'Cut';
 const Delete = 'Delete';
 const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
+const FileOrFolderAlreadyExists = 'A file or folder **{0}** 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.';
@@ -1866,8 +1883,11 @@ const fileCannotStartWithBackSlash = () => {
 const typeAFileName = () => {
   return i18nString(TypeAFileName);
 };
+const fileOrFolderAlreadyExists = () => {
+  return i18nString(FileOrFolderAlreadyExists);
+};
 
-const validateFileName2 = name => {
+const validateFileName2 = (name, siblingFileNames = []) => {
   if (!name) {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
@@ -1881,6 +1901,11 @@ const validateFileName2 = name => {
   if (name.startsWith(BackSlash)) {
     return fileCannotStartWithBackSlash();
   }
+
+  // Check if file already exists
+  if (siblingFileNames.includes(name)) {
+    return fileOrFolderAlreadyExists();
+  }
   return '';
 };
 
@@ -1893,7 +1918,8 @@ const acceptCreate = async (state, newDirentType) => {
     items
   } = state;
   const newFileName = editingValue;
-  const editingErrorMessage = validateFileName2(newFileName);
+  const siblingFileNames = getSiblingFileNames(items, focusedIndex);
+  const editingErrorMessage = validateFileName2(newFileName, siblingFileNames);
   if (editingErrorMessage) {
     return {
       ...state,
@@ -5077,10 +5103,12 @@ const renameDirent = async state => {
   };
 };
 
-const getCss = (scrollBarHeight, uniqueIndents) => {
+const getCss = (scrollBarHeight, uniqueIndents, errorMessageLeft, errorMessageTop) => {
   // TODO each visible item should have an indent property
   const rules = [`.Explorer {
   --ScrollBarThumbHeight: ${scrollBarHeight}px;
+  --ErrorMessageTop: ${errorMessageTop}px;
+  --ErrorMessageLeft: ${errorMessageLeft}px;
 }`];
   for (const item of uniqueIndents) {
     rules.push(`.Indent-${item} {
@@ -5105,11 +5133,13 @@ const renderCss = (oldState, newState) => {
   const {
     scrollBarHeight,
     uid,
-    visibleExplorerItems
+    visibleExplorerItems,
+    errorMessageLeft,
+    errorMessageTop
   } = newState;
   const indents = visibleExplorerItems.map(item => item.indent);
   const uniqueIndents = getUnique(indents);
-  const css = getCss(scrollBarHeight, uniqueIndents);
+  const css = getCss(scrollBarHeight, uniqueIndents, errorMessageLeft, errorMessageTop);
   return [SetCss, uid, css];
 };
 
@@ -5963,10 +5993,17 @@ const updateEditingValue = async (state, value, inputSource = User) => {
   const {
     editingType,
     items,
-    editingIndex
+    editingIndex,
+    focusedIndex
   } = state;
   const editingIcon = await getEditingIcon(editingType, value, items[editingIndex]?.type);
-  const editingErrorMessage = validateFileName2(value);
+
+  // Get sibling file names for validation during file/folder creation
+  let siblingFileNames = [];
+  if (editingType === CreateFile || editingType === CreateFolder) {
+    siblingFileNames = getSiblingFileNames(items, focusedIndex);
+  }
+  const editingErrorMessage = validateFileName2(value, siblingFileNames);
   return {
     ...state,
     editingValue: value,

package/package.json

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