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

package/dist/sourceControlWorkerMain.js

@@ -1030,39 +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
+    x,
+    y
   };
   set$1(id, state, state);
 };
@@ -1071,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];
@@ -1097,7 +1097,7 @@ const diff2 = uid => {
   return result;
 };
 
-const commandIds = ['acceptInput', 'handleMouseOut', 'focus', 'focusFirst', 'handleFocus', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'handleClick', 'handleClickAt', 'handleIconThemeChange', 'handleMouseOver', 'handleWheel', 'selectIndex', 'handleMouseOverAt'];
+const commandIds = ['acceptInput', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'handleClick', 'handleClickAt', 'handleFocus', 'handleIconThemeChange', 'handleMouseOut', 'handleMouseOutAt', 'handleMouseOver', 'handleMouseOverAt', 'handleWheel', 'selectIndex'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -1243,10 +1243,6 @@ const getDisplayItems = (allGroups, isExpanded) => {
   return displayItems;
 };
 
-const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
-};
-
 const getMissingIconRequests = (dirents, fileIconCache) => {
   const missingRequests = [];
   for (const dirent of dirents) {
@@ -1261,14 +1257,6 @@ const getMissingIconRequests = (dirents, fileIconCache) => {
   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
@@ -1305,12 +1293,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) => {
@@ -1401,62 +1384,59 @@ const getProtocol = uri => {
   return Disk;
 };
 
-const get = key => {
-  return false;
+const emptySourceControlButtons = [];
+
+const getContextId = (groupId, type) => {
+  if (type === File) {
+    return `${groupId}-item`;
+  }
+  return groupId;
 };
 
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
+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.file] || '';
+    visible.push({
+      ...item,
+      buttons,
+      fileIcon
+    });
   }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+  return visible;
+};
+
+const get = key => {
+  return false;
 };
 
 const getExtensions = async () => {
   return invoke('Extensions.getExtensions');
 };
 
-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 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'])) {
-        state.cache[key] = value;
+        newCache[key] = value;
       }
     }
   }
-};
-const getSourceControlActions = async (providerId, groupId, type) => {
-  string(groupId);
-  await ensureActions();
-  const contextId = getContextId(groupId, type);
-  const value = state.cache[contextId] || [];
-  return value;
+  return newCache;
 };
 
-const getNewButtons = async (displayItems, providerId, buttonIndex) => {
-  if (buttonIndex === -1) {
-    return [];
-  }
-  const item = displayItems[buttonIndex];
-  if (!item) {
-    return [];
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
   }
-  const actions = await getSourceControlActions(providerId, item.groupId, item.type);
-  return actions;
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
 };
+
 const loadContent = async state => {
   const {
     itemHeight,
@@ -1473,46 +1453,43 @@ const loadContent = async state => {
     gitRoot
   } = await getGroups(enabledProviderIds);
   const isExpanded = true;
-  const items = getDisplayItems(allGroups, isExpanded);
-  const buttons = await getNewButtons(items, state.providerId, state.buttonIndex);
+  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const cache = 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 slicedItems = displayItems.slice(minLineY, maxLineY);
+  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, cache, 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
   };
 };
 
 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;
   }
@@ -1628,27 +1605,41 @@ const handleFocus = async state => {
   return state;
 };
 
