@lvce-editor/explorer-view 2.1.0 → 2.2.0

package/dist/explorerViewWorkerMain.js

@@ -1288,7 +1288,41 @@ const ListItem = 22;
 const Slash = '/';
 
 // TODO parentUid might ot be needed
-const create = (id, uri, x, y, width, height, args, parentUid) => {
+const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) => {
+  const state = {
+    uid,
+    parentUid,
+    root: '',
+    items: [],
+    focusedIndex: -1,
+    focused: false,
+    hoverIndex: -1,
+    x,
+    y,
+    width,
+    height,
+    deltaY: 0,
+    minLineY: 0,
+    maxLineY: 0,
+    pathSeparator: Slash,
+    version: 0,
+    editingIndex: -1,
+    itemHeight: ListItem,
+    dropTargets: [],
+    excluded: [],
+    editingValue: '',
+    editingType: None$5,
+    editingIcon: '',
+    fileIconCache: Object.create(null),
+    useChevrons: false,
+    icons: [],
+    platform
+  };
+  set(uid, state, state);
+};
+
+// TODO parentUid might ot be needed
+const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
   const state = {
     uid: id,
     parentUid,
@@ -1315,7 +1349,8 @@ const create = (id, uri, x, y, width, height, args, parentUid) => {
     editingIcon: '',
     fileIconCache: Object.create(null),
     useChevrons: false,
-    icons: []
+    icons: [],
+    platform
   };
   set(state.uid, state, state);
   return state;
@@ -1802,7 +1837,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'relealItem', 'removeDirent', 'rename', 'renameDirent', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'renderEventListeners', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'revealItem', 'removeDirent', 'rename', 'renameDirent', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'renderEventListeners', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2660,7 +2695,7 @@ const getModule = isElectron => {
 };
 const handleDropRoot = async (state, files) => {
   // @ts-ignore
-  const fn = await getModule(state.isElectron);
+  const fn = getModule(state.isElectron);
   return fn(state, files);
 };
 
@@ -2806,6 +2841,7 @@ const mergeDirents = (oldDirents, newDirents) => {
 
 // TODO add lots of tests for this
 const updateRoot = async state1 => {
+  // @ts-ignore
   if (state1.disposed) {
     return state1;
   }
@@ -3095,15 +3131,18 @@ const getExcluded = () => {
   }
   return excluded;
 };
-const getSavedRoot$1 = (savedState, workspacePath) => {
+const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
 const loadContent = async (state, savedState) => {
+  const {
+    fileIconCache
+  } = state;
   const {
     useChevrons
   } = await getSettings();
   const workspacePath = await getWorkspacePath();
-  const root = getSavedRoot$1(savedState, workspacePath);
+  const root = getSavedRoot(savedState, workspacePath);
   // TODO path separator could be restored from saved state
   const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
   const excluded = getExcluded();
@@ -3124,7 +3163,7 @@ const loadContent = async (state, savedState) => {
   const {
     icons,
     newFileIconCache
-  } = await getFileIcons(restoredDirents, Object.create(null));
+  } = await getFileIcons(restoredDirents, fileIconCache);
   return {
     ...state,
     root,
@@ -3339,6 +3378,7 @@ const HandleListBlur = 'handleListBlur';
 const HandleListFocus = 'handleListFocus';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
+const HandleDragOver = 'handleDragOver';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -3487,7 +3527,8 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     onContextMenu: HandleContextMenu,
     onPointerDown: HandlePointerDown,
     onWheel: HandleWheel,
-    onClick: HandleClick
+    onClick: HandleClick,
+    onDragOver: HandleDragOver
   }, ...visibleItems.flatMap(getExplorerItemVirtualDom)];
   return dom;
 };
@@ -3749,31 +3790,42 @@ const renderEventListeners = () => {
     name: HandleWheel,
     params: ['handleWheel', 'event.deltaMode', 'event.deltaY'],
     passive: true
+  }, {
+    name: HandleDragOver,
+    params: ['handleDragOver', 'event.clientX', 'event.clientY']
   }];
 };
 
-const getSavedRoot = (savedState, workspacePath) => {
-  return workspacePath;
+const getSavedMinLineY = savedState => {
+  if (savedState && typeof savedState === 'object' && 'minLineY' in savedState && typeof savedState.minLineY === 'number') {
+    return savedState.minLineY;
+  }
+  return 0;
+};
+const getSavedDeltaY = savedState => {
+  if (savedState && typeof savedState === 'object' && 'deltaY' in savedState && typeof savedState.deltaY === 'number') {
+    return savedState.deltaY;
+  }
+  return 0;
+};
+const getSavedWorkspacePath = savedState => {
+  if (savedState && typeof savedState === 'object' && 'workspacePath' in savedState && typeof savedState.workspacePath === 'string') {
+    return savedState.workspacePath;
+  }
+  return '';
 };
-
 const restoreState = savedState => {
   if (!savedState) {
     return {
+      root: '',
       minLineY: 0,
       deltaY: 0
     };
   }
-  const root = getSavedRoot(savedState, savedState.workspacePath || '');
-  let minLineY = 0;
-  if (savedState && typeof savedState.minLineY === 'number') {
-    minLineY = savedState.minLineY;
-  }
-  let deltaY = 0;
-  if (savedState && typeof savedState.deltaY === 'number') {
-    deltaY = savedState.deltaY;
-  }
+  const root = getSavedWorkspacePath(savedState);
+  const minLineY = getSavedMinLineY(savedState);
+  const deltaY = getSavedDeltaY(savedState);
   return {
-    ...savedState,
     root,
     minLineY,
     deltaY
@@ -3866,8 +3918,8 @@ const getPathPartsToReveal = (root, pathParts, dirents) => {
   }
   return pathParts;
 };
-const getPathPartChildren = pathPart => {
-  const children = getChildDirents(pathPart.pathSeparator, pathPart);
+const getPathPartChildren = async pathPart => {
+  const children = await getChildDirents(pathPart.pathSeparator, pathPart);
   return children;
 };
 const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
@@ -4097,13 +4149,13 @@ const commandMap = {
   'Explorer.openContainingFolder': wrapCommand(openContainingFolder),
   'Explorer.removeDirent': wrapCommand(removeDirent),
   'Explorer.renameDirent': wrapCommand(renameDirent),
-  'Explorer.restoreState': wrapCommand(restoreState),
+  'Explorer.restoreState': restoreState,
   'Explorer.revealItem': wrapCommand(revealItem),
   'Explorer.setDeltaY': wrapCommand(setDeltaY),
   'Explorer.updateEditingValue': wrapCommand(updateEditingValue),
   'Explorer.updateIcons': wrapCommand(updateIcons),
   // not wrapped
-  'Explorer.create': create,
+  'Explorer.create2': create2,
   'Explorer.diff2': diff2,
   'Explorer.getKeyBindings': getKeyBindings,
   'Explorer.getMenuEntries': getMenuEntries,
@@ -4111,7 +4163,9 @@ const commandMap = {
   'Explorer.renderActions2': renderActions,
   'Explorer.renderEventListeners': renderEventListeners,
   'Explorer.saveState': saveState,
-  'Explorer.terminate': terminate
+  'Explorer.terminate': terminate,
+  // deprecated
+  'Explorer.create': create
 };
 
 const listen = async () => {

package/package.json

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