@lvce-editor/source-control-worker 1.6.0 → 1.7.0

package/dist/sourceControlWorkerMain.js

@@ -1162,7 +1162,7 @@ const Directory = 3;
 const DirectoryExpanded = 4;
 const File = 7;
 
-const getFileIcon$1 = ({
+const getFileIcon = ({
   name
 }) => {
   return '';
@@ -1219,7 +1219,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
         detail: folderName,
         posInSet: i + 1,
         setSize: length,
-        icon: getFileIcon$1({
+        icon: getFileIcon({
           name: file
         }),
         decorationIcon: icon,
@@ -1243,35 +1243,31 @@ const getDisplayItems = (allGroups, isExpanded) => {
   return displayItems;
 };
 
+const getIconType = direntType => {
+  switch (direntType) {
+    case Directory:
+    case DirectoryExpanded:
+      return 2;
+    default:
+      return 1;
+  }
+};
 const getMissingIconRequests = (dirents, fileIconCache) => {
   const missingRequests = [];
   for (const dirent of dirents) {
     if (!(dirent.file in fileIconCache)) {
       missingRequests.push({
-        type: dirent.type,
-        name: dirent.label,
-        path: dirent.file
+        type: getIconType(dirent.type),
+        name: dirent.label
       });
     }
   }
   return missingRequests;
 };
 
-const getFileIcon = async name => {
-  return invoke$1('IconTheme.getFileIcon', {
-    name
-  });
-};
-
-const getFolderIcon = async name => {
-  return invoke$1('IconTheme.getFolderIcon', {
-    name
-  });
-};
-
 const requestFileIcons = async requests => {
-  const promises = requests.map(request => request.type === File ? getFileIcon(request.name) : getFolderIcon(request.name));
-  return Promise.all(promises);
+  const results = await invoke$1('IconTheme.getIcons', requests);
+  return results;
 };
 
 const updateIconCache = (iconCache, missingRequests, newIcons) => {
@@ -1284,7 +1280,7 @@ const updateIconCache = (iconCache, missingRequests, newIcons) => {
   for (let i = 0; i < missingRequests.length; i++) {
     const request = missingRequests[i];
     const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
+    newFileIconCache[request.name] = icon;
   }
   return newFileIconCache;
 };
@@ -1399,7 +1395,7 @@ const getVisibleSourceControlItems = (items, minLineY, maxLineY, actionsCache, f
     const item = items[i];
     const contextId = getContextId(item.groupId, item.type);
     const buttons = actionsCache[contextId] || emptySourceControlButtons;
-    const fileIcon = fileIconCache[item.file] || '';
+    const fileIcon = fileIconCache[item.label] || '';
     visible.push({
       ...item,
       buttons,
@@ -1454,7 +1450,7 @@ const loadContent = async state => {
   } = await getGroups(enabledProviderIds);
   const isExpanded = true;
   const displayItems = getDisplayItems(allGroups, isExpanded);
-  const cache = await requestSourceActions();
+  const actionsCache = await requestSourceActions();
   const splitButtonEnabled = get();
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
@@ -1463,9 +1459,8 @@ const loadContent = async state => {
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
   const minLineY = 0;
   const maxLineY = Math.min(numberOfVisible, total);
-  const slicedItems = displayItems.slice(minLineY, maxLineY);
-  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
-  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, cache, newFileIconCache);
+  const newFileIconCache = await getFileIcons(displayItems, fileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
   return {
     ...state,
@@ -1480,7 +1475,8 @@ const loadContent = async state => {
     maxLineY,
     scrollBarHeight,
     finalDeltaY,
-    fileIconCache: newFileIconCache
+    fileIconCache: newFileIconCache,
+    actionsCache
   };
 };
 
@@ -1509,35 +1505,46 @@ const getIndex = (state, eventX, eventY) => {
   return index;
 };
 
-const handleClickDirectory = async (state, item) => {
+const updateVisibleItems = async (state, isExpanded) => {
   const {
-    allGroups
+    allGroups,
+    itemHeight,
+    height,
+    minimumSliderSize,
+    fileIconCache,
+    actionsCache
   } = state;
-  const isExpanded = true;
   const displayItems = getDisplayItems(allGroups, isExpanded);
   const newMaxLineY = displayItems.length;
+  const total = displayItems.length;
+  const contentHeight = total * itemHeight;
+  const listHeight = getListHeight(total, itemHeight, height);
+  const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
+  const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
+  const minLineY = 0;
+  const maxLineY = Math.min(numberOfVisible, total);
+  const slicedItems = displayItems.slice(minLineY, maxLineY);
+  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   return {
     ...state,
     items: displayItems,
     isExpanded,
-    maxLineY: newMaxLineY
+    maxLineY: newMaxLineY,
+    fileIconCache: newFileIconCache,
+    visibleItems,
+    scrollBarHeight
   };
 };
 
+const handleClickDirectory = async (state, item) => {
+  const isExpanded = true;
+  return updateVisibleItems(state, isExpanded);
+};
+
 const handleClickDirectoryExpanded = async (state, item) => {
-  const {
-    allGroups,
-    maxLineY
-  } = state;
   const isExpanded = false;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
-  const newMaxLineY = Math.min(displayItems.length, maxLineY);
-  return {
-    ...state,
-    items: displayItems,
-    isExpanded,
-    maxLineY: newMaxLineY
-  };
+  return updateVisibleItems(state, isExpanded);
 };
 
 const readFile = async (uri, encoding = 'utf8') => {
@@ -1640,6 +1647,35 @@ const handleMouseOverAt = async (state, eventX, eventY) => {
   return handleMouseOver(state, index);
 };
 
+const setDeltaY = async (state, newDeltaY) => {
+  const {
+    itemHeight,
+    items,
+    height,
+    headerHeight,
+    actionsCache,
+    fileIconCache
+  } = state;
+  const normalizedDeltaY = Math.max(newDeltaY, 0);
+  const newMinLineY = Math.floor(normalizedDeltaY / itemHeight);
+  const total = items.length;
+  const listHeight = height - headerHeight;
+  const visibleCount = getNumberOfVisibleItems(listHeight, itemHeight);
+  const maxLineY = Math.min(newMinLineY + visibleCount, total);
+  const visible = getVisibleSourceControlItems(items, newMinLineY, maxLineY, actionsCache, fileIconCache);
+  return {
+    ...state,
+    deltaY: newDeltaY,
+    visibleItems: visible,
+    minLineY: newMinLineY,
+    maxLineY
+  };
+};
+
+const handleWheel = async (state, deltaMode, deltaY) => {
+  return setDeltaY(state, state.deltaY + deltaY);
+};
+
 const getPortTuple = () => {
   const {
     port1,
@@ -2179,6 +2215,8 @@ const commandMap = {
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
+  'SourceControl.setDeltaY': wrapCommand(setDeltaY),
+  'SourceControl.handleWheel': wrapCommand(handleWheel),
   'SourceControl.loadContent': wrapCommand(loadContent),
   'SourceControl.render2': render2,
   'SourceControl.renderActions2': renderActions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"