@lvce-editor/main-area-worker 5.0.0 → 5.2.0

package/dist/mainAreaWorkerMain.js

@@ -1357,14 +1357,8 @@ const handleAttach = async command => {
   await invoke('Layout.attachViewlet', parentNodeSelector, command.instanceId);
 };
 
-let counter = 0;
 const create = () => {
-  return ++counter;
-};
-const setMinId = minId => {
-  if (minId > counter) {
-    counter = minId;
-  }
+  return Math.random();
 };
 
 const updateTab = (state, tabId, updates) => {
@@ -1944,21 +1938,6 @@ const initialize = async () => {
   set$2(rpc);
 };
 
-const getMaxIdFromLayout = layout => {
-  let maxId = 0;
-  for (const group of layout.groups) {
-    if (group.id > maxId) {
-      maxId = group.id;
-    }
-    for (const tab of group.tabs) {
-      if (tab.id > maxId) {
-        maxId = tab.id;
-      }
-    }
-  }
-  return maxId;
-};
-
 const isValidTab = tab => {
   return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.content === 'string' && typeof tab.isDirty === 'boolean' && (tab.editorType === 'text' || tab.editorType === 'custom') && (tab.editorType !== 'custom' || typeof tab.customEditorId === 'string');
 };
@@ -2129,6 +2108,19 @@ const loadFileIcons = async state => {
   }
 };
 
+const createViewlets = async (layout, viewletModuleIds, bounds) => {
+  const editorUids = {};
+  for (const group of layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && viewletModuleIds[activeTab.id]) {
+      const editorUid = activeTab.editorUid === -1 ? create() : activeTab.editorUid;
+      editorUids[activeTab.id] = editorUid;
+      await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
+    }
+  }
+  return editorUids;
+};
+
 const getViewletModuleId = async uri => {
   // Query RendererWorker for viewlet module ID (optional, may fail in tests)
   let viewletModuleId;
@@ -2141,9 +2133,6 @@ const getViewletModuleId = async uri => {
   return viewletModuleId;
 };
 
-const TAB_HEIGHT = 35;
-
-// Get viewlet module IDs for active tabs in each group
 const getViewletModuleIds = async layout => {
   const viewletModuleIds = {};
   for (const group of layout.groups) {
@@ -2158,21 +2147,6 @@ const getViewletModuleIds = async layout => {
   return viewletModuleIds;
 };
 
-// Create viewlets for the active tabs
-const createViewlets = async (layout, viewletModuleIds, bounds) => {
-  const editorUids = {};
-  for (const group of layout.groups) {
-    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-    if (activeTab && viewletModuleIds[activeTab.id]) {
-      const editorUid = activeTab.editorUid === -1 ? create() : activeTab.editorUid;
-      editorUids[activeTab.id] = editorUid;
-      await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
-    }
-  }
-  return editorUids;
-};
-
-// Update tabs with editor UIDs
 const updateTabs = (state, editorUids) => {
   const updatedGroups = state.layout.groups.map(group => {
     return {
@@ -2196,6 +2170,8 @@ const updateTabs = (state, editorUids) => {
     }
   };
 };
+
+const TAB_HEIGHT = 35;
 const restoreAndCreateEditors = async (state, restoredLayout) => {
   let newState = {
     ...state,
@@ -2232,9 +2208,6 @@ const restoreAndCreateEditors = async (state, restoredLayout) => {
 const loadContent = async (state, savedState) => {
   const restoredLayout = tryRestoreLayout(savedState);
   if (restoredLayout) {
-    const maxId = getMaxIdFromLayout(restoredLayout);
-    setMinId(maxId);
-
     // Restore and create editors
     const editorState = await restoreAndCreateEditors(state, restoredLayout);
 
@@ -2819,7 +2792,11 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     'data-index': tabIndex,
     onClick: HandleClickClose,
     type: Button
-  }, text('×')];
+  }, {
+    childCount: 0,
+    className: 'MaskIcon MaskIconClose',
+    type: Div
+  }];
 };
 
 const renderTabBar = (group, groupIndex) => {

package/package.json

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