@lvce-editor/explorer-view 1.27.0 → 1.28.0

package/dist/explorerViewWorkerMain.js

@@ -809,6 +809,9 @@ const createRpc = ipc => {
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
+    },
+    async dispose() {
+      await ipc?.dispose();
     }
   };
   return rpc;
@@ -1320,13 +1323,25 @@ const create = (id, uri, x, y, width, height, args, parentUid) => {
 
 const RenderItems = 4;
 const RenderEditingIndex = 5;
+const RenderFocus = 6;
 
-const diffType$1 = RenderEditingIndex;
-const isEqual$2 = (oldState, newState) => {
+const diffType$2 = RenderEditingIndex;
+const isEqual$3 = (oldState, newState) => {
   return oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType;
 };
 
 const DiffEditingIndex = {
+  __proto__: null,
+  diffType: diffType$2,
+  isEqual: isEqual$3
+};
+
+const diffType$1 = RenderFocus;
+const isEqual$2 = (oldState, newState) => {
+  return oldState.focused === newState.focused;
+};
+
+const DiffFocus = {
   __proto__: null,
   diffType: diffType$1,
   isEqual: isEqual$2
@@ -1343,7 +1358,7 @@ const DiffItems = {
   isEqual: isEqual$1
 };
 
-const modules = [DiffItems, DiffEditingIndex];
+const modules = [DiffItems, DiffEditingIndex, DiffFocus];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1355,6 +1370,15 @@ const diff = (oldState, newState) => {
   return diffResult;
 };
 
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
+
 const isSymbolicLink = dirent => {
   return dirent.type === Symlink;
 };
@@ -1411,11 +1435,11 @@ const resolveSymbolicLinks = async (uri, rawDirents) => {
 };
 
 const sortExplorerItems = rawDirents => {
-  rawDirents.sort(compareDirent);
+  return rawDirents.toSorted(compareDirent);
 };
 
 const toDisplayDirents = (pathSeparator, rawDirents, parentDirent, excluded) => {
-  sortExplorerItems(rawDirents);
+  rawDirents = sortExplorerItems(rawDirents);
   // TODO figure out whether this uses too much memory (name,path -> redundant, depth could be computed on demand)
   const toDisplayDirent = (rawDirent, index) => {
     const path = [parentDirent.path, rawDirent.name].join(pathSeparator);
@@ -1481,7 +1505,7 @@ const getExplorerMaxLineY = (minLineY, height, itemHeight, direntsLength) => {
 };
 
 const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent.path]);
+  return dirents.map(dirent => fileIconCache[dirent]);
 };
 
 const getMissingIconRequests = (dirents, fileIconCache) => {
@@ -1526,7 +1550,8 @@ const getFileIcons = async (dirents, fileIconCache) => {
   const missingRequests = getMissingIconRequests(dirents, fileIconCache);
   const newIcons = await requestFileIcons(missingRequests);
   const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const icons = getIconsCached(dirents, newFileIconCache);
+  const paths = dirents.map(dirent => dirent.path);
+  const icons = getIconsCached(paths, newFileIconCache);
   return {
     icons,
     newFileIconCache
@@ -1932,31 +1957,42 @@ const WelcomeMessage = 'WelcomeMessage';
 // only numbers are compared. it could also make rendering faster,
 // since less data is transferred to renderer process
 
-const HandleBlur = 'handleBlur';
 const HandleClick = 'handleClick';
 const HandleClickOpenFolder = 'handleClickOpenFolder';
 const HandleContextMenu = 'handleContextMenu';
 const HandleEditingInput = 'handleEditingInput';
-const HandleFocus = 'handleFocus';
+const HandleListBlur = 'handleListBlur';
+const HandleListFocus = 'handleListFocus';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+const Text = 12;
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
 const Button = 1;
 const Div = 4;
 const Input = 6;
-const Text = 12;
 const Img = 17;
 const P = 50;
 
 const chevronDownVirtualDom = {
   type: Div,
-  className: `${Chevron} ${MaskIconChevronDown}`,
+  className: mergeClassNames(Chevron, MaskIconChevronDown),
   childCount: 0
 };
 
 const chevronRightVirtualDom = {
   type: Div,
-  className: `${Chevron} ${MaskIconChevronRight}`,
+  className: mergeClassNames(Chevron, MaskIconChevronRight),
   childCount: 0
 };
 
@@ -1975,15 +2011,7 @@ const getFileIconVirtualDom = icon => {
   };
 };
 
-const ExplorerInput = 'ExploreerInput';
-
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
-};
+const ExplorerInput = 'ExplorerInput';
 
 const label = {
   type: Div,
@@ -2039,10 +2067,6 @@ const getExplorerItemVirtualDom = item => {
   return dom;
 };
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
 const getExplorerWelcomeVirtualDom = isWide => {
   return [{
     type: Div,
@@ -2084,8 +2108,8 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     ariaLabel: filesExplorer(),
     childCount: visibleItems.length,
     ariaActiveDescendant: getActiveDescendant(focusedIndex),
-    onFocus: HandleFocus,
-    onBlur: HandleBlur,
+    onFocus: HandleListFocus,
+    onBlur: HandleListBlur,
     onContextMenu: HandleContextMenu,
     onPointerDown: HandlePointerDown,
     onWheel: HandleWheel,
@@ -2620,6 +2644,13 @@ const handleBlur = state => {
   };
 };
 
+class ExplorerError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'ExplorerError';
+  }
+}
+
 const handleClickDirectoryExpanding = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = Directory;
@@ -2664,13 +2695,13 @@ const getClickFn = direntType => {
     case Symlink:
       return handleClickSymLink;
     case CharacterDevice:
-      throw new Error('Cannot open character device files');
+      throw new ExplorerError('Cannot open character device files');
     case BlockDevice:
-      throw new Error('Cannot open block device files');
+      throw new ExplorerError('Cannot open block device files');
     case Socket:
-      throw new Error('Cannot open socket files');
+      throw new ExplorerError('Cannot open socket files');
     default:
-      throw new Error(`unsupported dirent type ${direntType}`);
+      throw new ExplorerError(`unsupported dirent type ${direntType}`);
   }
 };
 
@@ -2786,15 +2817,21 @@ const handleContextMenuMouseAt = async (state, x, y) => {
   };
 };
 
-const handleContextMenu = (state, button, x, y) => {
+const getContextMenuHandler = button => {
   switch (button) {
     case Keyboard:
-      return handleContextMenuKeyboard(state);
+      return handleContextMenuKeyboard;
     default:
-      return handleContextMenuMouseAt(state, x, y);
+      return handleContextMenuMouseAt;
   }
 };
 
+const handleContextMenu = async (state, button, x, y) => {
+  const fn = getContextMenuHandler(button);
+  const newState = await fn(state, x, y);
+  return newState;
+};
+
 const handleCopy = async state => {
   // TODO handle multiple files
   // TODO if not file is selected, what happens?
@@ -3272,16 +3309,13 @@ const getSettings = async () => {
 
 const EmptyString = '';
 
-const Fulfilled = 'fulfilled';
-const Rejected = 'rejected';
-
 const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
-  const children = map[path];
+  let children = map[path];
   if (!children) {
     return [];
   }
   const dirents = [];
-  sortExplorerItems(children);
+  children = sortExplorerItems(children);
   const visible = [];
   const displayRoot = path.endsWith(pathSeparator) ? path : path + pathSeparator;
   for (const child of children) {
@@ -3323,6 +3357,10 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
   }
   return dirents;
 };
+
+const Fulfilled = 'fulfilled';
+const Rejected = 'rejected';
+
 const createDirents = (root, expandedDirentPaths, expandedDirentChildren, excluded, pathSeparator) => {
   const dirents = [];
   const map = Object.create(null);
@@ -3578,6 +3616,13 @@ const renderEditingIndex = (oldState, newState) => {
   return ['focusInput', 'ExplorerInput'];
 };
 
+const renderFocus = (oldState, newState) => {
+  // TODO
+  // 1. when focused, focus the outer list element
+  // 2. when focused, set focus context in renderer worker
+  return [];
+};
+
 const renderItems = (oldState, newState) => {
   const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue, newState.icons, newState.useChevrons);
   const isWide = newState.width > 450;
@@ -3591,6 +3636,8 @@ const getRenderer = diffType => {
       return renderEditingIndex;
     case RenderItems:
       return renderItems;
+    case RenderFocus:
+      return renderFocus;
     default:
       throw new Error('unknown renderer');
   }
@@ -3600,11 +3647,24 @@ const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
   for (const item of diffResult) {
     const fn = getRenderer(item);
-    commands.push(fn(oldState, newState));
+    const result = fn(oldState, newState);
+    if (result.length > 0) {
+      commands.push(result);
+    }
   }
   return commands;
 };
 
+const render2 = (uid, diffResult) => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  set(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
+  return commands;
+};
+
 const renderInternal = (oldState, newState) => {
   const diffResult = diff(oldState, newState);
   return applyRender(oldState, newState, diffResult);
@@ -3667,6 +3727,15 @@ const getActionsVirtualDom = actions => {
   }, ...actions.flatMap(getActionVirtualDom)];
 };
 
+const renderActions$1 = uid => {
+  const {
+    newState
+  } = get(uid);
+  const actions = getActions(newState.root);
+  const dom = getActionsVirtualDom(actions);
+  return dom;
+};
+
 const renderActions = state => {
   const actions = getActions(state.root);
   const dom = getActionsVirtualDom(actions);
@@ -3675,13 +3744,13 @@ const renderActions = state => {
 
 const renderEventListeners = () => {
   return [{
-    name: HandleBlur,
+    name: HandleListBlur,
     params: ['handleBlur']
   }, {
-    name: HandleFocus,
+    name: HandleListFocus,
     params: ['handleFocus', 'event.isTrusted', 'event.target.className']
   }, {
-    name: HandleBlur,
+    name: HandleListBlur,
     params: ['handleBlur']
   }, {
     name: HandleClick,
@@ -3700,7 +3769,8 @@ const renderEventListeners = () => {
     params: ['handleEditingInput', 'event.target.value']
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', 'event.button', 'event.clientX', 'event.clientY']
+    params: ['handleContextMenu', 'event.button', 'event.clientX', 'event.clientY'],
+    preventDefault: true
   }, {
     name: HandleWheel,
     params: ['handleWheel', 'event.deltaMode', 'event.deltaY'],
@@ -4068,10 +4138,14 @@ const commandMap = {
   'Explorer.updateIcons': wrapCommand(updateIcons),
   // not wrapped
   'Explorer.create': create,
-  'Explorer.render': doRender,
-  'Explorer.renderActions': renderActions,
-  'Explorer.saveState': saveState,
+  'Explorer.diff2': diff2,
+  'Explorer.render2': render2,
+  'Explorer.renderActions2': renderActions$1,
   'Explorer.renderEventListeners': renderEventListeners,
+  'Explorer.saveState': saveState,
+  // deprecated
+  'Explorer.renderActions': renderActions,
+  'Explorer.render': doRender,
   'Explorer.diff': diff
 };
 

package/package.json

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