@lvce-editor/main-area-worker 9.74.1 → 9.74.2

package/dist/mainAreaWorkerMain.js

@@ -2880,7 +2880,7 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight =
 };
 
 const isEqual$3 = (oldState, newState) => {
-  return oldState.layout === newState.layout && oldState.width === newState.width;
+  return oldState.layout === newState.layout && oldState.width === newState.width && oldState.activeTabVisibilityVersion === newState.activeTabVisibilityVersion;
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -4445,6 +4445,12 @@ const tabIconNode = {
   role: None$2,
   type: Div
 };
+const emptyTabIconNode = {
+  childCount: 0,
+  className: TabIcon,
+  role: None$2,
+  type: Div
+};
 const tabTitleNode = {
   childCount: 1,
   className: TabTitle,
@@ -4480,7 +4486,7 @@ const renderTabIcon = tab => {
     return renderMaskIcon(MaskIconDebugAlt2);
   }
   if (!tab.icon) {
-    return [];
+    return [emptyTabIconNode];
   }
   return [{
     childCount: 0,
@@ -4514,7 +4520,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex, dropIndicatorPosition) =
   }
   return [{
     'aria-selected': isActive,
-    childCount: 2 + (tabIconNodes.length > 0 ? 1 : 0),
+    childCount: 3,
     className,
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
@@ -5436,68 +5442,6 @@ const isDirectoryEditorInput = async (editorInput, applicationId) => {
   }
 };
 
-const switchTab = (state, groupId, tabId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const updatedGroups = groups.map(group => {
-    if (group.id === groupId) {
-      const tabExists = group.tabs.some(tab => tab.id === tabId);
-      if (tabExists) {
-        return {
-          ...group,
-          activeTabId: tabId
-        };
-      }
-    }
-    return group;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: updatedGroups
-    }
-  };
-};
-
-const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
-};
-
-const getBasename = uri => {
-  const lastSlashIndex = uri.lastIndexOf('/');
-  if (lastSlashIndex === -1) {
-    return uri;
-  }
-  return uri.slice(lastSlashIndex + 1);
-};
-const getMissingTabs = (tabs, fileIconCache) => {
-  const missingTabs = [];
-  for (const tab of tabs) {
-    if (tab.uri && !getFileIcon(tab.uri) && !(tab.uri in fileIconCache)) {
-      missingTabs.push(tab);
-    }
-  }
-  return missingTabs;
-};
-const tabToIconRequest = tab => {
-  const uri = tab.uri || '';
-  return {
-    name: getBasename(uri),
-    path: uri,
-    type: File
-  };
-};
-const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
-  const missingRequests = getMissingTabs(tabs, fileIconCache);
-  const iconRequests = missingRequests.map(tabToIconRequest);
-  return iconRequests;
-};
-
 const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded) {
     return 2;
@@ -5521,75 +5465,58 @@ const requestFileIcons = async requests => {
   return icons;
 };
 
-const updateIconCache = (iconCache, missingRequests, newIcons) => {
-  if (missingRequests.length === 0) {
-    return iconCache;
+const prepareTabIcon = async (context, uri) => {
+  const state = context.getState();
+  let icon = getFileIcon(uri) || state.fileIconCache[uri] || '';
+  if (!icon && uri && !(uri in state.fileIconCache)) {
+    try {
+      const icons = await requestFileIcons([{
+        name: uri.slice(uri.lastIndexOf('/') + 1),
+        path: uri,
+        type: File
+      }]);
+      icon = icons[0] || '';
+    } catch {
+      // Icon failures must not prevent opening the file. The reserved slot keeps its title stable.
+    }
   }
-  const newFileIconCache = {
-    ...iconCache
-  };
-  for (let i = 0; i < missingRequests.length; i++) {
-    const request = missingRequests[i];
-    const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
+  const latestState = context.getState();
+  if (latestState.iconThemeVersion !== state.iconThemeVersion) {
+    return prepareTabIcon(context, uri);
   }
-  return newFileIconCache;
-};
-
-const getUri = tab => {
-  return tab.uri || '';
-};
-const getFileIconsForTabs = async (tabs, fileIconCache) => {
-  const missingRequests = getMissingIconRequestsForTabs(tabs, fileIconCache);
-  const newIcons = await requestFileIcons(missingRequests);
-  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const tabUris = tabs.map(getUri);
-  const icons = getIconsCached(tabUris, newFileIconCache);
   return {
-    icons,
-    newFileIconCache
+    icon,
+    state: latestState
   };
 };
 
-const updateIcon = (state, tabId, icon) => {
+const switchTab = (state, groupId, tabId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => {
+    if (group.id === groupId) {
+      const tabExists = group.tabs.some(tab => tab.id === tabId);
+      if (tabExists) {
+        return {
+          ...group,
+          activeTabId: tabId
+        };
+      }
+    }
+    return group;
+  });
   return {
     ...state,
     layout: {
-      ...state.layout,
-      groups: state.layout.groups.map(group => ({
-        ...group,
-        tabs: group.tabs.map(tab => tab.id === tabId ? {
-          ...tab,
-          icon
-        } : tab)
-      }))
+      ...layout,
+      groups: updatedGroups
     }
   };
 };
-const updateTabIcon = async (context, readyState, tabId) => {
-  const newTab = findTabById(readyState, tabId);
-  if (!newTab || !newTab.tab.uri) {
-    return undefined;
-  }
-  const builtInIcon = getFileIcon(newTab.tab.uri);
-  if (builtInIcon) {
-    return context.updateState(state => updateIcon(state, tabId, builtInIcon));
-  }
-  try {
-    const {
-      newFileIconCache
-    } = await getFileIconsForTabs([newTab.tab], readyState.fileIconCache);
-    const stateBeforeIconUpdate = context.getState();
-    const icon = newFileIconCache[newTab.tab.uri] || '';
-    const stateWithIcon = updateIcon({
-      ...stateBeforeIconUpdate,
-      fileIconCache: newFileIconCache
-    }, tabId, icon);
-    return context.updateState(() => stateWithIcon);
-  } catch {
-    return undefined;
-  }
-};
 
 const renderMainAreaPending = async (uid, applicationId) => {
   try {
@@ -5671,19 +5598,70 @@ const handleOpenError = async (context, tabId, editorInput, uri, error) => {
   });
   await context.updateState(() => errorState);
 };
+const findReusableTab = (state, options, uri) => {
+  return options.reuseExisting === false ? undefined : findTabByUri(state, uri);
+};
+const getStateWithIcon = (state, tabId, uri, icon) => {
+  const stateWithIcon = updateTab(state, tabId, {
+    icon
+  });
+  return {
+    ...stateWithIcon,
+    fileIconCache: icon && !getFileIcon(uri) ? {
+      ...stateWithIcon.fileIconCache,
+      [uri]: icon
+    } : stateWithIcon.fileIconCache
+  };
+};
+const disposePreviewEditor = async editorUid => {
+  if (editorUid !== -1) {
+    await disposeEditors([editorUid]);
+  }
+};
+const isSupersededPreview = (state, initialState, requestId, preview) => {
+  return preview && (state.openRequestId !== requestId || getActiveTabId(state) !== getActiveTabId(initialState));
+};
 const openInputWithContext = async (context, options) => {
-  const state = context.getState();
-  object(state);
+  object(context.getState());
   object(options);
+  const requestId = getNextRequestId();
+  await context.updateState(state => ({
+    ...state,
+    openRequestId: requestId
+  }));
+  const state = context.getState();
   const {
     editorInput
   } = options;
   const preview = options.preview ?? false;
   const uri = getEditorInputUri(editorInput);
   const title = getEditorInputTitle(editorInput);
-  const currentState = state;
-  const existingTab = options.reuseExisting === false ? undefined : findTabByUri(currentState, uri);
-  const shouldRetry = shouldRetryExistingTab(existingTab, editorInput, options.forceOpen === true);
+  let currentState = state;
+  let existingTab = findReusableTab(currentState, options, uri);
+  let shouldRetry = shouldRetryExistingTab(existingTab, editorInput, options.forceOpen === true);
+  let icon = '';
+  let {
+    iconThemeVersion
+  } = state;
+  if (!existingTab || shouldRetry) {
+    const {
+      icon: resolvedIcon,
+      state: {
+        iconThemeVersion: resolvedIconThemeVersion
+      }
+    } = await prepareTabIcon(context, uri);
+    icon = resolvedIcon;
+    iconThemeVersion = resolvedIconThemeVersion;
+    currentState = context.getState();
+    existingTab = findReusableTab(currentState, options, uri);
+    shouldRetry = shouldRetryExistingTab(existingTab, editorInput, options.forceOpen === true);
+  }
+  if (isSupersededPreview(currentState, state, requestId, preview)) {
+    return;
+  }
+  if (currentState.iconThemeVersion !== iconThemeVersion) {
+    return openInputWithContext(context, options);
+  }
   if (existingTab && !shouldRetry) {
     const switchedState = getExistingTabState(currentState, existingTab, preview);
     await context.updateState(() => switchedState);
@@ -5697,10 +5675,8 @@ const openInputWithContext = async (context, options) => {
     stateWithTab,
     tabId
   } = getStateWithTab(currentState, editorInput, existingTab, shouldRetry, uri, preview, title);
-  await context.updateState(() => stateWithTab);
-  if (replacedEditorUid !== -1) {
-    await disposeEditors([replacedEditorUid]);
-  }
+  await context.updateState(() => getStateWithIcon(stateWithTab, tabId, uri, icon));
+  await disposePreviewEditor(replacedEditorUid);
   if (await isDirectoryEditorInput(editorInput, state.applicationId)) {
     const latestState = context.getState();
     const errorState = updateTab(latestState, tabId, {
@@ -5773,10 +5749,12 @@ const openInputWithContext = async (context, options) => {
       readyState = handleViewletReady(context.getState(), editorUid, renderedTitle);
       await context.updateState(() => readyState);
     }
-    const stateWithIcon = await updateTabIcon(context, readyState, tabId);
-    if (stateWithIcon) {
-      return;
-    }
+    // Earlier visibility commands can run before the final editor DOM is committed.
+    // Request a final scroll without changing the tab DOM or fetching its icon again.
+    await context.updateState(state => ({
+      ...state,
+      activeTabVisibilityVersion: (state.activeTabVisibilityVersion ?? 0) + 1
+    }));
   } catch (error) {
     await handleOpenError(context, tabId, editorInput, uri, error);
   }
@@ -7185,6 +7163,70 @@ const handleHeaderDoubleClick = async (state, className, groupIndexRaw) => {
   return newFile(state);
 };
 
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent]);
+};
+
+const getBasename = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
+  }
+  return uri.slice(lastSlashIndex + 1);
+};
+const getMissingTabs = (tabs, fileIconCache) => {
+  const missingTabs = [];
+  for (const tab of tabs) {
+    if (tab.uri && !getFileIcon(tab.uri) && !(tab.uri in fileIconCache)) {
+      missingTabs.push(tab);
+    }
+  }
+  return missingTabs;
+};
+const tabToIconRequest = tab => {
+  const uri = tab.uri || '';
+  return {
+    name: getBasename(uri),
+    path: uri,
+    type: File
+  };
+};
+const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
+  const missingRequests = getMissingTabs(tabs, fileIconCache);
+  const iconRequests = missingRequests.map(tabToIconRequest);
+  return iconRequests;
+};
+
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getUri = tab => {
+  return tab.uri || '';
+};
+const getFileIconsForTabs = async (tabs, fileIconCache) => {
+  const missingRequests = getMissingIconRequestsForTabs(tabs, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const tabUris = tabs.map(getUri);
+  const icons = getIconsCached(tabUris, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
 const getAllTabs$1 = layout => {
   const {
     groups
@@ -7259,6 +7301,7 @@ const handleIconThemeChange = async state => {
   return {
     ...state,
     fileIconCache,
+    iconThemeVersion: (state.iconThemeVersion ?? 0) + 1,
     layout: updatedLayout
   };
 };
@@ -8866,11 +8909,14 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const render2 = (uid, diffResult) => {
+const render2 = (uid, _diffResult) => {
   const {
     newState,
     oldState
   } = get$1(uid);
+  // State can change between the caller's diff2 RPC and this render2 RPC.
+  // Diff and render the same snapshot before marking it as rendered.
+  const diffResult = diff(oldState, newState);
   set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   if (!isConnected()) {

package/package.json

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