@lvce-editor/explorer-view 2.60.0 → 2.62.0

package/dist/explorerViewWorkerMain.js

@@ -931,17 +931,34 @@ const create$2 = rpcId => {
 };
 const RendererWorker$1 = 1;
 const {
-  invoke: invoke$4,
+  invoke: invoke$3,
   set: set$3} = create$2(RendererWorker$1);
+const showContextMenu$1 = async (x, y, id, ...args) => {
+  return invoke$3('ContextMenu.show', x, y, id, ...args);
+};
+const confirm$1 = async (message, options) => {
+  // @ts-ignore
+  const result = await invoke$3('Confirmprompt.prompt', message, options);
+  return result;
+};
+const writeClipBoardText$1 = async text => {
+  await invoke$3('ClipBoard.writeText', /* text */text);
+};
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$4,
-  set: set$3
+  confirm: confirm$1,
+  invoke: invoke$3,
+  set: set$3,
+  showContextMenu: showContextMenu$1,
+  writeClipBoardText: writeClipBoardText$1
 };
 
 const {
   invoke: invoke$1,
-  set: set$1
+  set: set$1,
+  writeClipBoardText,
+  confirm,
+  showContextMenu
 } = RendererWorker;
 
 // TODO use direct connection
@@ -1870,7 +1887,7 @@ const copyPath = async state => {
 };
 
 const writeText = async text => {
-  await invoke$1('ClipBoard.writeText', /* text */text);
+  await writeClipBoardText(text);
 };
 const readNativeFiles = async () => {
   // @ts-ignore
@@ -2004,7 +2021,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     scrollBarHeight: 0,
     confirmPaste: false,
     pasteShouldMove: false,
-    cutItems: []
+    cutItems: [],
+    isPointerDown: false
   };
   set(uid, state, state);
 };
@@ -2053,7 +2071,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     scrollBarHeight: 0,
     confirmPaste: false,
     pasteShouldMove: false,
-    cutItems: []
+    cutItems: [],
+    isPointerDown: false
   };
   set(state.uid, state, state);
   return state;
@@ -2064,6 +2083,7 @@ const RenderFocus = 6;
 const RenderFocusContext = 7;
 const RenderValue = 8;
 const RenderSelection = 9;
+const RenderDragData = 10;
 
 const diffType$3 = RenderFocus;
 const isEqual$4 = (oldState, newState) => {
@@ -2391,7 +2411,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'handleCut', 'selectIndices', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', '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', 'handleCut', 'handleDragLeave', 'handleDragOver', 'handleDragStart', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectIndices', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'toggleIndividualSelection', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -3090,14 +3110,44 @@ const handleClickAtRangeSelection = async (state, index) => {
   return handleRangeSelection(state, min, max);
 };
 
+const toggleIndividualSelection = async (state, index) => {
+  const {
+    items
+  } = state;
+
+  // If index is out of range, do nothing
+  if (index < 0 || index >= items.length) {
+    return state;
+  }
+  const newItems = items.map((item, i) => ({
+    ...item,
+    selected: i === index ? !item.selected : item.selected
+  }));
+  return {
+    ...state,
+    items: newItems
+  };
+};
+
 const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey, x, y) => {
   if (defaultPrevented || button !== LeftClick) {
     return state;
   }
   const index = getIndexFromPosition(state, x, y);
+  if (index === -1) {
+    return {
+      ...state,
+      focused: true,
+      focusedIndex: -1
+      // TODO mark all items as not selected
+    };
+  }
   if (shiftKey) {
     return handleClickAtRangeSelection(state, index);
   }
+  if (ctrlKey) {
+    return toggleIndividualSelection(state, index);
+  }
   return handleClick(state, index);
 };
 
@@ -3119,7 +3169,7 @@ const handleClickOpenFolder = async state => {
 };
 
 const show = async (x, y, id, ...args) => {
-  return invoke$1('ContextMenu.show', x, y, id, ...args);
+  return showContextMenu(x, y, id, ...args);
 };
 
 const Explorer$1 = 4;
@@ -3213,14 +3263,6 @@ const handleCut = async state => {
 
 const handleDragLeave = state => {
   return state;
-  // const { dropTargets } = state
-  // if (dropTargets.length === 0) {
-  //   return state
-  // }
-  // return {
-  //   ...state,
-  //   dropTargets: [],
-  // }
 };
 
 const canBeDroppedInto = dirent => {
@@ -3286,6 +3328,10 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
+const handleDragStart = state => {
+  return state;
+};
+
 const isExpanded = item => {
   return item.type === DirectoryExpanded || item.type === DirectoryExpanding;
 };
@@ -4284,6 +4330,10 @@ const handleWorkspaceChange = async state => {
   return newState;
 };
 
+const initialize = async () => {
+  // TODO create file system worker connection
+};
+
 const ExplorerEditBox = FocusExplorerEditBox;
 
 const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntType) => {
@@ -4452,7 +4502,7 @@ const confirmDelete = async paths => {
   // TODO use i18n string
   const message = paths.length === 1 ? `Are you sure you want to delete "${paths[0]}"?` : `Are you sure you want to delete ${paths.length} items?`;
   // @ts-ignore
-  const result = await invoke$1('Confirmprompt.prompt', message);
+  const result = await confirm(message);
   return result === true;
 };
 
@@ -4560,6 +4610,15 @@ const renameDirent = state => {
   };
 };
 
+const renderDragData = (oldState, newState) => {
+  // TODO send selected urls
+  const dragData = [{
+    type: 'text/plain',
+    data: 'https://example.com'
+  }];
+  return ['Viewlet.setDragData', newState.uid, dragData];
+};
+
 const ExplorerInput = 'ExplorerInput';
 
 const renderEditingSelection = (oldState, newState) => {
@@ -4670,19 +4729,20 @@ const getErrorMessageDom = (errorMessage, errorMessageLeft, errorMessageTop) =>
   }, text(errorMessage)];
 };
 
