@lvce-editor/explorer-view 7.11.0 → 7.13.0

package/dist/explorerViewWorkerMain.js

@@ -2509,6 +2509,50 @@ const acceptCreateFolder = async state => {
   return acceptCreate(state, Directory);
 };
 
+const getFocusedIndexCancel = (items, editingIndex) => {
+  const newFocusedIndex = editingIndex >= items.length ? items.length - 1 : editingIndex;
+  return newFocusedIndex;
+};
+
+const normalizeDirentType = direntType => {
+  if (direntType > DELTA_EDITING) {
+    return direntType - DELTA_EDITING;
+  }
+  return direntType;
+};
+
+const getNewDirentsForCancelRename = (items, editingIndex) => {
+  const item = items[editingIndex];
+  const newItems = [...items];
+  newItems[editingIndex] = {
+    ...item,
+    type: normalizeDirentType(item.type)
+  };
+  return newItems;
+};
+
+const cancelEditRename = (state, keepFocus) => {
+  const {
+    editingIndex,
+    items
+  } = state;
+  const newItems = getNewDirentsForCancelRename(items, editingIndex);
+  const newFocusedIndex = getFocusedIndexCancel(items, editingIndex);
+  return {
+    ...state,
+    editingErrorMessage: '',
+    editingIndex: -1,
+    editingSelectionEnd: 0,
+    editingSelectionStart: 0,
+    editingType: None$5,
+    editingValue: '',
+    focus: List,
+    focused: keepFocus,
+    focusedIndex: newFocusedIndex,
+    items: newItems
+  };
+};
+
 const getUpdatedChildren = (children, oldItems, newUri) => {
   const setSize = children.length;
   return children.toSorted(compareDirent).map((child, index) => {
@@ -2596,6 +2640,9 @@ const acceptRename = async state => {
   const oldUri = renamedDirent.path;
   const dirname = dirname2(oldUri);
   const newUri = join2(dirname, editingValue);
+  if (oldUri === newUri) {
+    return cancelEditRename(state, true);
+  }
   const operations = getFileOperationsRename(renamedDirent.path, editingValue);
   const renameErrorMessage = await applyFileOperations(operations);
   if (renameErrorMessage) {
@@ -2625,28 +2672,35 @@ const acceptRename = async state => {
   };
 };
 
-const acceptEdit = async state => {
+const User = 1;
+const Script = 2;
+
+const acceptEdit = async (state, inputSource = Script) => {
   if (state.isReadonly) {
     return state;
   }
   const {
-    editingType
+    editingType,
+    inputSource: currentInputSource
   } = state;
+  let newState;
   switch (editingType) {
     case CreateFile:
-      return acceptCreateFile(state);
+      newState = await acceptCreateFile(state);
+      break;
     case CreateFolder:
-      return acceptCreateFolder(state);
+      newState = await acceptCreateFolder(state);
+      break;
     case Rename$1:
-      return acceptRename(state);
+      newState = await acceptRename(state);
+      break;
     default:
       return state;
   }
-};
-
-const getFocusedIndexCancel = (items, editingIndex) => {
-  const newFocusedIndex = editingIndex >= items.length ? items.length - 1 : editingIndex;
-  return newFocusedIndex;
+  return {
+    ...newState,
+    inputSource: currentInputSource === User ? inputSource : currentInputSource
+  };
 };
 
 const isNormalItem = item => {
@@ -2673,45 +2727,6 @@ const cancelEditCreate = async (state, keepFocus) => {
   };
 };
 
-const normalizeDirentType = direntType => {
-  if (direntType > DELTA_EDITING) {
-    return direntType - DELTA_EDITING;
-  }
-  return direntType;
-};
-
-const getNewDirentsForCancelRename = (items, editingIndex) => {
-  const item = items[editingIndex];
-  const newItems = [...items];
-  newItems[editingIndex] = {
-    ...item,
-    type: normalizeDirentType(item.type)
-  };
-  return newItems;
-};
-
-const cancelEditRename = (state, keepFocus) => {
-  const {
-    editingIndex,
-    items
-  } = state;
-  const newItems = getNewDirentsForCancelRename(items, editingIndex);
-  const newFocusedIndex = getFocusedIndexCancel(items, editingIndex);
-  return {
-    ...state,
-    editingErrorMessage: '',
-    editingIndex: -1,
-    editingSelectionEnd: 0,
-    editingSelectionStart: 0,
-    editingType: None$5,
-    editingValue: '',
-    focus: List,
-    focused: keepFocus,
-    focusedIndex: newFocusedIndex,
-    items: newItems
-  };
-};
-
 const cancelEditInternal = async (state, keepFocus) => {
   const {
     editingType
@@ -2723,7 +2738,14 @@ const cancelEditInternal = async (state, keepFocus) => {
 };
 
 const cancelEdit = async state => {
-  return cancelEditInternal(state, true);
+  const {
+    inputSource
+  } = state;
+  const newState = await cancelEditInternal(state, true);
+  return {
+    ...newState,
+    inputSource: inputSource === User ? Script : inputSource
+  };
 };
 
 const cancelTypeAhead = state => {
@@ -3509,17 +3531,14 @@ const diffTrees = (oldTree, newTree, patches, path) => {
 };
 
 const removeTrailingNavigationPatches = patches => {
-  // Find the last non-navigation patch
-  let lastNonNavigationIndex = -1;
-  for (let i = patches.length - 1; i >= 0; i--) {
-    const patch = patches[i];
+  while (patches.length > 0) {
+    const patch = patches.at(-1);
     if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
-      lastNonNavigationIndex = i;
       break;
     }
+    patches.pop();
   }
-  // Return patches up to and including the last non-navigation patch
-  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+  return patches;
 };
 
 const diffTree = (oldNodes, newNodes) => {
@@ -3650,7 +3669,7 @@ const enqueueCommand = async (id, command) => {
   }
 };
 const hasSameVisibleExplorerItemInputs = (oldState, newState) => {
-  return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
+  return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingSessionId === newState.editingSessionId && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
 };
 const maybeUpdateGitIgnoredUris = async (oldState, newState) => {
   if (oldState.items === newState.items || oldState.sourceControlIgnoredUris !== newState.sourceControlIgnoredUris) {
@@ -3697,6 +3716,9 @@ const wrapListItemCommandInternal = (fn, queued) => {
     const intermediate = get(id);
     set(id, intermediate.oldState, updatedState, intermediate.scheduledState);
     if (hasSameVisibleExplorerItemInputs(intermediate.newState, updatedState)) {
+      if (updatedState.inputSource === User) {
+        set(id, intermediate.oldState, updatedState);
+      }
       return;
     }
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
@@ -3755,6 +3777,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     editingIndex: -1,
     editingSelectionEnd: 0,
     editingSelectionStart: 0,
+    editingSessionId: 0,
     editingType: None$5,
     editingValue: '',
     errorCode: '',
@@ -4734,6 +4757,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
   // TODO do it like vscode, select position between folders and files
   const {
     editingIndex,
+    editingSessionId,
     excluded,
     focusedIndex,
     items,
@@ -4750,6 +4774,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
     ...state,
     editingIcon,
     editingIndex: newEditingIndex,
+    editingSessionId: editingSessionId + 1,
     editingType,
     editingValue: '',
     focus: Input$1,
@@ -5351,7 +5376,7 @@ const isEqual = (a, b) => {
 };
 
 const handleDragOverIndex = (state, index) => {
-  if (state.isReadonly) {
+  if (state.isReadonly && state.root !== '') {
     return state;
   }
   const {
@@ -5370,7 +5395,7 @@ const handleDragOverIndex = (state, index) => {
 const handleDragOver = (state, x, y) => {
   number(x);
   number(y);
-  if (state.isReadonly) {
+  if (state.isReadonly && state.root !== '') {
     return state;
   }
   const index = getIndexFromPosition(state, x, y);
@@ -5629,7 +5654,7 @@ const loadContent = async (state, savedState) => {
     // TODO path separator could be restored from saved state
     const [pathSeparator, isReadonly$1] = await Promise.all([getPathSeparator(root),
     // TODO only load path separator once
-    isReadonly(root)]);
+    root === '' ? false : isReadonly(root)]);
     const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
     const rawDeltaY = getRestoredDeltaY(savedState);
     const maxDeltaY = Math.max(restoredDirents.length * itemHeight - height, 0);
@@ -5924,7 +5949,7 @@ const getModule = isElectron => {
   return handleDrop$2;
 };
 const handleDropRoot = async (state, fileHandles, files, paths) => {
-  if (state.isReadonly) {
+  if (state.isReadonly && state.root !== '') {
     return state;
   }
   const isElectron = state.platform === Electron;
@@ -6038,7 +6063,7 @@ const getFilePaths = async (files, platform) => {
 };
 
 const handleDrop = async (state, x, y, fileIds, fileList) => {
-  if (state.isReadonly) {
+  if (state.isReadonly && state.root !== '') {
     return state;
   }
   try {
@@ -6096,19 +6121,23 @@ const handleIconThemeChange = state => {
   return updateIcons(state);
 };
 
-const handleInputBlur = async state => {
+const handleInputBlur = async (state, editingSessionId) => {
   const {
     editingErrorMessage,
     editingIndex,
+    editingSessionId: currentEditingSessionId,
     editingValue
   } = state;
   if (editingIndex === -1) {
     return state;
   }
+  if (editingSessionId !== undefined && editingSessionId !== String(currentEditingSessionId)) {
+    return state;
+  }
   if (editingErrorMessage || !editingValue) {
     return cancelEditInternal(state, false);
   }
-  return acceptEdit(state);
+  return acceptEdit(state, User);
 };
 
 const handleInputClick = state => {
@@ -6661,14 +6690,12 @@ const getRenameSelectionRange = name => {
   };
 };
 
-const User = 1;
-const Script = 2;
-
 const renameDirent = async state => {
   if (state.isReadonly) {
     return state;
   }
   const {
+    editingSessionId,
     focusedIndex,
     icons,
     items,
@@ -6689,6 +6716,7 @@ const renameDirent = async state => {
     editingIndex: focusedIndex,
     editingSelectionEnd: end,
     editingSelectionStart: start,
+    editingSessionId: editingSessionId + 1,
     editingType: Rename$1,
     editingValue: item.name,
     focus: Input$1,
@@ -6909,6 +6937,18 @@ const HandlePointerDown = 14;
 const HandleWheel = 15;
 const HandleDoubleClick = 16;
 
+const Focusable = 0;
+
+const welcomeNode = {
+  childCount: 2,
+  className: Welcome,
+  type: Div
+};
+const welcomeMessageNode$1 = {
+  childCount: 1,
+  className: WelcomeMessage,
+  type: P
+};
 const getClassName$1 = dropTargets => {
   const extraClassName = dropTargets === dropTargetFull ? ExplorerDropTarget : Empty;
   return mergeClassNames(Viewlet, Explorer$1, extraClassName);
@@ -6921,17 +6961,9 @@ const getExplorerWelcomeVirtualDom = (isWide, dropTargets) => {
     onDragLeave: HandleDragLeave,
     onDragOver: HandleDragOver,
     onDrop: HandleDrop,
-    tabIndex: 0,
+    tabIndex: Focusable,
     type: Div
-  }, {
-    childCount: 2,
-    className: Welcome,
-    type: Div
-  }, {
-    childCount: 1,
-    className: WelcomeMessage,
-    type: P
-  }, text(youHaveNotYetOpenedAFolder()), {
+  }, welcomeNode, welcomeMessageNode$1, text(youHaveNotYetOpenedAFolder()), {
     childCount: 1,
     className: mergeClassNames(Button$2, ButtonPrimary, isWide ? ButtonWide : ButtonNarrow),
     name: OpenFolder,
@@ -6974,7 +7006,7 @@ const getInputClassName = hasEditingError => {
   return ExplorerInputBox;
 };
 
-const getInputDom = (isEditing, hasEditingError) => {
+const getInputDom = (isEditing, hasEditingError, editingSessionId) => {
   if (!isEditing) {
     return [];
   }
@@ -6986,6 +7018,7 @@ const getInputDom = (isEditing, hasEditingError) => {
     autocorrect: 'off',
     childCount: 0,
     className: getInputClassName(hasEditingError),
+    'data-editingSessionId': editingSessionId,
     id: 'ExplorerInput',
     name: ExplorerInput,
     onBlur: HandleInputBlur,
@@ -7021,7 +7054,7 @@ const getTitle = path => {
   }
   return path;
 };
-const getExplorerItemVirtualDom = item => {
+const getExplorerItemVirtualDom = (item, editingSessionId = 0) => {
   const {
     ariaExpanded,
     chevron,
@@ -7037,15 +7070,16 @@ const getExplorerItemVirtualDom = item => {
     name,
     path,
     posInSet,
+    selected,
     setSize
   } = item;
   const chevronDom = getChevronVirtualDom(chevron);
   return [{
-    ariaDescription: '',
     ariaExpanded,
     ariaLabel: name,
     ariaLevel: depth,
     ariaPosInSet: posInSet,
+    ariaSelected: selected ? 'true' : undefined,
     ariaSetSize: setSize,
     childCount: 2 + chevronDom.length,
     className,
@@ -7055,7 +7089,7 @@ const getExplorerItemVirtualDom = item => {
     role: TreeItem,
     title: getTitle(path),
     type: Div
-  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputDom(isEditing, hasEditingError), ...getLabelDom(isEditing, name, isCut || isIgnored)];
+  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputDom(isEditing, hasEditingError, editingSessionId), ...getLabelDom(isEditing, name, isCut || isIgnored)];
 };
 
 const getActiveDescendant = focusedIndex => {
@@ -7070,7 +7104,7 @@ const getClassName = (focused, focusedIndex, dropTarget) => {
   const className = mergeClassNames(ListItems, extraClass1, extraClass2);
   return className;
 };
-const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets) => {
+const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets, editingSessionId = 0) => {
   const dom = [{
     ariaActiveDescendant: getActiveDescendant(focusedIndex),
     ariaLabel: filesExplorer(),
@@ -7089,13 +7123,18 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
     onPointerDown: HandlePointerDown,
     onWheel: HandleWheel,
     role: Tree,
-    tabIndex: 0,
+    tabIndex: Focusable,
     type: Div
     // onKeyDown: DomEventListenerFunctions.HandleListKeyDown,
-  }, ...visibleItems.flatMap(getExplorerItemVirtualDom)];
+  }, ...visibleItems.flatMap(item => getExplorerItemVirtualDom(item, editingSessionId))];
   return dom;
 };
 
+const welcomeMessageNode = {
+  childCount: 1,
+  className: WelcomeMessage,
+  type: P
+};
 const getParentNode$1 = childCount => {
   return {
     childCount,
@@ -7110,11 +7149,7 @@ const getLoadErrorVirtualDom = (loadErrorMessage, isWide, showOpenAnotherFolderB
     childCount,
     className: Welcome,
     type: Div
-  }, {
-    childCount: 1,
-    className: WelcomeMessage,
-    type: P
-  }, text(loadErrorMessage)];
+  }, welcomeMessageNode, text(loadErrorMessage)];
   const buttonDom = showOpenAnotherFolderButton ? [{
     childCount: 1,
     className: mergeClassNames(Button$2, ButtonPrimary, isWide ? ButtonWide : ButtonNarrow),
@@ -7126,6 +7161,11 @@ const getLoadErrorVirtualDom = (loadErrorMessage, isWide, showOpenAnotherFolderB
   return [parentNode, ...errorDom, ...buttonDom];
 };
 
+const scrollBarThumbNode = {
+  childCount: 0,
+  className: ScrollBarThumb,
+  type: Div
+};
 const getScrollBarVirtualDom = scrollBarHeight => {
   const shouldShowScrollbar = scrollBarHeight > 0;
   if (!shouldShowScrollbar) {
@@ -7135,11 +7175,7 @@ const getScrollBarVirtualDom = scrollBarHeight => {
     childCount: 1,
     className: mergeClassNames(ScrollBar, ScrollBarSmall),
     type: Div
-  }, {
-    childCount: 0,
-    className: ScrollBarThumb,
-    type: Div
-  }];
+  }, scrollBarThumbNode];
 };
 
 const getParentNode = childCount => {
@@ -7160,7 +7196,7 @@ const getChildCount = (scrollBarDomLength, errorDomLength) => {
   }
   return childCount;
 };
-const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage, showOpenAnotherFolderButton) => {
+const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage, showOpenAnotherFolderButton, editingSessionId = 0) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide, dropTargets);
   }
@@ -7172,7 +7208,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
   const errorDom = getErrorMessageDom(editingErrorMessage);
   const childCount = getChildCount(scrollBarDom.length, errorDom.length);
   const parentNode = getParentNode(childCount);
-  const dom = [parentNode, ...getListItemsVirtualDom(visibleItems, focusedIndex, focused, dropTargets), ...scrollBarDom, ...errorDom];
+  const dom = [parentNode, ...getListItemsVirtualDom(visibleItems, focusedIndex, focused, dropTargets, editingSessionId), ...scrollBarDom, ...errorDom];
   return dom;
 };
 
@@ -7201,6 +7237,7 @@ const renderItems = (oldState, newState) => {
   const {
     dropTargets,
     editingErrorMessage,
+    editingSessionId,
     focused,
     focusedIndex,
     height,
@@ -7218,7 +7255,7 @@ const renderItems = (oldState, newState) => {
   if (initial) {
     return [SetDom2, newState.uid, []];
   }
-  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage, showOpenAnotherFolderButton);
+  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage, showOpenAnotherFolderButton, editingSessionId);
   return [SetDom2, newState.uid, dom];
 };
 
@@ -7331,7 +7368,7 @@ const getActions = (root, isReadonly) => {
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
-    className: `MaskIcon MaskIcon${icon}`,
+    className: mergeClassNames('MaskIcon', `MaskIcon${icon}`),
     role: None,
     type
   };
@@ -7383,7 +7420,7 @@ const renderActions = uid => {
 const renderEventListeners = () => {
   return [{
     name: HandleInputBlur,
-    params: ['handleInputBlur']
+    params: ['handleInputBlur', 'event.target.dataset.editingSessionId']
   }, {
     name: HandleListFocus,
     params: ['handleFocus', IsTrusted, EventTargetClassName]
@@ -7747,7 +7784,8 @@ const updateEditingValue = async (state, value, inputSource = User) => {
     ...state,
     editingErrorMessage,
     editingIcon,
-    editingValue: value
+    editingValue: value,
+    inputSource
   };
 };
 

package/package.json

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