@lvce-editor/explorer-view 5.16.0 → 5.18.0

package/dist/explorerViewWorkerMain.js

@@ -861,14 +861,14 @@ const execute = (command, ...args) => {
 };
 
 const Two = '2.0';
-const create$o = (method, params) => {
+const create$s = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$n = (id, method, params) => {
+const create$r = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -878,14 +878,14 @@ const create$n = (id, method, params) => {
   return message;
 };
 let id = 0;
-const create$m = () => {
+const create$q = () => {
   return ++id;
 };
 
 /* eslint-disable n/no-unsupported-features/es-syntax */
 
 const registerPromise = map => {
-  const id = create$m();
+  const id = create$q();
   const {
     promise,
     resolve
@@ -903,7 +903,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$n(id, method, params);
+  const message = create$r(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -939,7 +939,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$o(method, params);
+      const message = create$s(method, params);
       ipc.send(message);
     }
   };
@@ -975,7 +975,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$6 = async ({
+const create$4 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -992,7 +992,7 @@ const create$6 = async ({
   messagePort.start();
   return rpc;
 };
-const create$4 = async ({
+const create$2$1 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1002,7 +1002,7 @@ const create$4 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$6({
+  return create$4({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
@@ -1010,7 +1010,7 @@ const create$4 = async ({
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$4
+  create: create$2$1
 };
 const create$1$1 = async ({
   commandMap
@@ -1026,6 +1026,25 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$1$1
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
 
 const Button$3 = 'event.button';
 const ClientX = 'event.clientX';
@@ -1088,26 +1107,6 @@ const create$2 = rpcId => {
   };
 };
 
-const createMockRpc = ({
-  commandMap
-}) => {
-  const invocations = [];
-  const invoke = (method, ...params) => {
-    invocations.push([method, ...params]);
-    const command = commandMap[method];
-    if (!command) {
-      throw new Error(`command ${method} not found`);
-    }
-    return command(...params);
-  };
-  const mockRpc = {
-    invoke,
-    invokeAndTransfer: invoke,
-    invocations
-  };
-  return mockRpc;
-};
-
 const {
   dispose,
   invoke: invoke$4,
@@ -1121,7 +1120,6 @@ const readDirWithFileTypes$1 = async uri => {
   return invoke$4('FileSystem.readDirWithFileTypes', uri);
 };
 const getPathSeparator$2 = async root => {
-  // @ts-ignore
   return invoke$4('FileSystem.getPathSeparator', root);
 };
 const getRealPath$1 = async path => {
@@ -1149,21 +1147,23 @@ const copy$2 = async (oldUri, newUri) => {
   return invoke$4('FileSystem.copy', oldUri, newUri);
 };
 const exists = async uri => {
-  // @ts-ignore
   return invoke$4('FileSystem.exists', uri);
 };
 const getFolderSize = async uri => {
-  // @ts-ignore
   return invoke$4('FileSystem.getFolderSize', uri);
 };
 const readFileAsBlob = async uri => {
-  // @ts-ignore
   return invoke$4('FileSystem.readFileAsBlob', uri);
 };
 const appendFile = async (uri, text) => {
-  // @ts-ignore
   return invoke$4('FileSystem.appendFile', uri, text);
 };
+const watchFile = async (watchId, uri, rpcId) => {
+  await invoke$4('FileSystem.watchFile', watchId, uri, rpcId);
+};
+const unwatchFile = async watchId => {
+  await invoke$4('FileSystem.unwatchFile', watchId);
+};
 const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
@@ -1193,6 +1193,8 @@ const FileSystemWorker = {
   rename: rename$2,
   set: set$5,
   stat: stat$1,
+  unwatchFile,
+  watchFile,
   writeFile: writeFile$1
 };
 
@@ -1218,6 +1220,10 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   // @ts-ignore
   await invoke$2('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const getFileHandles$1 = async fileIds => {
+  const files = await invoke$2('FileSystemHandle.getFileHandles', fileIds);
+  return files;
+};
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
   // @ts-ignore
@@ -3546,21 +3552,25 @@ const getFittingIndex = (dirents, startIndex) => {
 const newDirent = async (state, editingType) => {
   // TODO do it like vscode, select position between folders and files
   const {
+    editingIndex,
     focusedIndex,
     items,
     root
   } = state;
+  if (editingIndex !== -1) {
+    return state;
+  }
   const index = getFittingIndex(items, focusedIndex);
   const direntType = getNewDirentType(editingType);
   const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root);
-  const editingIndex = newDirents.findIndex(item => item.type === EditingFile || item.type === EditingFolder);
+  const newEditingIndex = newDirents.findIndex(item => item.type === EditingFile || item.type === EditingFolder);
   return {
     ...state,
-    editingIndex,
+    editingIndex: newEditingIndex,
     editingType,
     editingValue: '',
     focus: Input$1,
-    focusedIndex: editingIndex,
+    focusedIndex: newEditingIndex,
     items: newDirents
   };
 };
@@ -3935,17 +3945,16 @@ const handleContextMenuAtIndex = async (state, index, x, y) => {
   return newState;
 };
 
-const handleContextMenuKeyboard = async state => {
+const handleContextMenuKeyboard = async (state, index = state.focusedIndex) => {
   const {
-    focusedIndex,
     itemHeight,
     minLineY,
     x,
     y
   } = state;
   const menuX = x;
-  const menuY = y + (focusedIndex - minLineY + 1) * itemHeight;
-  return handleContextMenuAtIndex(state, focusedIndex, menuX, menuY);
+  const menuY = y + (index - minLineY + 1) * itemHeight;
+  return handleContextMenuAtIndex(state, index, menuX, menuY);
 };
 
 const handleContextMenuMouseAt = async (state, x, y) => {
@@ -4014,6 +4023,14 @@ const handleCut = async state => {
   };
 };
 
+const handleDoubleClick = async (state, eventX, eventY) => {
+  const index = getIndexFromPosition(state, eventX, eventY);
+  if (index !== -1) {
+    return state;
+  }
+  return newFile(state);
+};
+
 const handleDragEnd = state => {
   return {
     ...state,
@@ -4129,7 +4146,8 @@ const isFileHandle = fileHandle => {
 
 const createUploadTree = async (root, fileHandles) => {
   const uploadTree = Object.create(null);
-  for (const fileHandle of fileHandles) {
+  const normalized = fileHandles.filter(Boolean);
+  for (const fileHandle of normalized) {
     const {
       name
     } = fileHandle;
@@ -4296,14 +4314,7 @@ const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, pa
     items,
     pathSeparator
   } = state;
-  // @ts-ignore
-  for (const file of fileHandles) {
-    // TODO path basename
-    const baseName = file.name;
-    const to = dirent.path + pathSeparator + baseName;
-    // @ts-ignore
-    await copy$1(file, to);
-  }
+  await uploadFileSystemHandles(dirent.path, '/', fileHandles);
   const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
   const mergedDirents = getMergedDirents(items, index, dirent, childDirents);
   // TODO update maxlineY
@@ -4358,7 +4369,7 @@ const getFileArray = fileList => {
 };
 
 const getFileHandles = async fileIds => {
-  const files = await invoke$2('FileSystemHandle.getFileHandles', fileIds);
+  const files = await getFileHandles$1(fileIds);
   return files;
 };
 
@@ -4380,9 +4391,12 @@ const getFilePaths = async (files, platform) => {
 
 const handleDrop = async (state, x, y, fileIds, fileList) => {
   try {
+    const {
+      platform
+    } = state;
     const files = getFileArray(fileList);
     const fileHandles = await getFileHandles(fileIds);
-    const paths = await getFilePaths(files, state.platform);
+    const paths = await getFilePaths(files, platform);
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
     const result = await fn(state, fileHandles, files, paths, index);
@@ -5343,20 +5357,22 @@ const getDragData = urls => {
     data,
     type: 'text/plain'
   }];
-  // @ts-ignore
-  dragData.label = getDragLabel(urls);
-  return dragData;
+  return {
+    items: dragData,
+    label: getDragLabel(urls)
+  };
 };
 
 const renderDragData = (oldState, newState) => {
   const {
     focusedIndex,
-    items
+    items,
+    uid
   } = newState;
   const selected = items.filter((item, index) => item.selected || index === focusedIndex);
   const urls = selected.map(item => item.path);
   const dragData = getDragData(urls);
-  return ['Viewlet.setDragData', newState.uid, dragData];
+  return ['Viewlet.setDragData', uid, dragData];
 };
 
 const renderEditingSelection = (oldState, newState) => {
@@ -5432,6 +5448,7 @@ const HandleListBlur = 11;
 const HandleListFocus = 12;
 const HandlePointerDown = 14;
 const HandleWheel = 15;
+const HandleDoubleClick = 16;
 
 const getExplorerWelcomeVirtualDom = isWide => {
   return [{
@@ -5589,6 +5606,7 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
     onBlur: HandleListBlur,
     onClick: HandleClick,
     onContextMenu: HandleContextMenu,
+    onDblClick: HandleDoubleClick,
     onDragEnd: HandleDragEnd,
     onDragLeave: HandleDragLeave,
     onDragOver: HandleDragOver,
@@ -5854,6 +5872,9 @@ const renderEventListeners = () => {
   }, {
     name: HandlePointerDown,
     params: ['handlePointerDown', Button$3, ClientX, ClientY]
+  }, {
+    name: HandleDoubleClick,
+    params: ['handleDoubleClick', ClientX, ClientY]
   }, {
     name: HandleEditingInput,
     params: ['updateEditingValue', TargetValue]
@@ -6212,12 +6233,14 @@ const commandMap = {
   'Explorer.handleContextMenuKeyboard': wrapListItemCommand(handleContextMenuKeyboard),
   'Explorer.handleCopy': wrapListItemCommand(handleCopy),
   'Explorer.handleCut': wrapListItemCommand(handleCut),
+  'Explorer.handleDoubleClick': wrapListItemCommand(handleDoubleClick),
   'Explorer.handleDragEnd': wrapListItemCommand(handleDragEnd),
   'Explorer.handleDragLeave': wrapListItemCommand(handleDragLeave),
   'Explorer.handleDragOver': wrapListItemCommand(handleDragOver),
   'Explorer.handleDragOverIndex': wrapListItemCommand(handleDragOverIndex),
   'Explorer.handleDragStart': wrapListItemCommand(handleDragStart),
   'Explorer.handleDrop': wrapListItemCommand(handleDrop),
+  'Explorer.handleDropIndex': wrapListItemCommand(handleDropIndex),
   'Explorer.handleEscape': wrapListItemCommand(handleEscape),
   'Explorer.handleFocus': wrapListItemCommand(handleFocus),
   'Explorer.handleIconThemeChange': wrapListItemCommand(handleIconThemeChange),

package/package.json

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