@lvce-editor/explorer-view 1.12.0 → 1.13.0

package/dist/explorerViewWorkerMain.js

@@ -442,10 +442,10 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set = (id, fn) => {
+const set$1 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get = id => {
+const get$1 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -461,7 +461,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set(id, resolve);
+  set$1(id, resolve);
   return {
     id,
     promise
@@ -618,7 +618,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get(id);
+  const fn = get$1(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -959,7 +959,7 @@ const computeExplorerRenamedDirent = (dirents, index, newName) => {
     if (dirent.depth < depth) {
       break;
     }
-    if (insertIndex === -1 && compareDirent(dirent, newDirent === -1)) {
+    if (insertIndex === -1 && compareDirent(dirent, newDirent) === -1) {
       for (; endIndex < dirents.length; endIndex++) {
       }
       insertIndex = endIndex;
@@ -1010,17 +1010,20 @@ const CreateFile = 1;
 const CreateFolder = 2;
 const Rename$1 = 3;
 
-const state = {
-  rpc: undefined
+const RendererWorker = 1;
+
+const rpcs = Object.create(null);
+const set = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
 };
+
 const invoke = (method, ...params) => {
-  const rpc = state.rpc;
-  // @ts-ignore
+  const rpc = get(RendererWorker);
   return rpc.invoke(method, ...params);
 };
-const setRpc = rpc => {
-  state.rpc = rpc;
-};
 
 const remove = async dirent => {
   return invoke('FileSystem.remove', dirent);
@@ -1129,15 +1132,21 @@ const acceptCreate = async (state, newDirentType, createFn) => {
       deltaPosInSet = 1 - 1;
       break;
     } else {
+      // @ts-ignore
       posInSet = dirent.posInSet + 1;
+      // @ts-ignore
       setSize = dirent.setSize + 1;
+      // @ts-ignore
       insertIndex = i;
     }
+    // @ts-ignore
     dirent.setSize++;
+    // @ts-ignore
     dirent.posInSet += deltaPosInSet;
   }
   newDirent.setSize = setSize;
   newDirent.posInSet = posInSet;
+  // @ts-ignore
   items.splice(insertIndex + 1, 0, newDirent);
   const newDirents = [...items];
   const newMaxlineY = Math.max(state.maxLineY, newDirents.length);
@@ -1174,6 +1183,7 @@ const acceptRename = async state => {
     focusedIndex
   } = computeExplorerRenamedDirent(items, editingIndex, editingValue);
   //  TODO move focused index
+  // @ts-ignore
   state.items = newDirents;
   return {
     ...state,
@@ -1185,7 +1195,7 @@ const acceptRename = async state => {
     focused: true
   };
 };
-const acceptEdit = state => {
+const acceptEdit = async state => {
   const {
     editingType
   } = state;
@@ -1219,11 +1229,6 @@ const isTopLevel$1 = dirent => {
   return dirent.depth === 1;
 };
 
-const IsTopLevel = {
-  __proto__: null,
-  isTopLevel: isTopLevel$1
-};
-
 const toCollapsedDirent = dirent => {
   if (dirent.type === DirectoryExpanded) {
     return {
@@ -1238,7 +1243,7 @@ const collapseAll$1 = state => {
   const {
     items
   } = state;
-  const newDirents = items.filter(IsTopLevel).map(toCollapsedDirent);
+  const newDirents = items.filter(isTopLevel$1).map(toCollapsedDirent);
   return {
     ...state,
     items: newDirents
@@ -1423,6 +1428,7 @@ const expandAll = async state => {
     if (dirent.depth === depth && dirent.type === Directory) {
       // TODO expand
       // TODO avoid mutating state here
+      // @ts-ignore
       dirent.type = DirectoryExpanding;
       // TODO handle error
       // TODO race condition
@@ -1433,6 +1439,7 @@ const expandAll = async state => {
       }
       newDirents.splice(newIndex + 1, 0, ...childDirents);
       // TODO avoid mutating state here
+      // @ts-ignore
       dirent.type = DirectoryExpanded;
       // await expand(state, dirent.index)
     }
@@ -1504,6 +1511,7 @@ const expandRecursively = async state => {
   // TODO race condition: what if folder is being collapse while it is recursively expanding?
   // TODO race condition: what if folder is being deleted while it is recursively expanding?
   // TODO race condition: what if a new file/folder is created while the folder is recursively expanding?
+  // @ts-ignore
   const childDirents = await getChildDirentsRecursively(dirent);
   const startIndex = focusedIndex;
   if (focusedIndex >= 0) {
@@ -1622,11 +1630,6 @@ const focusPrevious = state => {
 
 const Button$2 = 1;
 
-const CollapseAll = 'CollapseAll';
-const NewFile$1 = 'NewFile';
-const NewFolder$1 = 'NewFolder';
-const Refresh = 'Refresh';
-
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -1639,8 +1642,8 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-const NewFile = 'New File...';
-const NewFolder = 'New Folder...';
+const NewFile$1 = 'New File...';
+const NewFolder$1 = 'New Folder...';
 const OpenContainingFolder = 'Open Containing Folder';
 const OpenInIntegratedTerminal = 'Open in integrated Terminal';
 const Cut$1 = 'Cut';
@@ -1657,10 +1660,10 @@ const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder';
 const OpenFolder = 'Open folder';
 
 const newFile$1 = () => {
-  return i18nString(NewFile);
+  return i18nString(NewFile$1);
 };
 const newFolder$1 = () => {
-  return i18nString(NewFolder);
+  return i18nString(NewFolder$1);
 };
 const openContainingFolder$1 = () => {
   return i18nString(OpenContainingFolder);
@@ -1705,6 +1708,11 @@ const openFolder$1 = () => {
   return i18nString(OpenFolder);
 };
 
+const CollapseAll = 'CollapseAll';
+const NewFile = 'NewFile';
+const NewFolder = 'NewFolder';
+const Refresh = 'Refresh';
+
 const getActions = root => {
   if (!root) {
     return [];
@@ -1712,12 +1720,12 @@ const getActions = root => {
   return [{
     type: Button$2,
     id: newFile$1(),
-    icon: NewFile$1,
+    icon: NewFile,
     command: 'newFile'
   }, {
     type: Button$2,
     id: newFolder$1(),
-    icon: NewFolder$1,
+    icon: NewFolder,
     command: 'newFolder'
   }, {
     type: Button$2,
@@ -1740,6 +1748,7 @@ const TreeItem$1 = 'treeitem';
 const Actions = 'Actions';
 const Button$1 = 'Button';
 const ButtonPrimary = 'ButtonPrimary';
+const Chevron = 'Chevron';
 const Explorer$1 = 'Explorer';
 const FileIcon = 'FileIcon';
 const IconButton = 'IconButton';
@@ -1776,11 +1785,6 @@ const getFileIconVirtualDom = icon => {
   };
 };
 
-const defaultIndent = 1;
-const getTreeItemIndent = depth => {
-  return `${depth * defaultIndent}rem`;
-};
-
 const ExplorerInput = 'ExploreerInput';
 
 const text = data => {
@@ -1800,8 +1804,11 @@ const getItemVirtualDomFile = item => {
     path,
     depth,
     isFocused,
-    isEditing
+    isEditing,
+    indent
   } = item;
+
+  // TODO avoid mutation
   const dom = [];
   dom.push({
     type: Div,
@@ -1813,7 +1820,7 @@ const getItemVirtualDomFile = item => {
     ariaSetSize: setSize,
     ariaLevel: depth,
     childCount: 2,
-    paddingLeft: getTreeItemIndent(depth),
+    paddingLeft: indent,
     ariaLabel: name,
     ariaDescription: ''
   }, getFileIconVirtualDom(icon));
@@ -1841,6 +1848,22 @@ const getItemVirtualDomFile = item => {
   }
   return dom;
 };
+
+const getChevronDownVirtualDom = () => {
+  return {
+    type: Div,
+    className: `${Chevron} MaskIconChevronDown`,
+    childCount: 0
+  };
+};
+const getChevronRightVirtualDom = () => {
+  return {
+    type: Div,
+    className: `${Chevron} MaskIconChevronRight`,
+    childCount: 0
+  };
+};
+
 const getItemVirtualDomFolder = item => {
   const {
     posInSet,
@@ -1850,19 +1873,25 @@ const getItemVirtualDomFolder = item => {
     path,
     depth,
     type,
-    isFocused
+    isFocused,
+    useChevrons,
+    indent
   } = item;
   let ariaExpanded = '';
+  let chevron;
   switch (type) {
     // TODO decide on directory vs folder
     case Directory:
       ariaExpanded = 'false';
+      chevron = getChevronRightVirtualDom();
       break;
     case DirectoryExpanding:
       ariaExpanded = 'true'; // TODO tree should be aria-busy then
+      chevron = getChevronRightVirtualDom();
       break;
     case DirectoryExpanded:
       ariaExpanded = 'true';
+      chevron = getChevronDownVirtualDom();
       break;
   }
   const dom = [];
@@ -1876,11 +1905,17 @@ const getItemVirtualDomFolder = item => {
     ariaSetSize: setSize,
     ariaLevel: depth,
     childCount: 2,
-    paddingLeft: getTreeItemIndent(depth),
+    paddingLeft: indent,
     ariaLabel: name,
     ariaExpanded,
     ariaDescription: ''
   });
+  if (useChevrons) {
+    // @ts-ignore
+    dom[0].childCount++;
+    // @ts-ignore
+    dom.push(chevron);
+  }
   dom.push(getFileIconVirtualDom(icon), {
     type: Div,
     className: Label,
@@ -1892,6 +1927,7 @@ const getItemVirtualDomFolder = item => {
   }
   return dom;
 };
+
 const getExplorerItemVirtualDom = item => {
   const {
     type
@@ -1936,6 +1972,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
   }
+  // TODO
   const dom = [];
   dom.push({
     type: Div,
@@ -2168,24 +2205,35 @@ const getMenuEntries = state => {
   }
 };
 
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, icons) => {
+const defaultIndent = 1;
+const getTreeItemIndent = depth => {
+  // TODO logic should be in getVisibleItems
+  return `${depth * defaultIndent}rem`;
+};
+
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, icons, useChevrons) => {
   const visible = [];
   let iconIndex = 0;
   for (let i = minLineY; i < Math.min(maxLineY, items.length); i++) {
     const item = items[i];
     const icon = icons[iconIndex++];
+    const indent = getTreeItemIndent(item.depth);
     if (i === editingIndex) {
       visible.push({
         ...item,
         isFocused: i === focusedIndex,
         isEditing: true,
-        icon
+        icon,
+        useChevrons,
+        indent
       });
     } else {
       visible.push({
         ...item,
         isFocused: i === focusedIndex,
-        icon
+        icon,
+        useChevrons,
+        indent
       });
     }
   }
@@ -2199,7 +2247,9 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       name: 'new',
       path: '/test/new',
       type: 2,
-      isEditing: true
+      isEditing: true,
+      useChevrons,
+      indent: ''
     });
   }
   return visible;
@@ -2316,7 +2366,7 @@ const handleClickDirectoryExpanded$1 = async (state, dirent, index, keepFocus) =
   };
 };
 
-const handleClickDirectoryExpanding = (state, dirent, index, keepFocus) => {
+const handleClickDirectoryExpanding = async (state, dirent, index, keepFocus) => {
   dirent.type = Directory;
   dirent.icon = getIcon();
   return {
@@ -2501,7 +2551,7 @@ const handleClickDirectoryExpanded = (state, dirent, index, keepFocus) => {
     focused: keepFocus
   };
 };
-const handleClick = (state, index, keepFocus = false) => {
+const handleClick = async (state, index, keepFocus = false) => {
   const {
     items,
     minLineY
@@ -2553,6 +2603,7 @@ const handleArrowRightDirectoryExpanded = (state, dirent) => {
   if (nextDirent.depth === dirent.depth + 1) {
     return focusIndex(state, focusedIndex + 1);
   }
+  return state;
 };
 const handleArrowRight = async state => {
   const {
@@ -2670,7 +2721,7 @@ const handleCopy = async state => {
   const dirent = getFocusedDirent$1(state);
   if (!dirent) {
     console.info('[ViewletExplorer/handleCopy] no dirent selected');
-    return;
+    return state;
   }
   const absolutePath = dirent.path;
   // TODO handle copy error gracefully
@@ -2738,23 +2789,13 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
-const getFilePathElectron = async file => {
-  return invoke('GetFilePathElectron.getFilePathElectron', file);
+const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
+  // TODO send to renderer worker
 };
 
 const mergeDirents$2 = (oldDirents, newDirents) => {
   return newDirents;
 };
-
-// TODO copy files in parallel
-const copyFilesElectron = async (root, pathSeparator, files) => {
-  for (const file of files) {
-    const from = await getFilePathElectron(file);
-    // const from = file.path
-    const to = join(pathSeparator, root, file.name);
-    await copy$1(from, to);
-  }
-};
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, {
     path: root,
@@ -2769,7 +2810,10 @@ const handleDrop$2 = async (state, files) => {
     pathSeparator,
     items
   } = state;
-  await copyFilesElectron(root, pathSeparator, files);
+  const handled = await uploadFileSystemHandles();
+  if (handled) {
+    return state;
+  }
   const mergedDirents = await getMergedDirents$2(root, pathSeparator, items);
   return {
     ...state,
@@ -2778,13 +2822,23 @@ const handleDrop$2 = async (state, files) => {
   };
 };
 
-const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
-  // TODO send to renderer worker
+const getFilePathElectron = async file => {
+  return invoke('GetFilePathElectron.getFilePathElectron', file);
 };
 
 const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
+
+// TODO copy files in parallel
+const copyFilesElectron = async (root, pathSeparator, files) => {
+  for (const file of files) {
+    const from = await getFilePathElectron(file);
+    // const from = file.path
+    const to = join(pathSeparator, root, file.name);
+    await copy$1(from, to);
+  }
+};
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, {
     path: root,
@@ -2799,10 +2853,7 @@ const handleDrop$1 = async (state, files) => {
     pathSeparator,
     items
   } = state;
-  const handled = await uploadFileSystemHandles();
-  if (handled) {
-    return state;
-  }
+  await copyFilesElectron(root, pathSeparator, files);
   const mergedDirents = await getMergedDirents$1(root, pathSeparator, items);
   return {
     ...state,
@@ -2813,11 +2864,12 @@ const handleDrop$1 = async (state, files) => {
 
 const getModule = isElectron => {
   if (isElectron) {
-    return handleDrop$2;
+    return handleDrop$1;
   }
-  return handleDrop$1;
+  return handleDrop$2;
 };
 const handleDropRoot = async (state, files) => {
+  // @ts-ignore
   const fn = await getModule(state.isElectron);
   return fn(state, files);
 };
@@ -2870,7 +2922,7 @@ const handleDropIntoFile = (state, dirent, index, files) => {
   // @ts-ignore
   return handleDropIndex(parentIndex);
 };
-const handleDropIndex = (state, index, files) => {
+const handleDropIndex = async (state, index, files) => {
   const {
     items
   } = state;
@@ -2969,6 +3021,7 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO handle pasting files into hardlink
   // TODO what if folder is big and it takes a long time
   for (const source of nativeFiles.files) {
+    // @ts-ignore
     const target = join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
     await copy$1(source, target);
   }
@@ -2984,7 +3037,7 @@ const handlePasteCut = async (state, nativeFiles) => {
   return state;
 };
 
-const handlePasteNone = (state, nativeFiles) => {
+const handlePasteNone = async (state, nativeFiles) => {
   console.info('[ViewletExplorer/handlePaste] no paths detected');
   return state;
 };
@@ -3190,6 +3243,7 @@ const getSavedRoot$1 = (savedState, workspacePath) => {
   return workspacePath;
 };
 const loadContent = async (state, savedState) => {
+  const useChevrons = true;
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot$1(savedState, workspacePath);
   // TODO path separator could be restored from saved state
@@ -3219,7 +3273,8 @@ const loadContent = async (state, savedState) => {
     deltaY,
     maxLineY,
     pathSeparator,
-    excluded
+    excluded,
+    useChevrons
   };
 };
 
@@ -3233,12 +3288,12 @@ const handleWorkspaceChange = async state => {
   return newState;
 };
 
-const ExplorerEditBox = FocusExplorerEditBox;
-
 const setFocus = key => {
   return invoke('Focus.setFocus', key);
 };
 
+const ExplorerEditBox = FocusExplorerEditBox;
+
 const newDirent = async (state, editingType) => {
   // TODO make focus functional instead of side effect
   await setFocus(ExplorerEditBox);
@@ -3310,12 +3365,14 @@ const removeDirent = async state => {
     // on web should probably show notification (dialog)
     // ErrorHandling.handleError(error)
     // await ErrorHandling.showErrorDialog(error)
-    return;
+    return state;
   }
   // TODO avoid state mutation
+  // @ts-ignore
   const newVersion = ++state.version;
   // TODO race condition
   // const newState = await loadContent(state:any)
+  // @ts-ignore
   if (state.version !== newVersion || state.disposed) {
     return state;
   }
@@ -3349,6 +3406,7 @@ const removeDirent = async state => {
   return {
     ...state,
     items: newDirents,
+    // @ts-ignore
     icons,
     focusedIndex: indexToFocus
   };
@@ -3374,7 +3432,11 @@ const renderItems = {
     return JSON.stringify(oldState.items) === JSON.stringify(newState.items) && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.width === newState.width;
   },
   apply(oldState, newState) {
-    const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue, newState.icons);
+    const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue,
+    // @ts-ignore
+    newState.icons,
+    // @ts-ignore
+    newState.useChevrons);
     const isWide = newState.width > 450;
     const dom = getExplorerVirtualDom(visibleDirents, newState.focusedIndex, newState.root, isWide);
     return ['Viewlet.setDom2', dom];
@@ -3441,7 +3503,7 @@ const getActionButtonVirtualDom = action => {
     title: id,
     'data-command': command,
     childCount: 1
-  }, getIconVirtualDom(icon)];
+  }, getIconVirtualDom(icon || '')];
 };
 
 const getActionVirtualDom = action => {
@@ -3834,7 +3896,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  setRpc(rpc);
+  set(RendererWorker, rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Explorer Worker",
   "main": "dist/explorerViewWorkerMain.js",
   "type": "module",