@lvce-editor/explorer-view 7.27.0 → 7.28.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
@@ -2296,6 +2302,30 @@ 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 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 +2520,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 +2537,8 @@ const acceptCreate = async (state, newDirentType) => {
     focusedIndex,
     items,
     pathSeparator,
-    root
+    root,
+    uid
   } = state;
   const newFileName = editingValue;
   const siblingFileNames = getSiblingFileNames(items, focusedIndex);
@@ -2526,10 +2567,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,
@@ -2905,16 +2949,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 +2973,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 +3794,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set: set$1,
+  set,
   wrapGetter
 } = create$1();
 const commandQueues = new Map();
@@ -3784,6 +3828,9 @@ const enqueueCommand = async (id, command) => {
 const hasSameVisibleExplorerItemInputs = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingSessionId === newState.editingSessionId && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
 };
+const hasSameDragDataInputs = (oldState, newState) => {
+  return oldState.isPointerDown === newState.isPointerDown && oldState.pointerDownIndex === newState.pointerDownIndex;
+};
 const updateGitIgnoredUris = (state, generation, sourceControlIgnoredUris) => {
   const {
     gitIgnoreGeneration
@@ -3880,10 +3927,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) {
-        set$1(id, intermediate.oldState, updatedState);
+      if (updatedState.inputSource === User || !hasSameDragDataInputs(intermediate.newState, updatedState)) {
+        set(id, intermediate.oldState, updatedState);
       }
       return {
         completion
@@ -3904,7 +3951,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
@@ -4014,7 +4061,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;
 };
 
@@ -4832,7 +4879,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) => {
@@ -5261,7 +5308,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=()=>{}
@@ -5409,7 +5456,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
   });
@@ -5513,7 +5560,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;
 };
@@ -6403,8 +6450,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,
@@ -6443,8 +6490,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 {
@@ -6453,7 +6503,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);
@@ -6598,23 +6648,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}`];
@@ -6623,6 +6656,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: {
@@ -6631,7 +6669,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
     messagePort: port
   });
   if (setAsRendererProcess) {
-    set(rpc);
+    set$2(rpc);
   }
 };
 
@@ -7928,11 +7966,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;
@@ -7940,7 +7979,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;
@@ -8104,7 +8143,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleDrop,
-    params: ['handleDrop', ClientX, ClientY, DataTransferFiles2],
+    params: ['handleDrop', ClientX, ClientY, DropId],
     preventDefault: true
   }, {
     name: HandleNativePaste,

package/package.json

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