@lvce-editor/explorer-view 2.34.0 → 2.35.0

package/dist/explorerViewWorkerMain.js

@@ -1397,7 +1397,7 @@ const acceptRename = async state => {
     // TODO this does not work with rename of nested file
     const oldAbsolutePath = renamedDirent.path;
     const oldParentPath = dirname(pathSeparator, oldAbsolutePath);
-    const newAbsolutePath = [oldParentPath, editingValue].join(pathSeparator);
+    const newAbsolutePath = join2(oldParentPath, editingValue);
     await rename(oldAbsolutePath, newAbsolutePath);
   } catch (error) {
     console.error(new VError(error, `Failed to rename file`));
@@ -1407,9 +1407,6 @@ const acceptRename = async state => {
     newDirents,
     focusedIndex
   } = computeExplorerRenamedDirent(items, editingIndex, editingValue);
-  //  TODO move focused index
-  // @ts-ignore
-  state.items = newDirents;
   return {
     ...state,
     editingIndex: -1,
@@ -1418,7 +1415,8 @@ const acceptRename = async state => {
     editingIcon: '',
     focusedIndex,
     focused: true,
-    focus: List
+    focus: List,
+    items: newDirents
   };
 };
 
@@ -1438,6 +1436,28 @@ const acceptEdit = async state => {
   }
 };
 
+const isNormalItem = item => {
+  return item.type !== EditingFile && item.type !== EditingFolder;
+};
+
+const cancelEditCreate = (state, keepFocus) => {
+  const {
+    editingIndex,
+    items
+  } = state;
+  const filteredItems = items.filter(isNormalItem);
+  return {
+    ...state,
+    items: filteredItems,
+    focusedIndex: editingIndex,
+    focused: keepFocus,
+    editingIndex: -1,
+    editingValue: '',
+    editingType: None$5,
+    focus: List
+  };
+};
+
 const normalizeDirentType = direntType => {
   if (direntType > DELTA_EDITING) {
     return direntType - DELTA_EDITING;
@@ -1455,33 +1475,17 @@ const getNewDirentsForCancelRename = (items, editingIndex) => {
   return newItems;
 };
 
-const isNormalItem = item => {
-  return item.type !== EditingFile && item.type !== EditingFolder;
-};
-const cancelEdit = state => {
+const cancelEditRename = (state, keepFocus) => {
   const {
     editingIndex,
-    editingType
+    items
   } = state;
-  if (editingType === Rename$1) {
-    const newItems = getNewDirentsForCancelRename(state.items, editingIndex);
-    return {
-      ...state,
-      items: newItems,
-      focusedIndex: editingIndex,
-      focused: true,
-      editingIndex: -1,
-      editingValue: '',
-      editingType: None$5,
-      focus: List
-    };
-  }
-  const filteredItems = state.items.filter(isNormalItem);
+  const newItems = getNewDirentsForCancelRename(items, editingIndex);
   return {
     ...state,
-    items: filteredItems,
+    items: newItems,
     focusedIndex: editingIndex,
-    focused: true,
+    focused: keepFocus,
     editingIndex: -1,
     editingValue: '',
     editingType: None$5,
@@ -1489,6 +1493,20 @@ const cancelEdit = state => {
   };
 };
 
+const cancelEditInternal = (state, keepFocus) => {
+  const {
+    editingType
+  } = state;
+  if (editingType === Rename$1) {
+    return cancelEditRename(state, keepFocus);
+  }
+  return cancelEditCreate(state, keepFocus);
+};
+
+const cancelEdit = state => {
+  return cancelEditInternal(state, true);
+};
+
 const cancelTypeAhead = state => {
   return {
     ...state,
@@ -2645,15 +2663,9 @@ const handleArrowRight = async state => {
   }
 };
 
-const handleBlur = state => {
+const handleBlur = async state => {
   // TODO when blur event occurs because of context menu, focused index should stay the same
   // but focus outline should be removed
-  const {
-    editingType
-  } = state;
-  if (editingType !== None$5) {
-    return state;
-  }
   return {
     ...state,
     focused: false
@@ -3436,8 +3448,15 @@ const handleIconThemeChange = state => {
   return updateIcons(state);
 };
 
-const handleInputBlur = state => {
-  return cancelEdit(state);
+const handleInputBlur = async state => {
+  const {
+    editingErrorMessage,
+    editingValue
+  } = state;
+  if (editingErrorMessage || !editingValue) {
+    return cancelEditInternal(state, false);
+  }
+  return acceptEdit(state);
 };
 
 const handleInputClick = state => {
@@ -4193,7 +4212,6 @@ const HandleInputBlur = 'handleInputBlur';
 const HandleInputClick = 'handleInputClick';
 const HandleListBlur = 'handleListBlur';
 const HandleListFocus = 'handleListFocus';
-const HandleListKeyDown = 'handleListKeyDown';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 
@@ -4380,8 +4398,8 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
     onPointerDown: HandlePointerDown,
-    onWheel: HandleWheel,
-    onKeyDown: HandleListKeyDown
+    onWheel: HandleWheel
+    // onKeyDown: DomEventListenerFunctions.HandleListKeyDown,
   }, ...visibleItems.flatMap(getExplorerItemVirtualDom)];
   return dom;
 };
@@ -5093,7 +5111,12 @@ const getEditingIcon = async (editingType, value, direntType) => {
 };
 
 const updateEditingValue = async (state, value, inputSource = User) => {
-  const editingIcon = await getEditingIcon(state.editingType, value, state.items[state.editingIndex]?.type);
+  const {
+    editingType,
+    items,
+    editingIndex
+  } = state;
+  const editingIcon = await getEditingIcon(editingType, value, items[editingIndex]?.type);
   return {
     ...state,
     editingValue: value,

package/package.json

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