@lvce-editor/source-control-worker 1.18.0 → 1.20.0

package/dist/sourceControlWorkerMain.js

@@ -1040,10 +1040,10 @@ const TreeItem$1 = 'treeitem';
 
 const Button$2 = 1;
 const Div = 4;
-const Input = 6;
 const Span = 8;
 const Text = 12;
 const Img = 17;
+const TextArea = 62;
 
 const TargetValue = 'event.target.value';
 const ClientX = 'event.clientX';
@@ -1053,12 +1053,16 @@ const DeltaMode = 'event.deltaMode';
 const DeltaY = 'event.deltaY';
 const TargetName = 'event.target.name';
 
+const User = 1;
+
 const DebugWorker = 55;
 const ExtensionHostWorker = 44;
 const RendererWorker$1 = 1;
 const SourceControlWorker = 66;
 
+const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
+const SetValueByName = 'Viewlet.setValueByName';
 
 const rpcs = Object.create(null);
 const set$4 = (id, rpc) => {
@@ -1568,7 +1572,8 @@ const {
   set: set$1,
   wrapCommand,
   getCommandIds,
-  registerCommands
+  registerCommands,
+  wrapGetter
 } = create();
 
 const create2 = (id, uri, x, y, width, height, workspacePath) => {
@@ -1593,6 +1598,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     maxLineY: 0,
     merge: [],
     minimumSliderSize: 20,
+    inputBoxHeight: 30,
     minLineY: 0,
     providerId: '',
     root: '',
@@ -1605,20 +1611,36 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     workingTree: [],
     workspacePath,
     x,
-    y
+    y,
+    inputPlaceholder: '',
+    inputSource: 0,
+    maxInputLines: 5,
+    inputFontFamily: '"Fira Code"',
+    inputFontSize: 15,
+    inputFontWeight: 400,
+    inputLetterSpacing: 0.5
   };
   set$1(id, state, state);
 };
 
+const isEqual$2 = (oldState, newState) => {
+  return newState.inputBoxHeight === newState.inputBoxHeight;
+};
+
 const RenderItems = 4;
+const RenderValue = 8;
+const RenderCss = 10;
 
