@lvce-editor/source-control-worker 2.12.0 → 2.14.0

package/dist/sourceControlWorkerMain.js

@@ -521,7 +521,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
+const set$5 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$3 = id => {
@@ -540,7 +540,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$4(id, resolve);
+  set$5(id, resolve);
   return {
     id,
     promise
@@ -1045,7 +1045,12 @@ const DeltaY = 'event.deltaY';
 const TargetName = 'event.target.name';
 const TargetValue = 'event.target.value';
 
+const Enter = 3;
+
 const User = 1;
+const Script = 2;
+
+const CtrlCmd = 1 << 11 >>> 0;
 
 const SourceControl$1 = 22;
 
@@ -1054,16 +1059,20 @@ const None = 0;
 const ExtensionHostWorker = 44;
 const RendererWorker = 1;
 const SourceControlWorker = 66;
+const IconThemeWorker = 7009;
 
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
 const List = 1;
 const Tree = 2;
 
+const FocusSourceControlInput = 24;
+
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$2 = id => {
@@ -1085,7 +1094,7 @@ const create$1 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$4(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$2(rpcId);
@@ -1096,12 +1105,12 @@ const create$1 = rpcId => {
 
 const {
   invoke: invoke$1,
-  set: set$2} = create$1(ExtensionHostWorker);
+  set: set$3} = create$1(ExtensionHostWorker);
 
 const {
   invoke,
   invokeAndTransfer,
-  set: set$1} = create$1(RendererWorker);
+  set: set$2} = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1120,6 +1129,11 @@ const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
 const activateByEvent$1 = event => {
   return invoke('ExtensionHostManagement.activateByEvent', event);
 };
+const sendMessagePortToTextMeasurementWorker$1 = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
 const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
@@ -1127,6 +1141,9 @@ const openUri$1 = async (uri, focus, options) => {
   await invoke('Main.openUri', uri, focus, options);
 };
 
+const {
+  set: set$1} = create$1(IconThemeWorker);
+
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
@@ -1269,20 +1286,27 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     history: [],
     viewMode: 1,
     iconDefinitions: [],
-    decorationIcons: []
+    decorationIcons: [],
+    focus: 0
   };
   set(id, state, state);
 };
 
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.inputBoxHeight === newState.inputBoxHeight;
 };
 
+const isEqual$2 = (oldState, newState) => {
+  return oldState.focus === newState.focus;
+};
+
 const isEqual$1 = (oldState, newState) => {
   return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.visibleItems === newState.visibleItems;
 };
 
 const RenderItems = 4;
+const RenderFocus = 6;
+const RenderFocusContext = 7;
 const RenderValue = 8;
 const RenderCss = 10;
 
