@jbrowse/plugin-linear-genome-view 4.1.1 → 4.1.3

package/esm/BaseLinearDisplay/components/LinearBlocks.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { getContainingView } from '@jbrowse/core/util';
 import { makeStyles } from '@jbrowse/core/util/tss-react';
 import { observer } from 'mobx-react';
 import RenderedBlocks from "./RenderedBlocks.js";
@@ -14,8 +15,9 @@ const useStyles = makeStyles()({
 const LinearBlocks = observer(function LinearBlocks({ model, }) {
     const { classes } = useStyles();
     const { blockDefinitions } = model;
+    const viewModel = getContainingView(model);
     return (_jsx("div", { className: classes.linearBlocks, style: {
-            left: `calc(${blockDefinitions.offsetPx}px - var(--offset-px))`,
+            left: blockDefinitions.offsetPx - viewModel.offsetPx,
         }, children: _jsx(RenderedBlocks, { model: model }) }));
 });
 export default LinearBlocks;

package/esm/BaseLinearDisplay/model.d.ts

@@ -1171,8 +1171,8 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
     showLegend: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<boolean>>;
     showTooltips: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<boolean>>;
 }>>, {
-    id: string;
     type: string;
+    id: string;
     configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
     rpcDriverName: string | undefined;
     heightPreConfig: number | undefined;

package/esm/LinearBareDisplay/model.d.ts

@@ -1173,8 +1173,8 @@ export declare function stateModelFactory(configSchema: AnyConfigurationSchemaTy
     showLegend: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<boolean>>;
     showTooltips: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<boolean>>;
 }>> & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & import("@jbrowse/mobx-state-tree")._NotCustomized, {
-    id: string;
     type: string;
+    id: string;
     configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
     rpcDriverName: string | undefined;
     heightPreConfig: number | undefined;

package/esm/LinearGenomeView/components/Gridlines.js

@@ -60,11 +60,12 @@ const RenderedVerticalGuides = observer(function RenderedVerticalGuides({ model,
 });
 const Gridlines = observer(function Gridlines({ model, offset = 0, }) {
     const { classes } = useStyles();
-    const { staticBlocks, scaleFactor } = model;
+    const { staticBlocks, scaleFactor, offsetPx } = model;
+    const offsetLeft = staticBlocks.offsetPx - offsetPx;
     return (_jsx("div", { className: classes.verticalGuidesZoomContainer, style: {
             transform: scaleFactor !== 1 ? `scaleX(${scaleFactor})` : undefined,
         }, children: _jsx("div", { className: classes.verticalGuidesContainer, style: {
-                left: `calc(${staticBlocks.offsetPx}px - var(--offset-px) - ${offset}px)`,
+                left: offsetLeft - offset,
                 width: staticBlocks.totalWidthPx,
             }, children: _jsx(RenderedVerticalGuides, { model: model }) }) }));
 });

package/esm/LinearGenomeView/components/Scalebar.js

@@ -22,10 +22,11 @@ const useStyles = makeStyles()({
 const Scalebar = observer(function Scalebar({ model, style, className, ...other }) {
     const { classes } = useStyles();
     const { scaleFactor, staticBlocks, offsetPx } = model;
-    return (_jsxs(Paper, { "data-resizer": "true", className: cx(classes.container, className), variant: "outlined", style: { ...style, '--offset-px': `${offsetPx}px` }, ...other, children: [_jsx(Gridlines, { model: model, offset: 1 }), _jsx("div", { className: classes.zoomContainer, style: {
+    const offsetLeft = Math.round(staticBlocks.offsetPx - offsetPx);
+    return (_jsxs(Paper, { "data-resizer": "true", className: cx(classes.container, className), variant: "outlined", style: style, ...other, children: [_jsx(Gridlines, { model: model, offset: 1 }), _jsx("div", { className: classes.zoomContainer, style: {
                     transform: scaleFactor !== 1 ? `scaleX(${scaleFactor})` : undefined,
                 }, children: _jsx("div", { className: classes.scalebar, style: {
-                        transform: `translateX(calc(${staticBlocks.offsetPx}px - var(--offset-px) - 1px))`,
+                        transform: `translateX(${offsetLeft - 1}px)`,
                         width: staticBlocks.totalWidthPx,
                     }, children: _jsx(ScalebarCoordinateLabels, { model: model }) }) }), _jsx(ScalebarRefNameLabels, { model: model })] }));
 });

package/esm/LinearGenomeView/components/ScalebarRefNameLabels.js

@@ -65,8 +65,8 @@ const ScalebarRefNameLabels = observer(function ScalebarRefNameLabels({ model, }
                     (isLeftEndOfDisplayedRegion || last) &&
                     hasEnoughSpace ? (_jsxs("span", { style: {
                         left: last
-                            ? 'max(0px, calc(-1 * var(--offset-px)))'
-                            : `calc(${blockOffsetPx}px - var(--offset-px) - 1px)`,
+                            ? Math.max(0, -offsetPx)
+                            : blockOffsetPx - offsetPx - 1,
                         paddingLeft: last ? 0 : 1,
                         maxWidth: maxWidth !== undefined && maxWidth > 0 ? maxWidth : undefined,
                     }, className: classes.refLabel, "data-testid": `refLabel-${refName}`, onMouseDown: () => {

package/esm/LinearGenomeView/components/TracksContainer.js

@@ -30,7 +30,7 @@ const TracksContainer = observer(function TracksContainer({ children, model, })
     const { guideX, rubberbandOn, leftBpOffset, rightBpOffset, numOfBpSelected, width, left, anchorPosition, open, isClick, clickBpOffset, handleMenuItemClick, handleClose, mouseMove, mouseDown: mouseDown2, } = useRangeSelect(ref, model, true);
     useWheelScroll(ref, model);
     const additional = pluginManager.evaluateExtensionPoint('LinearGenomeView-TracksContainerComponent', undefined, { model });
-    return (_jsxs("div", { ref: ref, "data-testid": "tracksContainer", className: classes.tracksContainer, style: { '--offset-px': `${model.offsetPx}px` }, onMouseDown: event => {
+    return (_jsxs("div", { ref: ref, "data-testid": "tracksContainer", className: classes.tracksContainer, onMouseDown: event => {
             mouseDown1(event);
             mouseDown2(event);
         }, onMouseMove: mouseMove, onMouseUp: mouseUp, children: [showGridlines ? _jsx(Gridlines, { model: model }) : null, _jsx(Suspense, { fallback: null, children: showCenterLine ? _jsx(CenterLine, { model: model }) : null }), guideX !== undefined && !isScalebarRefNameMenuOpen ? (_jsx(VerticalGuide, { model: model, coordX: guideX })) : rubberbandOn ? (_jsx(Suspense, { fallback: null, children: _jsx(RubberbandSpan, { leftBpOffset: leftBpOffset, rightBpOffset: rightBpOffset, numOfBpSelected: numOfBpSelected, width: width, left: left, top: rubberbandTop, sticky: stickyViewHeaders }) })) : null, model.volatileGuides.map((guide, idx) => (_jsx(VerticalGuide, { model: model, coordX: guide.xPos }, idx))), anchorPosition ? (_jsx(Menu, { anchorReference: "anchorPosition", anchorPosition: {

package/esm/index.d.ts

@@ -1171,8 +1171,8 @@ export default class LinearGenomeViewPlugin extends Plugin {
             showLegend: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<boolean>>;
             showTooltips: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<boolean>>;
         }>>, {
-            id: string;
             type: string;
+            id: string;
             configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
             rpcDriverName: string | undefined;
             heightPreConfig: number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-linear-genome-view",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "type": "module",
   "description": "JBrowse 2 linear genome view",
   "keywords": [
@@ -29,8 +29,8 @@
     "file-saver-es": "^2.0.5",
     "mobx": "^6.15.0",
     "mobx-react": "^9.2.1",
-    "@jbrowse/product-core": "^4.1.1",
-    "@jbrowse/core": "^4.1.1"
+    "@jbrowse/product-core": "^4.1.3",
+    "@jbrowse/core": "^4.1.3"
   },
   "peerDependencies": {
     "react": ">=18.0.0",