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

package/dist/sourceControlWorkerMain.js

@@ -1062,7 +1062,9 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     itemHeight: 20,
     minimumSliderSize: 20,
     workspacePath,
-    headerHeight: 40 // TODO
+    headerHeight: 40,
+    // TODO
+    actionsCache: Object.create(null)
   };
   set$1(id, state, state);
 };
@@ -1097,7 +1099,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;
@@ -1380,40 +1382,21 @@ const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   return Math.min(totalHeight, maxHeight);
 };
 
-// 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
-const getNumberOfVisibleItems = (listHeight, itemHeight) => {
-  return Math.ceil(listHeight / itemHeight) + 1;
-};
-
-const Disk = 'file';
-
-const RE_PROTOCOL = /^([a-z-]+):\/\//;
-const getProtocol = uri => {
-  if (!uri) {
-    return Disk;
-  }
-  const protocolMatch = uri.match(RE_PROTOCOL);
-  if (protocolMatch) {
-    return protocolMatch[1];
-  }
-  return Disk;
-};
-
-const get = key => {
-  return false;
+const getExtensions = async () => {
+  return invoke('Extensions.getExtensions');
 };
 
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
+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 Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
-};
-
-const getExtensions = async () => {
-  return invoke('Extensions.getExtensions');
+  return newCache;
 };
 
 const state = {
@@ -1429,14 +1412,8 @@ const ensureActions = async () => {
   if (Object.keys(state.cache).length > 0) {
     return;
   }
-  const extensions = await getExtensions();
-  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;
-      }
-    }
-  }
+  const newCache = await requestSourceActions();
+  state.cache = newCache;
 };
 const getSourceControlActions = async (providerId, groupId, type) => {
   string(groupId);
@@ -1446,7 +1423,7 @@ const getSourceControlActions = async (providerId, groupId, type) => {
   return value;
 };
 
-const getNewButtons = async (displayItems, providerId, buttonIndex) => {
+const getNewButtons = async (displayItems, providerId, buttonIndex, actionsCache) => {
   if (buttonIndex === -1) {
     return [];
   }
@@ -1457,14 +1434,48 @@ const getNewButtons = async (displayItems, providerId, buttonIndex) => {
   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
+const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
+};
+
+const Disk = 'file';
+
+const RE_PROTOCOL = /^([a-z-]+):\/\//;
+const getProtocol = uri => {
+  if (!uri) {
+    return Disk;
+  }
+  const protocolMatch = uri.match(RE_PROTOCOL);
+  if (protocolMatch) {
+    return protocolMatch[1];
+  }
+  return Disk;
+};
+
+const get = key => {
+  return false;
+};
+
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
+  }
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+};
+
 const loadContent = async state => {
   const {
     itemHeight,
     height,
     minimumSliderSize,
     workspacePath,
-    fileIconCache
-  } = state;
+    fileIconCache,
+    providerId,
+    buttonIndex} = state;
   const root = workspacePath;
   const scheme = getProtocol(root);
   const enabledProviderIds = await getEnabledProviderIds(scheme, root);
@@ -1474,7 +1485,7 @@ const loadContent = async state => {
   } = await getGroups(enabledProviderIds);
   const isExpanded = true;
   const items = getDisplayItems(allGroups, isExpanded);
-  const buttons = await getNewButtons(items, state.providerId, state.buttonIndex);
+  const buttons = await getNewButtons(items, providerId, buttonIndex);
   const splitButtonEnabled = get();
   const total = items.length;
   const contentHeight = total * itemHeight;
@@ -1628,6 +1639,25 @@ const handleFocus = async state => {
   return state;
 };
 
+const handleMouseOut = (state, index) => {
+  const {
+    items
+  } = state;
+  if (index === -1 || index > items.length) {
+    return {
+      ...state,
+      buttonIndex: -1,
+      buttons: []
+    };
+  }
+  return state;
+};
+
+const handleMouseOutAt = (state, eventX, eventY) => {
+  const index = getIndex(state, eventX, eventY);
+  return handleMouseOut(state, index);
+};
+
 const handleMouseOver = async (state, index) => {
   const {
     items,
@@ -1649,6 +1679,11 @@ const handleMouseOver = async (state, index) => {
   };
 };
 
+const handleMouseOverAt = async (state, eventX, eventY) => {
+  const index = getIndex(state, eventX, eventY);
+  return handleMouseOver(state, index);
+};
+
 const getPortTuple = () => {
   const {
     port1,
@@ -1691,6 +1726,7 @@ const initialize = async () => {
 };
 
 const Actions = 'Actions';
+const Grow = 'Grow';
 const Chevron = 'Chevron';
 const ChevronRight = 'ChevronRight';
 const DecorationIcon = 'DecorationIcon';
@@ -1722,6 +1758,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 +1818,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 +1838,46 @@ const getBadgeVirtualDom = (className, count) => {
   }, text(`${count}`)];
 };
 
+const emptySourceControlButtons = [];
+
+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 +1897,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 +1957,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 +1966,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 +1984,7 @@ const createItemOther = item => {
       childCount: 1
     }, text(detail));
   }
-  addButtons(dom, buttons);
+  dom.push(...buttonsDom);
   dom.push({
     type: Img,
     className: DecorationIcon,
@@ -1968,7 +2011,9 @@ const getSourceControlListVirtualDom = items => {
     className: SourceControlItems,
     role: Tree,
     childCount: items.length,
-    onClick: HandleClickAt
+    onClick: HandleClickAt,
+    onPointerOver: HandleMouseOverAt,
+    onPointerOut: HandleMouseOutAt
   }, ...items.flatMap(getSourceControlItemVirtualDom)];
 };
 
@@ -2126,6 +2171,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 +2196,15 @@ const saveState = uid => {
   } = value;
   const {
     root,
-    maxLineY
+    maxLineY,
+    isExpanded
   } = newState;
   return {
     root,
     minLineY: 0,
     maxLineY,
-    deltaY: 0
+    deltaY: 0,
+    isExpanded
   };
 };
 
@@ -2188,9 +2238,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.5.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"