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

package/esm/BaseLinearDisplay/components/FloatingLabels.js

@@ -31,8 +31,8 @@ const FixedLabel = memo(function FixedLabel({ text, color, isOverlay, featureLef
             transform: `translate(calc(${featureLeftPx}px - var(--offset-px)), ${y}px)`,
         }, children: text }));
 });
-function FloatingLabel({ text, color, isOverlay, featureLeftPx, featureRightPx, featureId, subfeatureId, labelWidth, y, offsetPx, viewportLeft, tooltip, labelClass, overlayClass, }) {
-    const x = calculateFloatingLabelPosition(featureLeftPx, featureRightPx, labelWidth, offsetPx, viewportLeft);
+function FloatingLabel({ text, color, isOverlay, featureLeftPx, featureRightPx, featureId, subfeatureId, labelWidth, y, offsetPx, tooltip, labelClass, overlayClass, }) {
+    const x = calculateFloatingLabelPosition(featureLeftPx, featureRightPx, labelWidth, offsetPx);
     return (_jsx("div", { "data-feature-id": featureId, "data-subfeature-id": subfeatureId, "data-tooltip": tooltip, className: isOverlay ? `${labelClass} ${overlayClass}` : labelClass, style: { color, transform: `translate(${x}px,${y}px)` }, children: text }));
 }
 const FloatingLabels = observer(function FloatingLabels({ model, }) {
@@ -43,7 +43,6 @@ const FloatingLabels = observer(function FloatingLabels({ model, }) {
     const { onFeatureClick, onFeatureContextMenu, onMouseMove } = model.renderingProps();
     const fixedLabels = [];
     const floatingLabels = [];
-    const viewportLeft = Math.max(0, offsetPx);
     for (const [key, { leftPx, topPx, totalFeatureHeight, floatingLabels: labelData, featureWidth, },] of featureLabels.entries()) {
         const featureVisualBottom = topPx + totalFeatureHeight;
         const featureRightPx = leftPx + featureWidth;
@@ -57,7 +56,7 @@ const FloatingLabels = observer(function FloatingLabels({ model, }) {
                 fixedLabels.push(_jsx(FixedLabel, { text: text, color: color, isOverlay: isOverlay ?? false, featureLeftPx: leftPx, featureId: featureId, subfeatureId: subfeatureId, y: y, tooltip: tooltip, labelClass: classes.label, overlayClass: classes.overlay }, labelKey));
             }
             else {
-                floatingLabels.push(_jsx(FloatingLabel, { text: text, color: color, isOverlay: isOverlay ?? false, featureLeftPx: leftPx, featureRightPx: featureRightPx, featureId: featureId, subfeatureId: subfeatureId, labelWidth: labelWidth, y: y, offsetPx: offsetPx, viewportLeft: viewportLeft, tooltip: tooltip, labelClass: classes.label, overlayClass: classes.overlay }, labelKey));
+                floatingLabels.push(_jsx(FloatingLabel, { text: text, color: color, isOverlay: isOverlay ?? false, featureLeftPx: leftPx, featureRightPx: featureRightPx, featureId: featureId, subfeatureId: subfeatureId, labelWidth: labelWidth, y: y, offsetPx: offsetPx, tooltip: tooltip, labelClass: classes.label, overlayClass: classes.overlay }, labelKey));
             }
         }
     }

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/components/LoadingOverlay.d.ts

@@ -1,4 +1,5 @@
-export default function LoadingOverlay({ statusMessage, children, }: {
+export default function LoadingOverlay({ statusMessage, children, height, }: {
     statusMessage?: string;
     children?: React.ReactNode;
+    height?: number;
 }): import("react/jsx-runtime").JSX.Element;

package/esm/BaseLinearDisplay/components/LoadingOverlay.js

@@ -42,8 +42,8 @@ const useStyles = makeStyles()({
         },
     },
 });
-export default function LoadingOverlay({ statusMessage, children, }) {
+export default function LoadingOverlay({ statusMessage, children, height, }) {
     const { classes } = useStyles();
     const isLoading = !!statusMessage;
-    return (_jsxs("div", { className: classes.container, children: [children, _jsx("span", { className: cx(classes.overlay, isLoading && classes.visible), "data-testid": isLoading ? 'loading-overlay' : undefined, children: _jsx("span", { className: classes.dots, children: statusMessage || 'Loading' }) })] }));
+    return (_jsxs("div", { className: classes.container, style: height ? { height } : undefined, children: [children, _jsx("span", { className: cx(classes.overlay, isLoading && classes.visible), "data-testid": isLoading ? 'loading-overlay' : undefined, children: _jsx("span", { className: classes.dots, children: statusMessage || 'Loading' }) })] }));
 }

package/esm/BaseLinearDisplay/components/NonBlockCanvasDisplayComponent.d.ts

@@ -12,6 +12,7 @@ export interface NonBlockCanvasDisplayModel {
     statusMessage?: string;
     showLegend?: boolean;
     legendItems?: () => LegendItem[];
+    height: number;
 }
 declare const NonBlockCanvasDisplayComponent: ({ model, children, }: {
     model: NonBlockCanvasDisplayModel;

package/esm/BaseLinearDisplay/components/NonBlockCanvasDisplayComponent.js

@@ -31,14 +31,14 @@ const NonBlockCanvasDisplayComponent = observer(function NonBlockCanvasDisplayCo
     return error ? (_jsx(BlockErrorMessage, { model: model })) : regionTooLarge ? (model.regionCannotBeRendered()) : (_jsx(DataDisplay, { model: model, children: children }));
 });
 const DataDisplay = observer(function DataDisplay({ model, children, }) {
-    const { drawn, loading, showLegend, legendItems, lastDrawnBpPerPx } = model;
+    const { drawn, loading, showLegend, legendItems, lastDrawnBpPerPx, height } = model;
     const view = getContainingView(model);
     const items = legendItems?.() ?? [];
     const hasZoomed = lastDrawnBpPerPx !== undefined && lastDrawnBpPerPx !== view.bpPerPx;
     const calculatedLeft = hasZoomed
         ? 0
         : (model.lastDrawnOffsetPx ?? 0) - view.offsetPx;
-    return (_jsxs("div", { "data-testid": `drawn-${drawn}`, children: [_jsx("div", { style: {
+    return (_jsxs("div", { "data-testid": `drawn-${drawn}`, style: { position: 'relative', height }, children: [_jsx("div", { style: {
                     position: 'absolute',
                     left: calculatedLeft,
                     visibility: hasZoomed ? 'hidden' : undefined,

package/esm/BaseLinearDisplay/components/ServerSideRenderedBlockContent.d.ts

@@ -6,6 +6,7 @@ declare const ServerSideRenderedBlockContent: ({ model, }: {
         statusMessage?: string;
         reactElement?: React.ReactElement;
         isRenderingPending?: boolean;
+        displayHeight?: number;
     };
 }) => import("react/jsx-runtime").JSX.Element;
 export default ServerSideRenderedBlockContent;

package/esm/BaseLinearDisplay/components/ServerSideRenderedBlockContent.js

@@ -12,7 +12,7 @@ const ServerSideRenderedBlockContent = observer(function ServerSideRenderedBlock
         return isValidElement(model.message) ? (model.message) : (_jsx(BlockMsg, { message: `${model.message}`, severity: "info" }));
     }
     else {
-        return (_jsx(LoadingOverlay, { statusMessage: model.statusMessage, children: model.reactElement }));
+        return (_jsx(LoadingOverlay, { statusMessage: model.statusMessage, height: model.displayHeight, children: model.reactElement }));
     }
 });
 export default ServerSideRenderedBlockContent;

package/esm/BaseLinearDisplay/components/util.d.ts

@@ -3,19 +3,19 @@ import type { FloatingLabelData, LayoutRecord } from '../types.ts';
 import type { Assembly } from '@jbrowse/core/assemblyManager/assembly';
 export interface FeatureLabelData {
     leftPx: number;
-    rightPx: number;
     topPx: number;
     totalFeatureHeight: number;
     floatingLabels: FloatingLabelData[];
     featureWidth: number;
-    totalLayoutWidth: number;
 }
+interface RenderingWithLayout {
+    layout?: {
+        getRectangles?: () => Map<string, LayoutRecord>;
+    };
+}
+export declare function collectLayoutsFromRenderings(renderings: readonly (readonly [unknown, RenderingWithLayout])[]): Map<string, LayoutRecord>[];
 export declare function deduplicateFeatureLabels(layoutFeatures: {
     entries(): IterableIterator<readonly [string, LayoutRecord | undefined]>;
 }, view: LinearGenomeViewModel, assembly: Assembly | undefined, bpPerPx: number): Map<string, FeatureLabelData>;
-export declare function getViewportLeftEdge(offsetPx: number): number;
-export declare function clampToViewport(featureLeftPx: number, featureRightPx: number, offsetPx: number): {
-    leftPx: number;
-    rightPx: number;
-};
-export declare function calculateFloatingLabelPosition(featureLeftPx: number, featureRightPx: number, labelWidth: number, offsetPx: number, viewportLeft: number): number;
+export declare function calculateFloatingLabelPosition(featureLeftPx: number, featureRightPx: number, labelWidth: number, offsetPx: number): number;
+export {};

package/esm/BaseLinearDisplay/components/util.js

@@ -1,5 +1,14 @@
 import { clamp } from '@jbrowse/core/util';
-function calculateFeaturePixelPositions(view, assembly, refName, left, right, bpPerPx) {
+export function collectLayoutsFromRenderings(renderings) {
+    const layoutMaps = [];
+    for (const [, rendering] of renderings) {
+        if (rendering.layout?.getRectangles) {
+            layoutMaps.push(rendering.layout.getRectangles());
+        }
+    }
+    return layoutMaps;
+}
+function calculateFeatureLeftPx(view, assembly, refName, left, right, bpPerPx) {
     const canonicalRefName = assembly?.getCanonicalRefName(refName) || refName;
     const leftBpPx = view.bpToPx({
         refName: canonicalRefName,
@@ -11,28 +20,21 @@ function calculateFeaturePixelPositions(view, assembly, refName, left, right, bp
     })?.offsetPx;
     if (leftBpPx !== undefined) {
         const rightEstimate = rightBpPx !== undefined ? rightBpPx : leftBpPx + (right - left) / bpPerPx;
-        return {
-            leftPx: Math.min(leftBpPx, rightEstimate),
-            rightPx: Math.max(leftBpPx, rightEstimate),
-        };
+        return Math.min(leftBpPx, rightEstimate);
     }
     else if (rightBpPx !== undefined) {
         const leftEstimate = rightBpPx - (right - left) / bpPerPx;
-        return {
-            leftPx: Math.min(leftEstimate, rightBpPx),
-            rightPx: Math.max(leftEstimate, rightBpPx),
-        };
+        return Math.min(leftEstimate, rightBpPx);
     }
     return undefined;
 }
-function calculateMultiRegionPositions(view, assembly, refName, left, right) {
+function calculateMultiRegionLeftPx(view, assembly, refName, left, right) {
     const canonicalRefName = assembly?.getCanonicalRefName(refName) || refName;
     const visibleRegions = view.displayedRegions.filter(r => r.refName === canonicalRefName && r.start < right && r.end > left);
     if (visibleRegions.length === 0) {
         return undefined;
     }
     let minLeftPx = Infinity;
-    let maxRightPx = -Infinity;
     for (const region of visibleRegions) {
         const regionStart = Math.max(left, region.start);
         const regionEnd = Math.min(right, region.end);
@@ -46,16 +48,16 @@ function calculateMultiRegionPositions(view, assembly, refName, left, right) {
         })?.offsetPx;
         if (startPx !== undefined && endPx !== undefined) {
             minLeftPx = Math.min(minLeftPx, startPx, endPx);
-            maxRightPx = Math.max(maxRightPx, startPx, endPx);
         }
     }
-    if (minLeftPx === Infinity || maxRightPx === -Infinity) {
+    if (minLeftPx === Infinity) {
         return undefined;
     }
-    return { leftPx: minLeftPx, rightPx: maxRightPx };
+    return minLeftPx;
 }
-function getFeaturePositions(view, assembly, refName, left, right, bpPerPx) {
-    return (calculateFeaturePixelPositions(view, assembly, refName, left, right, bpPerPx) || calculateMultiRegionPositions(view, assembly, refName, left, right));
+function getFeatureLeftPx(view, assembly, refName, left, right, bpPerPx) {
+    return (calculateFeatureLeftPx(view, assembly, refName, left, right, bpPerPx) ??
+        calculateMultiRegionLeftPx(view, assembly, refName, left, right));
 }
 export function deduplicateFeatureLabels(layoutFeatures, view, assembly, bpPerPx) {
     const featureLabels = new Map();
@@ -64,51 +66,39 @@ export function deduplicateFeatureLabels(layoutFeatures, view, assembly, bpPerPx
             continue;
         }
         const [, topPx, , , feature] = val;
-        const { refName, floatingLabels, totalFeatureHeight, actualTopPx, featureWidth, totalLayoutWidth, featureStartBp, featureEndBp, } = feature;
+        const { refName, floatingLabels, totalFeatureHeight, actualTopPx, featureWidth, featureStartBp, featureEndBp, } = feature;
         const effectiveTopPx = actualTopPx ?? topPx;
         if (!floatingLabels ||
             floatingLabels.length === 0 ||
             !totalFeatureHeight ||
             featureWidth === undefined ||
-            totalLayoutWidth === undefined ||
             featureStartBp === undefined ||
             featureEndBp === undefined) {
             continue;
         }
-        const positions = getFeaturePositions(view, assembly, refName, featureStartBp, featureEndBp, bpPerPx);
-        if (!positions) {
+        const leftPx = getFeatureLeftPx(view, assembly, refName, featureStartBp, featureEndBp, bpPerPx);
+        if (leftPx === undefined) {
             continue;
         }
         const existing = featureLabels.get(key);
-        if (!existing || positions.leftPx < existing.leftPx) {
+        if (!existing || leftPx < existing.leftPx) {
             featureLabels.set(key, {
-                leftPx: positions.leftPx,
-                rightPx: positions.rightPx,
+                leftPx,
                 topPx: effectiveTopPx,
                 totalFeatureHeight,
                 floatingLabels,
                 featureWidth,
-                totalLayoutWidth,
             });
         }
     }
     return featureLabels;
 }
-export function getViewportLeftEdge(offsetPx) {
-    return Math.max(0, offsetPx);
-}
-export function clampToViewport(featureLeftPx, featureRightPx, offsetPx) {
-    const viewportLeft = getViewportLeftEdge(offsetPx);
-    return {
-        leftPx: Math.max(featureLeftPx, viewportLeft),
-        rightPx: Math.max(featureRightPx, viewportLeft),
-    };
-}
-export function calculateFloatingLabelPosition(featureLeftPx, featureRightPx, labelWidth, offsetPx, viewportLeft) {
+export function calculateFloatingLabelPosition(featureLeftPx, featureRightPx, labelWidth, offsetPx) {
     const featureWidth = featureRightPx - featureLeftPx;
     if (labelWidth > featureWidth) {
         return featureLeftPx - offsetPx;
     }
+    const viewportLeft = Math.max(0, offsetPx);
     const leftPx = Math.max(featureLeftPx, viewportLeft);
     const naturalX = leftPx - offsetPx;
     const maxX = featureRightPx - offsetPx - labelWidth;

package/esm/BaseLinearDisplay/model.d.ts

@@ -41,6 +41,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                 statusMessage?: string;
                 reactElement?: React.ReactElement;
                 isRenderingPending?: boolean;
+                displayHeight?: number;
             };
         }) => import("react/jsx-runtime").JSX.Element;
         renderProps: any;
@@ -59,10 +60,11 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
         beforeDestroy(): void;
     } & {
         readonly statusMessage: any;
+        readonly displayHeight: number | undefined;
     } & {
         afterAttach(): void;
     }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
-    configuration: import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaType<{
+    configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         maxFeatureScreenDensity: {
             type: string;
             description: string;
@@ -89,7 +91,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
             description: string;
             defaultValue: never[];
         };
-    }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "displayId">>;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;
     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>>;
 }, {
@@ -380,6 +382,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                         statusMessage?: string;
                         reactElement?: React.ReactElement;
                         isRenderingPending?: boolean;
+                        displayHeight?: number;
                     };
                 }) => import("react/jsx-runtime").JSX.Element;
                 renderProps: any;
@@ -398,6 +401,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                 beforeDestroy(): void;
             } & {
                 readonly statusMessage: any;
+                readonly displayHeight: number | undefined;
             } & {
                 afterAttach(): void;
             }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>> & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IMapType<import("@jbrowse/mobx-state-tree").IModelType<{
@@ -424,6 +428,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                         statusMessage?: string;
                         reactElement?: React.ReactElement;
                         isRenderingPending?: boolean;
+                        displayHeight?: number;
                     };
                 }) => import("react/jsx-runtime").JSX.Element;
                 renderProps: any;
@@ -442,6 +447,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                 beforeDestroy(): void;
             } & {
                 readonly statusMessage: any;
+                readonly displayHeight: number | undefined;
             } & {
                 afterAttach(): void;
             }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>>;
@@ -455,7 +461,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                         [x: string]: any;
                     } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & any & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>);
                 } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>);
-            } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaType<{
+            } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
                 maxFeatureScreenDensity: {
                     type: string;
                     description: string;
@@ -482,7 +488,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                     description: string;
                     defaultValue: never[];
                 };
-            }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "displayId">>>;
+            }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>>;
             showLegend: boolean | undefined;
             showTooltips: boolean | undefined;
         } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
@@ -772,6 +778,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                         statusMessage?: string;
                         reactElement?: React.ReactElement;
                         isRenderingPending?: boolean;
+                        displayHeight?: number;
                     };
                 }) => import("react/jsx-runtime").JSX.Element;
                 renderProps: any;
@@ -790,10 +797,11 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                 beforeDestroy(): void;
             } & {
                 readonly statusMessage: any;
+                readonly displayHeight: number | undefined;
             } & {
                 afterAttach(): void;
             }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
-            configuration: import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaType<{
+            configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
                 maxFeatureScreenDensity: {
                     type: string;
                     description: string;
@@ -820,7 +828,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                     description: string;
                     defaultValue: never[];
                 };
-            }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "displayId">>;
+            }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;
             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>>;
         }, {
@@ -1119,6 +1127,7 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
                 statusMessage?: string;
                 reactElement?: React.ReactElement;
                 isRenderingPending?: boolean;
+                displayHeight?: number;
             };
         }) => import("react/jsx-runtime").JSX.Element;
         renderProps: any;
