@lvce-editor/explorer-view 3.6.0 → 3.8.0

package/dist/explorerViewWorkerMain.js

@@ -2038,6 +2038,11 @@ const treeToArray = (map, root) => {
   return items;
 };
 
+const EmptyString = '';
+const Slash$1 = '/';
+const Dot = '.';
+const BackSlash = '\\';
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -2058,6 +2063,8 @@ const Cut = 'Cut';
 const Delete = 'Delete';
 const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 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...';
 const NewFolder$1 = 'New Folder...';
@@ -2124,6 +2131,12 @@ const fileOrFolderNameMustBeProvided = () => {
 const fileCannotStartWithSlash = () => {
   return i18nString(FileNameCannotStartWithSlash);
 };
+const fileCannotStartWithDot = () => {
+  return i18nString(FileCannotStartWithDot);
+};
+const fileCannotStartWithBackSlash = () => {
+  return i18nString(FileCannotStartWithBackSlash);
+};
 const typeAFileName = () => {
   return i18nString(TypeAFileName);
 };
@@ -2133,9 +2146,15 @@ const validateFileName2 = name => {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
   }
-  if (name.startsWith('/')) {
+  if (name.startsWith(Dot)) {
+    return fileCannotStartWithDot();
+  }
+  if (name.startsWith(Slash$1)) {
     return fileCannotStartWithSlash();
   }
+  if (name.startsWith(BackSlash)) {
+    return fileCannotStartWithBackSlash();
+  }
   return '';
 };
 
@@ -2321,12 +2340,17 @@ const isNormalItem = item => {
   return item.type !== EditingFile && item.type !== EditingFolder;
 };
 
-const cancelEditCreate = (state, keepFocus) => {
+const cancelEditCreate = async (state, keepFocus) => {
   const {
     editingIndex,
-    items
+    items,
+    fileIconCache
   } = state;
   const filteredItems = items.filter(isNormalItem);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(filteredItems, fileIconCache);
   return {
     ...state,
     items: filteredItems,
@@ -2336,7 +2360,9 @@ const cancelEditCreate = (state, keepFocus) => {
     editingValue: '',
     editingErrorMessage: '',
     editingType: None$5,
-    focus: List
+    focus: List,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -2378,7 +2404,7 @@ const cancelEditRename = (state, keepFocus) => {
   };
 };
 
-const cancelEditInternal = (state, keepFocus) => {
+const cancelEditInternal = async (state, keepFocus) => {
   const {
     editingType
   } = state;
@@ -2388,7 +2414,7 @@ const cancelEditInternal = (state, keepFocus) => {
   return cancelEditCreate(state, keepFocus);
 };
 
-const cancelEdit = state => {
+const cancelEdit = async state => {
   return cancelEditInternal(state, true);
 };
 
@@ -2563,7 +2589,9 @@ const create$1 = () => {
 const {
   get,
   set,
-  wrapCommand
+  wrapCommand,
+  registerCommands,
+  getCommandIds
 } = create$1();
 
 const ListItem = 22;
@@ -3011,12 +3039,6 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleCut', 'handleDragLeave', 'handleDragOver', 'handleDragOverIndex', 'handleDragStart', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectIndices', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'toggleIndividualSelection', 'updateEditingValue', 'updateIcons'];
-
-const getCommandIds = () => {
-  return commandIds;
-};
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -3124,6 +3146,10 @@ const getKeyBindings = () => {
     key: Enter,
     command: 'Explorer.handleClickCurrent',
     when: FocusExplorer
+  }, {
+    key: Escape,
+    command: 'Explorer.handleEscape',
+    when: FocusExplorer
   }, {
     key: CtrlCmd | KeyA,
     command: 'Explorer.selectAll',
@@ -4305,6 +4331,13 @@ const handleDrop = async (state, x, y, fileIds, fileList) => {
   }
 };
 
+const handleEscape = async state => {
+  return {
+    ...state,
+    cutItems: []
+  };
+};
+
 const handleFocus = async state => {
   await setFocus(FocusExplorer);
   return state;
@@ -4499,18 +4532,26 @@ const generateUniqueName = (baseName, existingPaths, root) => {
   }
 };
 
-const getFileOperationsCopy = (root, existingUris, files) => {
+const getFileOperationsCopy = (root, existingUris, files, focusedUri) => {
   const operations = [];
   for (const file of files) {
     const baseName = getBaseName('/', file);
-    const uniqueName = generateUniqueName(baseName, existingUris, root);
-    const newUri = join2(root, uniqueName);
-    operations.push({
-      type: Copy$1,
-      from: file,
-      // TODO ensure file is uri
-      path: newUri
-    });
+    if (existingUris.includes(file)) {
+      operations.push({
+        type: Rename$2,
+        from: file,
+        path: join2(focusedUri, baseName)
+      });
+    } else {
+      const uniqueName = generateUniqueName(baseName, existingUris, root);
+      const newUri = join2(root, uniqueName);
+      operations.push({
+        type: Copy$1,
+        from: file,
+        // TODO ensure file is uri
+        path: newUri
+      });
+    }
   }
   return operations;
 };
@@ -4525,10 +4566,12 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO use file operations and bulk edit
   const {
     items,
-    root
+    root,
+    focusedIndex
   } = state;
+  const focusedUri = items[focusedIndex]?.path || root;
   const existingUris = items.map(item => item.path);
-  const operations = getFileOperationsCopy(root, existingUris, nativeFiles.files);
+  const operations = getFileOperationsCopy(root, existingUris, nativeFiles.files, focusedUri);
   // TODO handle error?
   await applyFileOperations(operations);
 
@@ -4737,8 +4780,6 @@ const getSettings = async () => {
   };
 };
 
-const EmptyString = '';
-
 const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
   let children = map[path];
   if (!children) {
@@ -6270,6 +6311,7 @@ const commandMap = {
   'Explorer.getMouseActions': getMouseActions,
   'Explorer.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Explorer.handleArrowRight': wrapCommand(handleArrowRight),
+  'Explorer.handleEscape': wrapCommand(handleEscape),
   'Explorer.handleBlur': wrapCommand(handleBlur),
   'Explorer.handleClick': wrapCommand(handleClick),
   'Explorer.handleClickAt': wrapCommand(handleClickAt),
@@ -6328,6 +6370,7 @@ const commandMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

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