@lvce-editor/main-area-worker 6.2.0 → 6.3.0

package/dist/mainAreaWorkerMain.js

@@ -2071,6 +2071,11 @@ const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
   return selectTab(state, groupIndex, index);
 };
 
+const handleDoubleClick = async state => {
+  // TODO: implement handleDoubleClick
+  return state;
+};
+
 const handleResize = async (state, x, y, width, height) => {
   number(x);
   number(y);
@@ -2636,6 +2641,18 @@ const createEmptyGroup = (state, uri, requestId) => {
   };
 };
 
+const getActiveTabId = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+
 const openTab = (state, groupId, tab) => {
   const newTab = 'id' in tab && tab.id !== undefined ? tab : {
     ...tab,
@@ -2668,6 +2685,110 @@ const openTab = (state, groupId, tab) => {
   };
 };
 
+const newFile = async state => {
+  object(state);
+  const {
+    layout,
+    uid
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+
+  // Find the active group
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+
+  // Prepare initial state
+  let newState = state;
+  let targetGroupId;
+  if (activeGroup) {
+    targetGroupId = activeGroup.id;
+  } else {
+    // No active group, create an empty one
+    newState = createEmptyGroup(state, '');
+    const updatedActiveGroupId = newState.layout.activeGroupId;
+    if (!updatedActiveGroupId) {
+      return state;
+    }
+    targetGroupId = updatedActiveGroupId;
+
+    // Remove the tab that createEmptyGroup created, we'll add our own
+    newState = {
+      ...newState,
+      layout: {
+        ...newState.layout,
+        groups: newState.layout.groups.map(group => {
+          if (group.id === targetGroupId) {
+            return {
+              ...group,
+              activeTabId: undefined,
+              tabs: []
+            };
+          }
+          return group;
+        })
+      }
+    };
+  }
+
+  // Get previous active tab ID for viewlet switching
+  getActiveTabId(newState);
+
+  // Create a new empty tab
+  const tabId = create$1();
+  const editorUid = create$1();
+  const newTab = {
+    editorType: 'text',
+    editorUid,
+    errorMessage: '',
+    icon: '',
+    id: tabId,
+    isDirty: false,
+    language: 'plaintext',
+    loadingState: 'loading',
+    title: 'Untitled'
+  };
+  const stateWithNewTab = openTab(newState, targetGroupId, newTab);
+
+  // Calculate bounds: use main area bounds minus tab height
+  const bounds = {
+    height: stateWithNewTab.height - stateWithNewTab.tabHeight,
+    width: stateWithNewTab.width,
+    x: stateWithNewTab.x,
+    y: stateWithNewTab.y + stateWithNewTab.tabHeight
+  };
+  const stateWithViewlet = createViewletForTab(stateWithNewTab, tabId);
+  let intermediateState = stateWithViewlet;
+
+  // Switch viewlet (detach old, attach new if ready)
+  const {
+    newState: switchedState
+  } = switchViewlet(intermediateState);
+  intermediateState = switchedState;
+  set(uid, state, intermediateState);
+
+  // Get the tab to extract editorUid
+  const tabWithViewlet = findTabById(intermediateState, tabId);
+  if (!tabWithViewlet) {
+    return intermediateState;
+  }
+  const {
+    editorUid: actualEditorUid
+  } = tabWithViewlet.tab;
+  if (actualEditorUid === -1) {
+    throw new Error(`invalid editorUid`);
+  }
+  await createViewlet('Editor', actualEditorUid, tabId, bounds, 'untitled:///1');
+
+  // After viewlet is created, get the latest state and mark it as ready
+  const {
+    newState: latestState
+  } = get(uid);
+  const readyState = handleViewletReady(latestState, actualEditorUid);
+  return readyState;
+};
+
 const ensureActiveGroup = (state, uri) => {
   // Find the active group (by activeGroupId or focused flag)
   const {
@@ -2748,18 +2869,6 @@ const focusEditorGroup = (state, groupId) => {
   };
 };
 
-const getActiveTabId = state => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = groups.find(g => g.id === activeGroupId);
-  return activeGroup?.activeTabId;
-};
-
 const getOptionUriOptions = options => {
   let uri = '';
   if (typeof options === 'string') {
@@ -2826,13 +2935,12 @@ const openUri = async (state, options) => {
     return newState;
   }
 
-  // Calculate bounds: use main area bounds minus 35px for tab height
-  const TAB_HEIGHT = 35;
+  // Calculate bounds: use main area bounds minus tab height
   const bounds = {
-    height: newState.height - TAB_HEIGHT,
+    height: newState.height - newState.tabHeight,
     width: newState.width,
     x: newState.x,
-    y: newState.y + TAB_HEIGHT
+    y: newState.y + newState.tabHeight
   };
   const stateWithViewlet = createViewletForTab(newState, tabId);
   let intermediateState1 = stateWithViewlet;
@@ -3339,8 +3447,9 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
 const renderEditorGroupHeader = (group, groupIndex, splitButtonEnabled) => {
   const tabsChildCount = group.tabs.length;
   const actions = renderEditorGroupActions(group, groupIndex, splitButtonEnabled);
+  const hasActions = actions.length > 0;
   return [{
-    childCount: actions.length > 0 ? 2 : 1,
+    childCount: hasActions ? 2 : 1,
     className: 'EditorGroupHeader',
     role: 'none',
     type: Div
@@ -3471,6 +3580,10 @@ const getActiveTab = state => {
   };
 };
 
+const saveEditor = async editorUid => {
+  await invoke('Editor.save', editorUid);
+};
+
 const save = async state => {
   const activeTabData = getActiveTab(state);
   if (!activeTabData) {
@@ -3482,7 +3595,7 @@ const save = async state => {
   if (tab.loadingState === 'loading') {
     return state;
   }
-  await invoke('Editor.save', tab.editorUid);
+  await saveEditor(tab.editorUid);
   if (!tab.isDirty) {
     return state;
   }
@@ -3495,8 +3608,26 @@ const saveState = state => {
   const {
     layout
   } = state;
+
+  // Filter out untitled editors from tabs
+  const filteredGroups = layout.groups.map(group => ({
+    ...group,
+    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://'))
+  }))
+  // Remove groups that become empty after filtering
+  .filter(group => group.tabs.length > 0);
+
+  // Update activeGroupId if it points to a removed group
+  const {
+    activeGroupId: originalActiveGroupId
+  } = layout;
+  const activeGroupId = originalActiveGroupId !== undefined && !filteredGroups.some(g => g.id === originalActiveGroupId) ? undefined : originalActiveGroupId;
   return {
-    layout
+    layout: {
+      ...layout,
+      activeGroupId,
+      groups: filteredGroups
+    }
   };
 };
 
@@ -3582,11 +3713,13 @@ const commandMap = {
   'MainArea.handleClickAction': wrapCommand(handleClickAction),
   'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
   'MainArea.handleClickTab': wrapCommand(handleClickTab),
+  'MainArea.handleDoubleClick': wrapCommand(handleDoubleClick),
   'MainArea.handleResize': wrapCommand(handleResize),
   'MainArea.handleTabContextMenu': wrapCommand(handleTabContextMenu),
   'MainArea.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
+  'MainArea.newFile': wrapCommand(newFile),
   'MainArea.openUri': wrapCommand(openUri),
   'MainArea.refresh': wrapCommand(refresh),
   'MainArea.render2': render2,

package/package.json

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