@jbrowse/core 1.7.10 → 2.0.1

package/ui/ResizeHandle.js

@@ -17,9 +17,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
-
-var _clsx = _interopRequireDefault(require("clsx"));
+var _mui = require("tss-react/mui");
 
 var _excluded = ["onDrag", "vertical", "flexbox", "className"];
 
@@ -27,7 +25,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var useStyles = (0, _styles.makeStyles)({
+var useStyles = (0, _mui.makeStyles)()({
   horizontalHandle: {
     cursor: 'row-resize',
     width: '100%'
@@ -63,7 +61,11 @@ function ResizeHandle(_ref) {
       setMouseDragging = _useState2[1];
 
   var prevPos = (0, _react.useRef)(0);
-  var classes = useStyles();
+
+  var _useStyles = useStyles(),
+      classes = _useStyles.classes,
+      cx = _useStyles.cx;
+
   (0, _react.useEffect)(function () {
     function mouseMove(event) {
       event.preventDefault();
@@ -113,7 +115,7 @@ function ResizeHandle(_ref) {
       setMouseDragging(true);
     },
     role: "presentation",
-    className: (0, _clsx.default)(className, originalClassName)
+    className: cx(className, originalClassName)
   }, props));
 }
 

package/ui/ReturnToImportFormDialog.js

@@ -11,13 +11,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _mobxReact = require("mobx-react");
 
-var _styles = require("@material-ui/core/styles");
+var _material = require("@mui/material");
 
-var _core = require("@material-ui/core");
+var _mui = require("tss-react/mui");
 
-var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
+var _Close = _interopRequireDefault(require("@mui/icons-material/Close"));
 
-var useStyles = (0, _styles.makeStyles)(function (theme) {
+var useStyles = (0, _mui.makeStyles)()(function (theme) {
   return {
     closeButton: {
       position: 'absolute',
@@ -31,17 +31,21 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
 function ReturnToImportFormDialog(_ref) {
   var model = _ref.model,
       handleClose = _ref.handleClose;
-  var classes = useStyles();
-  return /*#__PURE__*/_react.default.createElement(_core.Dialog, {
+
+  var _useStyles = useStyles(),
+      classes = _useStyles.classes;
+
+  return /*#__PURE__*/_react.default.createElement(_material.Dialog, {
     maxWidth: "xl",
     open: true,
     onClose: handleClose
-  }, /*#__PURE__*/_react.default.createElement(_core.DialogTitle, null, "Reference sequence", handleClose ? /*#__PURE__*/_react.default.createElement(_core.IconButton, {
+  }, /*#__PURE__*/_react.default.createElement(_material.DialogTitle, null, "Reference sequence", handleClose ? /*#__PURE__*/_react.default.createElement(_material.IconButton, {
     className: classes.closeButton,
     onClick: function onClick() {
       return handleClose();
-    }
-  }, /*#__PURE__*/_react.default.createElement(_Close.default, null)) : null), /*#__PURE__*/_react.default.createElement(_core.Divider, null), /*#__PURE__*/_react.default.createElement(_core.DialogContent, null, /*#__PURE__*/_react.default.createElement(_core.Typography, null, "Are you sure you want to return to the import form? This will lose your current view")), /*#__PURE__*/_react.default.createElement(_core.DialogActions, null, /*#__PURE__*/_react.default.createElement(_core.Button, {
+    },
+    size: "large"
+  }, /*#__PURE__*/_react.default.createElement(_Close.default, null)) : null), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement(_material.DialogContent, null, /*#__PURE__*/_react.default.createElement(_material.Typography, null, "Are you sure you want to return to the import form? This will lose your current view")), /*#__PURE__*/_react.default.createElement(_material.DialogActions, null, /*#__PURE__*/_react.default.createElement(_material.Button, {
     onClick: function onClick() {
       model.clearView();
       handleClose();
@@ -49,7 +53,7 @@ function ReturnToImportFormDialog(_ref) {
     variant: "contained",
     color: "primary",
     autoFocus: true
-  }, "OK"), /*#__PURE__*/_react.default.createElement(_core.Button, {
+  }, "OK"), /*#__PURE__*/_react.default.createElement(_material.Button, {
     onClick: function onClick() {
       return handleClose();
     },

package/ui/SanitizedHTML.js

@@ -2,24 +2,18 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = SanitizedHTML;
 exports.isHTML = isHTML;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _escapeHtml = _interopRequireDefault(require("escape-html"));
 
 var _dompurify = _interopRequireDefault(require("dompurify"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 // source https://github.com/sindresorhus/html-tags/blob/master/html-tags.json
 // with some random uncommon ones removed. note: we just use this to run the content
 // through dompurify without escaping if we see an htmlTag from this list
@@ -40,20 +34,20 @@ function isHTML(str) {
 function SanitizedHTML(_ref) {
   var html = _ref.html;
   var value = isHTML(html) ? html : (0, _escapeHtml.default)(html);
-  (0, _react.useEffect)(function () {
-    if (!added) {
-      added = true; // see https://github.com/cure53/DOMPurify/issues/317
-      // only have to add this once, and can't do it globally because dompurify
-      // not yet initialized at global scope
-
-      _dompurify.default.addHook('afterSanitizeAttributes', function (node) {
-        if (node.tagName === 'A') {
-          node.setAttribute('rel', 'noopener noreferrer');
-          node.setAttribute('target', '_blank');
-        }
-      });
-    }
-  }, []);
+
+  if (!added) {
+    added = true; // see https://github.com/cure53/DOMPurify/issues/317
+    // only have to add this once, and can't do it globally because dompurify
+    // not yet initialized at global scope
+
+    _dompurify.default.addHook('afterSanitizeAttributes', function (node) {
+      if (node.tagName === 'A') {
+        node.setAttribute('rel', 'noopener noreferrer');
+        node.setAttribute('target', '_blank');
+      }
+    });
+  }
+
   return /*#__PURE__*/_react.default.createElement("div", {
     // eslint-disable-next-line react/no-danger
     dangerouslySetInnerHTML: {

package/ui/Snackbar.js

@@ -13,11 +13,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _core = require("@material-ui/core");
+var _material = require("@mui/material");
 
-var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
-
-var _Alert = _interopRequireDefault(require("@material-ui/lab/Alert"));
+var _Close = _interopRequireDefault(require("@mui/icons-material/Close"));
 
 var _mobxReact = require("mobx-react");
 
@@ -79,18 +77,22 @@ function MessageSnackbar(_ref) {
       level = _ref3[1],
       action = _ref3[2];
 
-  return /*#__PURE__*/_react.default.createElement(_core.Snackbar, {
+  return /*#__PURE__*/_react.default.createElement(_material.Snackbar, {
     open: open && !!message,
-    onClose: handleClose
-  }, /*#__PURE__*/_react.default.createElement(_Alert.default, {
     onClose: handleClose,
-    action: action ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.Button, {
+    anchorOrigin: {
+      vertical: 'bottom',
+      horizontal: 'center'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_material.Alert, {
+    onClose: handleClose,
+    action: action ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_material.Button, {
       color: "inherit",
       onClick: function onClick(e) {
         action.onClick();
         handleClose(e);
       }
-    }, action.name), /*#__PURE__*/_react.default.createElement(_core.IconButton, {
+    }, action.name), /*#__PURE__*/_react.default.createElement(_material.IconButton, {
       "aria-label": "close",
       color: "inherit",
       onClick: handleClose

package/ui/Tooltip.d.ts

@@ -3,7 +3,9 @@ import { Feature } from '../util/simpleFeature';
 declare const _default: ({ offsetX, offsetY, configuration, feature, timeout, }: {
     offsetX: number;
     offsetY: number;
-    configuration: import("mobx-state-tree").ModelInstanceTypeProps<Record<string, any>> & {
+    configuration: {
+        [x: string]: any;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         setSubschema(slotName: string, data: unknown): any;
     } & import("mobx-state-tree").IStateTreeNode<import("../configuration").AnyConfigurationSchemaType>;
     feature?: Feature | undefined;

package/ui/Tooltip.js

@@ -13,7 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _core = require("@material-ui/core");
+var _mui = require("tss-react/mui");
 
 var _mobxReact = require("mobx-react");
 
@@ -23,7 +23,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var useStyles = (0, _core.makeStyles)({
+var useStyles = (0, _mui.makeStyles)()({
   hoverLabel: {
     border: '1px solid black',
     position: 'absolute',
@@ -40,7 +40,9 @@ var Tooltip = function Tooltip(_ref) {
       feature = _ref.feature,
       _ref$timeout = _ref.timeout,
       timeout = _ref$timeout === void 0 ? 300 : _ref$timeout;
-  var classes = useStyles();
+
+  var _useStyles = useStyles(),
+      classes = _useStyles.classes;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),

package/ui/ViewContainer.js

@@ -17,7 +17,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _core = require("@material-ui/core");
+var _material = require("@mui/material");
+
+var _mui = require("tss-react/mui");
+
+var _styles = require("@mui/material/styles");
 
 var _mobxReact = require("mobx-react");
 
@@ -25,9 +29,9 @@ var _mobxStateTree = require("mobx-state-tree");
 
 var _reactUseMeasure = _interopRequireDefault(require("react-use-measure"));
 
-var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
+var _Close = _interopRequireDefault(require("@mui/icons-material/Close"));
 
-var _Menu = _interopRequireDefault(require("@material-ui/icons/Menu"));
+var _Menu = _interopRequireDefault(require("@mui/icons-material/Menu"));
 
 var _EditableTypography = _interopRequireDefault(require("./EditableTypography"));
 
@@ -41,7 +45,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var useStyles = (0, _core.makeStyles)(function (theme) {
+var useStyles = (0, _mui.makeStyles)()(function (theme) {
   return {
     viewContainer: {
       overflow: 'hidden',
@@ -56,7 +60,7 @@ var useStyles = (0, _core.makeStyles)(function (theme) {
     },
     iconRoot: {
       '&:hover': {
-        backgroundColor: (0, _core.alpha)(theme.palette.secondary.contrastText, theme.palette.action.hoverOpacity),
+        backgroundColor: (0, _styles.alpha)(theme.palette.secondary.contrastText, theme.palette.action.hoverOpacity),
         '@media (hover: none)': {
           backgroundColor: 'transparent'
         }
@@ -93,15 +97,18 @@ var ViewMenu = (0, _mobxReact.observer)(function (_ref) {
   var menuItems = model.menuItems; // <=1.3.3 didn't use a function
 
   var items = typeof menuItems === 'function' ? menuItems() : menuItems;
-  return items !== null && items !== void 0 && items.length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.IconButton, (0, _extends2.default)({}, IconButtonProps, {
-    "aria-label": "more",
-    "aria-controls": "view-menu",
-    "aria-haspopup": "true",
+  return items !== null && items !== void 0 && items.length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_material.IconButton, (0, _extends2.default)({}, IconButtonProps, {
+    style: {
+      padding: 3
+    },
     onClick: function onClick(event) {
-      setAnchorEl(event.currentTarget);
+      return setAnchorEl(event.currentTarget);
     },
-    "data-testid": "view_menu_icon"
-  }), /*#__PURE__*/_react.default.createElement(_Menu.default, IconProps)), /*#__PURE__*/_react.default.createElement(_Menu2.default, {
+    "data-testid": "view_menu_icon",
+    size: "small"
+  }), /*#__PURE__*/_react.default.createElement(_Menu.default, (0, _extends2.default)({}, IconProps, {
+    fontSize: "small"
+  }))), /*#__PURE__*/_react.default.createElement(_Menu2.default, {
     anchorEl: anchorEl,
     open: Boolean(anchorEl),
     onMenuItemClick: function onMenuItemClick(_event, callback) {
@@ -109,18 +116,23 @@ var ViewMenu = (0, _mobxReact.observer)(function (_ref) {
       setAnchorEl(undefined);
     },
     onClose: function onClose() {
-      setAnchorEl(undefined);
+      return setAnchorEl(undefined);
     },
     menuItems: model.menuItems()
   })) : null;
 });
 var ViewContainer = (0, _mobxReact.observer)(function (_ref2) {
+  var _view$assemblyNames;
+
   var view = _ref2.view,
       onClose = _ref2.onClose,
       style = _ref2.style,
       children = _ref2.children;
-  var classes = useStyles();
-  var theme = (0, _core.useTheme)();
+
+  var _useStyles = useStyles(),
+      classes = _useStyles.classes;
+
+  var theme = (0, _material.useTheme)();
   var padWidth = theme.spacing(1);
 
   var _useMeasure = (0, _reactUseMeasure.default)(),
@@ -130,7 +142,7 @@ var ViewContainer = (0, _mobxReact.observer)(function (_ref2) {
 
   (0, _react.useEffect)(function () {
     if (width && (0, _mobxStateTree.isAlive)(view)) {
-      view.setWidth(width - padWidth * 2);
+      view.setWidth(width - parseInt(padWidth, 10) * 2);
     }
   }, [padWidth, view, width]);
   var scrollRef = (0, _react.useRef)(null); // scroll the view into view when first mounted
@@ -144,12 +156,12 @@ var ViewContainer = (0, _mobxReact.observer)(function (_ref2) {
       block: 'center'
     });
   }, []);
-  return /*#__PURE__*/_react.default.createElement(_core.Paper, {
+  return /*#__PURE__*/_react.default.createElement(_material.Paper, {
     ref: ref,
     elevation: 12,
     className: classes.viewContainer,
     style: _objectSpread(_objectSpread({}, style), {}, {
-      padding: "0px ".concat(padWidth, "px ").concat(padWidth, "px")
+      padding: "0px ".concat(padWidth, " ").concat(padWidth)
     })
   }, /*#__PURE__*/_react.default.createElement("div", {
     ref: scrollRef,
@@ -169,15 +181,14 @@ var ViewContainer = (0, _mobxReact.observer)(function (_ref2) {
     }
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: classes.grow
-  }), /*#__PURE__*/_react.default.createElement(_core.Tooltip, {
+  }), /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
     title: "Rename view",
     arrow: true
   }, /*#__PURE__*/_react.default.createElement(_EditableTypography.default, {
     value: view.displayName || ( // @ts-ignore
-    view.assemblyNames ? // @ts-ignore
-    view.assemblyNames.join(',') : 'Untitled view'),
+    (_view$assemblyNames = view.assemblyNames) === null || _view$assemblyNames === void 0 ? void 0 : _view$assemblyNames.join(',')) || 'Untitled view',
     setValue: function setValue(val) {
-      view.setDisplayName(val);
+      return view.setDisplayName(val);
     },
     variant: "body2",
     classes: {
@@ -188,16 +199,18 @@ var ViewContainer = (0, _mobxReact.observer)(function (_ref2) {
     }
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: classes.grow
-  }), /*#__PURE__*/_react.default.createElement(_core.IconButton, {
+  }), /*#__PURE__*/_react.default.createElement(_material.IconButton, {
     "data-testid": "close_view",
     classes: {
       root: classes.iconRoot
     },
     edge: "end",
+    size: "small",
     onClick: onClose
   }, /*#__PURE__*/_react.default.createElement(_Close.default, {
-    className: classes.icon
-  }))), /*#__PURE__*/_react.default.createElement(_core.Paper, null, children));
+    className: classes.icon,
+    fontSize: "small"
+  }))), /*#__PURE__*/_react.default.createElement(_material.Paper, null, children));
 });
 var _default = ViewContainer;
 exports.default = _default;