@@ -1290,8 +1314,8 @@ 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 modules = [isEqual$1, isEqual, isEqual$3, isEqual$2];
+const numbers = [RenderItems, RenderValue, RenderCss, RenderFocus];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1320,6 +1344,26 @@ const getInfo = uid => {
   return newState.allGroups;
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
+const getKeyBindings = () => {
+  return [{
+    key: CtrlCmd | Enter,
+    command: 'Source Control.acceptInput',
+    when: FocusSourceControlInput
+  }];
+};
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -1684,7 +1728,10 @@ const getGroups = async enabledProviderIds => {
 
 const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight) => {
   try {
-    const actualInput = '\n' + input;
+    if (!input) {
+      return lineHeight;
+    }
+    const actualInput = input;
     // TODO line height could also be like 1.5
     const lineHeightPx = `${lineHeight}px`;
     // @ts-ignore
@@ -2097,8 +2144,12 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
-const handleFocus = async state => {
-  return state;
+const handleInputFocus = async state => {
+  return {
+    ...state,
+    focus: FocusSourceControlInput,
+    inputSource: Script
+  };
 };
 
 const handleInput = async (state, value, inputSource = User) => {
@@ -2119,6 +2170,11 @@ const handleInput = async (state, value, inputSource = User) => {
   };
 };
 
+const handleInputBlur = async state => {
+  // TODO reset focus
+  return state;
+};
+
 const handleMessagePort = async port => {
   await PlainMessagePortRpc.create({
     commandMap: {},
@@ -2210,9 +2266,26 @@ const createExtensionHostRpc = async () => {
   }
 };
 
+const sendMessagePortToTextMeasurementWorker = async port => {
+  await sendMessagePortToTextMeasurementWorker$1(port);
+};
+
+const createTextMeasurementWorkerRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: sendMessagePortToTextMeasurementWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create text measurement worker rpc`);
+  }
+};
+
 const initialize = async () => {
-  const extensionHostRpc = await createExtensionHostRpc();
-  set$2(extensionHostRpc);
+  const [extensionHostRpc, textRpc] = await Promise.all([createExtensionHostRpc(), createTextMeasurementWorkerRpc()]);
+  set$3(extensionHostRpc);
+  set$1(textRpc);
 };
 
 const renderCss = (oldState, newState) => {
@@ -2227,16 +2300,12 @@ const renderCss = (oldState, newState) => {
   return [SetCss, id, css];
 };
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
+const renderFocusContext = (oldState, newState) => {
+  const {
+    id,
+    focus
+  } = newState;
+  return [SetFocusContext, id, focus];
 };
 
 const Actions = 'Actions';
@@ -2564,6 +2633,8 @@ const getRenderer = diffType => {
       return renderValue;
     case RenderCss:
       return renderCss;
+    case RenderFocusContext:
+      return renderFocusContext;
     default:
       throw new Error('unknown renderer');
   }
@@ -2723,17 +2794,17 @@ const commandMap = {
   'SourceControl.create2': create2,
   'SourceControl.diff2': diff2,
   'SourceControl.getCommandIds': getCommandIds,
-  'SourceControl.handleWorkspaceRefresh': wrapCommand(handleWorkspaceRefresh),
-  'SourceControl.getMenuIds': getMenuIds,
   'SourceControl.getEnabledProviderIds': getEnabledProviderIds,
   'SourceControl.getFileDecorations': getFileDecorations,
   'SourceControl.getInfo': getInfo,
+  'SourceControl.getKeyBindings': getKeyBindings,
   'SourceControl.getMenuEntries2': wrapGetter(getMenuEntries2),
+  'SourceControl.getMenuIds': getMenuIds,
   'SourceControl.handleButtonClick': wrapCommand(handleButtonClick),
   'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleClickSourceControlButtons': wrapCommand(handleClickSourceControlButtons),
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
-  'SourceControl.handleFocus': wrapCommand(handleFocus),
+  'SourceControl.handleFocus': wrapCommand(handleInputFocus),
   'SourceControl.handleInput': wrapCommand(handleInput),
   'SourceControl.handleMessagePort': handleMessagePort,
   'SourceControl.handleMouseOut': wrapCommand(handleMouseOut),
@@ -2741,6 +2812,7 @@ const commandMap = {
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
   'SourceControl.handleWheel': wrapCommand(handleWheel),
+  'SourceControl.handleWorkspaceRefresh': wrapCommand(handleWorkspaceRefresh),
   'SourceControl.loadContent': wrapCommand(loadContent),
   'SourceControl.refresh': wrapCommand(refresh),
   'SourceControl.render2': render2,
@@ -2753,7 +2825,8 @@ const commandMap = {
   'SourceControl.terminate': terminate,
   'SourceControl.updateIcons': wrapCommand(updateIcons),
   'SourceControl.viewAsList': wrapCommand(viewAsList),
-  'SourceControl.viewAsTree': wrapCommand(viewAsTree)
+  'SourceControl.viewAsTree': wrapCommand(viewAsTree),
+  'SourceControl.handleInputBlur': wrapCommand(handleInputBlur)
 };
 
 const listen = async () => {
@@ -2761,7 +2834,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

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