@lvce-editor/source-control-worker 1.22.0 → 2.0.0

package/dist/sourceControlWorkerMain.js

@@ -1619,7 +1619,11 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     inputFontSize: 13,
     inputFontWeight: 400,
     inputLetterSpacing: 0,
-    inputLineHeight: 14.95
+    inputLineHeight: 20,
+    inputBoxMaxHeight: 214,
+    history: [],
+    viewMode: 1,
+    iconDefinitions: []
   };
   set$1(id, state, state);
 };
@@ -1717,7 +1721,7 @@ const pathBaseName = path => {
   return path.slice(path.lastIndexOf('/') + 1);
 };
 
-const getDisplayItemsGroup = (group, expandedGroups) => {
+const getDisplayItemsGroup = (group, expandedGroups, iconDefinitions) => {
   const displayItems = [];
   const {
     id,
@@ -1758,6 +1762,10 @@ const getDisplayItemsGroup = (group, expandedGroups) => {
       } = item;
       const baseName = pathBaseName(file);
       const folderName = file.slice(0, -baseName.length - 1);
+      let actualDecorationIcon = icon;
+      if (typeof icon === 'number') {
+        actualDecorationIcon = iconDefinitions[icon];
+      }
       displayItems.push({
         file,
         label: baseName,
@@ -1767,7 +1775,7 @@ const getDisplayItemsGroup = (group, expandedGroups) => {
         icon: getFileIcon({
           name: file
         }),
-        decorationIcon: icon,
+        decorationIcon: actualDecorationIcon,
         decorationIconTitle: iconTitle,
         decorationStrikeThrough: strikeThrough,
         type: File,
@@ -1779,10 +1787,10 @@ const getDisplayItemsGroup = (group, expandedGroups) => {
   return displayItems;
 };
 
-const getDisplayItems = (allGroups, expandedGroups) => {
+const getDisplayItems = (allGroups, expandedGroups, iconDefinitions) => {
   const displayItems = [];
   for (const group of allGroups) {
-    const groupDisplayItems = getDisplayItemsGroup(group, expandedGroups);
+    const groupDisplayItems = getDisplayItemsGroup(group, expandedGroups, iconDefinitions);
     displayItems.push(...groupDisplayItems);
   }
   return displayItems;
@@ -1870,6 +1878,11 @@ const getEnabledProviderIds$1 = (scheme, root) => {
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
+const getIconDefinitions$1 = async providerId => {
+  // @ts-ignore
+  const result = await invoke$1('ExtensionHostSourceControl.getIconDefinitions', providerId);
+  return result;
+};
 
 const getFileBefore = (providerId, file) => {
   return getFileBefore$1(providerId, file);
@@ -1882,6 +1895,16 @@ const getEnabledProviderIds = (scheme, root) => {
 const getGroups$1 = (providerId, root) => {
   return getGroups$2(providerId, root);
 };
+const getIconDefinitions = async providerIds => {
+  try {
+    if (providerIds.length === 0) {
+      return [];
+    }
+    return await getIconDefinitions$1(providerIds[0]);
+  } catch {
+    return [];
+  }
+};
 
 const getGroups = async enabledProviderIds => {
   const allGroups = [];
@@ -1896,6 +1919,28 @@ const getGroups = async enabledProviderIds => {
   };
 };
 
+const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight) => {
+  try {
+    const actualInput = '\n' + input;
+    // TODO line height could also be like 1.5
+    const lineHeightPx = `${lineHeight}px`;
+    // @ts-ignore
+    const height = await invoke$2(`MeasureTextHeight.measureTextBlockHeight`, actualInput, fontFamily, fontSize, lineHeightPx, width);
+    return height;
+  } catch {
+    // fallback
+    const lines = input.split('\n');
+    const lineCount = lines.length;
+    const inputHeight = lineCount * lineHeight;
+    return inputHeight;
+  }
+};
+
+const getInputHeight = async (input, width, fontFamily, fontWeight, fontSize, letterSpacing, lineHeight) => {
+  const height = await getTextHeight(input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight);
+  return height;
+};
+
 const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   number(itemsLength);
   number(itemHeight);
@@ -1984,6 +2029,19 @@ const restoreExpandedGroups = groups => {
   }, Object.create(null));
 };
 
+const getRestoredInputValue = savedState => {
+  if (savedState && typeof savedState === 'object' && 'inputValue' in savedState && typeof savedState['inputValue'] === 'string') {
+    return savedState.inputValue;
+  }
+  return '';
+};
+const restoreState = savedState => {
+  const inputValue = getRestoredInputValue(savedState);
+  return {
+    inputValue
+  };
+};
+
 const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   if (size >= contentSize) {
     return 0;
@@ -2013,24 +2071,36 @@ const sourceControlInput = () => {
   return i18nString(SourceControlInput$1);
 };
 
-const loadContent = async state => {
+const loadContent = async (state, savedState) => {
   const {
     itemHeight,
     height,
     minimumSliderSize,
     workspacePath,
-    fileIconCache
+    fileIconCache,
+    width,
+    inputFontFamily,
+    inputFontSize,
+    inputFontWeight,
+    inputLetterSpacing,
+    inputLineHeight
   } = state;
   const root = workspacePath;
   const scheme = getProtocol(root);
+  const {
+    inputValue
+  } = restoreState(savedState);
   const enabledProviderIds = await getEnabledProviderIds(scheme, root);
+  const iconDefinitions = await getIconDefinitions(enabledProviderIds);
   const {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
   const expandedGroups = restoreExpandedGroups(allGroups);
-  const displayItems = getDisplayItems(allGroups, expandedGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const actionsCache = await requestSourceActions();
+
+  // TODO make preferences async and more functional
   const splitButtonEnabled = get();
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
@@ -2043,6 +2113,7 @@ const loadContent = async state => {
   const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
   const inputPlaceholder = messageEnterToCommitOnMaster();
+  const inputBoxHeight = await getInputHeight(inputValue, width, inputFontFamily, inputFontSize, inputFontWeight, inputLetterSpacing, inputLineHeight);
   return {
     ...state,
     actionsCache,
@@ -2051,7 +2122,9 @@ const loadContent = async state => {
     fileIconCache: newFileIconCache,
     finalDeltaY,
     gitRoot,
+    inputBoxHeight,
     inputPlaceholder,
+    inputValue,
     items: displayItems,
     maxLineY,
     root,
@@ -2071,7 +2144,7 @@ const handleButtonClick = async (state, clickedIndex) => {
     return state;
   }
   await executeCommand(button.command, item.file);
-  const newState = await loadContent(state);
+  const newState = await loadContent(state, {});
   return newState;
 };
 
@@ -2099,14 +2172,15 @@ const refresh = async state => {
     fileIconCache,
     enabledProviderIds,
     splitButtonEnabled,
-    actionsCache
+    actionsCache,
+    iconDefinitions
   } = state;
   const {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
   const expandedGroups = restoreExpandedGroups(allGroups);
-  const displayItems = getDisplayItems(allGroups, expandedGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -2159,9 +2233,10 @@ const updateVisibleItems = async (state, expandedGroups) => {
     height,
     actionsCache,
     fileIconCache,
-    allGroups
+    allGroups,
+    iconDefinitions
   } = state;
-  const displayItems = getDisplayItems(allGroups, expandedGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const total = displayItems.length;
   const listHeight = getListHeight(total, itemHeight, height);
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
@@ -2274,27 +2349,6 @@ const handleFocus = async state => {
   return state;
 };
 
-const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight) => {
-  try {
-    // TODO line height could also be like 1.5
-    const lineHeightPx = `${lineHeight}px`;
-    // @ts-ignore
-    const height = await invoke$2(`MeasureTextHeight.measureTextBlockHeight`, input, fontFamily, fontSize, lineHeightPx, width);
-    return height;
-  } catch {
-    // fallback
-    const lines = input.split('\n');
-    const lineCount = lines.length;
-    const inputHeight = lineCount * lineHeight;
-    return inputHeight;
-  }
-};
-
-const getInputHeight = async (input, width, fontFamily, fontWeight, fontSize, letterSpacing, lineHeight) => {
-  const height = await getTextHeight(input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight);
-  return height;
-};
-
 const handleInput = async (state, value, inputSource = User) => {
   const {
     width,
@@ -2530,12 +2584,13 @@ const getButtonsVirtualDom = buttons => {
   }, ...buttons.flatMap(getButtonVirtualDom)];
 };
 
+const classNameDefault = mergeClassNames(Label, Grow);
+const classNameStrikeThrough = mergeClassNames(classNameDefault, StrikeThrough);
 const getLabelClassName = decorationStrikeThrough => {
-  let className = mergeClassNames(Label, Grow);
   if (decorationStrikeThrough) {
-    className = mergeClassNames(className, StrikeThrough);
+    return classNameStrikeThrough;
   }
-  return className;
+  return classNameDefault;
 };
 
 const PaddingLeft = '1rem';
@@ -2564,6 +2619,7 @@ const createItemDirectory = item => {
     ariaSetSize: setSize,
     childCount: 3 + (hasButtons ? 1 : 0),
     paddingLeft: PaddingLeft,
+    // TODO classname for indent / padding
     paddingRight: PaddingRight
   }, {
     type: Div,
@@ -2679,11 +2735,11 @@ const getSplitButtonVirtualDom = (hasItems, splitButtonEnabled, buttonText) => {
   }
   return [{
     type: Div,
-    className: `${SplitButton} ${hasItems ? '' : SplitButtonDisabled}`,
+    className: mergeClassNames(SplitButton, hasItems ? '' : SplitButtonDisabled),
     childCount: 3
   }, {
     type: Div,
-    className: `${SplitButtonContent} ${hasItems ? '' : SplitButtonContentDisabled}`,
+    className: mergeClassNames(SplitButtonContent, hasItems ? '' : SplitButtonContentDisabled),
     childCount: 1,
     tabIndex: 0
   }, text(buttonText), {
@@ -2692,12 +2748,12 @@ const getSplitButtonVirtualDom = (hasItems, splitButtonEnabled, buttonText) => {
     childCount: 0
   }, {
     type: Div,
-    className: `${SplitButtonDropDown} ${hasItems ? '' : SplitButtonDropDownDisabled}`,
+    className: mergeClassNames(SplitButtonDropDown, hasItems ? '' : SplitButtonDropDownDisabled),
     childCount: 1,
     tabIndex: 0
   }, {
     type: Div,
-    className: `${MaskIcon} ${MaskIconChevronDown}`,
+    className: mergeClassNames(MaskIcon, MaskIconChevronDown),
     childCount: 0
   }];
 };
@@ -2855,14 +2911,16 @@ const saveState = uid => {
   const {
     root,
     maxLineY,
-    expandedGroups
+    expandedGroups,
+    inputValue
   } = newState;
   return {
     root,
     minLineY: 0,
     maxLineY,
     deltaY: 0,
-    expandedGroups
+    expandedGroups,
+    inputValue
   };
 };
 
@@ -2881,6 +2939,20 @@ const updateIcons = async state => {
   };
 };
 
+const viewAsList = state => {
+  return {
+    ...state,
+    viewMode: 1
+  };
+};
+
+const viewAsTree = state => {
+  return {
+    ...state,
+    viewMode: 2
+  };
+};
+
 const commandMap = {
   'Initialize.initialize': initialize,
   'SourceControl.create2': create2,
@@ -2908,7 +2980,9 @@ const commandMap = {
   'SourceControl.selectIndex': wrapCommand(selectIndex),
   'SourceControl.setDeltaY': wrapCommand(setDeltaY),
   'SourceControl.terminate': terminate,
-  'SourceControl.updateIcons': wrapCommand(updateIcons)
+  'SourceControl.updateIcons': wrapCommand(updateIcons),
+  'SourceControl.viewAsList': wrapCommand(viewAsList),
+  'SourceControl.viewAsTree': wrapCommand(viewAsTree)
 };
 
 const listen = async () => {

package/package.json

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