@lvce-editor/explorer-view 7.27.1 → 7.29.0

package/dist/explorerViewWorkerMain.js

@@ -1355,10 +1355,10 @@ const Button$3 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const CtrlKey = 'event.ctrlKey';
-const DataTransferFiles2 = 'event.dataTransfer.files2';
 const DefaultPrevented = 'event.defaultPrevented';
 const DeltaMode = 'event.deltaMode';
 const DeltaY = 'event.deltaY';
+const DropId = 'event.dropId';
 const EventTargetClassName = 'event.target.className';
 const IsTrusted = 'event.isTrusted';
 const Key = 'event.key';
@@ -1416,6 +1416,12 @@ const {
 const getDroppedItems$1 = async (itemIds, isElectron) => {
   return invoke$6('DragAndDrop.getDroppedItems', itemIds, isElectron);
 };
+const getDroppedItemsByDropId = async (dropId, isElectron) => {
+  return invoke$6('DragAndDrop.getDroppedItemsByDropId', dropId, isElectron);
+};
+const discardDrop = async dropId => {
+  await invoke$6('DragAndDrop.discardDrop', dropId);
+};
 
 const {
   set: set$8
@@ -1437,12 +1443,13 @@ const getIcons = async iconRequests => {
 
 const {
   invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$2,
   set: set$6
 } = create$2(RendererProcess);
 
 const {
   invoke: invoke$3,
-  invokeAndTransfer,
+  invokeAndTransfer: invokeAndTransfer$1,
   set: set$5
 } = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
@@ -1452,21 +1459,17 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke$3('ContextMenu.show2', uid, menuId, x, y, args);
 };
-const sendMessagePortToDragAndDropWorker = async port => {
-  const command = 'DragAndDrop.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDragAndDropWorker', port, command);
-};
 const sendMessagePortToDialogWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
 };
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
 };
 const confirm$1 = async (message, options) => {
   const result = await invoke$3('ConfirmPrompt.prompt', message, options);
@@ -1477,7 +1480,7 @@ const writeClipBoardText = async text => {
 };
 const sendMessagePortToSourceControlWorker = async port => {
   const command = 'SourceControl.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
 };
 const openUri$1 = async (uri, focus, options) => {
   await invoke$3('Main.openUri', {
@@ -1500,7 +1503,8 @@ const create$1 = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
-  const commandMapRef = {};
+  const commandMapRef = Object.create(null);
+  const commandsById = Object.create(null);
   const getGeneration = uid => generations[uid] || 0;
   const isCurrentGeneration = (uid, generation) => {
     return states[uid] !== undefined && getGeneration(uid) === generation;
@@ -1562,6 +1566,18 @@ const create$1 = () => {
         delete states[key];
       }
     },
+    createDirectEventCommandMap(requestRender) {
+      return {
+        async 'Viewlet.executeViewletCommand'(uid, command, ...args) {
+          const fn = commandsById[command];
+          if (!fn) {
+            throw new Error(`Viewlet command not found: ${command}`);
+          }
+          await fn(uid, ...args);
+          await requestRender(uid);
+        }
+      };
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -1593,6 +1609,9 @@ const create$1 = () => {
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
+      for (const [key, fn] of Object.entries(commandMap)) {
+        commandsById[toCommandId(key)] = fn;
+      }
     },
     set(uid, oldState, newState, scheduledState) {
       const current = states[uid];
@@ -2296,6 +2315,33 @@ const refreshWorkspace = async () => {
   }
 };
 
+const state$1 = {
+  connected: false
+};
+const postRenderFocusRequests = new Set();
+const isConnected = () => {
+  const {
+    connected
+  } = state$1;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$4(method, ...params);
+};
+const invokeAndTransfer = (method, ...params) => {
+  return invokeAndTransfer$2(method, ...params);
+};
+const requestPostRenderFocus = uid => {
+  postRenderFocusRequests.add(uid);
+};
+const set$2 = rpc => {
+  set$6(rpc);
+  state$1.connected = true;
+};
+const takePostRenderFocus = uid => {
+  return postRenderFocusRequests.delete(uid);
+};
+
 const treeToArrayInternal = (map, root, items, path, depth) => {
   const children = map[path];
   if (!children) {
@@ -2490,6 +2536,16 @@ const focusEditorAfterExplorerRender = () => {
     void invoke$3('Main.focus');
   }, 0);
 };
+const openCreatedFile = async absolutePath => {
+  await openUri(absolutePath, true);
+  focusEditorAfterExplorerRender();
+};
+const finishCreate = async (absolutePath, newDirentType) => {
+  await refreshWorkspace();
+  if (newDirentType === File) {
+    await openCreatedFile(absolutePath);
+  }
+};
 const acceptCreate = async (state, newDirentType) => {
   const {
     editingValue,
@@ -2497,7 +2553,8 @@ const acceptCreate = async (state, newDirentType) => {
     focusedIndex,
     items,
     pathSeparator,
-    root
+    root,
+    uid
   } = state;
   const newFileName = editingValue;
   const siblingFileNames = getSiblingFileNames(items, focusedIndex);
@@ -2526,10 +2583,13 @@ const acceptCreate = async (state, newDirentType) => {
   const newItems = treeToArray$1(merged, root);
   const dirents = newItems;
   const newFocusedIndex = getIndex(newItems, absolutePath);
-  await refreshWorkspace();
-  if (newDirentType === File) {
-    await openUri(absolutePath, true);
-    focusEditorAfterExplorerRender();
+  if (isConnected()) {
+    if (newDirentType === File) {
+      await openUri(absolutePath, true);
+      requestPostRenderFocus(uid);
+    }
+  } else {
+    await finishCreate(absolutePath, newDirentType);
   }
   return {
     ...state,
@@ -2811,11 +2871,15 @@ const toCollapsedDirent = dirent => {
 
 const collapseAll = async state => {
   const {
-    items
+    editingIndex
   } = state;
+  const stateWithoutEdit = editingIndex === -1 ? state : await cancelEditInternal(state, true);
+  const {
+    items
+  } = stateWithoutEdit;
   const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
   return {
-    ...state,
+    ...stateWithoutEdit,
     expandedPaths: [],
     focusedIndex: 0,
     items: newDirents
@@ -2905,16 +2969,16 @@ const copyRelativePath = async state => {
 };
 
 const missingDialogWorkerRelay = 'Command "SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker" not found';
-const state$1 = {
+const state = {
   isTest: false
 };
 const setIsTest = value => {
-  state$1.isTest = value;
+  state.isTest = value;
 };
 const confirm = async message => {
   const {
     isTest
-  } = state$1;
+  } = state;
   if (isTest) {
     return confirm$1(message);
   }
@@ -2929,7 +2993,7 @@ const confirm = async message => {
 };
 
 const commandCompletions = new WeakMap();
-const set$2 = (state, completion) => {
+const set$1 = (state, completion) => {
   commandCompletions.set(state, completion);
   return state;
 };
@@ -3750,7 +3814,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set: set$1,
+  set,
   wrapGetter
 } = create$1();
 const commandQueues = new Map();
@@ -3883,10 +3947,10 @@ const wrapListItemCommandInternal = (fn, queued) => {
       useChevrons
     } = updatedState;
     const intermediate = get(id);
-    set$1(id, intermediate.oldState, updatedState, intermediate.scheduledState);
+    set(id, intermediate.oldState, updatedState, intermediate.scheduledState);
     if (hasSameVisibleExplorerItemInputs(intermediate.newState, updatedState)) {
       if (updatedState.inputSource === User || !hasSameDragDataInputs(intermediate.newState, updatedState)) {
-        set$1(id, intermediate.oldState, updatedState);
+        set(id, intermediate.oldState, updatedState);
       }
       return {
         completion
@@ -3907,7 +3971,7 @@ const wrapListItemCommandInternal = (fn, queued) => {
       visibleExplorerItems
     };
     const intermediate2 = get(id);
-    set$1(id, intermediate2.oldState, finalState);
+    set(id, intermediate2.oldState, finalState);
     maybeScheduleGitIgnoredUrisUpdate(newState, finalState);
     return {
       completion
@@ -4017,7 +4081,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     x,
     y
   };
-  set$1(state.uid, state, state);
+  set(state.uid, state, state);
   return state;
 };
 
@@ -4835,7 +4899,7 @@ const handleClickFile = async (state, dirent, index, keepFocus = false) => {
     focused: keepFocus,
     focusedIndex: index
   };
-  return set$2(newState, completion);
+  return set$1(newState, completion);
 };
 
 const handleClickSymLink = async (state, dirent, index) => {
@@ -4902,13 +4966,13 @@ const NewFolder$1 = 'NewFolder';
 const OpenFolder = 'OpenFolder';
 const Refresh$1 = 'Refresh';
 
-const isFolder = direntType => {
+const isFolder$1 = direntType => {
   return [Directory, DirectoryExpanded, SymLinkFolder].includes(direntType);
 };
 const getFittingIndex = (dirents, startIndex) => {
   for (let i = startIndex; i >= 0; i--) {
     const dirent = dirents[i];
-    if (dirent && isFolder(dirent.type)) {
+    if (dirent && isFolder$1(dirent.type)) {
       return i;
     }
   }
@@ -4951,7 +5015,14 @@ const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntTy
   return allChildDirents;
 };
 
-const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, excluded = []) => {
+const isFolder = type => {
+  return [Directory, DirectoryExpanded, DirectoryExpanding, SymLinkFolder].includes(type);
+};
+const getTopLevelFileIndex = items => {
+  const topLevelDepth = items[0]?.depth;
+  return items.findIndex(item => item.depth === topLevelDepth && !isFolder(item.type));
+};
+const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, excluded = [], insertAtFolderBoundary = false) => {
   if (items.length === 0 || focusedIndex === -1) {
     const newDirent = {
       depth: 0,
@@ -4966,7 +5037,14 @@ const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, exclud
     if (type === EditingFolder) {
       return [newDirent, ...items];
     }
-    return [...items, newDirent];
+    if (!insertAtFolderBoundary) {
+      return [...items, newDirent];
+    }
+    const fileIndex = getTopLevelFileIndex(items);
+    if (fileIndex === -1) {
+      return [...items, newDirent];
+    }
+    return [...items.slice(0, fileIndex), newDirent, ...items.slice(fileIndex)];
   }
   const focusedItem = items[focusedIndex];
   if (!focusedItem) {
@@ -5016,7 +5094,6 @@ const getNewDirentType = editingType => {
 };
 
 const newDirent = async (state, editingType, editingIcon = '') => {
-  // TODO do it like vscode, select position between folders and files
   const {
     editingIndex,
     editingSessionId,
@@ -5030,7 +5107,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
   }
   const index = getFittingIndex(items, focusedIndex);
   const direntType = getNewDirentType(editingType);
-  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root, excluded);
+  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root, excluded, focusedIndex === -1);
   const newEditingIndex = newDirents.findIndex(item => item.type === EditingFile || item.type === EditingFolder);
   return {
     ...state,
@@ -5264,7 +5341,7 @@ const handleClick = async (state, index, keepFocus = false) => {
     ...newState,
     ...resetEditing
   };
-  return completion ? set$2(finalState, completion) : finalState;
+  return completion ? set$1(finalState, completion) : finalState;
 };
 
 // export const handleBlur=()=>{}
@@ -5412,7 +5489,7 @@ const handleContextMenuAtIndex = async (state, index, x, y) => {
     focusedIndex: index,
     items: newItems
   };
-  set$1(uid, state, newState);
+  set(uid, state, newState);
   await show2(uid, Explorer, x, y, {
     menuId: Explorer
   });
@@ -5516,7 +5593,7 @@ const handleDoubleClick = async (state, eventX, eventY) => {
   const item = state.items[index];
   const type = normalizeDirentType(item.type);
   if (type === File || type === SymLinkFile) {
-    return set$2(state, openUri(item.path, true));
+    return set$1(state, openUri(item.path, true));
   }
   return state;
 };
@@ -6406,8 +6483,8 @@ const getDropHandler = index => {
   }
 };
 
-const getDroppedItems = async (itemIds, isElectron) => {
-  const result = await getDroppedItems$1(itemIds, isElectron);
+const getDroppedItems = async (dropIdOrItemIds, isElectron) => {
+  const result = typeof dropIdOrItemIds === 'number' ? await getDroppedItemsByDropId(dropIdOrItemIds, isElectron) : await getDroppedItems$1(dropIdOrItemIds, isElectron);
   const files = isElectron ? result.files : result.files.filter(file => file.handle);
   const fileHandles = files.map(file => file.handle || {
     kind: file.kind,
@@ -6446,8 +6523,11 @@ const getInternalDragPaths = (items, uris) => {
   return paths;
 };
 
-const handleDrop = async (state, x, y, fileIds) => {
+const handleDrop = async (state, x, y, dropIdOrFileIds) => {
   if (state.isReadonly && state.root !== '') {
+    if (typeof dropIdOrFileIds === 'number') {
+      await discardDrop(dropIdOrFileIds);
+    }
     return state;
   }
   try {
@@ -6456,7 +6536,7 @@ const handleDrop = async (state, x, y, fileIds) => {
       fileHandles,
       paths,
       uris
-    } = await getDroppedItems(fileIds, isElectron);
+    } = await getDroppedItems(dropIdOrFileIds, isElectron);
     const internalPaths = getInternalDragPaths(state.items, uris);
     const droppedPaths = internalPaths.length > 0 ? internalPaths : paths;
     const index = getIndexFromPosition(state, x, y);
@@ -6601,23 +6681,6 @@ const handleKeyDown = (state, defaultPrevented, key) => {
   };
 };
 
-const state = {
-  connected: false
-};
-const isConnected = () => {
-  const {
-    connected
-  } = state;
-  return connected;
-};
-const invoke = (method, ...params) => {
-  return invoke$4(method, ...params);
-};
-const set = rpc => {
-  set$6(rpc);
-  state.connected = true;
-};
-
 const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
   const executeViewletCommand = async (uid, command, ...args) => {
     const fn = viewletCommandMap[`Explorer.${command}`];
@@ -6626,6 +6689,11 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
     }
     await fn(uid, ...args);
     await invoke$3('Viewlet.requestRender', uid);
+    if (takePostRenderFocus(uid)) {
+      setTimeout(() => {
+        void invoke$3('Main.focus');
+      }, 0);
+    }
   };
   const rpc = await create$6({
     commandMap: {
@@ -6634,7 +6702,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
     messagePort: port
   });
   if (setAsRendererProcess) {
-    set(rpc);
+    set$2(rpc);
   }
 };
 
@@ -7931,11 +7999,12 @@ const applyRender = (oldState, newState, diffResult) => {
 
 const render2 = async (uid, _diffResult) => {
   const {
+    newState,
     oldState,
     scheduledState
   } = get(uid);
   const diffResult = diff(oldState, scheduledState);
-  set$1(uid, scheduledState, scheduledState);
+  set(uid, scheduledState, newState, scheduledState);
   const commands = applyRender(oldState, scheduledState, diffResult);
   if (!isConnected()) {
     return commands;
@@ -7943,7 +8012,7 @@ const render2 = async (uid, _diffResult) => {
   const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
   const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
   const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
-  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+  return [['Viewlet.commitPending', uid, transactionId], ...rendererWorkerCommands];
 };
 
 const Button = 1;
@@ -8107,7 +8176,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleDrop,
-    params: ['handleDrop', ClientX, ClientY, DataTransferFiles2],
+    params: ['handleDrop', ClientX, ClientY, DropId],
     preventDefault: true
   }, {
     name: HandleNativePaste,
@@ -8534,7 +8603,7 @@ const commandMap = {
 };
 
 const send$2 = async port => {
-  await sendMessagePortToDragAndDropWorker(port);
+  await invokeAndTransfer('DragAndDrop.handleMessagePort', port);
 };
 const createDragAndDropWorkerRpc = async () => {
   return create$4({

package/package.json

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