@lvce-editor/source-control-worker 2.15.0 → 2.17.0

package/dist/sourceControlWorkerMain.js

@@ -1557,6 +1557,15 @@ const getContextId = (groupId, type) => {
   return groupId;
 };
 
+const defaultIndent = 16; // 1rem = 16px
+
+const getTreeItemIndent = type => {
+  if (type === Directory || type === DirectoryExpanded) {
+    return 0;
+  }
+  return defaultIndent;
+};
+
 const getVisibleSourceControlItems = (items, minLineY, maxLineY, actionsCache, fileIconCache) => {
   const visible = [];
   for (let i = minLineY; i < maxLineY; i++) {
@@ -1564,10 +1573,12 @@ const getVisibleSourceControlItems = (items, minLineY, maxLineY, actionsCache, f
     const contextId = getContextId(item.groupId, item.type);
     const buttons = actionsCache[contextId] || emptySourceControlButtons;
     const fileIcon = fileIconCache[item.label] || '';
+    const indent = getTreeItemIndent(item.type);
     visible.push({
       ...item,
       buttons,
-      fileIcon
+      fileIcon,
+      indent
     });
   }
   return visible;
@@ -1644,6 +1655,9 @@ const StageChanges = 'Stage Changes';
 const AddToGitignore = 'Add to gitignore';
 const RevealInExplorerView = 'Reveal in Explorer View';
 const OpenContainingFolder = 'Open Containing Folder';
+const ViewAsTree$1 = 'View As Tree';
+const CommitAndPush$1 = 'Commit and Push';
+const Refresh$2 = 'Refresh';
 const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
 const SourceControlInput$1 = 'Source Control Input';
 
@@ -1671,6 +1685,15 @@ const revealInExplorerView = () => {
 const openContainingFolder = () => {
   return i18nString(OpenContainingFolder);
 };
+const viewAsTree$1 = () => {
+  return i18nString(ViewAsTree$1);
+};
+const commitAndPush = () => {
+  return i18nString(CommitAndPush$1);
+};
+const refresh$1 = () => {
+  return i18nString(Refresh$2);
+};
 const messageEnterToCommitOnMaster = () => {
   return i18nString(MessageEnterToCommitOnMaster);
 };
@@ -1829,7 +1852,9 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     viewMode: 1,
     iconDefinitions: [],
     decorationIcons: [],
-    focus: 0
+    focus: 0,
+    isVisible: true,
+    badgeCount: 0
   };
   set(id, state, state);
 };
@@ -1878,6 +1903,10 @@ const diff2 = uid => {
   return result;
 };
 
+const getBadgeCount = state => {
+  return state.badgeCount;
+};
+
 const getInfo = uid => {
   const {
     newState
@@ -1957,38 +1986,10 @@ const getMenuIds = () => {
   return [SourceControl$1];
 };
 
-const executeCommand = (id, ...args) => {
-  return executeProvider({
-    event: `onCommand:${id}`,
-    method: CommandExecute,
-    params: [id, ...args]
-  });
-};
-
-const handleButtonClick = async (state, clickedIndex) => {
-  const {
-    visibleItems
-  } = state;
-  const item = visibleItems[clickedIndex];
-  const button = item.buttons[clickedIndex];
-  if (!button) {
-    return state;
-  }
-  await executeCommand(button.command, item.file);
-  const newState = await loadContent(state, {});
-  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 SourceControlInput = 'SourceControlInput';
+const ViewAsTree = 'ViewAsTree';
+const CommitAndPush = 'CommitAndPush';
+const Refresh$1 = 'Refresh';
 
 const refresh = async state => {
   const {
@@ -2033,6 +2034,61 @@ const refresh = async state => {
   };
 };
 
+const viewAsTree = state => {
+  return {
+    ...state,
+    viewMode: Tree
+  };
+};
+
+const handleActionClick = async (state, actionName) => {
+  switch (actionName) {
+    case Refresh$1:
+      return refresh(state);
+    case ViewAsTree:
+      return viewAsTree(state);
+    case CommitAndPush:
+      warn(`[source-control-worker] CommitAndPush action not yet implemented`);
+      return state;
+    default:
+      warn(`[source-control-worker] Unknown action name: ${actionName}`);
+      return state;
+  }
+};
+
+const executeCommand = (id, ...args) => {
+  return executeProvider({
+    event: `onCommand:${id}`,
+    method: CommandExecute,
+    params: [id, ...args]
+  });
+};
+
+const handleButtonClick = async (state, clickedIndex) => {
+  const {
+    visibleItems
+  } = state;
+  const item = visibleItems[clickedIndex];
+  const button = item.buttons[clickedIndex];
+  if (!button) {
+    return state;
+  }
+  await executeCommand(button.command, item.file);
+  const newState = await loadContent(state, {});
+  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 handleClickSourceControlButtons = async (state, index, name) => {
   const {
     visibleItems
@@ -2324,12 +2380,35 @@ const initialize = async () => {
   set$1(textRpc);
 };
 
+const getUnique = items => {
+  const seens = [];
+  for (const item of items) {
+    if (!seens.includes(item)) {
+      seens.push(item);
+    }
+  }
+  return seens;
+};
+
+const getIndentRule = indent => {
+  return `.Indent-${indent} {
+  padding-left: ${indent}px;
+}`;
+};
 const renderCss = (oldState, newState) => {
   const {
     id,
-    inputBoxHeight
+    inputBoxHeight,
+    visibleItems
   } = newState;
-  const css = `:root {
+  const indents = visibleItems.map(item => item.indent);
+  const uniqueIndents = getUnique(indents);
+  const indentRules = uniqueIndents.map(getIndentRule).join('\n');
+  const css = indentRules ? `:root {
+  --SourceControlInputHeight: ${inputBoxHeight}px;
+}
+${indentRules}
+` : `:root {
   --SourceControlInputHeight: ${inputBoxHeight}px;
 }
 `;
@@ -2380,8 +2459,7 @@ const HandleMouseOutAt = 6;
 const HandleMouseOver = 7;
 const HandleMouseOverAt = 8;
 const HandleWheel = 9;
-
-const SourceControlInput = 'SourceControlInput';
+const HandleClickAction = 10;
 
 const getSourceControlInputDom = inputPlaceholder => {
   return [{
@@ -2461,7 +2539,12 @@ const getLabelClassName = decorationStrikeThrough => {
   return classNameDefault;
 };
 
-const PaddingLeft = '1rem';
+const getTreeItemClassName = indent => {
+  let className = TreeItem;
+  className = mergeClassNames(className, `Indent-${indent}`);
+  return className;
+};
+
 const PaddingRight = '12px';
 
 const createItemDirectory = item => {
@@ -2473,21 +2556,21 @@ const createItemDirectory = item => {
     badgeCount,
     decorationStrikeThrough,
     type,
-    buttons
+    buttons,
+    indent
   } = item;
   const labelClassName = getLabelClassName(decorationStrikeThrough);
   const buttonsDom = getButtonsVirtualDom(buttons);
   const hasButtons = buttons.length;
+  const treeItemClassName = getTreeItemClassName(indent);
   return [{
     type: Div,
-    className: TreeItem,
+    className: treeItemClassName,
     role: TreeItem$1,
     ariaExpanded: type === DirectoryExpanded,
     ariaPosInSet: posInSet,
     ariaSetSize: setSize,
     childCount: 3 + (hasButtons ? 1 : 0),
-    paddingLeft: PaddingLeft,
-    // TODO classname for indent / padding
     paddingRight: PaddingRight
   }, {
     type: Div,
@@ -2533,21 +2616,22 @@ const createItemOther = item => {
     decorationStrikeThrough,
     detail,
     buttons,
-    fileIcon
+    fileIcon,
+    indent
   } = item;
   const labelClassName = getLabelClassName(decorationStrikeThrough);
   const dom = [];
   const hasButtons = buttons.length;
   const buttonsDom = getButtonsVirtualDom(buttons);
+  const treeItemClassName = getTreeItemClassName(indent);
   dom.push({
     type: Div,
-    className: TreeItem,
+    className: treeItemClassName,
     role: TreeItem$1,
     ariaPosInSet: posInSet,
     ariaSetSize: setSize,
     title: file,
     childCount: 3 + (hasButtons ? 1 : 0),
-    paddingLeft: '1rem',
     paddingRight: '12px'
   }, ...getIconsDom(icon, fileIcon));
   const labelDom = {
@@ -2700,18 +2784,43 @@ const render2 = (uid, diffResult) => {
 
 const Button = 1;
 
+const Check = 'Check';
+const ListFlat = 'ListFlat';
+const Refresh = 'Refresh';
+
+const getActions = () => {
+  return [{
+    type: Button,
+    id: viewAsTree$1(),
+    name: ViewAsTree,
+    icon: ListFlat,
+    command: ''
+  }, {
+    type: Button,
+    id: commitAndPush(),
+    name: CommitAndPush,
+    icon: Check,
+    command: ''
+  }, {
+    type: Button,
+    id: refresh$1(),
+    name: Refresh$1,
+    icon: Refresh,
+    command: ''
+  }];
+};
+
 const getActionButtonVirtualDom = action => {
   const {
     id,
     icon,
-    command
+    label
   } = action;
   return [{
     type: Button$2,
     className: IconButton,
     title: id,
-    'data-command': command,
-    // TODO remove this
+    name: label,
     childCount: 1
   }, getIconVirtualDom(icon)];
 };
@@ -2719,7 +2828,14 @@ const getActionButtonVirtualDom = action => {
 const getActionVirtualDom = action => {
   switch (action.type) {
     case Button:
-      return getActionButtonVirtualDom(action);
+      {
+        const actionButton = {
+          id: action.id,
+          icon: action.icon,
+          label: action.name
+        };
+        return getActionButtonVirtualDom(actionButton);
+      }
     default:
       return [];
   }
@@ -2730,12 +2846,13 @@ const getActionsVirtualDom = actions => {
     type: Div,
     className: Actions,
     role: ToolBar,
-    childCount: actions.length
+    childCount: actions.length,
+    onClick: HandleClickAction
   }, ...actions.flatMap(getActionVirtualDom)];
 };
 
 const renderActions = state => {
-  const actions = [];
+  const actions = getActions();
   const dom = getActionsVirtualDom(actions);
   return dom;
 };
@@ -2771,6 +2888,9 @@ const renderEventListeners = () => {
     name: HandleWheel,
     params: ['handleWheel', DeltaMode, DeltaY],
     passive: true
+  }, {
+    name: HandleClickAction,
+    params: ['handleActionClick', TargetName]
   }];
 };
 
@@ -2818,18 +2938,12 @@ const viewAsList = state => {
   };
 };
 
-const viewAsTree = state => {
-  return {
-    ...state,
-    viewMode: Tree
-  };
-};
-
 const commandMap = {
   'Initialize.initialize': initialize,
   'SourceControl.acceptInput': wrapCommand(acceptInput),
   'SourceControl.create2': create2,
   'SourceControl.diff2': diff2,
+  'SourceControl.getBadgeCount': wrapGetter(getBadgeCount),
   'SourceControl.getCommandIds': getCommandIds,
   'SourceControl.getEnabledProviderIds': getEnabledProviderIds,
   'SourceControl.getFileDecorations': getFileDecorations,
@@ -2837,6 +2951,7 @@ const commandMap = {
   'SourceControl.getKeyBindings': getKeyBindings,
   'SourceControl.getMenuEntries2': wrapGetter(getMenuEntries2),
   'SourceControl.getMenuIds': getMenuIds,
+  'SourceControl.handleActionClick': wrapCommand(handleActionClick),
   'SourceControl.handleButtonClick': wrapCommand(handleButtonClick),
   'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleClickSourceControlButtons': wrapCommand(handleClickSourceControlButtons),

package/package.json

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