@jbrowse/embedded-core 2.13.1 → 2.15.0

package/dist/ui/ModalWidget.js

@@ -42,18 +42,19 @@ const ModalWidget = (0, mobx_react_1.observer)(function ({ session, }) {
         return null;
     }
     const { ReactComponent, HeadingComponent, heading } = pluginManager.getWidgetType(visibleWidget.type);
-    const Component = visibleWidget
-        ? pluginManager.evaluateExtensionPoint('Core-replaceWidget', ReactComponent, {
-            session,
-            model: visibleWidget,
-        })
-        : null;
-    return (react_1.default.createElement(ui_1.Dialog, { open: true, onClose: () => session.hideAllWidgets(), maxWidth: "xl", header: react_1.default.createElement(material_1.AppBar, { position: "static" },
-            react_1.default.createElement(material_1.Toolbar, null, HeadingComponent ? (react_1.default.createElement(HeadingComponent, { model: visibleWidget })) : (react_1.default.createElement(material_1.Typography, { variant: "h6" }, heading)))) }, Component ? (react_1.default.createElement(react_1.Suspense, { fallback: react_1.default.createElement("div", null, "Loading...") },
-        react_1.default.createElement(material_1.Paper, { className: classes.paper },
-            react_1.default.createElement(Component, { model: visibleWidget, session: session, overrideDimensions: {
-                    height: (window.innerHeight * 5) / 8,
-                    width: 800,
-                } })))) : null));
+    const Component = pluginManager.evaluateExtensionPoint('Core-replaceWidget', ReactComponent, {
+        session,
+        model: visibleWidget,
+    });
+    return (react_1.default.createElement(ui_1.Dialog, { open: true, onClose: () => {
+            session.hideAllWidgets();
+        }, maxWidth: "xl", header: react_1.default.createElement(material_1.AppBar, { position: "static" },
+            react_1.default.createElement(material_1.Toolbar, null, HeadingComponent ? (react_1.default.createElement(HeadingComponent, { model: visibleWidget })) : (react_1.default.createElement(material_1.Typography, { variant: "h6" }, heading)))) },
+        react_1.default.createElement(react_1.Suspense, { fallback: react_1.default.createElement("div", null, "Loading...") },
+            react_1.default.createElement(material_1.Paper, { className: classes.paper },
+                react_1.default.createElement(Component, { model: visibleWidget, session: session, overrideDimensions: {
+                        height: (window.innerHeight * 5) / 8,
+                        width: 800,
+                    } })))));
 });
 exports.default = ModalWidget;

package/dist/ui/ViewMenu.d.ts

@@ -5,5 +5,5 @@ declare const ViewMenu: ({ model, IconButtonProps, IconProps, }: {
     model: IBaseViewModel;
     IconButtonProps: IconButtonPropsType;
     IconProps: SvgIconProps;
-}) => React.JSX.Element | null;
+}) => React.JSX.Element;
 export default ViewMenu;

package/dist/ui/ViewMenu.js

@@ -1,48 +1,24 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importStar(require("react"));
+const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
 const Menu_1 = __importDefault(require("@mui/icons-material/Menu"));
 const mobx_react_1 = require("mobx-react");
 const ui_1 = require("@jbrowse/core/ui");
+const hooks_1 = require("material-ui-popup-state/hooks");
 const ViewMenu = (0, mobx_react_1.observer)(function ({ model, IconButtonProps, IconProps, }) {
-    var _a;
-    const [anchorEl, setAnchorEl] = (0, react_1.useState)();
-    if (!((_a = model.menuItems()) === null || _a === void 0 ? void 0 : _a.length)) {
-        return null;
-    }
+    const popupState = (0, hooks_1.usePopupState)({
+        popupId: 'viewMenu',
+        variant: 'popover',
+    });
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(material_1.IconButton, { ...IconButtonProps, "aria-label": "more", "aria-controls": "view-menu", "aria-haspopup": "true", onClick: event => setAnchorEl(event.currentTarget), "data-testid": "view_menu_icon" },
+        react_1.default.createElement(material_1.IconButton, { ...IconButtonProps, ...(0, hooks_1.bindTrigger)(popupState), "data-testid": "view_menu_icon" },
             react_1.default.createElement(Menu_1.default, { ...IconProps })),
-        react_1.default.createElement(ui_1.Menu, { anchorEl: anchorEl, open: Boolean(anchorEl), onMenuItemClick: (_, callback) => {
+        react_1.default.createElement(ui_1.CascadingMenu, { ...(0, hooks_1.bindPopover)(popupState), onMenuItemClick: (_event, callback) => {
                 callback();
-                setAnchorEl(undefined);
-            }, onClose: () => setAnchorEl(undefined), menuItems: model.menuItems() })));
+            }, menuItems: model.menuItems(), popupState: popupState })));
 });
 exports.default = ViewMenu;

