@lvce-editor/explorer-view 3.0.0 → 3.2.0

package/dist/explorerViewWorkerMain.js

@@ -895,6 +895,7 @@ const CreateFolder$1 = 1;
 const CreateFile$1 = 2;
 const Copy$1 = 3;
 const Rename$2 = 4;
+const Remove = 5;
 
 const rpcs = Object.create(null);
 const set$g = (id, rpc) => {
@@ -1004,6 +1005,9 @@ const applyOperation = operation => {
   if (operation.type === Rename$2) {
     return rename$1(operation.from || '', operation.path);
   }
+  if (operation.type === Remove) {
+    return remove(operation.path);
+  }
   return writeFile(operation.path, operation.text);
 };
 
@@ -2416,7 +2420,7 @@ 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', '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 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;
@@ -3294,19 +3298,28 @@ const canBeDroppedInto = dirent => {
   }
 };
 
+const countInRange = (start, end) => {
+  const items = [];
+  for (let i = start; i < end; i++) {
+    items.push(i);
+  }
+  return items;
+};
+
 const dropTargetFull = [-1];
 
-const getNewDropTargets = (state, x, y) => {
+const getNewDropTargets = (state, index) => {
   const {
     items
   } = state;
-  const index = getIndexFromPosition(state, x, y);
   if (index === -1) {
     return dropTargetFull;
   }
   const item = items[index];
   if (!canBeDroppedInto(item)) {
-    return [];
+    const startIndex = getParentStartIndex(items, index);
+    const endIndex = getParentEndIndex(items, index);
+    return countInRange(startIndex, endIndex);
   }
   const newDropTargets = [index];
   return newDropTargets;
@@ -3327,13 +3340,11 @@ const isEqual = (a, b) => {
   return true;
 };
 
-const handleDragOver = (state, x, y) => {
-  number(x);
-  number(y);
+const handleDragOverIndex = (state, index) => {
   const {
     dropTargets
   } = state;
-  const newDropTargets = getNewDropTargets(state, x, y);
+  const newDropTargets = getNewDropTargets(state, index);
   if (isEqual(dropTargets, newDropTargets)) {
     return state;
   }
@@ -3343,6 +3354,13 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
+const handleDragOver = (state, x, y) => {
+  number(x);
+  number(y);
+  const index = getIndexFromPosition(state, x, y);
+  return handleDragOverIndex(state, index);
+};
+
 const handleDragStart = state => {
   return state;
 };
@@ -4523,16 +4541,6 @@ const confirmDelete = async paths => {
   return result === true;
 };
 
-const removePaths = async paths => {
-  for (const item of paths) {
-    try {
-      await remove(item);
-    } catch {
-      // ignore
-    }
-  }
-};
-
 const removeDirent = async state => {
   const {
     items,
@@ -4550,9 +4558,18 @@ const removeDirent = async state => {
       return state;
     }
   }
-
-  // TODO use file operations, bulk edit and explorer refresh
-  await removePaths(toRemove);
+  const fileOperations = toRemove.map(item => {
+    return {
+      type: Remove,
+      path: item
+    };
+  });
+  // TODO use bulk edit and explorer refresh
+  const errorMessage = await applyFileOperations(fileOperations);
+  if (errorMessage) {
+    await confirm(errorMessage);
+    return state;
+  }
   const newState = await refresh(state);
   return {
     ...newState,
@@ -4629,7 +4646,7 @@ const renameDirent = state => {
 
 const getDragLabel = urls => {
   if (urls.length === 1) {
-    return urls[0];
+    return getBaseName('/', urls[0]);
   }
   return `${urls.length}`;
 };
@@ -5673,6 +5690,7 @@ const commandMap = {
   'Explorer.focusIndex': wrapCommand(focusIndex),
   'Explorer.focusLast': wrapCommand(focusLast),
   'Explorer.handleDragStart': wrapCommand(handleDragStart),
+  'Explorer.handleDragOverIndex': wrapCommand(handleDragOverIndex),
   'Explorer.focusNext': wrapCommand(focusNext),
   'Explorer.focusNone': wrapCommand(focusNone),
   'Explorer.focusPrevious': wrapCommand(focusPrevious),

package/package.json

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