@lvce-editor/main-area-worker 9.46.0 → 9.48.0

package/dist/mainAreaWorkerMain.js

@@ -2945,13 +2945,34 @@ const getActiveTab = state => {
   };
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$3(rpc);
+  state.connected = true;
+};
+
 const focus = async state => {
   const activeTab = getActiveTab(state);
   const editorUid = activeTab?.tab.editorUid;
   if (typeof editorUid !== 'number' || editorUid < 0) {
     return state;
   }
-  await invoke$1('Viewlet.focusSelector', editorUid, '[name="editor"]');
+  if (isConnected()) {
+    await invoke('Viewlet.focusSelectorAfterRender', editorUid, '[name="editor"]');
+  } else {
+    await invoke$1('Viewlet.focusSelector', editorUid, '[name="editor"]');
+  }
   return state;
 };
 
@@ -3474,6 +3495,15 @@ const focusPreviousTab = async state => {
   return selectTab(state, activeGroupIndex, previousTabIndex);
 };
 
+const getActiveEditorUid = state => {
+  const activeTab = getActiveTab(state);
+  const editorUid = activeTab?.tab.editorUid;
+  if (editorUid === undefined || editorUid < 0) {
+    throw new Error('no active editor found');
+  }
+  return editorUid;
+};
+
 const getMenuIds = () => {
   return [Main$1, Tab];
 };
@@ -5410,24 +5440,7 @@ const handleIconThemeChange = async state => {
   };
 };
 
-const state = {
-  connected: false
-};
-const isConnected = () => {
-  const {
-    connected
-  } = state;
-  return connected;
-};
-const invoke = (method, ...params) => {
-  return invoke$2(method, ...params);
-};
-const set = rpc => {
-  set$3(rpc);
-  state.connected = true;
-};
-
-const handleMessagePort = async (port, viewletCommandMap) => {
+const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
   const executeViewletCommand = async (uid, command, ...args) => {
     const fn = viewletCommandMap[`MainArea.${command}`];
     if (typeof fn !== 'function') {
@@ -5442,7 +5455,9 @@ const handleMessagePort = async (port, viewletCommandMap) => {
     },
     messagePort: port
   });
-  set(rpc);
+  if (setAsRendererProcess) {
+    set(rpc);
+  }
 };
 
 const handleModifiedStatusChange = (state, uri, newStatus) => {
@@ -8302,7 +8317,8 @@ const resize = async (uid, dimensions) => {
   set$1(uid, instance.oldState, resizedState);
   return handleResize(resizedState, dimensions);
 };
-const handleDirectMessagePort = port => handleMessagePort(port, commandMap);
+const handleDirectMessagePort = (port, setAsRendererProcess = true) => handleMessagePort(port, commandMap, setAsRendererProcess);
+const handleTestWorkerMessagePort = port => handleMessagePort(port, commandMap, false);
 const commandMap = {
   'Main.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
   'Main.closeAll': wrapSerialCommand(closeAll$1),
@@ -8349,6 +8365,7 @@ const commandMap = {
   'MainArea.focusNextTab': wrapSerialCommand(focusNextTab),
   'MainArea.focusPrevious': wrapSerialCommand(focusPreviousTab),
   'MainArea.focusPreviousTab': wrapSerialCommand(focusPreviousTab),
+  'MainArea.getActiveEditorUid': wrapGetter(getActiveEditorUid),
   'MainArea.getCommandIds': getCommandIds,
   'MainArea.getMenuEntries': wrapGetter(getMenuEntries),
   'MainArea.getMenuIds': getMenuIds,
@@ -8377,6 +8394,7 @@ const commandMap = {
   'MainArea.handleSashPointerUp': wrapSerialCommand(handleSashPointerUp),
   'MainArea.handleTabContextMenu': wrapSerialCommand(handleTabContextMenu),
   'MainArea.handleTabMouseUp': wrapSerialCommand(resetPointerDown),
+  'MainArea.handleTestWorkerMessagePort': handleTestWorkerMessagePort,
   'MainArea.handleUriChange': wrapSerialCommand(handleUriChange),
   'MainArea.handleWorkspaceChange': wrapSerialCommand(handleWorkspaceChange),
   'MainArea.handleWorkspaceRefresh': wrapAsyncCommand(handleWorkspaceRefreshWithContext),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "9.46.0",
+  "version": "9.48.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",