@lvce-editor/explorer-view 2.14.0 → 2.16.0

package/dist/explorerViewWorkerMain.js

@@ -1452,6 +1452,10 @@ const getFocusedDirent$1 = state => {
 };
 
 const copyPath = async state => {
+  const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   // await Command.execute(RendererWorkerCommandType.ClipBoardWriteText, /* text */ path)
   return state;
 };
@@ -1468,6 +1472,9 @@ const writeNativeFiles = async (type, files) => {
 
 const copyRelativePath = async state => {
   const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   const relativePath = dirent.path.slice(1);
   // TODO handle error
   await writeText(relativePath);
@@ -1565,49 +1572,27 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
 };
 
 const RenderItems = 4;
-const RenderEditingIndex = 5;
 const RenderFocus = 6;
 
-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 && oldState.focus === newState.focus;
 };
 
-const DiffFocus = {
-  __proto__: null,
-  diffType: diffType$1,
-  isEqual: isEqual$2
-};
-
 const diffType = RenderItems;
 const isEqual$1 = (oldState, newState) => {
   return oldState.items === 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.editingErrorMessage === newState.editingErrorMessage && oldState.width === newState.width && oldState.focused === newState.focused && oldState.dropTargets === newState.dropTargets;
 };
 
-const DiffItems = {
-  __proto__: null,
-  diffType,
-  isEqual: isEqual$1
-};
-
-const modules = [DiffItems, DiffEditingIndex, DiffFocus];
+const modules = [isEqual$1, isEqual$2];
+const numbers = [diffType, diffType$1];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
-  for (const module of modules) {
-    if (!module.isEqual(oldState, newState)) {
-      diffResult.push(module.diffType);
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
     }
   }
   return diffResult;
@@ -3203,7 +3188,8 @@ const handlePointerDown = (state, button, x, y) => {
     return {
       ...state,
       focused: true,
-      focusedIndex: -1
+      focusedIndex: -1,
+      focus: List
     };
   }
   return state;
@@ -3517,6 +3503,9 @@ const removeDirent = async state => {
     return state;
   }
   const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   const absolutePath = dirent.path;
   try {
     // TODO handle error
@@ -3589,16 +3578,20 @@ const renameDirent = state => {
   };
 };
 
-const renderEditingIndex = (oldState, newState) => {
-  return ['focusInput', 'ExplorerInput'];
-};
-
 const ExplorerInput = 'ExplorerInput';
 
+const User = 1;
+
 const renderFocus = (oldState, newState) => {
+  if (newState.inputSource === User) {
+    return [];
+  }
   if (newState.focus === Input$1) {
     return ['Viewlet.focusElementByName', ExplorerInput];
   }
+  if (newState.focus === List) {
+    return ['Viewlet.focusSelector', '.ListItems'];
+  }
   // TODO
   // 1. when focused, focus the outer list element
   // 2. when focused, set focus context in renderer worker
@@ -3621,6 +3614,7 @@ const Explorer = 'Explorer';
 const ExplorerDropTarget = 'DropTarget';
 const FileIcon = 'FileIcon';
 const FocusOutline = 'FocusOutline';
+const ListItems = 'ListItems';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
 const InputValidationError = 'InputValidationError';
@@ -3798,14 +3792,20 @@ const getActiveDescendant = focusedIndex => {
 const getClassName = (focused, focusedIndex, dropTarget) => {
   const extraClass1 = focused && focusedIndex === -1 ? FocusOutline : Empty;
   const extraClass2 = dropTarget === dropTargetFull ? ExplorerDropTarget : Empty;
-  const className = mergeClassNames(Viewlet, Explorer, extraClass1, extraClass2);
+  const className = mergeClassNames(ListItems, extraClass1, extraClass2);
   return className;
 };
+const parentNode = {
+  type: Div,
+  childCount: 1,
+  className: mergeClassNames(Viewlet, Explorer),
+  role: 'none'
+};
 const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
   }
-  const dom = [{
+  const dom = [parentNode, {
     type: Div,
     className: getClassName(focused, focusedIndex, dropTargets),
     tabIndex: 0,
@@ -3893,6 +3893,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const className = isFocused ? mergeClassNames(TreeItem, TreeItemActive) : TreeItem;
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
+
+    // @ts-ignore
     visible.push({
       ...item,
       isEditing: i === editingIndex,
@@ -3934,8 +3936,6 @@ const renderItems = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
-    case RenderEditingIndex:
-      return renderEditingIndex;
     case RenderItems:
       return renderItems;
     case RenderFocus:
@@ -4161,6 +4161,18 @@ const getPathParts = (root, uri, pathSeparator) => {
   return parts;
 };
 
+const getPathPartsToReveal = (root, pathParts, dirents) => {
+  for (let i = 0; i < pathParts.length; i++) {
+    const pathPart = pathParts[i];
+    const index = getIndex(dirents, pathPart.path);
+    if (index === -1) {
+      continue;
+    }
+    return pathParts.slice(i);
+  }
+  return pathParts;
+};
+
 const isTopLevel = dirent => {
   return dirent.depth === 1;
 };
@@ -4209,17 +4221,6 @@ const scrollInto = (index, minLineY, maxLineY) => {
   };
 };
 
-const getPathPartsToReveal = (root, pathParts, dirents) => {
-  for (let i = 0; i < pathParts.length; i++) {
-    const pathPart = pathParts[i];
-    const index = getIndex(dirents, pathPart.uri);
-    if (index === -1) {
-      continue;
-    }
-    return pathParts.slice(i);
-  }
-  return pathParts;
-};
 const getPathPartChildren = async pathPart => {
   const children = await getChildDirents(pathPart.pathSeparator, pathPart);
   return children;
@@ -4387,8 +4388,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const User = 1;
-
 const updateEditingValue = (state, value, inputSource = User) => {
   const editingIcon = '';
   return {

package/package.json

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