@lvce-editor/source-control-worker 2.18.0 → 2.20.0

package/dist/sourceControlWorkerMain.js

@@ -1491,28 +1491,28 @@ const getGroups = async enabledProviderIds => {
   };
 };
 
-const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight) => {
+const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight, inputPadding) => {
   try {
     if (!input) {
-      return lineHeight;
+      return lineHeight + inputPadding * 2;
     }
     const actualInput = input;
     // TODO line height could also be like 1.5
     const lineHeightPx = `${lineHeight}px`;
     // @ts-ignore
     const height = await invoke(`MeasureTextHeight.measureTextBlockHeight`, actualInput, fontFamily, fontSize, lineHeightPx, width);
-    return height;
+    return height + inputPadding * 2;
   } catch {
     // fallback
     const lines = input.split('\n');
     const lineCount = lines.length;
-    const inputHeight = lineCount * lineHeight;
+    const inputHeight = lineCount * lineHeight + inputPadding * 2;
     return inputHeight;
   }
 };
 
-const getInputHeight = async (input, width, fontFamily, fontWeight, fontSize, letterSpacing, lineHeight) => {
-  const height = await getTextHeight(input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight);
+const getInputHeight = async (input, width, fontFamily, fontWeight, fontSize, letterSpacing, lineHeight, inputPadding) => {
+  const height = await getTextHeight(input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight, inputPadding);
   return height;
 };
 
@@ -1710,6 +1710,7 @@ const loadContent = async (state, savedState) => {
     inputFontWeight,
     inputLetterSpacing,
     inputLineHeight,
+    inputPadding,
     itemHeight,
     minimumSliderSize,
     width,
@@ -1732,6 +1733,7 @@ const loadContent = async (state, savedState) => {
 
   // TODO make preferences async and more functional
   const splitButtonEnabled = await get$1('sourceControl.splitButtonEnabled');
+  const badgeCount = allGroups.reduce((sum, group) => sum + group.items.length, 0);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -1743,11 +1745,12 @@ const loadContent = async (state, savedState) => {
   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);
+  const inputBoxHeight = await getInputHeight(inputValue, width, inputFontFamily, inputFontSize, inputFontWeight, inputLetterSpacing, inputLineHeight, inputPadding);
   return {
     ...state,
     actionsCache,
     allGroups,
+    badgeCount,
     decorationIcons: iconDefinitions,
     enabledProviderIds,
     fileIconCache: newFileIconCache,
@@ -1831,6 +1834,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     inputFontWeight: 400,
     inputLetterSpacing: 0,
     inputLineHeight: 20,
+    inputPadding: 2,
     inputPlaceholder: '',
     inputSource: 0,
     inputValue: '',
@@ -2010,6 +2014,7 @@ const refresh = async state => {
   } = await getGroups(enabledProviderIds);
   const expandedGroups = restoreExpandedGroups(allGroups);
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
+  const badgeCount = allGroups.reduce((sum, group) => sum + group.items.length, 0);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -2024,6 +2029,7 @@ const refresh = async state => {
     ...state,
     actionsCache,
     allGroups,
+    badgeCount,
     enabledProviderIds,
     fileIconCache: newFileIconCache,
     finalDeltaY,
@@ -2125,6 +2131,7 @@ const updateVisibleItems = async (state, expandedGroups) => {
     itemHeight
   } = state;
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
+  const badgeCount = allGroups.reduce((sum, group) => sum + group.items.length, 0);
   const total = displayItems.length;
   const listHeight = getListHeight(total, itemHeight, height);
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
@@ -2133,6 +2140,7 @@ const updateVisibleItems = async (state, expandedGroups) => {
   const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, fileIconCache);
   return {
     ...state,
+    badgeCount,
     expandedGroups,
     items: displayItems,
     maxLineY,
@@ -2253,9 +2261,10 @@ const handleInput = async (state, value, inputSource = User) => {
     inputFontWeight,
     inputLetterSpacing,
     inputLineHeight,
+    inputPadding,
     width
   } = state;
-  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, inputLineHeight);
+  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, inputLineHeight, inputPadding);
   return {
     ...state,
     inputBoxHeight,

package/package.json

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