@lvce-editor/main-area-worker 9.64.0 → 9.64.2

package/dist/mainAreaWorkerMain.js

@@ -1798,14 +1798,42 @@ const getActiveFileUri = state => {
   return editorInput && 'uri' in editorInput ? editorInput.uri : '';
 };
 
+const getActiveTab = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const activeGroup = groups.find(group => group.focused);
+  if (!activeGroup || !activeGroup.activeTabId) {
+    return undefined;
+  }
+  const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
+  if (!activeTab) {
+    return undefined;
+  }
+  return {
+    groupId: activeGroup.id,
+    tab: activeTab
+  };
+};
+
+const hasActiveTextEditor = state => {
+  const activeTab = getActiveTab(state);
+  return activeTab?.tab.editorInput?.type === 'editor';
+};
+
 const notifyActiveEditorChange = async (oldState, newState) => {
   const oldUri = getActiveFileUri(oldState);
   const newUri = getActiveFileUri(newState);
-  if (oldUri === newUri) {
+  const oldIsTextEditor = hasActiveTextEditor(oldState);
+  const newIsTextEditor = hasActiveTextEditor(newState);
+  if (oldUri === newUri && oldIsTextEditor === newIsTextEditor) {
     return;
   }
   try {
-    await invoke$1(newState.applicationId, 'Layout.handleActiveEditorChange', newUri);
+    await invoke$1(newState.applicationId, 'Layout.handleActiveEditorChange', newUri, newIsTextEditor);
   } catch (error) {
     console.warn('Failed to notify viewlets about active editor change', error);
   }
@@ -2764,27 +2792,6 @@ const diff2 = uid => {
   return result;
 };
 
-const getActiveTab = state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const activeGroup = groups.find(group => group.focused);
-  if (!activeGroup || !activeGroup.activeTabId) {
-    return undefined;
-  }
-  const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
-  if (!activeTab) {
-    return undefined;
-  }
-  return {
-    groupId: activeGroup.id,
-    tab: activeTab
-  };
-};
-
 const state = {
   connected: false
 };
@@ -3865,6 +3872,7 @@ const HandleTabKeyDown = 29;
 const HandleTabsWheel = 30;
 const HandleTabDragOver = 31;
 const HandleTabsDragOver = 32;
+const HandleFocus = 33;
 
 const dragOverlayVirtualDom = {
   childCount: 0,
@@ -4515,6 +4523,7 @@ const renderEmptyEditorGroup = (group, groupIndex, closeButtonEnabled = true) =>
     className: mergeClassNames(EditorGroupEmpty, getEditorGroupClassName(group.id)),
     'data-groupId': String(group.id),
     onContextMenu: HandleContextMenu,
+    onFocus: HandleFocus,
     tabIndex: Focusable,
     type: Div
   }, ...closeButtonDom, ...renderWaterMark(group.id)];
@@ -4560,6 +4569,7 @@ const renderSash = (direction, sashId) => {
   }, {
     childCount: 0,
     className: getSashBorderClassName(direction),
+    'data-sashId': sashId,
     type: Div
   }];
 };
@@ -4747,11 +4757,42 @@ const getMenuIds = () => {
   return [Main$1, Tab];
 };
 
+const focusEditorGroup = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => ({
+    ...group,
+    focused: group.id === groupId
+  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
+    }
+  };
+};
+
+const parseRawGroupId = rawGroupId => {
+  if (!rawGroupId) {
+    return undefined;
+  }
+  const groupId = Number(rawGroupId);
+  return Number.isNaN(groupId) ? undefined : groupId;
+};
+
 const handleClick = async (state, name) => {
-  if (!name) {
+  const groupId = parseRawGroupId(name);
+  if (groupId === undefined) {
     return state;
   }
-  return state;
+  const hasGroup = state.layout.groups.some(group => group.id === groupId);
+  return hasGroup ? focusEditorGroup(state, groupId) : state;
 };
 
 const getActiveGroup = (groups, activeGroupId) => {
@@ -4800,27 +4841,6 @@ const findTabByUri = (state, uri) => {
   return undefined;
 };
 
-const focusEditorGroup = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const updatedGroups = groups.map(group => ({
-    ...group,
-    focused: group.id === groupId
-  }));
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      activeGroupId: groupId,
-      groups: updatedGroups
-    }
-  };
-};
-
 const getActiveTabId = state => {
   const {
     layout
@@ -5655,14 +5675,6 @@ const openUriWithContext = async (context, options, focus = true, viewletContext
   await openInputWithContext(context, getOpenInputOptions(options, focus, viewletContext));
 };
 
-const parseRawGroupId = rawGroupId => {
-  if (!rawGroupId) {
-    return undefined;
-  }
-  const groupId = Number(rawGroupId);
-  return Number.isNaN(groupId) ? undefined : groupId;
-};
-
 const focusGroup = (groups, groupId, activeTabId) => {
   return groups.map(group => {
     if (group.id === groupId) {
@@ -7784,11 +7796,6 @@ const handleWorkspaceRefreshWithContext = async (context, refresh = {}) => {
   }
 };
 
-const hasActiveTextEditor = state => {
-  const activeTab = getActiveTab(state);
-  return activeTab?.tab.editorInput?.type === 'editor';
-};
-
 const getTabs = group => {
   return group.tabs;
 };
@@ -8363,6 +8370,9 @@ const renderEventListeners = () => {
   return [{
     name: HandleClick,
     params: ['handleClick', TargetName]
+  }, {
+    name: HandleFocus,
+    params: ['handleClick', 'event.target.dataset.groupId']
   }, {
     name: HandleClickClose,
     params: ['handleClickCloseTab', 'event.currentTarget.dataset.groupIndex', 'event.currentTarget.dataset.index'],

package/package.json

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