@@ -1137,10 +1146,11 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
         beforeDestroy(): void;
     } & {
         readonly statusMessage: any;
+        readonly displayHeight: number | undefined;
     } & {
         afterAttach(): void;
     }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
-    configuration: import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaType<{
+    configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         maxFeatureScreenDensity: {
             type: string;
             description: string;
@@ -1167,12 +1177,12 @@ export declare const BaseLinearDisplay: import("@jbrowse/mobx-state-tree").IMode
             description: string;
             defaultValue: never[];
         };
-    }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "displayId">>;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;
     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/BaseLinearDisplay/models/SvgFloatingLabels.d.ts

@@ -0,0 +1,8 @@
+import { type FeatureLabelData } from '../components/util.ts';
+interface Props {
+    featureLabels: Map<string, FeatureLabelData>;
+    offsetPx: number;
+    viewWidth: number;
+}
+export declare function SvgFloatingLabels({ featureLabels, offsetPx, viewWidth, }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

package/esm/BaseLinearDisplay/models/SvgFloatingLabels.js

@@ -0,0 +1,19 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { calculateFloatingLabelPosition, } from "../components/util.js";
+export function SvgFloatingLabels({ featureLabels, offsetPx, viewWidth, }) {
+    const elements = [];
+    for (const [key, { leftPx, topPx, totalFeatureHeight, floatingLabels, featureWidth },] of featureLabels.entries()) {
+        const featureVisualBottom = topPx + totalFeatureHeight;
+        const featureRightPx = leftPx + featureWidth;
+        for (const [i, { text, relativeY, color, textWidth, isOverlay },] of floatingLabels.entries()) {
+            const y = featureVisualBottom + relativeY;
+            const x = calculateFloatingLabelPosition(leftPx, featureRightPx, textWidth, offsetPx);
+            if (x < 0 || x > viewWidth) {
+                continue;
+            }
+            const fontSize = 11;
+            elements.push(_jsxs("g", { transform: `translate(${x}, ${y})`, children: [isOverlay ? (_jsx("rect", { x: -1, y: 0, width: textWidth + 2, height: fontSize + 1, fill: "rgba(255, 255, 255, 0.8)" })) : null, _jsx("text", { x: 0, y: fontSize, fontSize: fontSize, fill: color, style: { pointerEvents: 'none' }, children: text })] }, `${key}-${i}`));
+        }
+    }
+    return _jsx(_Fragment, { children: elements });
+}

package/esm/BaseLinearDisplay/models/configSchema.d.ts

@@ -1,4 +1,4 @@
-declare const baseLinearDisplayConfigSchema: import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaType<{
+declare const baseLinearDisplayConfigSchema: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
     maxFeatureScreenDensity: {
         type: string;
         description: string;
@@ -25,5 +25,5 @@ declare const baseLinearDisplayConfigSchema: import("node_modules/@jbrowse/core/
         description: string;
         defaultValue: never[];
     };
-}, import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;
+}, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;
 export default baseLinearDisplayConfigSchema;

package/esm/BaseLinearDisplay/models/serverSideRenderedBlock.d.ts

@@ -35,6 +35,7 @@ declare const blockState: import("@jbrowse/mobx-state-tree").IModelType<{
             statusMessage?: string;
             reactElement?: React.ReactElement;
             isRenderingPending?: boolean;
+            displayHeight?: number;
         };
     }) => import("react/jsx-runtime").JSX.Element;
     renderProps: any;
