@lvce-editor/main-area-worker 8.13.0 → 8.14.0

package/dist/mainAreaWorkerMain.js

@@ -88,7 +88,13 @@ const terminate = () => {
 };
 
 const getGroupIndexById = (state, groupId) => {
-  return state.layout.groups.findIndex(group => group.id === groupId);
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.findIndex(group => group.id === groupId);
 };
 
 const redistributeSizesWithRounding = groups => {
@@ -181,7 +187,13 @@ const closeTab = (state, groupId, tabId) => {
 };
 
 const getFocusedGroup = state => {
-  return state.layout.groups.find(group => group.focused);
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.focused);
 };
 
 const closeActiveEditor = state => {
@@ -1669,6 +1681,7 @@ const copyPath$1 = async (state, path) => {
 
 const copyRelativePath$1 = async (state, path) => {
   string(path);
+  // TODO use clipboard worker
   const relativePath = await invoke('Workspace.pathBaseName', path);
   await invoke('ClipBoard.writeText', relativePath);
   return state;
@@ -2344,6 +2357,11 @@ const handleClickTogglePreview = async state => {
   return state;
 };
 
+const CloseGroup = 'close-group';
+const RetryOpen = 'retry-open';
+const SplitRight = 'split-right';
+const TogglePreview$1 = 'toggle-preview';
+
 const getBasename$1 = uri => {
   const lastSlashIndex = uri.lastIndexOf('/');
   if (lastSlashIndex === -1) {
@@ -2382,6 +2400,7 @@ const createEmptyGroup = (state, uri, requestId) => {
     icon: '',
     id: tabId,
     isDirty: false,
+    isPreview: false,
     language: '',
     loadingState: 'loading',
     title,
@@ -2406,8 +2425,12 @@ const createEmptyGroup = (state, uri, requestId) => {
 };
 
 const openTab = (state, groupId, tab) => {
-  const newTab = 'id' in tab && tab.id !== undefined ? tab : {
+  const normalizedTab = {
     ...tab,
+    isPreview: tab.isPreview ?? false
+  };
+  const newTab = 'id' in normalizedTab && normalizedTab.id !== undefined ? normalizedTab : {
+    ...normalizedTab,
     id: create$1()
   };
   const {
@@ -2465,6 +2488,7 @@ const ensureActiveGroup = (state, uri) => {
       icon: '',
       id: tabId,
       isDirty: false,
+      isPreview: false,
       language: '',
       loadingState: 'loading',
       title,
@@ -2936,17 +2960,17 @@ const handleClickAction = async (state, action, rawGroupId) => {
     return state;
   }
   switch (action) {
-    case 'close-group':
+    case CloseGroup:
       if (rawGroupId) {
         const groupId = Number.parseInt(rawGroupId, 10);
         return closeEditorGroup$1(state, groupId);
       }
       return state;
-    case 'retry-open':
+    case RetryOpen:
       return retryOpen(state);
-    case 'split-right':
+    case SplitRight:
       return splitEditorGroup$1(state, activeGroup.id, Right);
-    case 'toggle-preview':
+    case TogglePreview$1:
       return handleClickTogglePreview(state);
     default:
       return state;
@@ -3085,6 +3109,7 @@ const newFile = async state => {
     icon: '',
     id: tabId,
     isDirty: false,
+    isPreview: false,
     language: 'plaintext',
     loadingState: 'loading',
     title: 'Untitled',
@@ -3442,10 +3467,13 @@ const handleUriChange = async (state, oldUri, newUri) => {
 };
 
 const handleWorkspaceChange = state => {
+  const {
+    layout
+  } = state;
   return {
     ...state,
     layout: {
-      ...state.layout,
+      ...layout,
       activeGroupId: undefined,
       groups: []
     }
@@ -3475,7 +3503,7 @@ const initialize = async () => {
 };
 
 const isValidTab = tab => {
-  return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
+  return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.isPreview === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
 };
 
 const isValidEditorGroup = group => {
@@ -3512,23 +3540,31 @@ const tryRestoreLayout = savedState => {
   const {
     layout
   } = savedState;
-  if (!isValidMainAreaLayout(layout)) {
+  if (!layout || typeof layout !== 'object') {
+    return undefined;
+  }
+  const rawLayout = layout;
+  if (!Array.isArray(rawLayout.groups)) {
     return undefined;
   }
 
   // Normalize all tabs to have editorUid: -1 so SelectTab will create viewlets
   // Mark all restored tabs as not dirty
   const normalizedLayout = {
-    ...layout,
-    groups: layout.groups.map(group => ({
+    ...rawLayout,
+    groups: rawLayout.groups.map(group => ({
       ...group,
-      tabs: group.tabs.map(tab => ({
+      tabs: Array.isArray(group?.tabs) ? group.tabs.map(tab => ({
         ...tab,
         editorUid: -1,
-        isDirty: false
-      }))
+        isDirty: false,
+        isPreview: typeof tab?.isPreview === 'boolean' ? tab.isPreview : false
+      })) : []
     }))
   };
+  if (!isValidMainAreaLayout(normalizedLayout)) {
+    return undefined;
+  }
   return normalizedLayout;
 };
 
@@ -3817,6 +3853,28 @@ const getMenuEntries = async (state, props) => {
   }
 };
 
+const openUris = async (state, uris) => {
+  if (uris.length === 0) {
+    return state;
+  }
+  if (uris.length === 1) {
+    return openUri(state, uris[0]);
+  }
+  let currentState = await openUri(state, uris[0]);
+  const firstTab = findTabByUri(currentState, uris[0]);
+  for (const uri of uris.slice(1)) {
+    const existingTab = findTabByUri(currentState, uri);
+    if (existingTab) {
+      continue;
+    }
+    currentState = ensureActiveGroup(currentState, uri);
+  }
+  if (!firstTab) {
+    return currentState;
+  }
+  return switchTab(currentState, firstTab.groupId, firstTab.tab.id);
+};
+
 const refresh = state => {
   return {
     ...state
@@ -4169,7 +4227,8 @@ const renderError = errorMessage => {
   }, text(`Error: ${errorMessage}`), {
     childCount: 1,
     className: `${Button} ${ButtonSecondary}`,
-    'data-action': 'retry-open',
+    'data-action': RetryOpen,
+    name: RetryOpen,
     onClick: HandleClickAction,
     type: Button$2
   }, text('Retry')];
@@ -4313,9 +4372,9 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
       ariaLabel: 'Preview',
       childCount: 1,
       className: IconButton,
-      'data-action': 'toggle-preview',
+      'data-action': TogglePreview$1,
       'data-groupId': String(group.id),
-      name: 'toggle-preview',
+      name: TogglePreview$1,
       onClick: HandleClickAction,
       title: togglePreview(),
       type: Button$2
@@ -4329,8 +4388,9 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
     buttons.push({
       childCount: 1,
       className: EditorGroupActionButton + ' ' + SplitEditorGroupButton,
-      'data-action': 'split-right',
+      'data-action': SplitRight,
       'data-groupId': String(group.id),
+      name: SplitRight,
       onClick: HandleClickAction,
       title: splitEditorGroup(),
       type: Button$2
@@ -4363,7 +4423,7 @@ const renderEmptyGroupCloseButton = (group, groupIndex) => {
     childCount: 1,
     className: EmptyGroupCloseButton,
     'data-groupId': String(group.id),
-    name: 'close-group',
+    name: CloseGroup,
     onClick: HandleClickAction,
     title: closeEditorGroup(),
     type: Button$2
@@ -4723,6 +4783,7 @@ const commandMap = {
   'MainArea.loadContent': wrapCommand(loadContent),
   'MainArea.newFile': wrapCommand(newFile),
   'MainArea.openUri': wrapCommand(openUri),
+  'MainArea.openUris': wrapCommand(openUris),
   'MainArea.refresh': wrapCommand(refresh),
   'MainArea.render2': render2,
   'MainArea.renderEventListeners': renderEventListeners,

package/package.json

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