@jbrowse/plugin-menus 5.0.0-beta.1 → 5.0.0-beta.11

package/esm/AboutWidget/components/AboutWidget.js

@@ -19,9 +19,6 @@ const useStyles = makeStyles()(theme => ({
     accordions: {
         marginTop: theme.spacing(3),
     },
-    icon: {
-        color: theme.palette.tertiary.contrastText || '#fff',
-    },
 }));
 const AboutWidget = observer(function AboutWidget({ model, }) {
     const { classes } = useStyles();
@@ -35,9 +32,9 @@ const AboutWidget = observer(function AboutWidget({ model, }) {
         .filter(p => pluginManager.pluginMetadata[p.name]?.isCore)
         .map(p => p.name));
     const externalPlugins = plugins.filter(plugin => !corePlugins.has(plugin.name));
-    return (_jsxs("div", { className: classes.root, children: [_jsx(Typography, { variant: "h4", align: "center", children: "JBrowse 2" }), _jsx(Typography, { variant: "h6", align: "center", className: classes.subtitle, children: version }), gitCommit ? (_jsxs(Typography, { variant: "body2", align: "center", children: ["Commit: ", gitCommit] })) : null, _jsxs(Typography, { align: "center", children: ["JBrowse is a ", _jsx(ExternalLink, { href: "https://gmod.org/", children: "GMOD" }), ' ', "project"] }), _jsx("br", {}), _jsx(Typography, { align: "center", children: "\u00A9 2019-2026 The Evolutionary Software Foundation" }), _jsxs("div", { className: classes.accordions, children: [_jsxs(Accordion, { defaultExpanded: true, children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, { className: classes.icon }), children: _jsx(Typography, { children: "Browser settings" }) }), _jsx(AccordionDetails, { children: _jsxs("ul", { children: [graphicsCapabilities ? (_jsxs("li", { children: ["Graphics: ", effectiveRenderer(graphicsCapabilities)] })) : null, _jsxs("li", { children: ["Rendering:", ' ', defaultRpcDriver === 'WebWorkerRpcDriver'
+    return (_jsxs("div", { className: classes.root, children: [_jsx(Typography, { variant: "h4", align: "center", children: "JBrowse 2" }), _jsx(Typography, { variant: "h6", align: "center", className: classes.subtitle, children: version }), gitCommit ? (_jsxs(Typography, { variant: "body2", align: "center", children: ["Commit: ", gitCommit] })) : null, _jsxs(Typography, { align: "center", children: ["JBrowse is a ", _jsx(ExternalLink, { href: "https://gmod.org/", children: "GMOD" }), ' ', "project"] }), _jsx("br", {}), _jsx(Typography, { align: "center", children: "\u00A9 2019-2026 The Evolutionary Software Foundation" }), _jsxs("div", { className: classes.accordions, children: [_jsxs(Accordion, { defaultExpanded: true, children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, {}), children: _jsx(Typography, { children: "Browser settings" }) }), _jsx(AccordionDetails, { children: _jsxs("ul", { children: [graphicsCapabilities ? (_jsxs("li", { children: ["Graphics: ", effectiveRenderer(graphicsCapabilities)] })) : null, _jsxs("li", { children: ["Rendering:", ' ', defaultRpcDriver === 'WebWorkerRpcDriver'
                                                     ? 'off main thread'
-                                                    : 'on main thread'] })] }) })] }), _jsxs(Accordion, { defaultExpanded: true, children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, { className: classes.icon }), children: _jsx(Typography, { children: "Plugins loaded" }) }), _jsxs(AccordionDetails, { children: [_jsx(Typography, { children: "External plugins" }), externalPlugins.length ? (_jsx("ul", { children: externalPlugins.map(plugin => {
+                                                    : 'on main thread'] })] }) })] }), _jsxs(Accordion, { defaultExpanded: true, children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, {}), children: _jsx(Typography, { children: "Plugins loaded" }) }), _jsxs(AccordionDetails, { children: [_jsx(Typography, { children: "External plugins" }), externalPlugins.length ? (_jsx("ul", { children: externalPlugins.map(plugin => {
                                             const { url, name, version = '' } = plugin;
                                             const text = `${name} ${version || ''}`;
                                             return (_jsx("li", { children: plugin.url ? (_jsx(ExternalLink, { href: url, children: text })) : (_jsx("span", { children: text })) }, plugin.name));

package/esm/AboutWidget/index.js

@@ -1,6 +1,6 @@
-import { lazy } from 'react';
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 import { WidgetType } from '@jbrowse/core/pluggableElementTypes';
+import { lazyWithPreload } from '@jbrowse/core/util/lazyWithPreload';
 import { ElementId } from '@jbrowse/core/util/types/mst';
 import { types } from '@jbrowse/mobx-state-tree';
 const configSchema = ConfigurationSchema('AboutWidget', {});
@@ -12,10 +12,11 @@ export default function AboutWidgetF(pluginManager) {
     pluginManager.addWidgetType(() => {
         return new WidgetType({
             name: 'AboutWidget',
+            discardOnClose: true,
             heading: 'About',
             configSchema,
             stateModel,
-            ReactComponent: lazy(() => import('./components/AboutWidget.js')),
+            ReactComponent: lazyWithPreload(() => import('./components/AboutWidget.js')),
         });
     });
 }

package/esm/HelpWidget/index.js

@@ -1,6 +1,6 @@
-import { lazy } from 'react';
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 import { WidgetType } from '@jbrowse/core/pluggableElementTypes';
+import { lazyWithPreload } from '@jbrowse/core/util/lazyWithPreload';
 import { ElementId } from '@jbrowse/core/util/types/mst';
 import { types } from '@jbrowse/mobx-state-tree';
 const configSchema = ConfigurationSchema('HelpWidget', {});
@@ -12,10 +12,11 @@ export default function HelpWidgetF(pluginManager) {
     pluginManager.addWidgetType(() => {
         return new WidgetType({
             name: 'HelpWidget',
+            discardOnClose: true,
             heading: 'Help',
             configSchema,
             stateModel,
-            ReactComponent: lazy(() => import('./components/HelpWidget.js')),
+            ReactComponent: lazyWithPreload(() => import('./components/HelpWidget.js')),
         });
     });
 }

package/esm/ImportSessionWidget/components/ImportSessionWidget.js

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { FileDropZone } from '@jbrowse/core/ui';
-import { getSession } from '@jbrowse/core/util';
+import { getEnv, getSession } from '@jbrowse/core/util';
 import { makeStyles } from '@jbrowse/core/util/tss-react';
 import { Button, Paper, Typography } from '@mui/material';
 import { observer } from 'mobx-react';
@@ -33,6 +33,7 @@ const ImportSessionWidget = observer(function ImportSessionWidget({ model, }) {
                             if (!session || typeof session !== 'object') {
                                 throw new Error('No session found in file. Expected a JBrowse session export (a JSON file with a top-level "session" key).');
                             }
+                            await getEnv(model).pluginManager.preloadSessionTypes(session);
                             getSession(model).setSession?.(session);
                         }
                         catch (e) {

package/esm/ImportSessionWidget/index.js

@@ -1,6 +1,6 @@
-import { lazy } from 'react';
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 import { WidgetType } from '@jbrowse/core/pluggableElementTypes';
+import { lazyWithPreload } from '@jbrowse/core/util/lazyWithPreload';
 import { ElementId } from '@jbrowse/core/util/types/mst';
 import { types } from '@jbrowse/mobx-state-tree';
 const configSchema = ConfigurationSchema('ImportSessionWidget', {});
@@ -12,10 +12,11 @@ export default function ImportSessionWidgetF(pluginManager) {
     pluginManager.addWidgetType(() => {
         return new WidgetType({
             name: 'ImportSessionWidget',
+            discardOnClose: true,
             heading: 'Import session',
             configSchema,
             stateModel,
-            ReactComponent: lazy(() => import('./components/ImportSessionWidget.js')),
+            ReactComponent: lazyWithPreload(() => import('./components/ImportSessionWidget.js')),
         });
     });
 }

package/esm/SessionManager/index.d.ts

@@ -1,5 +1,5 @@
 import type PluginManager from '@jbrowse/core/PluginManager';
-export declare const configSchema: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{}, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+export declare const configSchema: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{}, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
 export declare const stateModel: import("@jbrowse/mobx-state-tree").IModelType<{
     id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
     type: import("@jbrowse/mobx-state-tree").ILiteralType<"SessionManager">;

package/esm/SessionManager/index.js

@@ -1,6 +1,6 @@
-import { lazy } from 'react';
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 import { WidgetType } from '@jbrowse/core/pluggableElementTypes';
+import { lazyWithPreload } from '@jbrowse/core/util/lazyWithPreload';
 import { ElementId } from '@jbrowse/core/util/types/mst';
 import { types } from '@jbrowse/mobx-state-tree';
 export const configSchema = ConfigurationSchema('SessionManager', {});
@@ -12,10 +12,11 @@ export default function SessionManagerF(pluginManager) {
     pluginManager.addWidgetType(() => {
         return new WidgetType({
             name: 'SessionManager',
+            discardOnClose: true,
             heading: 'Recent sessions',
             configSchema,
             stateModel,
-            ReactComponent: lazy(() => import('./components/SessionManager.js')),
+            ReactComponent: lazyWithPreload(() => import('./components/SessionManager.js')),
         });
     });
 }

package/esm/index.js

@@ -20,16 +20,14 @@ export default class MenusPlugin extends Plugin {
                 label: 'About',
                 icon: InfoIcon,
                 onClick: (session) => {
-                    const widget = session.addWidget('AboutWidget', 'aboutWidget');
-                    session.showWidget(widget);
+                    session.openWidget('AboutWidget', 'aboutWidget');
                 },
             });
             pluginManager.rootModel.appendToMenu('Help', {
                 label: 'Help',
                 icon: HelpIcon,
                 onClick: (session) => {
-                    const widget = session.addWidget('HelpWidget', 'helpWidget');
-                    session.showWidget(widget);
+                    session.openWidget('HelpWidget', 'helpWidget');
                 },
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-menus",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.11",
   "type": "module",
   "description": "JBrowse 2 basic menus",
   "keywords": [
@@ -21,14 +21,15 @@
     "esm"
   ],
   "dependencies": {
-    "@jbrowse/mobx-state-tree": "^6.5.1",
-    "@mui/icons-material": "^9.3.1",
-    "@mui/material": "^9.3.1",
-    "@mui/x-data-grid": "^9.12.0",
-    "mobx": "^7.0.3",
+    "@jbrowse/mobx-state-tree": "^6.7.0",
+    "@mui/icons-material": "^9.4.0",
+    "@mui/material": "^9.4.0",
+    "@mui/system": "^9.4.0",
+    "@mui/x-data-grid": "^9.14.0",
+    "mobx": "^7.0.5",
     "mobx-react": "^10.0.2",
-    "@jbrowse/core": "^5.0.0-beta.1",
-    "@jbrowse/render-core": "^5.0.0-beta.1"
+    "@jbrowse/core": "^5.0.0-beta.11",
+    "@jbrowse/render-core": "^5.0.0-beta.11"
   },
   "peerDependencies": {
     "react": ">=19.0.0",