@jbrowse/app-core 5.0.0-beta.13 → 5.0.0-beta.14

package/esm/ui/App/ViewMenu.js

@@ -26,19 +26,18 @@ const ViewMenu = observer(function ViewMenu({ model, className, }) {
         bottom: session.moveViewToBottom,
     };
     const moveViewOut = (to) => {
-        const allViewIds = session.views.map(v => v.id);
         if (to === 'tab') {
-            session.moveViewToNewTab(model.id, allViewIds);
+            session.moveViewToNewTab(model.id);
         }
         else {
-            session.moveViewToSplit(model.id, to, allViewIds);
+            session.moveViewToSplit(model.id, to);
         }
     };
     // views render in `session.views` order within a tab, so a view joining one
     // goes to its bottom rather than wherever its old slot falls
     const moveViewToTab = (tabId) => {
         const members = session.findTab(tabId)?.tab.viewIds ?? [];
-        session.moveViewToTab(model.id, tabId, session.views.map(v => v.id));
+        session.moveViewToTab(model.id, tabId);
         session.moveViewToBottom(model.id, [...members, model.id]);
     };
     return (_jsx(CascadingMenuButton, { "data-testid": "view_menu_icon", tooltip: "View menu", menuItems: () => {
@@ -50,6 +49,8 @@ const ViewMenu = observer(function ViewMenu({ model, className, }) {
                 ? session.tabs.filter(t => t.id !== home.tab.id)
                 : [];
             const viewCount = scopeIds?.length ?? session.views.length;
+            const aloneInTab = viewCount <= 1;
+            const aloneInCell = aloneInTab && (home?.panel.tabs.length ?? 1) <= 1;
             return [
                 {
                     label: 'View options',
@@ -62,13 +63,17 @@ const ViewMenu = observer(function ViewMenu({ model, className, }) {
                                 session.addView(model.type, renameIds(getSnapshot(model)));
                             },
                         },
-                        {
-                            label: 'Move to new tab',
-                            icon: OpenInNewIcon,
-                            onClick: () => {
-                                moveViewOut('tab');
-                            },
-                        },
+                        ...(aloneInTab
+                            ? []
+                            : [
+                                {
+                                    label: 'Move to new tab',
+                                    icon: OpenInNewIcon,
+                                    onClick: () => {
+                                        moveViewOut('tab');
+                                    },
+                                },
+                            ]),
                         ...(otherTabs.length > 0
                             ? [
                                 {
@@ -84,20 +89,24 @@ const ViewMenu = observer(function ViewMenu({ model, className, }) {
                                 },
                             ]
                             : []),
-                        {
-                            label: 'Move to split view (right)',
-                            icon: VerticalSplitIcon,
-                            onClick: () => {
-                                moveViewOut('row');
-                            },
-                        },
-                        {
-                            label: 'Move to split view (below)',
-                            icon: HorizontalSplitIcon,
-                            onClick: () => {
-                                moveViewOut('column');
-                            },
-                        },
+                        ...(aloneInCell
+                            ? []
+                            : [
+                                {
+                                    label: 'Move to split view (right)',
+                                    icon: VerticalSplitIcon,
+                                    onClick: () => {
+                                        moveViewOut('row');
+                                    },
+                                },
+                                {
+                                    label: 'Move to split view (below)',
+                                    icon: HorizontalSplitIcon,
+                                    onClick: () => {
+                                        moveViewOut('column');
+                                    },
+                                },
+                            ]),
                         // 'top'/'bottom' only mean something with a view above *and* below
                         ...[
                             ['top', 'Move view to top', KeyboardDoubleArrowUpIcon, 2],

package/esm/ui/App/ViewWrapper.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Suspense } from 'react';
+import { ViewLoadingScreen } from '@jbrowse/core/ui';
 import { ErrorBoundary } from '@jbrowse/core/ui/ErrorBoundary';
-import LoadingEllipses from '@jbrowse/core/ui/LoadingEllipses';
 import { getEnv } from '@jbrowse/core/util';
 import { observer } from 'mobx-react';
 import ViewErrorFallback from './ViewErrorFallback.js';
@@ -12,7 +12,7 @@ import ViewErrorFallback from './ViewErrorFallback.js';
 const ViewComponent = observer(function ViewComponent({ view, session, }) {
     const { pluginManager } = getEnv(session);
     const { ReactComponent } = pluginManager.getViewType(view.type);
-    return (_jsx(Suspense, { fallback: _jsx(LoadingEllipses, { variant: "h6", "data-view-component-pending": "true" }), children: _jsx(ReactComponent, { model: view, session: session }) }));
+    return (_jsx(Suspense, { fallback: _jsx("div", { "data-view-component-pending": "true", children: _jsx(ViewLoadingScreen, {}) }), children: _jsx(ReactComponent, { model: view, session: session }) }));
 });
 /**
  * A view's body, and the boundary that keeps a view that throws from being an

package/esm/ui/App/viewTitle.d.ts

@@ -2,10 +2,15 @@ interface TitledView {
     displayName?: string;
     assemblyNames?: string[];
     minimized?: boolean;
+    initialized?: boolean;
+    showImportForm?: boolean;
+    error?: unknown;
 }
 /**
  * The view's own name, or its assemblies'. An emptied name counts as unset, so
- * clearing the title in the header puts the derived one back.
+ * clearing the title in the header puts the derived one back. A view still
+ * resolving its assembly is not untitled, only unnamed so far, so it reads
+ * blank rather than "Untitled view" for the moment before its name arrives.
  */
 export declare function viewName(view: TitledView, getDisplayName: (assemblyName: string) => string): string;
 export declare function viewTitle(view: TitledView, getDisplayName: (assemblyName: string) => string): string;

package/esm/ui/App/viewTitle.js

@@ -1,15 +1,20 @@
 /**
  * The view's own name, or its assemblies'. An emptied name counts as unset, so
- * clearing the title in the header puts the derived one back.
+ * clearing the title in the header puts the derived one back. A view still
+ * resolving its assembly is not untitled, only unnamed so far, so it reads
+ * blank rather than "Untitled view" for the moment before its name arrives.
  */
 export function viewName(view, getDisplayName) {
     // assemblyNames is [] (not undefined) for a view with no displayed regions
     // yet, so fall back on emptiness rather than nullishness
     const assemblyNames = view.assemblyNames ?? [];
+    const launching = view.initialized === false && !view.showImportForm && !view.error;
     return (view.displayName ||
         (assemblyNames.length
             ? assemblyNames.map(r => getDisplayName(r)).join(', ')
-            : 'Untitled view'));
+            : launching
+                ? ''
+                : 'Untitled view'));
 }
 export function viewTitle(view, getDisplayName) {
     const name = viewName(view, getDisplayName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/app-core",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "type": "module",
   "description": "JBrowse 2 code shared between the 'full featured' apps e.g. jbrowse-web and jbrowse-desktop",
   "keywords": [
@@ -24,13 +24,13 @@
     "esm"
   ],
   "dependencies": {
-    "@jbrowse/mobx-state-tree": "^6.7.0",
-    "@mui/icons-material": "^9.4.0",
-    "@mui/material": "^9.4.0",
+    "@jbrowse/mobx-state-tree": "^6.9.0",
+    "@mui/icons-material": "^9.5.0",
+    "@mui/material": "^9.5.0",
     "mobx": "^7.0.6",
     "mobx-react": "^10.0.2",
-    "@jbrowse/product-core": "^5.0.0-beta.13",
-    "@jbrowse/core": "^5.0.0-beta.13"
+    "@jbrowse/core": "^5.0.0-beta.14",
+    "@jbrowse/product-core": "^5.0.0-beta.14"
   },
   "peerDependencies": {
     "react": ">=19.0.0",