@lvce-editor/panel-worker 2.12.0 → 2.13.0

package/dist/panelWorkerMain.js

@@ -1581,12 +1581,8 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   set$1(uid, state, state);
 };
 
-const isEqual$2 = (oldState, newState) => {
-  return oldState.actionsUid === newState.actionsUid;
-};
-
 const isEqual$1 = (oldState, newState) => {
-  return oldState.childUid === newState.childUid;
+  return oldState.actionsUid === newState.actionsUid;
 };
 
 const areBadgeCountsEqual = (oldBadgeCounts, newBadgeCounts) => {
@@ -1600,11 +1596,10 @@ const isEqual = (oldState, newState) => {
 
 const RenderItems = 4;
 const RenderIncremental = 11;
-const RenderChildUid = 12;
 const RenderActionsUid = 13;
 
-const modules = [isEqual, isEqual$1, isEqual$2];
-const numbers = [RenderIncremental, RenderChildUid, RenderActionsUid];
+const modules = [isEqual, isEqual$1];
+const numbers = [RenderIncremental, RenderActionsUid];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1759,8 +1754,12 @@ const handleFilterInput = async (state, value) => {
   return state;
 };
 
-const getPanelViews = () => {
-  const views = [Problems, Output, DebugConsole, Terminals, Ports];
+const remoteSshWorkspacePrefix = 'remote-ssh://';
+const getPanelViews = (workspaceUri = '') => {
+  const views = [Problems, Output, DebugConsole, Terminals];
+  if (workspaceUri.startsWith(remoteSshWorkspacePrefix)) {
+    views.push(Ports);
+  }
   return views;
 };
 
@@ -1815,6 +1814,9 @@ const openViewlet = async (state, id, focus = false, uri = '') => {
     currentViewletId,
     views
   } = state;
+  if (!views.includes(id)) {
+    return state;
+  }
   await saveViewletState(currentChildUid, currentViewletId);
   const childDimensions = getContentDimensions(state);
   const childUid = getUid();
@@ -1822,6 +1824,9 @@ const openViewlet = async (state, id, focus = false, uri = '') => {
   const actionsUid = getUid();
   const index = views.indexOf(id);
   await createViewlet(id, childUid, tabId, actionsUid, childDimensions, uri, focus);
+  if (currentChildUid > 0) {
+    await invoke$1('Viewlet.dispose', currentChildUid);
+  }
   return {
     ...state,
     actionsUid,
@@ -1832,21 +1837,31 @@ const openViewlet = async (state, id, focus = false, uri = '') => {
   };
 };
 
-const loadContent = (state, savedState) => {
+const loadContent = (state, savedState, workspaceUri = '') => {
+  const {
+    currentViewletId: activeViewletId
+  } = state;
   const savedViewletId = getSavedViewletId(savedState);
-  const views = getPanelViews();
+  const views = getPanelViews(workspaceUri);
+  let currentViewletId = savedViewletId;
+  if (!views.includes(currentViewletId)) {
+    currentViewletId = views.includes(activeViewletId) ? activeViewletId : views[0];
+  }
   const loaded = {
     ...state,
-    currentViewletId: savedViewletId,
+    currentViewletId,
     views
   };
-  return openViewlet(loaded, savedViewletId);
+  return openViewlet(loaded, currentViewletId);
 };
 
 const selectIndex = async (state, index, uri = '') => {
   const {
     views
   } = state;
+  if (index < 0 || index >= views.length) {
+    return state;
+  }
   return openViewlet(state, views[index], true, uri);
 };
 
@@ -1877,15 +1892,6 @@ const renderActionsUid = (oldState, newState) => {
   return ['Viewlet.dispose', oldActionsUid];
 };
 
-// TODO also need to dispose child when panel becomes hidden
-const renderChildUid = (oldState, newState) => {
-  const oldChildUid = oldState.childUid;
-  if (oldChildUid <= 0 || oldChildUid === newState.childUid) {
-    return [];
-  }
-  return ['Viewlet.dispose', oldChildUid];
-};
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -2354,8 +2360,6 @@ const getRenderer = diffType => {
   switch (diffType) {
     case RenderActionsUid:
       return renderActionsUid;
-    case RenderChildUid:
-      return renderChildUid;
     case RenderIncremental:
       return renderIncremental;
     case RenderItems:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/panel-worker",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "Panel Worker",
   "repository": {
     "type": "git",