-const HandleClick = 'handleClick';
-const HandleClickOpenFolder = 'handleClickOpenFolder';
-const HandleContextMenu = 'handleContextMenu';
-const HandleDragLeave = 'handleDragLeave';
-const HandleDragOver = 'handleDragOver';
-const HandleDrop = 'handleDrop';
-const HandleEditingInput = 'handleEditingInput';
-const HandleInputBlur = 'handleInputBlur';
-const HandleInputClick = 'handleInputClick';
-const HandleListBlur = 'handleListBlur';
-const HandleListFocus = 'handleListFocus';
-const HandlePointerDown = 'handlePointerDown';
-const HandleWheel = 'handleWheel';
+const HandleClick = 1;
+const HandleClickOpenFolder = 2;
+const HandleContextMenu = 3;
+const HandleDragLeave = 4;
+const HandleDragOver = 5;
+const HandleDrop = 6;
+const HandleEditingInput = 7;
+const HandleInputBlur = 8;
+const HandleInputClick = 9;
+const HandleListBlur = 11;
+const HandleListFocus = 12;
+const HandlePointerDown = 14;
+const HandleWheel = 15;
+const HandleDragStart = 17;
 
 const getExplorerWelcomeVirtualDom = isWide => {
   return [{
@@ -4796,7 +4856,8 @@ const getExplorerItemVirtualDom = item => {
     path,
     setSize,
     posInSet,
-    isCut
+    isCut,
+    index
   } = item;
   const chevronDom = getChevronVirtualDom(chevron);
   return [{
@@ -4813,7 +4874,8 @@ const getExplorerItemVirtualDom = item => {
     ariaLabel: name,
     ariaExpanded,
     ariaDescription: '',
-    id
+    id,
+    'data-index': index
   }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, hasEditingError, name, isCut)];
 };
 
@@ -5021,7 +5083,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       chevron,
       id,
       className,
-      isCut
+      isCut,
+      index: i
     });
   }
   return visible;
@@ -5088,6 +5151,8 @@ const getRenderer = diffType => {
       return renderValue;
     case RenderSelection:
       return renderEditingSelection;
+    case RenderDragData:
+      return renderDragData;
     default:
       throw new Error('unknown renderer');
   }
@@ -5259,6 +5324,13 @@ const renderEventListeners = () => {
   }, {
     name: HandleDragLeave,
     params: ['handleDragLeave']
+  }, {
+    name: HandleDragStart,
+    params: ['handleDragStart'],
+    // @ts-ignore
+    dragInfo: {
+      'text/uri': 'abc'
+    }
   }];
 };
 
@@ -5555,6 +5627,7 @@ const commandMap = {
   'Explorer.focusFirst': wrapCommand(focusFirst),
   'Explorer.focusIndex': wrapCommand(focusIndex),
   'Explorer.focusLast': wrapCommand(focusLast),
+  'Explorer.handleDragStart': wrapCommand(handleDragStart),
   'Explorer.focusNext': wrapCommand(focusNext),
   'Explorer.focusNone': wrapCommand(focusNone),
   'Explorer.focusPrevious': wrapCommand(focusPrevious),
@@ -5598,10 +5671,11 @@ const commandMap = {
   'Explorer.revealItem': wrapCommand(revealItem),
   'Explorer.selectAll': wrapCommand(selectAll),
   'Explorer.selectDown': wrapCommand(selectDown),
+  'Explorer.selectIndices': wrapCommand(setSelectedIndices),
   'Explorer.selectUp': wrapCommand(selectUp),
   'Explorer.setDeltaY': wrapCommand(setDeltaY),
   'Explorer.setSelectedIndices': wrapCommand(setSelectedIndices),
-  'Explorer.selectIndices': wrapCommand(setSelectedIndices),
+  'Explorer.toggleIndividualSelection': wrapCommand(toggleIndividualSelection),
   'Explorer.updateEditingValue': wrapCommand(updateEditingValue),
   'Explorer.updateIcons': wrapCommand(updateIcons),
   // not wrapped
@@ -5614,6 +5688,7 @@ const commandMap = {
   'Explorer.renderEventListeners': renderEventListeners,
   'Explorer.saveState': saveState,
   'Explorer.terminate': terminate,
+  'Explorer.initialize': initialize,
   // deprecated
   'Explorer.create': create
 };

package/package.json

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