-const handleMouseOver = async (state, index) => {
+const handleMouseOut = (state, index) => {
   const {
-    items,
-    providerId,
-    buttonIndex
+    items
   } = state;
-  if (index === buttonIndex) {
-    return state;
+  if (index === -1 || index > items.length) {
+    return {
+      ...state
+    };
   }
+  return state;
+};
+
+const handleMouseOutAt = (state, eventX, eventY) => {
+  const index = getIndex(state, eventX, eventY);
+  return handleMouseOut(state, index);
+};
+
+const handleMouseOver = async (state, index) => {
+  const {
+    items
+  } = 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
   };
 };
 
+const handleMouseOverAt = async (state, eventX, eventY) => {
+  const index = getIndex(state, eventX, eventY);
+  return handleMouseOver(state, index);
+};
+
 const getPortTuple = () => {
   const {
     port1,
@@ -1691,6 +1682,7 @@ const initialize = async () => {
 };
 
 const Actions = 'Actions';
+const Grow = 'Grow';
 const Chevron = 'Chevron';
 const ChevronRight = 'ChevronRight';
 const DecorationIcon = 'DecorationIcon';
@@ -1722,6 +1714,7 @@ const HandleContextMenu = 'handleContextMenu';
 const HandleFocus = 'handleFocus';
 const HandleInput = 'handleInput';
 const HandleMouseOut = 'handleMouseOut';
+const HandleMouseOutAt = 'handleMouseOutAt';
 const HandleMouseOver = 'handleMouseOver';
 const HandleMouseOverAt = 'handleMouseOverAt';
 const HandleWheel = 'handleWheel';
@@ -1781,37 +1774,6 @@ const ToolBar = 'toolbar';
 const Tree = 'tree';
 const TreeItem = 'treeitem';
 
-const emptySourceControlButtons = [];
-
-const getIconVirtualDom = (icon, type = Div) => {
-  return {
-    type,
-    className: `MaskIcon MaskIcon${icon}`,
-    role: None,
-    childCount: 0
-  };
-};
-
-const addButtons = (dom, buttons) => {
-  if (buttons === emptySourceControlButtons) {
-    return;
-  }
-  dom[0].childCount += buttons.length;
-  for (const button of buttons) {
-    const {
-      icon,
-      label
-    } = button;
-    dom.push({
-      type: Button$1,
-      className: SourceControlButton,
-      title: label,
-      ariaLabel: label,
-      childCount: 1
-    }, getIconVirtualDom(icon, Span));
-  }
-};
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1832,10 +1794,44 @@ const getBadgeVirtualDom = (className, count) => {
   }, text(`${count}`)];
 };
 
+const getIconVirtualDom = (icon, type = Div) => {
+  return {
+    type,
+    className: `MaskIcon MaskIcon${icon}`,
+    role: None,
+    childCount: 0
+  };
+};
+
+const getButtonVirtualDom = button => {
+  const {
+    icon,
+    label
+  } = button;
+  return [{
+    type: Button$1,
+    className: SourceControlButton,
+    title: label,
+    ariaLabel: label,
+    childCount: 1
+  }, getIconVirtualDom(icon, Span)];
+};
+
+const getButtonsVirtualDom = buttons => {
+  if (buttons === emptySourceControlButtons) {
+    return [];
+  }
+  return [{
+    type: Div,
+    className: 'SourceControlButtons',
+    childCount: buttons.length
+  }, ...buttons.flatMap(getButtonVirtualDom)];
+};
+
 const getLabelClassName = decorationStrikeThrough => {
-  let className = Label + ' Grow';
+  let className = mergeClassNames(Label, Grow);
   if (decorationStrikeThrough) {
-    className += ` ${StrikeThrough}`;
+    className = mergeClassNames(className, StrikeThrough);
   }
   return className;
 };
@@ -1855,28 +1851,27 @@ const createItemDirectory = item => {
     buttons
   } = item;
   const labelClassName = getLabelClassName(decorationStrikeThrough);
-  const dom = [{
+  const buttonsDom = getButtonsVirtualDom(buttons);
+  const hasButtons = buttons.length;
+  return [{
     type: Div,
     className: TreeItem$1,
     role: TreeItem,
     ariaExpanded: type === DirectoryExpanded,
     ariaPosInSet: posInSet,
     ariaSetSize: setSize,
-    childCount: 3,
+    childCount: 3 + (hasButtons ? 1 : 0),
     paddingLeft: PaddingLeft,
     paddingRight: PaddingRight
   }, {
     type: Div,
-    className: `${Chevron} MaskIcon${icon}`,
+    className: mergeClassNames(Chevron, `MaskIcon${icon}`),
     childCount: 0
   }, {
     type: Div,
     className: labelClassName,
     childCount: 1
-  }, text(label)];
-  addButtons(dom, buttons);
-  dom.push(...getBadgeVirtualDom(SourceControlBadge, badgeCount));
-  return dom;
+  }, text(label), ...buttonsDom, ...getBadgeVirtualDom(SourceControlBadge, badgeCount)];
 };
 
 const getFileIconVirtualDom = icon => {
@@ -1916,6 +1911,8 @@ const createItemOther = item => {
   } = item;
   const labelClassName = getLabelClassName(decorationStrikeThrough);
   const dom = [];
+  const hasButtons = buttons.length;
+  const buttonsDom = getButtonsVirtualDom(buttons);
   dom.push({
     type: Div,
     className: TreeItem$1,
@@ -1923,7 +1920,7 @@ const createItemOther = item => {
     ariaPosInSet: posInSet,
     ariaSetSize: setSize,
     title: file,
-    childCount: 3,
+    childCount: 3 + (hasButtons ? 1 : 0),
     paddingLeft: '1rem',
     paddingRight: '12px'
   }, ...getIconsDom(icon, fileIcon));
@@ -1941,7 +1938,7 @@ const createItemOther = item => {
       childCount: 1
     }, text(detail));
   }
-  addButtons(dom, buttons);
+  dom.push(...buttonsDom);
   dom.push({
     type: Img,
     className: DecorationIcon,
@@ -1968,7 +1965,9 @@ const getSourceControlListVirtualDom = items => {
     className: SourceControlItems,
     role: Tree,
     childCount: items.length,
-    onClick: HandleClickAt
+    onClick: HandleClickAt,
+    onPointerOver: HandleMouseOverAt,
+    onPointerOut: HandleMouseOutAt
   }, ...items.flatMap(getSourceControlItemVirtualDom)];
 };
 
@@ -2016,23 +2015,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];
 };
@@ -2126,6 +2110,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleMouseOver,
     params: ['handleMouseOver', 'event.clientX', 'event.clientY']
+  }, {
+    name: HandleMouseOutAt,
+    params: ['handleMouseOutAt', 'event.clientX', 'event.clientY']
   }, {
     name: HandleInput,
     params: ['handleInput', 'event.target.value']
@@ -2148,13 +2135,15 @@ const saveState = uid => {
   } = value;
   const {
     root,
-    maxLineY
+    maxLineY,
+    isExpanded
   } = newState;
   return {
     root,
     minLineY: 0,
     maxLineY,
-    deltaY: 0
+    deltaY: 0,
+    isExpanded
   };
 };
 
@@ -2169,13 +2158,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
   };
 };
@@ -2188,9 +2174,12 @@ const commandMap = {
   'SourceControl.handleButtonClick': wrapCommand(handleButtonClick),
   'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
+  'SourceControl.handleFocus': wrapCommand(handleFocus),
+  'SourceControl.handleMouseOut': wrapCommand(handleMouseOut),
+  'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
+  'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
   'SourceControl.loadContent': wrapCommand(loadContent),
-  'SourceControl.handleFocus': wrapCommand(handleFocus),
   'SourceControl.render2': render2,
   'SourceControl.renderActions2': renderActions,
   'SourceControl.renderEventListeners': renderEventListeners,

package/package.json

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