@lvce-editor/source-control-worker 3.13.0 → 3.14.1

package/dist/sourceControlWorkerMain.js

@@ -1744,8 +1744,9 @@ const getIconDefinitions = async (providerIds, assetDir, platform) => {
       return [];
     }
     const icons = extension['source-control-icons'].filter(icon => typeof icon === 'string');
+    const baseUri = extension.uri.endsWith('/') ? extension.uri : `${extension.uri}/`;
     return icons.map(icon => {
-      const uri = `${extension.uri}/${icon}`;
+      const uri = new URL(icon, baseUri).href;
       if (platform === Electron || platform === Remote) {
         const protocol = getProtocol(uri);
         const path = getPath(protocol, uri);
@@ -3102,9 +3103,19 @@ const set = rpc => {
   state.connected = true;
 };
 
-const handleRendererProcessMessagePort = async port => {
+const handleRendererProcessMessagePort = async (port, viewletCommandMap) => {
+  const executeViewletCommand = async (uid, command, ...args) => {
+    const fn = viewletCommandMap[`SourceControl.${command}`];
+    if (typeof fn !== 'function') {
+      throw new TypeError(`Viewlet command not found: ${command}`);
+    }
+    await fn(uid, ...args);
+    await invoke$1('Viewlet.requestRender', uid);
+  };
   const rpc = await create$4({
-    commandMap: {},
+    commandMap: {
+      'Viewlet.executeViewletCommand': executeViewletCommand
+    },
     messagePort: port
   });
   set(rpc);
@@ -3334,11 +3345,18 @@ const renderCss = (oldState, newState) => {
   const listHeight = Math.max(height - headerHeight, 0);
   const scrollBarY = scrollBarHeight > 0 ? getScrollBarY(deltaY, finalDeltaY, listHeight, scrollBarHeight) : 0;
   const itemOffset = -(deltaY % itemHeight);
-  const indentCss = indentRules ? `\n${indentRules}\n` : '';
+  const indentCss = indentRules ? `${indentRules}\n` : '';
   const css = `:root {
   --SourceControlInputHeight: ${inputBoxHeight}px;
 }
 
+.SourceControl .SplitButtonContent > .MaskIcon {
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  flex-shrink: 0;
+}
+
 .SourceControl .ScrollBarThumb {
   height: ${scrollBarHeight}px;
   translate: 0 ${Math.round(scrollBarY)}px;
@@ -3347,7 +3365,11 @@ const renderCss = (oldState, newState) => {
 .SourceControlItems > .TreeItem:first-child {
   margin-top: ${itemOffset}px;
 }
-${indentCss}`;
+
+${indentCss}.IndentRight-12 {
+  padding-right: 12px;
+}
+`;
   return [SetCss, id, css];
 };
 
@@ -3371,6 +3393,7 @@ const InputBox = 'InputBox';
 const Label = 'Label';
 const LabelDetail = 'LabelDetail';
 const List = 'List';
+const ListItems = 'ListItems';
 const Message = 'Message';
 const Progress = 'Progress';
 const ProgressContainer = 'ProgressContainer';
@@ -3389,6 +3412,7 @@ const SplitButtonDisabled = 'SplitButtonDisabled';
 const StrikeThrough = 'StrikeThrough';
 const TreeItem = 'TreeItem';
 const Viewlet = 'Viewlet';
+const ViewSourceControlInput = 'ViewSourceControlInput';
 
 const HandleClickAt = 1;
 const HandleContextMenu = 2;
@@ -3459,8 +3483,13 @@ const messageNode$1 = {
   className: Message,
   type: Div
 };
+const inputWrapperNode = {
+  childCount: 1,
+  className: ViewSourceControlInput,
+  type: Div
+};
 const getSourceControlInputDom = (inputPlaceholder, inputMessage) => {
-  const dom = [{
+  const dom = [inputWrapperNode, {
     ariaLabel: sourceControlInput(),
     autocapitalize: 'off',
     autocorrect: 'off',
@@ -3554,13 +3583,9 @@ const getLabelClassName = decorationStrikeThrough => {
 };
 
 const getTreeItemClassName = indent => {
-  let className = TreeItem;
-  className = mergeClassNames(className, `Indent-${indent}`);
-  return className;
+  return mergeClassNames(TreeItem, `Indent-${indent}`, 'IndentRight-12');
 };
 
-const PaddingRight = '12px';
-
 const createItemDirectory = item => {
   const {
     badgeCount,
@@ -3583,7 +3608,6 @@ const createItemDirectory = item => {
     ariaSetSize: setSize,
     childCount: 3 + (hasButtons ? 1 : 0),
     className: treeItemClassName,
-    paddingRight: PaddingRight,
     role: TreeItem$1,
     type: Div
   }, {
@@ -3648,7 +3672,6 @@ const createItemOther = item => {
     ariaSetSize: setSize,
     childCount: 3 + (hasButtons ? 1 : 0),
     className: treeItemClassName,
-    paddingRight: '12px',
     role: TreeItem$1,
     title: file,
     type: Div
@@ -3692,7 +3715,7 @@ const getSourceControlListVirtualDom = (items, scrollBarHeight, scrollBarActive)
     type: Div
   }, {
     childCount: items.length,
-    className: SourceControlItems,
+    className: mergeClassNames(ListItems, SourceControlItems),
     onClick: HandleClickAt,
     onPointerOut: HandleMouseOutAt,
     onPointerOver: HandleMouseOverAt,
@@ -4014,6 +4037,7 @@ const viewAsList = state => {
   };
 };
 
+const handleDirectMessagePort = port => handleRendererProcessMessagePort(port, commandMap);
 const commandMap = {
   'Initialize.initialize': initialize,
   'SourceControl.acceptInput': wrapCommand(acceptInput),
@@ -4042,7 +4066,7 @@ const commandMap = {
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
-  'SourceControl.handleRendererProcessMessagePort': handleRendererProcessMessagePort,
+  'SourceControl.handleRendererProcessMessagePort': handleDirectMessagePort,
   'SourceControl.handleScrollBarCaptureLost': wrapCommand(handleScrollBarCaptureLost),
   'SourceControl.handleScrollBarClick': wrapCommand(handleScrollBarClick),
   'SourceControl.handleScrollBarMove': wrapCommand(handleScrollBarMove),

package/package.json

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