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

package/dist/sourceControlWorkerMain.js

@@ -1051,7 +1051,6 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     untracked: [],
     workingTree: [],
     inputValue: '',
-    displayItems: [],
     buttonIndex: -1,
     enabledProviderIds: [],
     isExpanded: true,
@@ -1062,7 +1061,8 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     gitRoot: '',
     itemHeight: 20,
     minimumSliderSize: 20,
-    workspacePath
+    workspacePath,
+    headerHeight: 40 // TODO
   };
   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.displayItems === newState.displayItems && 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.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;
 };
 
 const modules = [isEqual];
@@ -1097,7 +1097,7 @@ const diff2 = uid => {
   return result;
 };
 
-const commandIds = ['acceptInput', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'handleClick', 'handleClickAt', 'handleIconThemeChange', 'handleWheel'];
+const commandIds = ['acceptInput', 'handleMouseOut', 'focus', 'focusFirst', 'handleFocus', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'handleClick', 'handleClickAt', 'handleIconThemeChange', 'handleMouseOver', 'handleWheel', 'selectIndex', 'handleMouseOverAt'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -1147,6 +1147,7 @@ const executeProvider = async ({
 
 const CommandExecute = 'ExtensionHostCommand.executeCommand';
 const SourceControlGetEnabledProviderIds = 'ExtensionHostSourceControl.getEnabledProviderIds';
+const SourceControlGetFileBefore = 'ExtensionHostSourceControl.GetFileBefore';
 const SourceControlGetGroups = 'ExtensionHostSourceControl.getGroups';
 
 const executeCommand = (id, ...args) => {
@@ -1183,8 +1184,8 @@ const getDisplayItemsGroup = (group, isExpanded) => {
     throw new Error('Source control group is missing an items property');
   }
   const length = items.length;
-  const type = DirectoryExpanded ;
-  const icon = 'ChevronDown' ;
+  const type = isExpanded ? DirectoryExpanded : Directory;
+  const icon = isExpanded ? 'ChevronDown' : 'ChevronRight';
   if (length > 0) {
     displayItems.push({
       file: '',
@@ -1201,7 +1202,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
       groupId: id
     });
   }
-  {
+  if (isExpanded) {
     for (let i = 0; i < length; i++) {
       const item = items[i];
       const {
@@ -1236,7 +1237,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
 const getDisplayItems = (allGroups, isExpanded) => {
   const displayItems = [];
   for (const group of allGroups) {
-    const groupDisplayItems = getDisplayItemsGroup(group);
+    const groupDisplayItems = getDisplayItemsGroup(group, isExpanded);
     displayItems.push(...groupDisplayItems);
   }
   return displayItems;
@@ -1318,6 +1319,14 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   return finalDeltaY;
 };
 
+const getFileBefore$1 = (providerId, path) => {
+  return executeProvider({
+    event: 'none',
+    method: SourceControlGetFileBefore,
+    params: [providerId, path]
+    // noProviderFoundMessage: 'No source control provider found',
+  });
+};
 const getGroups$2 = (providerId, path) => {
   return executeProvider({
     event: 'none',
@@ -1335,6 +1344,9 @@ const getEnabledProviderIds$1 = (scheme, root) => {
   });
 };
 
+const getFileBefore = (providerId, file) => {
+  return getFileBefore$1(providerId, file);
+};
 const getEnabledProviderIds = (scheme, root) => {
   string(scheme);
   string(root);
@@ -1461,7 +1473,7 @@ const loadContent = async state => {
     gitRoot
   } = await getGroups(enabledProviderIds);
   const isExpanded = true;
-  const items = getDisplayItems(allGroups);
+  const items = getDisplayItems(allGroups, isExpanded);
   const buttons = await getNewButtons(items, state.providerId, state.buttonIndex);
   const splitButtonEnabled = get();
   const total = items.length;
@@ -1509,6 +1521,98 @@ const handleButtonClick = async (state, clickedIndex) => {
   return newState;
 };
 
+const getIndex = (state, eventX, eventY) => {
+  const {
+    headerHeight,
+    y,
+    itemHeight
+  } = state;
+  const relativeY = eventY - y - headerHeight;
+  const index = Math.floor(relativeY / itemHeight);
+  return index;
+};
+
+const handleClickDirectory = async (state, item) => {
+  const {
+    allGroups
+  } = state;
+  const isExpanded = true;
+  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const newMaxLineY = displayItems.length;
+  return {
+    ...state,
+    items: displayItems,
+    isExpanded,
+    maxLineY: newMaxLineY
+  };
+};
+
+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
+  };
+};
+
+const readFile = async (uri, encoding = 'utf8') => {
+  const content = await invoke$1('FileSystem.readFile', uri);
+  return content;
+};
+
+const openUri = uri => {
+  return invoke$1('Main.openUri', uri);
+};
+
+const handleClickFile = async (state, item) => {
+  const {
+    enabledProviderIds,
+    root
+  } = state;
+  const providerId = enabledProviderIds[0];
+  const absolutePath = `${root}/${item.file}`;
+  // TODO handle error
+  const [fileBefore] = await Promise.all([getFileBefore(providerId, item.file), readFile(absolutePath)]);
+  {
+    await openUri(`inline-diff://data://${fileBefore}<->${absolutePath}`);
+  }
+  return state;
+};
+
+const selectIndex = async (state, index) => {
+  const {
+    items
+  } = state;
+  if (index < 0 || index >= items.length) {
+    return state;
+  }
+  const item = items[index];
+  switch (item.type) {
+    case Directory:
+      return handleClickDirectory(state);
+    case DirectoryExpanded:
+      return handleClickDirectoryExpanded(state);
+    case File:
+      return handleClickFile(state, item);
+    default:
+      console.warn(`unknown item type: ${item.type}`);
+      return state;
+  }
+};
+
+const handleClickAt = async (state, eventX, eventY) => {
+  const index = getIndex(state, eventX, eventY);
+  return selectIndex(state, index);
+};
+
 const show = async (x, y, id, ...args) => {
   return invoke$1('ContextMenu.show', x, y, id, ...args);
 };
@@ -1520,6 +1624,31 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
+const handleFocus = async state => {
+  return state;
+};
+
+const handleMouseOver = async (state, index) => {
+  const {
+    items,
+    providerId,
+    buttonIndex
+  } = 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
+  };
+};
+
 const getPortTuple = () => {
   const {
     port1,
@@ -1588,20 +1717,15 @@ const StrikeThrough = 'StrikeThrough';
 const TreeItem$1 = 'TreeItem';
 const Viewlet = 'Viewlet';
 
-const HandleClick = 'handleClick';
 const HandleClickAt = 'handleClickAt';
 const HandleContextMenu = 'handleContextMenu';
 const HandleFocus = 'handleFocus';
 const HandleInput = 'handleInput';
 const HandleMouseOut = 'handleMouseOut';
 const HandleMouseOver = 'handleMouseOver';
+const HandleMouseOverAt = 'handleMouseOverAt';
 const HandleWheel = 'handleWheel';
 
-const None = 'none';
-const ToolBar = 'toolbar';
-const Tree = 'tree';
-const TreeItem = 'treeitem';
-
 const SourceControlInput$1 = 'SourceControlInput';
 
 const emptyObject = {};
@@ -1652,6 +1776,11 @@ const getSourceControlHeaderVirtualDom = () => {
   }];
 };
 
+const None = 'none';
+const ToolBar = 'toolbar';
+const Tree = 'tree';
+const TreeItem = 'treeitem';
+
 const emptySourceControlButtons = [];
 
 const getIconVirtualDom = (icon, type = Div) => {
@@ -1833,9 +1962,21 @@ const getSourceControlItemVirtualDom = item => {
   }
 };
 
-const getSourceControlItemsVirtualDom$1 = (hasItems, buttonText) => {
-  const dom = [];
-  dom.push({
+const getSourceControlListVirtualDom = items => {
+  return [{
+    type: Div,
+    className: SourceControlItems,
+    role: Tree,
+    childCount: items.length,
+    onClick: HandleClickAt
+  }, ...items.flatMap(getSourceControlItemVirtualDom)];
+};
+
+const getSplitButtonVirtualDom = (hasItems, splitButtonEnabled, buttonText) => {
+  if (!splitButtonEnabled || !hasItems) {
+    return [];
+  }
+  return [{
     type: Div,
     className: `${SplitButton} ${hasItems ? '' : SplitButtonDisabled}`,
     childCount: 3
@@ -1857,38 +1998,21 @@ const getSourceControlItemsVirtualDom$1 = (hasItems, buttonText) => {
     type: Div,
     className: `${MaskIcon} ${MaskIconChevronDown}`,
     childCount: 0
-  });
-  return dom;
-};
-
-const getSourceControlItemsVirtualDom = (items, splitButtonEnabled) => {
-  const dom = [];
-  dom.push(...getSourceControlHeaderVirtualDom());
-  if (splitButtonEnabled) {
-    const hasItems = items.length > 0;
-    dom.push(...getSourceControlItemsVirtualDom$1(hasItems, 'Commit'));
-  }
-  dom.push({
-    type: Div,
-    className: SourceControlItems,
-    role: Tree,
-    childCount: items.length
-  }, ...items.flatMap(getSourceControlItemVirtualDom));
-  return dom;
+  }];
 };
 
 const getSourceControlVirtualDom = (items, splitButtonEnabled) => {
+  const hasItems = items.length > 0;
   const dom = [{
     type: Div,
     className: mergeClassNames(Viewlet, SourceControl),
     tabIndex: 0,
-    onClick: HandleClick,
     onContextMenu: HandleContextMenu,
     onMouseOver: HandleMouseOver,
     onMouseOut: HandleMouseOut,
     onWheel: HandleWheel,
     childCount: splitButtonEnabled ? 3 : 2
-  }, ...getSourceControlItemsVirtualDom(items, splitButtonEnabled)];
+  }, ...getSourceControlHeaderVirtualDom(), ...getSplitButtonVirtualDom(hasItems, splitButtonEnabled, 'Commit'), ...getSourceControlListVirtualDom(items)];
   return dom;
 };
 
@@ -1996,6 +2120,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickAt,
     params: ['handleClickAt', 'event.clientX', 'event.clientY']
+  }, {
+    name: HandleMouseOverAt,
+    params: ['handleMouseOverAt', 'event.clientX', 'event.clientY']
   }, {
     name: HandleMouseOver,
     params: ['handleMouseOver', 'event.clientX', 'event.clientY']
@@ -2059,12 +2186,16 @@ const commandMap = {
   'SourceControl.diff2': diff2,
   'SourceControl.getCommandIds': getCommandIds,
   'SourceControl.handleButtonClick': wrapCommand(handleButtonClick),
+  'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
+  'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.loadContent': wrapCommand(loadContent),
+  'SourceControl.handleFocus': wrapCommand(handleFocus),
   'SourceControl.render2': render2,
   'SourceControl.renderActions2': renderActions,
   'SourceControl.renderEventListeners': renderEventListeners,
   'SourceControl.saveState': saveState,
+  'SourceControl.selectIndex': wrapCommand(selectIndex),
   'SourceControl.terminate': terminate,
   'SourceControl.updateIcons': wrapCommand(updateIcons)
 };

package/package.json

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