@@ -53,6 +54,7 @@ declare const blockState: import("@jbrowse/mobx-state-tree").IModelType<{
     beforeDestroy(): void;
 } & {
     readonly statusMessage: any;
+    readonly displayHeight: number | undefined;
 } & {
     afterAttach(): void;
 }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>;

package/esm/BaseLinearDisplay/models/serverSideRenderedBlock.js

@@ -132,6 +132,9 @@ const blockState = types
                 'Loading'
             : undefined;
     },
+    get displayHeight() {
+        return self.cachedDisplay?.height;
+    },
 }))
     .actions(self => ({
     afterAttach() {

package/esm/BaseLinearDisplay/models/util.d.ts

@@ -1,18 +1,5 @@
 import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
 import type { FeatureDensityStats } from '@jbrowse/core/data_adapters/BaseAdapter';
-export interface RenderProps {
-    rendererType: any;
-    renderArgs: Record<string, any>;
-    renderProps: Record<string, any>;
-    displayError: unknown;
-    rpcManager: {
-        call: (...args: unknown[]) => void;
-    };
-    cannotBeRenderedReason: string;
-}
-export interface ErrorProps {
-    displayError: string;
-}
 export declare function getDisplayStr(totalBytes: number): string;
 export declare function getId(id: string, index: string | number): string;
 export declare function getFeatureDensityStatsPre(self: {

package/esm/BaseLinearDisplay/renderSvg.js

@@ -2,11 +2,13 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { Fragment } from 'react';
 import { createJBrowseTheme } from '@jbrowse/core/ui';
 import { ReactRendering, getContainingView, getSession, } from '@jbrowse/core/util';
+import CompositeMap from '@jbrowse/core/util/compositeMap';
 import SVGLegend from "./SVGLegend.js";
+import { collectLayoutsFromRenderings, deduplicateFeatureLabels, } from "./components/util.js";
+import { SvgFloatingLabels } from "./models/SvgFloatingLabels.js";
 import BlockState, { renderBlockData, } from "./models/serverSideRenderedBlock.js";
 import { getId } from "./models/util.js";
 import { ErrorBox } from "../LinearGenomeView/SVGErrorBox.js";
-import { calculateLabelPositions } from "./models/calculateLabelPositions.js";
 export async function renderBaseLinearDisplaySvg(self, opts) {
     const { height, id } = self;
     const { overrideHeight } = opts;
@@ -42,11 +44,13 @@ export async function renderBaseLinearDisplaySvg(self, opts) {
             }),
         ];
     }));
+    const layoutMaps = collectLayoutsFromRenderings(renderings);
+    const layoutFeatures = new CompositeMap(layoutMaps);
     const { assemblyManager } = getSession(self);
-    const { offsetPx } = view;
+    const { offsetPx, bpPerPx } = view;
     const assemblyName = view.assemblyNames[0];
     const assembly = assemblyName ? assemblyManager.get(assemblyName) : undefined;
-    const labelData = calculateLabelPositions(self, view, assembly, offsetPx);
+    const featureLabels = deduplicateFeatureLabels(layoutFeatures, view, assembly, bpPerPx);
     const labelsClipId = getId(id, 'labels');
     const theme = createJBrowseTheme(opts.theme);
     const legendItems = self.showLegend ? self.legendItems(theme) : [];
@@ -55,5 +59,5 @@ export async function renderBaseLinearDisplaySvg(self, opts) {
                 const offset = offsetPx - viewOffsetPx;
                 const clipid = getId(id, index);
                 return (_jsxs(Fragment, { children: [_jsx("defs", { children: _jsx("clipPath", { id: clipid, children: _jsx("rect", { x: 0, y: 0, width: widthPx, height: overrideHeight || height }) }) }), _jsx("g", { transform: `translate(${offset} 0)`, children: _jsx("g", { clipPath: `url(#${clipid})`, children: _jsx(ReactRendering, { rendering: rendering }) }) })] }, `frag-${index}`));
-            }), _jsx("defs", { children: _jsx("clipPath", { id: labelsClipId, children: _jsx("rect", { x: 0, y: 0, width: width, height: overrideHeight || height }) }) }), _jsx("g", { clipPath: `url(#${labelsClipId})`, children: labelData.map(({ key, label, description, leftPos, topPos }) => (_jsxs("g", { transform: `translate(${leftPos}, ${topPos})`, children: [_jsx("text", { x: 0, y: 11, fontSize: 11, fill: "currentColor", children: label }), description ? (_jsx("text", { x: 0, y: 25, fontSize: 11, fill: "blue", children: description })) : null] }, `label-${key}`))) }), legendItems.length > 0 ? (_jsx(SVGLegend, { items: legendItems, width: width, legendAreaWidth: opts.legendWidth })) : null] }));
+            }), _jsx("defs", { children: _jsx("clipPath", { id: labelsClipId, children: _jsx("rect", { x: 0, y: 0, width: width, height: overrideHeight || height }) }) }), _jsx("g", { clipPath: `url(#${labelsClipId})`, children: _jsx(SvgFloatingLabels, { featureLabels: featureLabels, offsetPx: offsetPx, viewWidth: width }) }), legendItems.length > 0 ? (_jsx(SVGLegend, { items: legendItems, width: width, legendAreaWidth: opts.legendWidth })) : null] }));
 }

