@jbrowse/plugin-linear-genome-view 1.6.6 → 1.6.7

package/dist/LinearGenomeView/components/TrackContainer.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="react" />
 import { BaseTrackModel } from '@jbrowse/core/pluggableElementTypes/models';
 import { LinearGenomeViewModel } from '..';
-declare type LGV = LinearGenomeViewModel;
 declare function TrackContainer({ model, track, }: {
-    model: LGV;
+    model: LinearGenomeViewModel;
     track: BaseTrackModel;
 }): JSX.Element;
 declare const _default: typeof TrackContainer;

package/dist/plugin-linear-genome-view.cjs.development.js

@@ -58,13 +58,13 @@ var ArrowBackIcon = _interopDefault(require('@material-ui/icons/ArrowBack'));
 var IconButton = _interopDefault(require('@material-ui/core/IconButton'));
 var Slider = _interopDefault(require('@material-ui/core/Slider'));
 var ZoomOut = _interopDefault(require('@material-ui/icons/ZoomOut'));
+var Paper = _interopDefault(require('@material-ui/core/Paper'));
 var MoreVertIcon = _interopDefault(require('@material-ui/icons/MoreVert'));
 var DragIcon = _interopDefault(require('@material-ui/icons/DragIndicator'));
 var normalizeWheel = _interopDefault(require('normalize-wheel'));
 var colorManipulator = require('@material-ui/core/styles/colorManipulator');
 var Popover = _interopDefault(require('@material-ui/core/Popover'));
 var Tooltip$1 = _interopDefault(require('@material-ui/core/Tooltip'));
-var Paper = _interopDefault(require('@material-ui/core/Paper'));
 var ErrorMessage = _interopDefault(require('@jbrowse/core/ui/ErrorMessage'));
 var AssemblySelector = _interopDefault(require('@jbrowse/core/ui/AssemblySelector'));
 var ArrowDown = _interopDefault(require('@material-ui/icons/KeyboardArrowDown'));
@@ -4668,11 +4668,15 @@ var TrackLabel = /*#__PURE__*/React__default.forwardRef(function (props, ref) {
 });
 var TrackLabel$1 = /*#__PURE__*/mobxReact.observer(TrackLabel);
 
-var useStyles$c = /*#__PURE__*/core.makeStyles(function (theme) {
+var useStyles$c = /*#__PURE__*/styles.makeStyles(function (theme) {
   return {
-    root: {},
+    root: {
+      margin: 2
+    },
     resizeHandle: {
       height: RESIZE_HANDLE_HEIGHT,
+      boxSizing: 'border-box',
+      position: 'relative',
       zIndex: 2
     },
     overlay: {
@@ -4685,8 +4689,7 @@ var useStyles$c = /*#__PURE__*/core.makeStyles(function (theme) {
       borderRadius: theme.shape.borderRadius
     },
     trackLabel: {
-      zIndex: 3,
-      margin: theme.spacing(1)
+      zIndex: 3
     },
     trackLabelInline: {
       position: 'relative',
@@ -4701,19 +4704,29 @@ var useStyles$c = /*#__PURE__*/core.makeStyles(function (theme) {
       whiteSpace: 'nowrap',
       position: 'relative',
       background: 'none',
-      zIndex: 2
+      zIndex: 2,
+      boxSizing: 'content-box'
     }
   };
 });
 
-function TrackContainer(_ref) {
+function TrackContainerLabel(_ref) {
   var model = _ref.model,
-      track = _ref.track;
+      view = _ref.view;
+  var classes = useStyles$c();
+  var labelStyle = view.trackLabels === 'overlapping' ? classes.trackLabelOverlap : classes.trackLabelInline;
+  return view.trackLabels !== 'hidden' ? /*#__PURE__*/React__default.createElement(TrackLabel$1, {
+    track: model,
+    className: clsx(classes.trackLabel, labelStyle)
+  }) : null;
+}
+
+function TrackContainer(_ref2) {
+  var model = _ref2.model,
+      track = _ref2.track;
   var classes = useStyles$c();
   var display = track.displays[0];
-  var id = model.id,
-      trackLabels = model.trackLabels,
-      horizontalScroll = model.horizontalScroll,
+  var horizontalScroll = model.horizontalScroll,
       draggingTrackId = model.draggingTrackId,
       moveTrack = model.moveTrack;
   var height = display.height;
@@ -4739,10 +4752,13 @@ function TrackContainer(_ref) {
   var RenderingComponent = display.RenderingComponent,
       DisplayBlurb = display.DisplayBlurb;
   var dimmed = draggingTrackId !== undefined && draggingTrackId !== display.id;
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: classes.root
-  }, /*#__PURE__*/React__default.createElement(core.Paper, {
-    variant: "outlined",
+  return /*#__PURE__*/React__default.createElement(Paper, {
+    className: classes.root,
+    variant: "outlined"
+  }, /*#__PURE__*/React__default.createElement(TrackContainerLabel, {
+    model: track,
+    view: model
+  }), /*#__PURE__*/React__default.createElement("div", {
     className: classes.trackRenderingContainer,
     style: {
       height: height
@@ -4752,19 +4768,15 @@ function TrackContainer(_ref) {
       display.setScrollTop(target.scrollTop);
     },
     onDragEnter: debouncedOnDragEnter,
-    "data-testid": "trackRenderingContainer-".concat(id, "-").concat(trackId),
+    "data-testid": "trackRenderingContainer-".concat(model.id, "-").concat(trackId),
     role: "presentation"
-  }, trackLabels !== 'hidden' ? /*#__PURE__*/React__default.createElement(TrackLabel$1, {
-    track: track,
-    className: clsx(classes.trackLabel, trackLabels === 'overlapping' ? classes.trackLabelOverlap : classes.trackLabelInline)
-  }) : null, /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement("div", {
     ref: ref,
     style: {
       transform: "scaleX(".concat(model.scaleFactor, ")")
     }
   }, /*#__PURE__*/React__default.createElement(RenderingComponent, {
     model: display,
-    blockState: {},
     onHorizontalScroll: horizontalScroll
   })), DisplayBlurb ? /*#__PURE__*/React__default.createElement("div", {
     style: {
@@ -5543,8 +5555,6 @@ function TracksContainer(_ref) {
         boxSizing: 'border-box'
       }
     })
-  }), /*#__PURE__*/React__default.createElement("div", {
-    className: classes.spacer
   }), children);
 }