@lvce-editor/main-area-worker 9.33.3 → 9.34.1

package/dist/mainAreaWorkerMain.js

@@ -2016,10 +2016,38 @@ const notifyActiveEditorChange = async (oldState, newState) => {
   }
 };
 
+const getMountedViewletUids = state => {
+  const mountedViewletUids = [];
+  for (const group of state.layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab?.loadingState === 'loaded' && activeTab.editorUid !== -1) {
+      mountedViewletUids.push(activeTab.editorUid);
+    }
+  }
+  return mountedViewletUids;
+};
+
+const arraysEqual = (a, b) => {
+  return a.length === b.length && a.every((value, index) => value === b[index]);
+};
+const notifyMountedViewlets = async (oldState, newState) => {
+  const oldViewletUids = getMountedViewletUids(oldState);
+  const newViewletUids = getMountedViewletUids(newState);
+  if (oldState.uid === newState.uid && arraysEqual(oldViewletUids, newViewletUids)) {
+    return;
+  }
+  try {
+    await invoke('Layout.setMountedViewlets', newState.uid, newViewletUids);
+  } catch (error) {
+    console.warn('Failed to publish mounted viewlets', error);
+  }
+};
+
 const withActiveEditorChange = fn => {
   return async (state, ...args) => {
     const newState = await fn(state, ...args);
     await notifyActiveEditorChange(state, newState);
+    await notifyMountedViewlets(state, newState);
     return newState;
   };
 };
@@ -2029,6 +2057,7 @@ const withActiveEditorChangeAsync = fn => {
     await fn(context, ...args);
     const newState = context.getState();
     await notifyActiveEditorChange(oldState, newState);
+    await notifyMountedViewlets(oldState, newState);
   };
 };
 
@@ -4747,6 +4776,9 @@ const getSplitDirection = (x, y, width, height) => {
   return None;
 };
 
+const isNotEmpty = group => {
+  return !group.isEmpty;
+};
 const getDragOverlay = (state, eventX, eventY) => {
   const {
     height,
@@ -4759,7 +4791,7 @@ const getDragOverlay = (state, eventX, eventY) => {
   const {
     groups
   } = layout;
-  const hasOpenEditor = groups.some(group => !group.isEmpty);
+  const hasOpenEditor = groups.some(isNotEmpty);
   const contentY = hasOpenEditor ? tabHeight : 0;
   const contentHeight = Math.max(0, height - contentY);
   const relativeX = eventX - x;
@@ -4786,6 +4818,7 @@ const handleDragOver = (state, eventX, eventY) => {
 };
 
 const lineSeparatorRegex = /\r?\n/;
+const chromiumDragIdRegex = /^[A-F\d]{32}$/i;
 const isUriList = item => {
   if (!item || typeof item !== 'object') {
     return false;
@@ -4796,12 +4829,37 @@ const isUriList = item => {
 const parseUriList = value => {
   return value.split(lineSeparatorRegex).map(uri => uri.trim()).filter(uri => uri && !uri.startsWith('#'));
 };
+const isChromiumDragId = item => {
+  if (!item || typeof item !== 'object') {
+    return false;
+  }
+  const candidate = item;
+  return candidate.kind === 'string' && (candidate.type === '' || candidate.type === 'chromium/x-drag-id') && typeof candidate.value === 'string' && chromiumDragIdRegex.test(candidate.value);
+};
+const isDragInfoItem = item => {
+  if (!item || typeof item !== 'object') {
+    return false;
+  }
+  const candidate = item;
+  return candidate.type === 'text/uri-list' && typeof candidate.data === 'string';
+};
+const getUrisFromDragInfo = dragInfo => {
+  if (!dragInfo || typeof dragInfo !== 'object' || !Array.isArray(dragInfo.items)) {
+    return [];
+  }
+  return dragInfo.items.filter(isDragInfoItem).flatMap(item => parseUriList(item.data));
+};
 const getDroppedUris = async itemIds => {
   if (itemIds.length === 0) {
     return [];
   }
   const items = await getFileHandles(itemIds);
-  return items.filter(isUriList).flatMap(item => parseUriList(item.value));
+  const uris = items.filter(isUriList).flatMap(item => parseUriList(item.value));
+  if (uris.length > 0 || !items.some(isChromiumDragId)) {
+    return uris;
+  }
+  const dragInfo = await invoke('Viewlet.getDragData');
+  return getUrisFromDragInfo(dragInfo);
 };
 
 const openUrisWithContext = async (context, uris) => {
@@ -5067,6 +5125,13 @@ const handleModifiedStatusChangeWithContext = async (context, uri, newStatus) =>
   await context.updateState(state => handleModifiedStatusChange(state, uri, newStatus));
 };
 
+const resizeChild = async (editorUid, dimensions) => {
+  try {
+    return await invoke('Viewlet.resize', editorUid, dimensions);
+  } catch {
+    return [];
+  }
+};
 const handleResize = async (state, dimensions) => {
   const {
     height,
@@ -5084,25 +5149,22 @@ const handleResize = async (state, dimensions) => {
     groups
   } = layout;
   const contentHeight = height - tabHeight;
-  const allResizeCommands = [];
-  for (const group of groups) {
-    for (const tab of group.tabs) {
-      if (tab.editorUid !== -1) {
-        try {
-          const resizeCommands = await invoke('Viewlet.resize', tab.editorUid, {
-            height: contentHeight,
-            width,
-            x,
-            y: y + tabHeight
-          });
-          allResizeCommands.push(...resizeCommands);
-        } catch {
-          // ignore
-        }
-      }
+  const resizePromises = [];
+  const tabs = groups.flatMap(group => group.tabs);
+  for (const tab of tabs) {
+    if (tab.editorUid === -1) {
+      continue;
     }
+    const resizePromise = resizeChild(tab.editorUid, {
+      height: contentHeight,
+      width,
+      x,
+      y: y + tabHeight
+    });
+    resizePromises.push(resizePromise);
   }
-  return allResizeCommands;
+  const resizeCommands = await Promise.all(resizePromises);
+  return resizeCommands.flat();
 };
 
 const offsetsMatch = (first, second) => {

package/package.json

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