@lvce-editor/explorer-view 2.20.0 → 2.22.0

package/dist/explorerViewWorkerMain.js

@@ -1579,19 +1579,28 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
 const RenderItems = 4;
 const RenderFocus = 6;
 const RenderFocusContext = 7;
+const RenderValue = 8;
 
-const diffType$1 = RenderFocus;
-const isEqual$2 = (oldState, newState) => {
+const diffType$2 = RenderFocus;
+const isEqual$3 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const diffType = RenderItems;
-const isEqual$1 = (oldState, newState) => {
+const diffType$1 = RenderItems;
+const isEqual$2 = (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 modules = [isEqual$1, isEqual$2, isEqual$2];
-const numbers = [diffType, diffType$1, RenderFocusContext];
+const diffType = RenderValue;
+const isEqual$1 = (oldState, newState) => {
+  if (newState.focus !== Input$1) {
+    return true;
+  }
+  return oldState.focus === Input$1 && newState.focus === Input$1 && oldState.editingValue === newState.editingValue;
+};
+
+const modules = [isEqual$2, isEqual$3, isEqual$3, isEqual$1];
+const numbers = [diffType$1, diffType$2, RenderFocusContext, diffType];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1986,7 +1995,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'selectUp', 'selectDown', 'getMouseActions', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'setSelectedIndices', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2002,6 +2011,7 @@ const UpArrow = 14;
 const RightArrow = 15;
 const DownArrow = 16;
 const Delete = 18;
+const KeyA = 29;
 const KeyC = 31;
 const KeyV = 50;
 const F2 = 58;
@@ -2095,6 +2105,10 @@ const getKeyBindings = () => {
     key: Enter,
     command: 'Explorer.handleClickCurrent',
     when: FocusExplorer
+  }, {
+    key: CtrlCmd | KeyA,
+    command: 'Explorer.selectAll',
+    when: FocusExplorer
   }];
 };
 
@@ -2225,14 +2239,12 @@ const LeftClick = 0;
 
 const getMouseActions = () => {
   return [{
-    id: 'explorer.openFile',
     description: 'Open file on click',
     button: LeftClick,
     modifiers: {},
     command: 'Explorer.openFile',
     when: FocusExplorer
   }, {
-    id: 'explorer.toggleSelection',
     description: 'Toggle selection with Ctrl+Click',
     button: LeftClick,
     modifiers: {
@@ -2241,7 +2253,6 @@ const getMouseActions = () => {
     command: 'Explorer.toggleSelection',
     when: FocusExplorer
   }, {
-    id: 'explorer.rangeSelection',
     description: 'Select range with Shift+Click',
     button: LeftClick,
     modifiers: {
@@ -2249,14 +2260,6 @@ const getMouseActions = () => {
     },
     command: 'Explorer.rangeSelection',
     when: FocusExplorer
-  }, {
-    id: 'explorer.contextMenu',
-    description: 'Show context menu on right click',
-    button: 2,
-    // Right click
-    modifiers: {},
-    command: 'Explorer.showContextMenu',
-    when: FocusExplorer
   }];
 };
 
@@ -2623,19 +2626,23 @@ const handleRangeSelection = (state, startIndex, endIndex) => {
   };
 };
 
-const handleClickAt = (state, button, ctrlKey, shiftKey, x, y) => {
+const handleClickAtRangeSelection = async (state, index) => {
+  const firstSelectedIndex = state.items.findIndex(item => item.selected);
+  if (firstSelectedIndex === -1) {
+    return handleRangeSelection(state, index, index);
+  }
+  const min = Math.min(firstSelectedIndex, index);
+  const max = Math.min(firstSelectedIndex, index);
+  return handleRangeSelection(state, min, max);
+};
+
+const handleClickAt = async (state, button, ctrlKey, shiftKey, x, y) => {
   if (button !== LeftClick) {
     return state;
   }
   const index = getIndexFromPosition(state, x, y);
   if (shiftKey) {
-    const firstSelectedIndex = state.items.findIndex(item => item.selected);
-    if (firstSelectedIndex === -1) {
-      return handleRangeSelection(state, index, index);
-    }
-    const min = Math.min(firstSelectedIndex, index);
-    const max = Math.min(firstSelectedIndex, index);
-    return handleRangeSelection(state, min, max);
+    return handleClickAtRangeSelection(state, index);
   }
   return handleClick(state, index);
 };
@@ -2852,6 +2859,7 @@ const applyOperation = operation => {
   }
   return writeFile(operation.path, operation.text);
 };
+
 const applyFileOperations = async operations => {
   // TODO run operations in parallel if possible
   for (const operation of operations) {
@@ -3657,6 +3665,9 @@ const removeDirent = async state => {
   };
 };
 
+const User = 1;
+const Script = 2;
+
 const renameDirent = state => {
   const {
     focusedIndex,
@@ -3668,14 +3679,13 @@ const renameDirent = state => {
     editingIndex: focusedIndex,
     editingType: Rename$1,
     editingValue: item.name,
-    focus: Input$1
+    focus: Input$1,
+    inputSource: Script
   };
 };
 
 const ExplorerInput = 'ExplorerInput';
 
-const User = 1;
-
 const renderFocus$1 = (oldState, newState) => {
   if (newState.inputSource === User) {
     return [];
@@ -4049,6 +4059,16 @@ const renderItems = (oldState, newState) => {
   return ['Viewlet.setDom2', dom];
 };
 
+const renderValue = (oldState, newState) => {
+  if (newState.inputSource === User) {
+    return [];
+  }
+  if (newState.focus === Input$1) {
+    return ['Viewlet.setValueByName', ExplorerInput, newState.editingValue];
+  }
+  return [];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderItems:
@@ -4057,6 +4077,8 @@ const getRenderer = diffType => {
       return renderFocus$1;
     case RenderFocusContext:
       return renderFocus;
+    case RenderValue:
+      return renderValue;
     default:
       throw new Error('unknown renderer');
   }
@@ -4450,13 +4472,36 @@ const saveState = uid => {
   };
 };
 
+const selectAll = state => {
+  const {
+    items
+  } = state;
+  const newItems = items.map(item => ({
+    ...item,
+    selected: true
+  }));
+  return {
+    ...state,
+    items: newItems
+  };
+};
+
+const getLastSelectedIndex = items => {
+  let lastSelectedIndex = -1;
+  for (let index = 0; index < items.length; index++) {
+    if (items[index].selected) {
+      lastSelectedIndex = index;
+    }
+  }
+  return lastSelectedIndex;
+};
 const selectDown = state => {
   const {
     items,
     focusedIndex
   } = state;
-  const firstSelectedIndex = items.findIndex(item => item.selected);
-  const targetIndex = firstSelectedIndex === -1 ? focusedIndex : firstSelectedIndex;
+  const lastSelectedIndex = getLastSelectedIndex(items);
+  const targetIndex = lastSelectedIndex === -1 ? focusedIndex : lastSelectedIndex;
   if (targetIndex >= items.length - 1) {
     return state;
   }
@@ -4464,6 +4509,21 @@ const selectDown = state => {
     ...item,
     selected: i === targetIndex + 1 ? true : item.selected
   }));
+  return {
+    ...state,
+    items: newItems,
+    focusedIndex: targetIndex + 1
+  };
+};
+
+const setSelectedIndices = (state, indices) => {
+  const {
+    items
+  } = state;
+  const newItems = items.map((item, i) => ({
+    ...item,
+    selected: indices.includes(i)
+  }));
   return {
     ...state,
     items: newItems
@@ -4551,6 +4611,7 @@ const commandMap = {
   'Explorer.handleBlur': wrapCommand(handleBlur),
   'Explorer.selectUp': wrapCommand(selectUp),
   'Explorer.selectDown': wrapCommand(selectDown),
+  'Explorer.selectAll': wrapCommand(selectAll),
   'Explorer.handleClick': wrapCommand(handleClick),
   'Explorer.handleClickAt': wrapCommand(handleClickAt),
   'Explorer.handleClickCurrent': wrapCommand(handleClickCurrent),
@@ -4582,6 +4643,7 @@ const commandMap = {
   'Explorer.setDeltaY': wrapCommand(setDeltaY),
   'Explorer.updateEditingValue': wrapCommand(updateEditingValue),
   'Explorer.updateIcons': wrapCommand(updateIcons),
+  'Explorer.setSelectedIndices': wrapCommand(setSelectedIndices),
   // not wrapped
   'Explorer.create2': create2,
   'Explorer.diff2': diff2,

package/package.json

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