-const diffType = RenderItems;
-const isEqual = (oldState, newState) => {
+const isEqual$1 = (oldState, newState) => {
   return oldState.allGroups === newState.allGroups && oldState.visibleItems === newState.visibleItems && oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.deltaY === newState.deltaY;
 };
 
-const modules = [isEqual];
-const numbers = [diffType];
+const isEqual = (oldState, newState) => {
+  return newState.inputSource === User || oldState.inputValue === newState.inputValue;
+};
+
+const modules = [isEqual$1, isEqual, isEqual$2];
+const numbers = [RenderItems, RenderValue, RenderCss];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1968,6 +1990,28 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
 };
 
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
+const SourceControlInput$1 = 'Source Control Input';
+
+const messageEnterToCommitOnMaster = () => {
+  return i18nString(MessageEnterToCommitOnMaster);
+};
+const sourceControlInput = () => {
+  return i18nString(SourceControlInput$1);
+};
+
 const loadContent = async state => {
   const {
     itemHeight,
@@ -1997,20 +2041,22 @@ const loadContent = async state => {
   const newFileIconCache = await getFileIcons(displayItems, fileIconCache);
   const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
+  const inputPlaceholder = messageEnterToCommitOnMaster();
   return {
     ...state,
+    actionsCache,
     allGroups,
+    enabledProviderIds,
+    fileIconCache: newFileIconCache,
+    finalDeltaY,
     gitRoot,
+    inputPlaceholder,
     items: displayItems,
-    visibleItems,
-    enabledProviderIds,
-    root,
-    splitButtonEnabled,
     maxLineY,
+    root,
     scrollBarHeight,
-    finalDeltaY,
-    fileIconCache: newFileIconCache,
-    actionsCache
+    splitButtonEnabled,
+    visibleItems
   };
 };
 
@@ -2226,6 +2272,45 @@ 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,
+    inputFontFamily,
+    inputFontSize,
+    inputFontWeight,
+    inputLetterSpacing
+  } = state;
+  const lineHeight = 30;
+  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, lineHeight);
+  return {
+    ...state,
+    inputValue: value,
+    inputSource,
+    inputBoxHeight
+  };
+};
+
 const handleMouseOut = (state, index) => {
   const {
     items
@@ -2311,6 +2396,18 @@ const initialize = async () => {
   set(extensionHostRpc);
 };
 
+const renderCss = (oldState, newState) => {
+  const {
+    id,
+    inputBoxHeight
+  } = newState;
+  const css = `:root {
+  --SourceControlInputHeight: ${inputBoxHeight}px;
+}
+`;
+  return [SetCss, id, css];
+};
+
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -2352,60 +2449,42 @@ const StrikeThrough = 'StrikeThrough';
 const TreeItem = 'TreeItem';
 const Viewlet = 'Viewlet';
 
-const HandleClickAt = 'handleClickAt';
-const HandleContextMenu = 'handleContextMenu';
-const HandleFocus = 'handleFocus';
-const HandleInput = 'handleInput';
-const HandleMouseOut = 'handleMouseOut';
-const HandleMouseOutAt = 'handleMouseOutAt';
-const HandleMouseOver = 'handleMouseOver';
-const HandleMouseOverAt = 'handleMouseOverAt';
-const HandleWheel = 'handleWheel';
-
-const SourceControlInput$1 = 'SourceControlInput';
-
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
+const HandleClickAt = 1;
+const HandleContextMenu = 2;
+const HandleFocus = 3;
+const HandleInput = 4;
+const HandleMouseOut = 5;
+const HandleMouseOutAt = 6;
+const HandleMouseOver = 7;
+const HandleMouseOverAt = 8;
+const HandleWheel = 9;
 
-const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
-const SourceControlInput = 'Source Control Input';
+const SourceControlInput = 'SourceControlInput';
 
-const messageEnterToCommitOnMaster = () => {
-  return i18nString(MessageEnterToCommitOnMaster);
-};
-const sourceControlInput = () => {
-  return i18nString(SourceControlInput);
-};
-
-const getSourceControlHeaderVirtualDom = () => {
+const getSourceControlInputDom = inputPlaceholder => {
   return [{
-    type: Div,
-    className: SourceControlHeader,
-    childCount: 1
-  }, {
-    type: Input,
-    className: InputBox,
+    type: TextArea,
+    className: mergeClassNames(InputBox, 'MultilineInputBox'),
     ariaLabel: sourceControlInput(),
     autocapitalize: 'off',
     autocorrect: 'off',
     childCount: 0,
-    name: SourceControlInput$1,
+    name: SourceControlInput,
     onFocus: HandleFocus,
     onInput: HandleInput,
-    placeholder: messageEnterToCommitOnMaster(),
+    placeholder: inputPlaceholder,
     spellcheck: false
   }];
 };
 
+const getSourceControlHeaderVirtualDom = inputPlaceholder => {
+  return [{
+    type: Div,
+    className: SourceControlHeader,
+    childCount: 1
+  }, ...getSourceControlInputDom(inputPlaceholder)];
+};
+
 const getBadgeVirtualDom = (className, count) => {
   return [{
     type: Div,
@@ -2621,7 +2700,7 @@ const getSplitButtonVirtualDom = (hasItems, splitButtonEnabled, buttonText) => {
   }];
 };
 
-const getSourceControlVirtualDom = (items, splitButtonEnabled) => {
+const getSourceControlVirtualDom = (items, splitButtonEnabled, inputPlaceholder) => {
   const hasItems = items.length > 0;
   const dom = [{
     type: Div,
@@ -2632,20 +2711,37 @@ const getSourceControlVirtualDom = (items, splitButtonEnabled) => {
     onMouseOut: HandleMouseOut,
     onWheel: HandleWheel,
     childCount: splitButtonEnabled ? 3 : 2
-  }, ...getSourceControlHeaderVirtualDom(), ...getSplitButtonVirtualDom(hasItems, splitButtonEnabled, 'Commit'), ...getSourceControlListVirtualDom(items)];
+  }, ...getSourceControlHeaderVirtualDom(inputPlaceholder), ...getSplitButtonVirtualDom(hasItems, splitButtonEnabled, 'Commit'), ...getSourceControlListVirtualDom(items)];
   return dom;
 };
 
 const renderItems = (oldState, newState) => {
-  const visible = newState.visibleItems;
-  const dom = getSourceControlVirtualDom(visible, newState.splitButtonEnabled);
-  return [SetDom2, dom];
+  const {
+    visibleItems,
+    splitButtonEnabled,
+    inputPlaceholder,
+    id
+  } = newState;
+  const dom = getSourceControlVirtualDom(visibleItems, splitButtonEnabled, inputPlaceholder);
+  return [SetDom2, id, dom];
+};
+
+const renderValue = (oldState, newState) => {
+  const {
+    id,
+    inputValue
+  } = newState;
+  return [SetValueByName, id, SourceControlInput, inputValue];
 };
 
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderItems:
       return renderItems;
+    case RenderValue:
+      return renderValue;
+    case RenderCss:
+      return renderCss;
     default:
       throw new Error('unknown renderer');
   }
@@ -2708,7 +2804,7 @@ const getActionsVirtualDom = actions => {
   }, ...actions.flatMap(getActionVirtualDom)];
 };
 
-const renderActions = uid => {
+const renderActions = state => {
   const actions = [];
   const dom = getActionsVirtualDom(actions);
   return dom;
@@ -2788,11 +2884,13 @@ const commandMap = {
   'SourceControl.create2': create2,
   'SourceControl.diff2': diff2,
   'SourceControl.getCommandIds': getCommandIds,
+  'SourceControl.getInfo': getInfo,
   'SourceControl.handleButtonClick': wrapCommand(handleButtonClick),
   'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleClickSourceControlButtons': wrapCommand(handleClickSourceControlButtons),
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
   'SourceControl.handleFocus': wrapCommand(handleFocus),
+  'SourceControl.handleInput': wrapCommand(handleInput),
   'SourceControl.handleMouseOut': wrapCommand(handleMouseOut),
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
@@ -2801,14 +2899,14 @@ const commandMap = {
   'SourceControl.loadContent': wrapCommand(loadContent),
   'SourceControl.refresh': wrapCommand(refresh),
   'SourceControl.render2': render2,
+  'SourceControl.renderActions': wrapGetter(renderActions),
   'SourceControl.renderActions2': renderActions,
   'SourceControl.renderEventListeners': renderEventListeners,
   'SourceControl.saveState': saveState,
   'SourceControl.selectIndex': wrapCommand(selectIndex),
   'SourceControl.setDeltaY': wrapCommand(setDeltaY),
   'SourceControl.terminate': terminate,
-  'SourceControl.updateIcons': wrapCommand(updateIcons),
-  'SourceControl.getInfo': getInfo
+  'SourceControl.updateIcons': wrapCommand(updateIcons)
 };
 
 const listen = async () => {

package/package.json

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