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

package/dist/sourceControlWorkerMain.js

@@ -1030,41 +1030,39 @@ const {
 
 const create2 = (id, uri, x, y, width, height, workspacePath) => {
   const state = {
-    id,
-    root: '',
-    items: [],
-    x,
-    y,
-    width,
-    height,
+    actionsCache: Object.create(null),
+    allGroups: [],
     deltaY: 0,
-    minLineY: 0,
-    maxLineY: 0,
+    enabledProviderIds: [],
     fileIconCache: Object.create(null),
-    icons: [],
     finalDeltaY: 0,
+    gitRoot: '',
     handleOffset: 0,
-    scrollBarActive: false,
-    scrollBarHeight: 0,
-    merge: [],
+    headerHeight: 40,
+    // TODO
+    height,
+    id,
     index: [],
-    untracked: [],
-    workingTree: [],
     inputValue: '',
-    buttonIndex: -1,
-    enabledProviderIds: [],
     isExpanded: true,
-    buttons: [],
-    providerId: '',
-    splitButtonEnabled: false,
-    allGroups: [],
-    gitRoot: '',
     itemHeight: 20,
+    items: [],
+    maxLineY: 0,
+    merge: [],
     minimumSliderSize: 20,
+    minLineY: 0,
+    providerId: '',
+    root: '',
+    scrollBarActive: false,
+    scrollBarHeight: 0,
+    splitButtonEnabled: false,
+    untracked: [],
+    visibleItems: [],
+    width,
+    workingTree: [],
     workspacePath,
-    headerHeight: 40,
-    // TODO
-    actionsCache: Object.create(null)
+    x,
+    y
   };
   set$1(id, state, state);
 };
@@ -1073,7 +1071,7 @@ const RenderItems = 4;
 
 const diffType = RenderItems;
 const isEqual = (oldState, newState) => {
-  return oldState.allGroups === newState.allGroups && oldState.items === newState.items && oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.deltaY === newState.deltaY && oldState.buttonIndex === newState.buttonIndex && oldState.buttons === newState.buttons;
+  return oldState.allGroups === newState.allGroups && oldState.visibleItems === newState.visibleItems && oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.deltaY === newState.deltaY;
 };
 
 const modules = [isEqual];
@@ -1164,7 +1162,7 @@ const Directory = 3;
 const DirectoryExpanded = 4;
 const File = 7;
 
-const getFileIcon$1 = ({
+const getFileIcon = ({
   name
 }) => {
   return '';
@@ -1221,7 +1219,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
         detail: folderName,
         posInSet: i + 1,
         setSize: length,
-        icon: getFileIcon$1({
+        icon: getFileIcon({
           name: file
         }),
         decorationIcon: icon,
@@ -1245,47 +1243,31 @@ const getDisplayItems = (allGroups, isExpanded) => {
   return displayItems;
 };
 
-const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
+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 getPath = item => {
-  return item.file;
-};
-
-const getPaths = items => {
-  return items.map(getPath);
-};
-
-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) => {
@@ -1298,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;
 };
@@ -1307,12 +1289,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   const missingRequests = getMissingIconRequests(dirents, fileIconCache);
   const newIcons = await requestFileIcons(missingRequests);
   const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const paths = getPaths(dirents);
-  const icons = getIconsCached(paths, newFileIconCache);
-  return {
-    icons,
-    newFileIconCache
-  };
+  return newFileIconCache;
 };
 
 const getFinalDeltaY = (height, itemHeight, itemsLength) => {
@@ -1382,59 +1359,6 @@ const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   return Math.min(totalHeight, maxHeight);
 };
 
-const getExtensions = async () => {
-  return invoke('Extensions.getExtensions');
-};
-
-const requestSourceActions = async () => {
-  const extensions = await getExtensions();
-  const newCache = Object.create(null);
-  for (const extension of extensions) {
-    if (extension && extension['source-control-actions']) {
-      for (const [key, value] of Object.entries(extension['source-control-actions'])) {
-        newCache.cache[key] = value;
-      }
-    }
-  }
-  return newCache;
-};
-
-const state = {
-  cache: Object.create(null)
-};
-const getContextId = (groupId, type) => {
-  if (type === File) {
-    return `${groupId}-item`;
-  }
-  return groupId;
-};
-const ensureActions = async () => {
-  if (Object.keys(state.cache).length > 0) {
-    return;
-  }
-  const newCache = await requestSourceActions();
-  state.cache = newCache;
-};
-const getSourceControlActions = async (providerId, groupId, type) => {
-  string(groupId);
-  await ensureActions();
-  const contextId = getContextId(groupId, type);
-  const value = state.cache[contextId] || [];
-  return value;
-};
-
-const getNewButtons = async (displayItems, providerId, buttonIndex, actionsCache) => {
-  if (buttonIndex === -1) {
-    return [];
-  }
-  const item = displayItems[buttonIndex];
-  if (!item) {
-    return [];
-  }
-  const actions = await getSourceControlActions(providerId, item.groupId, item.type);
-  return actions;
-};
-
 // TODO optimize this function to return the minimum number
 // of visible items needed, e.g. when not scrolled 5 items with
 // 20px fill 100px but when scrolled 6 items are needed
@@ -1456,10 +1380,52 @@ const getProtocol = uri => {
   return Disk;
 };
 
+const emptySourceControlButtons = [];
+
+const getContextId = (groupId, type) => {
+  if (type === File) {
+    return `${groupId}-item`;
+  }
+  return groupId;
+};
+
+const getVisibleSourceControlItems = (items, minLineY, maxLineY, actionsCache, fileIconCache) => {
+  const visible = [];
+  for (let i = minLineY; i < maxLineY; i++) {
+    const item = items[i];
+    const contextId = getContextId(item.groupId, item.type);
+    const buttons = actionsCache[contextId] || emptySourceControlButtons;
+    const fileIcon = fileIconCache[item.label] || '';
+    visible.push({
+      ...item,
+      buttons,
+      fileIcon
+    });
+  }
+  return visible;
+};
+
 const get = key => {
   return false;
 };
 
+const getExtensions = async () => {
+  return invoke('Extensions.getExtensions');
+};
+
+const requestSourceActions = async () => {
+  const extensions = await getExtensions();
+  const newCache = Object.create(null);
+  for (const extension of extensions) {
+    if (extension && extension['source-control-actions']) {
+      for (const [key, value] of Object.entries(extension['source-control-actions'])) {
+        newCache[key] = value;
+      }
+    }
+  }
+  return newCache;
+};
+
 const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   if (size >= contentSize) {
     return 0;
@@ -1473,9 +1439,8 @@ const loadContent = async state => {
     height,
     minimumSliderSize,
     workspacePath,
-    fileIconCache,
-    providerId,
-    buttonIndex} = state;
+    fileIconCache
+  } = state;
   const root = workspacePath;
   const scheme = getProtocol(root);
   const enabledProviderIds = await getEnabledProviderIds(scheme, root);
@@ -1484,46 +1449,43 @@ const loadContent = async state => {
     gitRoot
   } = await getGroups(enabledProviderIds);
   const isExpanded = true;
-  const items = getDisplayItems(allGroups, isExpanded);
-  const buttons = await getNewButtons(items, providerId, buttonIndex);
+  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const actionsCache = await requestSourceActions();
   const splitButtonEnabled = get();
-  const total = items.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 newFileIconCache = await getFileIcons(displayItems, fileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(items, fileIconCache);
   return {
     ...state,
     allGroups,
     gitRoot,
-    items,
+    items: displayItems,
+    visibleItems,
     enabledProviderIds,
     isExpanded,
-    buttons,
     root,
     splitButtonEnabled,
     maxLineY,
     scrollBarHeight,
     finalDeltaY,
-    icons,
-    fileIconCache: newFileIconCache
+    fileIconCache: newFileIconCache,
+    actionsCache
   };
 };
 
 const handleButtonClick = async (state, clickedIndex) => {
   const {
-    buttonIndex,
-    buttons,
-    items
+    visibleItems
   } = state;
-  const button = buttons[clickedIndex];
-  const item = items[buttonIndex];
+  const item = visibleItems[clickedIndex];
+  const button = item.buttons[clickedIndex];
   if (!button) {
     return state;
   }
@@ -1543,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') => {
@@ -1645,9 +1618,7 @@ const handleMouseOut = (state, index) => {
   } = state;
   if (index === -1 || index > items.length) {
     return {
-      ...state,
-      buttonIndex: -1,
-      buttons: []
+      ...state
     };
   }
   return state;
@@ -1660,22 +1631,14 @@ const handleMouseOutAt = (state, eventX, eventY) => {
 
 const handleMouseOver = async (state, index) => {
   const {
-    items,
-    providerId,
-    buttonIndex
+    items
   } = state;
-  if (index === buttonIndex) {
-    return state;
-  }
   const item = items[index];
   if (!item) {
     return state;
   }
-  const actions = await getSourceControlActions(providerId, item.groupId, item.type);
   return {
-    ...state,
-    buttonIndex: index,
-    buttons: actions
+    ...state
   };
 };
 
@@ -1684,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,
@@ -1838,8 +1830,6 @@ const getBadgeVirtualDom = (className, count) => {
   }, text(`${count}`)];
 };
 
-const emptySourceControlButtons = [];
-
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -2061,23 +2051,8 @@ const getSourceControlVirtualDom = (items, splitButtonEnabled) => {
   return dom;
 };
 
-const getVisibleSourceControlItems = (items, minLineY, maxLineY, buttons, buttonIndex, icons) => {
-  const visible = [];
-  for (let i = minLineY; i < maxLineY; i++) {
-    const item = items[i];
-    const itemButtons = i === buttonIndex ? buttons : emptySourceControlButtons;
-    const fileIcon = icons[i - minLineY];
-    visible.push({
-      ...item,
-      buttons: itemButtons,
-      fileIcon
-    });
-  }
-  return visible;
-};
-
 const renderItems = (oldState, newState) => {
-  const visible = getVisibleSourceControlItems(newState.items, newState.minLineY, newState.maxLineY, newState.buttons, newState.buttonIndex, newState.icons);
+  const visible = newState.visibleItems;
   const dom = getSourceControlVirtualDom(visible, newState.splitButtonEnabled);
   return ['Viewlet.setDom2', dom];
 };
@@ -2219,13 +2194,10 @@ const updateIcons = async state => {
     maxLineY
   } = state;
   const visible = items.slice(minLineY, maxLineY);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(visible, Object.create(null));
+  const newFileIconCache = await getFileIcons(visible, Object.create(null));
+  // TODO update visible items
   return {
     ...state,
-    icons,
     fileIconCache: newFileIconCache
   };
 };
@@ -2243,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.5.0",
+  "version": "1.7.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"