package/dist/ui/ViewTitle.js

@@ -71,10 +71,14 @@ const ViewTitle = (0, mobx_react_1.observer)(({ view }) => {
         react_1.default.createElement("div", { className: classes.grow }),
         displayName ? (react_1.default.createElement(material_1.Typography, { variant: "body2", className: classes.displayName }, displayName)) : null,
         react_1.default.createElement("div", { className: classes.grow }),
-        react_1.default.createElement(material_1.IconButton, { onClick: () => setDialogOpen(true) },
+        react_1.default.createElement(material_1.IconButton, { onClick: () => {
+                setDialogOpen(true);
+            } },
             react_1.default.createElement("div", { style: { width: 22, height: 22 } },
                 react_1.default.createElement(ui_1.Logomark, { variant: "white" }))),
         dialogOpen ? (react_1.default.createElement(react_1.Suspense, { fallback: null },
-            react_1.default.createElement(VersionAboutDialog, { open: true, onClose: () => setDialogOpen(false), version: session.version }))) : null));
+            react_1.default.createElement(VersionAboutDialog, { open: true, onClose: () => {
+                    setDialogOpen(false);
+                }, version: session.version }))) : null));
 });
 exports.default = ViewTitle;

package/esm/ui/ModalWidget.js

@@ -17,18 +17,19 @@ const ModalWidget = observer(function ({ session, }) {
         return null;
     }
     const { ReactComponent, HeadingComponent, heading } = pluginManager.getWidgetType(visibleWidget.type);
-    const Component = visibleWidget
-        ? pluginManager.evaluateExtensionPoint('Core-replaceWidget', ReactComponent, {
-            session,
-            model: visibleWidget,
-        })
-        : null;
-    return (React.createElement(Dialog, { open: true, onClose: () => session.hideAllWidgets(), maxWidth: "xl", header: React.createElement(AppBar, { position: "static" },
-            React.createElement(Toolbar, null, HeadingComponent ? (React.createElement(HeadingComponent, { model: visibleWidget })) : (React.createElement(Typography, { variant: "h6" }, heading)))) }, Component ? (React.createElement(Suspense, { fallback: React.createElement("div", null, "Loading...") },
-        React.createElement(Paper, { className: classes.paper },
-            React.createElement(Component, { model: visibleWidget, session: session, overrideDimensions: {
-                    height: (window.innerHeight * 5) / 8,
-                    width: 800,
-                } })))) : null));
+    const Component = pluginManager.evaluateExtensionPoint('Core-replaceWidget', ReactComponent, {
+        session,
+        model: visibleWidget,
+    });
+    return (React.createElement(Dialog, { open: true, onClose: () => {
+            session.hideAllWidgets();
+        }, maxWidth: "xl", header: React.createElement(AppBar, { position: "static" },
+            React.createElement(Toolbar, null, HeadingComponent ? (React.createElement(HeadingComponent, { model: visibleWidget })) : (React.createElement(Typography, { variant: "h6" }, heading)))) },
+        React.createElement(Suspense, { fallback: React.createElement("div", null, "Loading...") },
+            React.createElement(Paper, { className: classes.paper },
+                React.createElement(Component, { model: visibleWidget, session: session, overrideDimensions: {
+                        height: (window.innerHeight * 5) / 8,
+                        width: 800,
+                    } })))));
 });
 export default ModalWidget;

package/esm/ui/ViewMenu.d.ts

@@ -5,5 +5,5 @@ declare const ViewMenu: ({ model, IconButtonProps, IconProps, }: {
     model: IBaseViewModel;
     IconButtonProps: IconButtonPropsType;
     IconProps: SvgIconProps;
-}) => React.JSX.Element | null;
+}) => React.JSX.Element;
 export default ViewMenu;

