@lvce-editor/explorer-view 7.2.0 → 7.4.0

package/dist/explorerViewWorkerMain.js

@@ -1276,6 +1276,7 @@ const DeltaMode = 'event.deltaMode';
 const DeltaY = 'event.deltaY';
 const EventTargetClassName = 'event.target.className';
 const IsTrusted = 'event.isTrusted';
+const Key = 'event.key';
 const ShiftKey = 'event.shiftKey';
 const TargetName = 'event.target.name';
 const TargetValue = 'event.target.value';
@@ -3695,6 +3696,18 @@ const getMouseActions = () => {
   }];
 };
 
+const getTitle$1 = state => {
+  const {
+    pathSeparator,
+    root
+  } = state;
+  if (!root) {
+    return 'Explorer';
+  }
+  const normalizedRoot = root.endsWith(pathSeparator) && root !== pathSeparator ? root.slice(0, -pathSeparator.length) : root;
+  return getBaseName(pathSeparator, normalizedRoot) || normalizedRoot;
+};
+
 const getParentStartIndex = (dirents, index) => {
   const dirent = dirents[index];
   let startIndex = index - 1;
@@ -3953,6 +3966,9 @@ const getNewDirentsForNewDirent = async (items, focusedIndex, type, root) => {
       setSize: 1,
       type
     };
+    if (type === EditingFolder) {
+      return [newDirent, ...items];
+    }
     return [...items, newDirent];
   }
   const focusedItem = items[focusedIndex];
@@ -3993,7 +4009,7 @@ const getNewDirentType = editingType => {
   }
 };
 
-const newDirent = async (state, editingType) => {
+const newDirent = async (state, editingType, editingIcon = '') => {
   // TODO do it like vscode, select position between folders and files
   const {
     editingIndex,
@@ -4010,6 +4026,7 @@ const newDirent = async (state, editingType) => {
   const newEditingIndex = newDirents.findIndex(item => item.type === EditingFile || item.type === EditingFolder);
   return {
     ...state,
+    editingIcon,
     editingIndex: newEditingIndex,
     editingType,
     editingValue: '',
@@ -4024,8 +4041,38 @@ const newFile = state => {
   return newDirent(state, CreateFile);
 };
 
-const newFolder = state => {
-  return newDirent(state, CreateFolder);
+const getEditingIcon = async (editingType, value, direntType) => {
+  if (editingType === CreateFile) {
+    return invoke$2('IconTheme.getFileIcon', {
+      name: value
+    });
+  }
+  if (editingType === Rename$1) {
+    if (direntType === File || direntType === EditingFile) {
+      return invoke$2('IconTheme.getFileIcon', {
+        name: value
+      });
+    }
+    if (direntType !== undefined && [Directory, EditingFolder, EditingDirectoryExpanded].includes(direntType)) {
+      return invoke$2('IconTheme.getFolderIcon', {
+        name: value
+      });
+    }
+  }
+  if (editingType === CreateFolder) {
+    return invoke$2('IconTheme.getFolderIcon', {
+      name: value
+    });
+  }
+  return '';
+};
+
+const newFolder = async state => {
+  if (state.editingIndex !== -1) {
+    return state;
+  }
+  const editingIcon = await getEditingIcon(CreateFolder, '');
+  return newDirent(state, CreateFolder, editingIcon);
 };
 
 const isExpanded = item => {
@@ -5301,7 +5348,7 @@ const filterByFocusWord = (items, focusedIndex, focusWord) => {
   }
   const matches = [];
   for (let i = 0; i < items.length; i++) {
-    if (items[i].toLowerCase().includes(focusWord)) {
+    if (items[i].toLowerCase().startsWith(focusWord)) {
       matches.push(i);
     }
   }
@@ -5318,19 +5365,22 @@ const filterByFocusWord = (items, focusedIndex, focusWord) => {
   return matches[nextIndex];
 };
 
-const RE_ASCII = /^[a-z]$/;
+const RE_ASCII = /^[a-z]$/i;
 const isAscii = key => {
   return RE_ASCII.test(key);
 };
 
 const typeAheadTimeout = {};
-const handleKeyDown = (state, key) => {
+const handleKeyDown = (state, defaultPrevented, key) => {
   const {
     focusedIndex,
     focusWord,
     focusWordTimeout,
     items
   } = state;
+  if (defaultPrevented) {
+    return state;
+  }
   if (focusWord && key === '') {
     return cancelTypeAhead(state);
   }
@@ -6068,6 +6118,7 @@ const HandleDrop = 6;
 const HandleEditingInput = 7;
 const HandleInputBlur = 8;
 const HandleInputClick = 9;
+const HandleKeyDown = 21;
 const HandleListBlur = 11;
 const HandleListFocus = 12;
 const HandlePointerDown = 14;
@@ -6549,6 +6600,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleListBlur,
     params: ['handleBlur']
+  }, {
+    name: HandleKeyDown,
+    params: ['handleKeyDown', DefaultPrevented, Key]
   }, {
     name: HandleClick,
     params: ['handleClickAt', DefaultPrevented, Button$3, CtrlKey, ShiftKey, ClientX, ClientY],
@@ -6876,32 +6930,6 @@ const selectUp = state => {
   };
 };
 
-const getEditingIcon = async (editingType, value, direntType) => {
-  if (editingType === CreateFile) {
-    return invoke$2('IconTheme.getFileIcon', {
-      name: value
-    });
-  }
-  if (editingType === Rename$1) {
-    if (direntType === File || direntType === EditingFile) {
-      return invoke$2('IconTheme.getFileIcon', {
-        name: value
-      });
-    }
-    if (direntType !== undefined && [Directory, EditingFolder, EditingDirectoryExpanded].includes(direntType)) {
-      return invoke$2('IconTheme.getFolderIcon', {
-        name: value
-      });
-    }
-  }
-  if (editingType === CreateFolder) {
-    return invoke$2('IconTheme.getFolderIcon', {
-      name: value
-    });
-  }
-  return '';
-};
-
 const updateEditingValue = async (state, value, inputSource = User) => {
   const {
     editingIndex,
@@ -6950,6 +6978,7 @@ const commandMap = {
   'Explorer.getMenuEntries': getMenuEntries,
   'Explorer.getMenuEntries2': wrapGetter(getMenuEntries2),
   'Explorer.getMouseActions': getMouseActions,
+  'Explorer.getTitle': wrapGetter(getTitle$1),
   'Explorer.handleArrowLeft': wrapListItemCommand(handleArrowLeft),
   'Explorer.handleArrowRight': wrapListItemCommand(handleArrowRight),
   'Explorer.handleBlur': wrapListItemCommand(handleBlur),

package/package.json

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