package/esm/BaseLinearDisplay/types.d.ts

@@ -18,12 +18,9 @@ export interface FloatingLabelData {
     tooltip?: string;
 }
 export interface LayoutFeatureMetadata {
-    label?: string;
-    description?: string;
     refName: string;
     floatingLabels?: FloatingLabelData[];
     totalFeatureHeight?: number;
-    totalLayoutWidth?: number;
     featureWidth?: number;
     actualTopPx?: number;
     featureStartBp?: number;
@@ -33,7 +30,6 @@ export declare function createSubfeatureLabelMetadata(args: {
     refName: string;
     floatingLabels: FloatingLabelData[];
     totalFeatureHeight: number;
-    totalLayoutWidth: number;
     featureWidth: number;
     actualTopPx: number;
     featureStartBp: number;

package/esm/BasicTrack/configSchema.d.ts

@@ -1,5 +1,5 @@
 import type PluginManager from '@jbrowse/core/PluginManager';
-declare const configSchema: (pluginManager: PluginManager) => import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaType<{}, import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaOptions<import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaType<{
+declare const configSchema: (pluginManager: PluginManager) => import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{}, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
     name: {
         description: string;
         type: string;
@@ -31,7 +31,7 @@ declare const configSchema: (pluginManager: PluginManager) => import("node_modul
         defaultValue: string;
     };
     adapter: import("@jbrowse/mobx-state-tree").IAnyModelType;
-    textSearching: import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaType<{
+    textSearching: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         indexingAttributes: {
             type: string;
             description: string;
@@ -43,9 +43,9 @@ declare const configSchema: (pluginManager: PluginManager) => import("node_modul
             defaultValue: string[];
         };
         textSearchAdapter: import("@jbrowse/mobx-state-tree").IAnyModelType;
-    }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
     displays: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/mobx-state-tree").IAnyModelType>;
-    formatDetails: import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaType<{
+    formatDetails: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         feature: {
             type: string;
             description: string;
@@ -68,8 +68,8 @@ declare const configSchema: (pluginManager: PluginManager) => import("node_modul
             defaultValue: number;
             description: string;
         };
-    }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-    formatAbout: import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaType<{
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+    formatAbout: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         config: {
             type: string;
             description: string;
@@ -80,6 +80,6 @@ declare const configSchema: (pluginManager: PluginManager) => import("node_modul
             type: string;
             defaultValue: boolean;
         };
-    }, import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-}, import("node_modules/@jbrowse/core/src/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "trackId">>, "trackId">>;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+}, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "trackId">>, "trackId">>;
 export default configSchema;