package/esm/ui/ViewMenu.js

@@ -1,20 +1,19 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { IconButton, } from '@mui/material';
 import MenuIcon from '@mui/icons-material/Menu';
 import { observer } from 'mobx-react';
-import { Menu } from '@jbrowse/core/ui';
+import { CascadingMenu } from '@jbrowse/core/ui';
+import { bindTrigger, bindPopover, usePopupState, } from 'material-ui-popup-state/hooks';
 const ViewMenu = observer(function ({ model, IconButtonProps, IconProps, }) {
-    var _a;
-    const [anchorEl, setAnchorEl] = useState();
-    if (!((_a = model.menuItems()) === null || _a === void 0 ? void 0 : _a.length)) {
-        return null;
-    }
+    const popupState = usePopupState({
+        popupId: 'viewMenu',
+        variant: 'popover',
+    });
     return (React.createElement(React.Fragment, null,
-        React.createElement(IconButton, { ...IconButtonProps, "aria-label": "more", "aria-controls": "view-menu", "aria-haspopup": "true", onClick: event => setAnchorEl(event.currentTarget), "data-testid": "view_menu_icon" },
+        React.createElement(IconButton, { ...IconButtonProps, ...bindTrigger(popupState), "data-testid": "view_menu_icon" },
             React.createElement(MenuIcon, { ...IconProps })),
-        React.createElement(Menu, { anchorEl: anchorEl, open: Boolean(anchorEl), onMenuItemClick: (_, callback) => {
+        React.createElement(CascadingMenu, { ...bindPopover(popupState), onMenuItemClick: (_event, callback) => {
                 callback();
-                setAnchorEl(undefined);
-            }, onClose: () => setAnchorEl(undefined), menuItems: model.menuItems() })));
+            }, menuItems: model.menuItems(), popupState: popupState })));
 });
 export default ViewMenu;

package/esm/ui/ViewTitle.js

@@ -43,10 +43,14 @@ const ViewTitle = observer(({ view }) => {
         React.createElement("div", { className: classes.grow }),
         displayName ? (React.createElement(Typography, { variant: "body2", className: classes.displayName }, displayName)) : null,
         React.createElement("div", { className: classes.grow }),
-        React.createElement(IconButton, { onClick: () => setDialogOpen(true) },
+        React.createElement(IconButton, { onClick: () => {
+                setDialogOpen(true);
+            } },
             React.createElement("div", { style: { width: 22, height: 22 } },
                 React.createElement(Logomark, { variant: "white" }))),
         dialogOpen ? (React.createElement(Suspense, { fallback: null },
-            React.createElement(VersionAboutDialog, { open: true, onClose: () => setDialogOpen(false), version: session.version }))) : null));
+            React.createElement(VersionAboutDialog, { open: true, onClose: () => {
+                    setDialogOpen(false);
+                }, version: session.version }))) : null));
 });
 export default ViewTitle;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/embedded-core",
-  "version": "2.13.1",
+  "version": "2.15.0",
   "description": "JBrowse 2 code shared between embedded products",
   "keywords": [
     "jbrowse",
@@ -32,7 +32,7 @@
     "build:esm": "tsc --build tsconfig.build.esm.json",
     "build:commonjs": "tsc --build tsconfig.build.commonjs.json",
     "build": "npm run build:esm && npm run build:commonjs",
-    "test": "cd ../..; jest packages/embedded-core",
+    "test": "cd ../..; jest --passWithNoTests packages/embedded-core",
     "clean": "rimraf dist esm *.tsbuildinfo",
     "prebuild": "yarn clean",
     "prepack": "yarn build && yarn useDist",
@@ -42,9 +42,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@jbrowse/product-core": "^2.13.1",
-    "@mui/icons-material": "^5.0.0",
-    "@mui/material": "^5.10.17",
+    "@jbrowse/core": "^2.15.0",
+    "@jbrowse/product-core": "^2.15.0",
+    "@mui/icons-material": "^6.0.0",
+    "@mui/material": "^6.0.0",
     "copy-to-clipboard": "^3.3.1",
     "react-error-boundary": "^4.0.3"
   },
@@ -60,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fcebca71cc1d066654603e1a9accfa6c6d4f764d"
+  "gitHead": "87eeb1fbf8311dbf88d5e75b5a265f03beffdda8"
 }