@jbrowse/plugin-linear-genome-view 2.4.1 → 2.4.2

package/dist/BaseLinearDisplay/components/LinearBlocks.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="react" />
 import { BaseLinearDisplayModel } from '../models/BaseLinearDisplayModel';
 declare const useStyles: (params: void, styleOverrides?: {
-    props: {
-        classes?: Record<string, string> | undefined;
-    } & Record<string, unknown>;
+    props: any;
     ownerState?: Record<string, unknown> | undefined;
 } | undefined) => {
     classes: Record<"linearBlocks" | "heightOverflowed", string>;

package/dist/BaseLinearDisplay/components/ServerSideRenderedBlockContent.js

@@ -1,32 +1,9 @@
 "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 mui_1 = require("tss-react/mui");
 const mobx_react_1 = require("mobx-react");
 const mobx_state_tree_1 = require("mobx-state-tree");
@@ -48,40 +25,28 @@ const useStyles = (0, mui_1.makeStyles)()(theme => {
 });
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const LoadingMessage = (0, mobx_react_1.observer)(({ model }) => {
-    // only show the loading message after 300ms to prevent excessive flickering
-    const [shown, setShown] = (0, react_1.useState)(false);
     const { classes } = useStyles();
-    (0, react_1.useEffect)(() => {
-        let killed = false;
-        const timeout = setTimeout(() => {
-            if (!killed) {
-                setShown(true);
-            }
-        }, 300);
-        return () => {
-            clearTimeout(timeout);
-            killed = true;
-        };
-    }, []);
     const { status: blockStatus } = model;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const { message: displayStatus } = (0, mobx_state_tree_1.getParent)(model, 2);
     const status = displayStatus || blockStatus;
-    return (react_1.default.createElement(react_1.default.Fragment, null, shown ? (react_1.default.createElement("div", { className: classes.loading },
-        react_1.default.createElement(ui_1.LoadingEllipses, { message: status }))) : null));
+    return (react_1.default.createElement("div", { className: classes.loading },
+        react_1.default.createElement(ui_1.LoadingEllipses, { message: status })));
 });
 const ServerSideRenderedBlockContent = (0, mobx_react_1.observer)(function ({ model, }) {
     if (model.error) {
         return (react_1.default.createElement(BlockMsg_1.default, { message: `${model.error}`, severity: "error", buttonText: "reload", icon: react_1.default.createElement(Refresh_1.default, null), action: model.reload }));
     }
-    if (model.message) {
+    else if (model.message) {
         // the message can be a fully rendered react component, e.g. the region too large message
         return react_1.default.isValidElement(model.message) ? (model.message) : (react_1.default.createElement(BlockMsg_1.default, { message: `${model.message}`, severity: "info" }));
     }
-    if (!model.filled) {
+    else if (!model.filled) {
         return react_1.default.createElement(LoadingMessage, { model: model });
     }
-    return model.reactElement;
+    else {
+        return model.reactElement;
+    }
 });
 exports.default = ServerSideRenderedBlockContent;
 //# sourceMappingURL=ServerSideRenderedBlockContent.js.map

package/dist/BaseLinearDisplay/components/ServerSideRenderedBlockContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServerSideRenderedBlockContent.js","sourceRoot":"","sources":["../../../src/BaseLinearDisplay/components/ServerSideRenderedBlockContent.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServerSideRenderedBlockContent.js","sourceRoot":"","sources":["../../../src/BaseLinearDisplay/components/ServerSideRenderedBlockContent.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,uCAA0C;AAC1C,2CAAqC;AACrC,qDAA2C;AAC3C,yCAAkD;AAElD,QAAQ;AACR,0EAAqD;AAErD,SAAS;AACT,0DAAiC;AAEjC,MAAM,SAAS,GAAG,IAAA,gBAAU,GAAE,CAAC,KAAK,CAAC,EAAE;IACrC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAA;IAClD,OAAO;QACL,OAAO,EAAE;YACP,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO;YACjD,eAAe,EAAE,kEAAkE,EAAE,SAAS,EAAE,QAAQ;YACxG,SAAS,EAAE,QAAQ;SACpB;KACF,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,8DAA8D;AAC9D,MAAM,cAAc,GAAG,IAAA,qBAAQ,EAAC,CAAC,EAAE,KAAK,EAAkB,EAAE,EAAE;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IACrC,8DAA8D;IAC9D,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAA,2BAAS,EAAM,KAAK,EAAE,CAAC,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,aAAa,IAAI,WAAW,CAAA;IAC3C,OAAO,CACL,uCAAK,SAAS,EAAE,OAAO,CAAC,OAAO;QAC7B,8BAAC,oBAAe,IAAC,OAAO,EAAE,MAAM,GAAI,CAChC,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,8BAA8B,GAAG,IAAA,qBAAQ,EAAC,UAAU,EACxD,KAAK,GAIN;IACC,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CACL,8BAAC,kBAAQ,IACP,OAAO,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,EACzB,QAAQ,EAAC,OAAO,EAChB,UAAU,EAAC,QAAQ,EACnB,IAAI,EAAE,8BAAC,iBAAW,OAAG,EACrB,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,CACH,CAAA;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,EAAE;QACxB,yFAAyF;QACzF,OAAO,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAC3C,KAAK,CAAC,OAAO,CACd,CAAC,CAAC,CAAC,CACF,8BAAC,kBAAQ,IAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAC,MAAM,GAAG,CAC1D,CAAA;KACF;SAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACxB,OAAO,8BAAC,cAAc,IAAC,KAAK,EAAE,KAAK,GAAI,CAAA;KACxC;SAAM;QACL,OAAO,KAAK,CAAC,YAAY,CAAA;KAC1B;AACH,CAAC,CAAC,CAAA;AAEF,kBAAe,8BAA8B,CAAA"}

package/dist/BaseLinearDisplay/components/TooLargeMessage.d.ts

@@ -3,8 +3,8 @@ import { Stats } from '@jbrowse/core/data_adapters/BaseAdapter';
 declare function TooLargeMessage({ model, }: {
     model: {
         regionTooLargeReason: string;
-        estimatedRegionStats?: Stats;
-        updateStatsLimit: (s: Stats) => void;
+        estimatedRegionsStats?: Stats;
+        updateStatsLimit: (s?: Stats) => void;
         reload: () => void;
     };
 }): JSX.Element;

package/dist/BaseLinearDisplay/components/TooLargeMessage.js

@@ -4,18 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
+// locals
 const BlockMsg_1 = __importDefault(require("../components/BlockMsg"));
 function TooLargeMessage({ model, }) {
     const { regionTooLargeReason } = model;
     return (react_1.default.createElement(BlockMsg_1.default, { severity: "warning", action: () => {
-            if (!model.estimatedRegionStats) {
-                console.error('No global stats?');
-            }
-            else {
-                model.updateStatsLimit(model.estimatedRegionStats);
-                model.reload();
-            }
-        }, buttonText: "Force load", message: `${regionTooLargeReason ? regionTooLargeReason + '. ' : ''}
+            model.updateStatsLimit(model.estimatedRegionsStats);
+            model.reload();
+        }, buttonText: "Force load", message: `${regionTooLargeReason ? `${regionTooLargeReason}. ` : ''}
       Zoom in to see features or force load (may be slow).` }));
 }
 exports.default = TooLargeMessage;

package/dist/BaseLinearDisplay/components/TooLargeMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"TooLargeMessage.js","sourceRoot":"","sources":["../../../src/BaseLinearDisplay/components/TooLargeMessage.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,sEAA6C;AAG7C,SAAS,eAAe,CAAC,EACvB,KAAK,GAQN;IACC,MAAM,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAA;IACtC,OAAO,CACL,8BAAC,kBAAQ,IACP,QAAQ,EAAC,SAAS,EAClB,MAAM,EAAE,GAAG,EAAE;YACX,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;gBAC/B,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;aAClC;iBAAM;gBACL,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;gBAClD,KAAK,CAAC,MAAM,EAAE,CAAA;aACf;QACH,CAAC,EACD,UAAU,EAAC,YAAY,EACvB,OAAO,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;2DACd,GACrD,CACH,CAAA;AACH,CAAC;AAED,kBAAe,eAAe,CAAA"}
+{"version":3,"file":"TooLargeMessage.js","sourceRoot":"","sources":["../../../src/BaseLinearDisplay/components/TooLargeMessage.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAGzB,SAAS;AACT,sEAA6C;AAE7C,SAAS,eAAe,CAAC,EACvB,KAAK,GAQN;IACC,MAAM,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAA;IACtC,OAAO,CACL,8BAAC,kBAAQ,IACP,QAAQ,EAAC,SAAS,EAClB,MAAM,EAAE,GAAG,EAAE;YACX,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;YACnD,KAAK,CAAC,MAAM,EAAE,CAAA;QAChB,CAAC,EACD,UAAU,EAAC,YAAY,EACvB,OAAO,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,IAAI,CAAC,CAAC,CAAC,EAAE;2DACd,GACrD,CACH,CAAA;AACH,CAAC;AAED,kBAAe,eAAe,CAAA"}

package/dist/BaseLinearDisplay/models/BaseLinearDisplayModel.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ThemeOptions } from '@mui/material';
 import { MenuItem } from '@jbrowse/core/ui';
 import { Feature } from '@jbrowse/core/util';
 import { Stats } from '@jbrowse/core/data_adapters/BaseAdapter';
@@ -7,7 +8,6 @@ import { Region } from '@jbrowse/core/util/types';
 import CompositeMap from '@jbrowse/core/util/compositeMap';
 import { Instance } from 'mobx-state-tree';
 import { ExportSvgOptions } from '../../LinearGenomeView';
-import { ThemeOptions } from '@mui/material';
 export interface Layout {
     minX: number;
     minY: number;
@@ -117,9 +117,7 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
             type: import("mobx-state-tree").ISimpleType<string>;
-            rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>; /**
-             * #property
-             */
+            rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
         }, {
             rendererTypeName: string;
             error: unknown;
@@ -136,11 +134,6 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
 } & {
     setError(error?: unknown): void;
     setRpcDriverName(rpcDriverName: string): void;
-    /**
-     * #getter
-     * returns a string feature ID if the globally-selected object
-     * is probably a feature
-     */
     reload(): void;
 } & {
     currBpPerPx: number;
@@ -148,8 +141,8 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
     message: string;
     featureIdUnderMouse: string | undefined;
     contextMenuFeature: Feature | undefined;
-    estimatedRegionStatsP: Promise<Stats> | undefined;
-    estimatedRegionStats: Stats | undefined;
+    estimatedRegionsStatsP: Promise<Stats> | undefined;
+    estimatedRegionsStats: Stats | undefined;
 } & {
     readonly height: number;
     /**
@@ -197,7 +190,7 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
     /**
      * #getter
      */
-    getFeatureOverlapping(blockKey: string, x: number, y: number): any;
+    getFeatureOverlapping(blockKey: string, x: number, y: number): string | undefined;
     /**
      * #getter
      */
@@ -231,27 +224,24 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
      * #action
      */
     setMessage(message: string): void;
+} & {
     afterAttach(): void;
     /**
      * #action
      */
-    estimateRegionsStats(regions: Region[], opts: {
-        headers?: Record<string, string>;
-        signal?: AbortSignal;
-        filters?: string[];
-    }): Promise<{}>;
+    estimateRegionsStats(): Promise<Stats>;
     /**
      * #action
      */
-    setRegionStatsP(p?: Promise<Stats>): void;
+    setRegionsStatsP(arg: any): void;
     /**
      * #action
      */
-    setRegionStats(estimatedRegionStats?: Stats): void;
+    setRegionsStats(estimatedRegionsStats?: Stats): void;
     /**
      * #action
      */
-    clearRegionStats(): void;
+    clearRegionsStats(): void;
     /**
      * #action
      */
@@ -267,7 +257,7 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
     /**
      * #action
      */
-    updateStatsLimit(stats: Stats): void;
+    updateStatsLimit(stats?: Stats): void;
     /**
      * #action
      */
@@ -320,6 +310,7 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
      * #action
      */
     reload(): Promise<void>;
+} & {
     afterAttach(): void;
 } & {
     /**
@@ -342,13 +333,7 @@ export declare const BaseLinearDisplay: import("mobx-state-tree").IModelType<{
     /**
      * #method
      */
-    contextMenuItems(): {
-        label: string;
-        icon: import("@mui/material/OverridableComponent").OverridableComponent<import("@mui/material").SvgIconTypeMap<{}, "svg">> & {
-            muiName: string;
-        };
-        onClick: () => void;
-    }[];
+    contextMenuItems(): MenuItem[];
     /**
      * #method
      */

package/dist/BaseLinearDisplay/models/BaseLinearDisplayModel.js

@@ -41,24 +41,7 @@ const MenuOpen_1 = __importDefault(require("@mui/icons-material/MenuOpen"));
 const BaseLinearDisplay_1 = require("../components/BaseLinearDisplay");
 const TooLargeMessage_1 = __importDefault(require("../components/TooLargeMessage"));
 const serverSideRenderedBlock_1 = __importStar(require("./serverSideRenderedBlock"));
-// stabilize clipid under test for snapshot
-function getId(id, index) {
-    const isJest = typeof jest === 'undefined';
-    return `clip-${isJest ? id : 'jest'}-${index}`;
-}
-function getDisplayStr(totalBytes) {
-    let displayBp;
-    if (Math.floor(totalBytes / 1000000) > 0) {
-        displayBp = `${Number.parseFloat((totalBytes / 1000000).toPrecision(3))} Mb`;
-    }
-    else if (Math.floor(totalBytes / 1000) > 0) {
-        displayBp = `${Number.parseFloat((totalBytes / 1000).toPrecision(3))} Kb`;
-    }
-    else {
-        displayBp = `${Math.floor(totalBytes)} bytes`;
-    }
-    return displayBp;
-}
+const util_2 = require("./util");
 const minDisplayHeight = 20;
 /**
  * #stateModel BaseLinearDisplay
@@ -91,8 +74,8 @@ function stateModelFactory() {
         message: '',
         featureIdUnderMouse: undefined,
         contextMenuFeature: undefined,
-        estimatedRegionStatsP: undefined,
-        estimatedRegionStats: undefined,
+        estimatedRegionsStatsP: undefined,
+        estimatedRegionsStats: undefined,
     }))
         .views(self => ({
         get height() {
@@ -165,7 +148,7 @@ function stateModelFactory() {
         get features() {
             const featureMaps = [];
             for (const block of self.blockState.values()) {
-                if (block && block.features) {
+                if (block === null || block === void 0 ? void 0 : block.features) {
                     featureMaps.push(block.features);
                 }
             }
@@ -211,7 +194,7 @@ function stateModelFactory() {
          */
         get currentBytesRequested() {
             var _a;
-            return ((_a = self.estimatedRegionStats) === null || _a === void 0 ? void 0 : _a.bytes) || 0;
+            return ((_a = self.estimatedRegionsStats) === null || _a === void 0 ? void 0 : _a.bytes) || 0;
         },
         /**
          * #getter
@@ -219,7 +202,7 @@ function stateModelFactory() {
         get currentFeatureScreenDensity() {
             var _a;
             const view = (0, util_1.getContainingView)(self);
-            return (((_a = self.estimatedRegionStats) === null || _a === void 0 ? void 0 : _a.featureDensity) || 0) * view.bpPerPx;
+            return (((_a = self.estimatedRegionsStats) === null || _a === void 0 ? void 0 : _a.featureDensity) || 0) * view.bpPerPx;
         },
         /**
          * #getter
@@ -231,7 +214,7 @@ function stateModelFactory() {
          * #getter
          */
         get estimatedStatsReady() {
-            return !!self.estimatedRegionStats;
+            return !!self.estimatedRegionsStats || !!self.userBpPerPxLimit;
         },
         /**
          * #getter
@@ -239,7 +222,7 @@ function stateModelFactory() {
         get maxAllowableBytes() {
             var _a;
             return (self.userByteSizeLimit ||
-                ((_a = self.estimatedRegionStats) === null || _a === void 0 ? void 0 : _a.fetchSizeLimit) ||
+                ((_a = self.estimatedRegionsStats) === null || _a === void 0 ? void 0 : _a.fetchSizeLimit) ||
                 (0, configuration_1.getConf)(self, 'fetchSizeLimit'));
         },
     }))
@@ -250,11 +233,13 @@ function stateModelFactory() {
         setMessage(message) {
             self.message = message;
         },
+    }))
+        .actions(self => ({
         afterAttach() {
             // watch the parent's blocks to update our block state when they change,
             // then we recreate the blocks on our own model (creating and deleting to
             // match the parent blocks)
-            const blockWatchDisposer = (0, mobx_1.autorun)(() => {
+            (0, mobx_state_tree_1.addDisposer)(self, (0, mobx_1.autorun)(() => {
                 const blocksPresent = {};
                 const view = (0, util_1.getContainingView)(self);
                 if (view.initialized) {
@@ -270,61 +255,38 @@ function stateModelFactory() {
                         }
                     });
                 }
-            });
-            (0, mobx_state_tree_1.addDisposer)(self, blockWatchDisposer);
+            }));
         },
         /**
          * #action
          */
-        estimateRegionsStats(regions, opts) {
-            if (self.estimatedRegionStatsP) {
-                return self.estimatedRegionStatsP;
-            }
-            const { rpcManager } = (0, util_1.getSession)(self);
-            const { adapterConfig } = self;
-            if (!adapterConfig) {
-                // A track extending the base track might not have an adapter config
-                // e.g. Apollo tracks don't use adapters
-                return Promise.resolve({});
+        async estimateRegionsStats() {
+            if (!self.estimatedRegionsStatsP) {
+                self.estimatedRegionsStatsP = (0, util_2.estimateRegionsStatsPre)(self).catch(e => {
+                    this.setRegionsStatsP(undefined);
+                    throw e;
+                });
             }
-            const sessionId = (0, tracks_1.getRpcSessionId)(self);
-            const params = {
-                sessionId,
-                regions,
-                adapterConfig,
-                statusCallback: (message) => {
-                    if ((0, mobx_state_tree_1.isAlive)(self)) {
-                        this.setMessage(message);
-                    }
-                },
-                ...opts,
-            };
-            self.estimatedRegionStatsP = rpcManager
-                .call(sessionId, 'CoreEstimateRegionStats', params)
-                .catch(e => {
-                this.setRegionStatsP(undefined);
-                throw e;
-            });
-            return self.estimatedRegionStatsP;
+            return self.estimatedRegionsStatsP;
         },
         /**
          * #action
          */
-        setRegionStatsP(p) {
-            self.estimatedRegionStatsP = p;
+        setRegionsStatsP(arg) {
+            self.estimatedRegionsStatsP = arg;
         },
         /**
          * #action
          */
-        setRegionStats(estimatedRegionStats) {
-            self.estimatedRegionStats = estimatedRegionStats;
+        setRegionsStats(estimatedRegionsStats) {
+            self.estimatedRegionsStats = estimatedRegionsStats;
         },
         /**
          * #action
          */
-        clearRegionStats() {
-            self.estimatedRegionStatsP = undefined;
-            self.estimatedRegionStats = undefined;
+        clearRegionsStats() {
+            self.estimatedRegionsStatsP = undefined;
+            self.estimatedRegionsStats = undefined;
         },
         /**
          * #action
@@ -353,7 +315,7 @@ function stateModelFactory() {
          */
         updateStatsLimit(stats) {
             const view = (0, util_1.getContainingView)(self);
-            if (stats.bytes) {
+            if (stats === null || stats === void 0 ? void 0 : stats.bytes) {
                 self.userByteSizeLimit = stats.bytes;
             }
             else {
@@ -438,11 +400,10 @@ function stateModelFactory() {
             if (!self.estimatedStatsReady || view.dynamicBlocks.totalBp < 20000) {
                 return false;
             }
-            const bpLimitOrDensity = self.userBpPerPxLimit
-                ? view.bpPerPx > self.userBpPerPxLimit
-                : self.currentFeatureScreenDensity > self.maxFeatureScreenDensity;
             return (self.currentBytesRequested > self.maxAllowableBytes ||
-                bpLimitOrDensity);
+                (self.userBpPerPxLimit
+                    ? view.bpPerPx > self.userBpPerPxLimit
+                    : self.currentFeatureScreenDensity > self.maxFeatureScreenDensity));
         },
         /**
          * #getter
@@ -453,7 +414,7 @@ function stateModelFactory() {
             const req = self.currentBytesRequested;
             const max = self.maxAllowableBytes;
             return req && req > max
-                ? `Requested too much data (${getDisplayStr(req)})`
+                ? `Requested too much data (${(0, util_2.getDisplayStr)(req)})`
                 : '';
         },
     }))
@@ -465,7 +426,6 @@ function stateModelFactory() {
              */
             async reload() {
                 self.setError();
-                const aborter = new AbortController();
                 const view = (0, util_1.getContainingView)(self);
                 // extra check for contentBlocks.length
                 // https://github.com/GMOD/jbrowse-components/issues/2694
@@ -473,68 +433,63 @@ function stateModelFactory() {
                     return;
                 }
                 try {
-                    self.estimatedRegionStatsP = self.estimateRegionsStats(view.staticBlocks.contentBlocks, { signal: aborter.signal });
-                    const estimatedRegionStats = await self.estimatedRegionStatsP;
+                    const estimatedRegionsStats = await self.estimateRegionsStats();
                     if ((0, mobx_state_tree_1.isAlive)(self)) {
-                        self.setRegionStats(estimatedRegionStats);
+                        self.setRegionsStats(estimatedRegionsStats);
                         superReload();
                     }
-                    else {
-                        return;
-                    }
                 }
                 catch (e) {
                     console.error(e);
                     self.setError(e);
                 }
             },
-            afterAttach() {
-                // this autorun performs stats estimation
-                //
-                // the chain of events calls estimateRegionsStats against the data
-                // adapter which by default uses featureDensity, but can also respond
-                // with a byte size estimate and fetch size limit (data adapter can
-                // define what is too much data)
-                (0, mobx_state_tree_1.addDisposer)(self, (0, mobx_1.autorun)(async () => {
-                    var _a;
-                    try {
-                        const aborter = new AbortController();
-                        const view = (0, util_1.getContainingView)(self);
-                        // extra check for contentBlocks.length
-                        // https://github.com/GMOD/jbrowse-components/issues/2694
-                        if (!view.initialized ||
-                            !view.staticBlocks.contentBlocks.length) {
-                            return;
-                        }
-                        // don't re-estimate featureDensity even if zoom level changes,
-                        // jbrowse1-style assume it's sort of representative
-                        if (((_a = self.estimatedRegionStats) === null || _a === void 0 ? void 0 : _a.featureDensity) !== undefined) {
-                            self.setCurrBpPerPx(view.bpPerPx);
-                            return;
-                        }
-                        // we estimate stats once at a given zoom level
-                        if (view.bpPerPx === self.currBpPerPx) {
-                            return;
-                        }
-                        self.clearRegionStats();
+        };
+    })
+        .actions(self => ({
+        afterAttach() {
+            // this autorun performs stats estimation
+            //
+            // the chain of events calls estimateRegionsStats against the data
+            // adapter which by default uses featureDensity, but can also respond
+            // with a byte size estimate and fetch size limit (data adapter can
+            // define what is too much data)
+            (0, mobx_state_tree_1.addDisposer)(self, (0, mobx_1.autorun)(async () => {
+                var _a;
+                try {
+                    const view = (0, util_1.getContainingView)(self);
+                    // extra check for contentBlocks.length
+                    // https://github.com/GMOD/jbrowse-components/issues/2694
+                    if (!view.initialized ||
+                        !view.staticBlocks.contentBlocks.length) {
+                        return;
+                    }
+                    // don't re-estimate featureDensity even if zoom level changes,
+                    // jbrowse1-style assume it's sort of representative
+                    if (((_a = self.estimatedRegionsStats) === null || _a === void 0 ? void 0 : _a.featureDensity) !== undefined) {
                         self.setCurrBpPerPx(view.bpPerPx);
-                        const statsP = self.estimateRegionsStats(view.staticBlocks.contentBlocks, { signal: aborter.signal });
-                        self.setRegionStatsP(statsP);
-                        const estimatedRegionStats = await statsP;
-                        if ((0, mobx_state_tree_1.isAlive)(self)) {
-                            self.setRegionStats(estimatedRegionStats);
-                        }
+                        return;
                     }
-                    catch (e) {
-                        if (!(0, util_1.isAbortException)(e) && (0, mobx_state_tree_1.isAlive)(self)) {
-                            console.error(e);
-                            self.setError(e);
-                        }
+                    // we estimate stats once at a given zoom level
+                    if (view.bpPerPx === self.currBpPerPx) {
+                        return;
                     }
-                }, { delay: 500 }));
-            },
-        };
-    })
+                    self.clearRegionsStats();
+                    self.setCurrBpPerPx(view.bpPerPx);
+                    const estimatedRegionsStats = await self.estimateRegionsStats();
+                    if ((0, mobx_state_tree_1.isAlive)(self)) {
+                        self.setRegionsStats(estimatedRegionsStats);
+                    }
+                }
+                catch (e) {
+                    if (!(0, util_1.isAbortException)(e) && (0, mobx_state_tree_1.isAlive)(self)) {
+                        console.error(e);
+                        self.setError(e);
+                    }
+                }
+            }));
+        },
+    }))
         .views(self => ({
         /**
          * #method
@@ -551,8 +506,7 @@ function stateModelFactory() {
          *  react node allows user to force load at current setting
          */
         regionCannotBeRendered(_region) {
-            const { regionTooLarge } = self;
-            return regionTooLarge ? react_1.default.createElement(TooLargeMessage_1.default, { model: self }) : null;
+            return self.regionTooLarge ? react_1.default.createElement(TooLargeMessage_1.default, { model: self }) : null;
         },
         /**
          * #method
@@ -564,19 +518,21 @@ function stateModelFactory() {
          * #method
          */
         contextMenuItems() {
-            return self.contextMenuFeature
-                ? [
-                    {
-                        label: 'Open feature details',
-                        icon: MenuOpen_1.default,
-                        onClick: () => {
-                            if (self.contextMenuFeature) {
-                                self.selectFeature(self.contextMenuFeature);
-                            }
+            return [
+                ...(self.contextMenuFeature
+                    ? [
+                        {
+                            label: 'Open feature details',
+                            icon: MenuOpen_1.default,
+                            onClick: () => {
+                                if (self.contextMenuFeature) {
+                                    self.selectFeature(self.contextMenuFeature);
+                                }
+                            },
                         },
-                    },
-                ]
-                : [];
+                    ]
+                    : []),
+            ];
         },
         /**
          * #method
@@ -585,7 +541,7 @@ function stateModelFactory() {
             const view = (0, util_1.getContainingView)(self);
             return {
                 ...(0, tracks_1.getParentRenderProps)(self),
-                notReady: self.currBpPerPx !== view.bpPerPx || !self.estimatedRegionStats,
+                notReady: self.currBpPerPx !== view.bpPerPx || !self.estimatedRegionsStats,
                 rpcDriverName: self.rpcDriverName,
                 displayModel: self,
                 onFeatureClick(_, featureId) {
@@ -670,7 +626,7 @@ function stateModelFactory() {
             return (react_1.default.createElement(react_1.default.Fragment, null, renderings.map(([block, rendering], index) => {
                 const { offsetPx, widthPx } = block;
                 const offset = offsetPx - viewOffsetPx;
-                const clipid = getId(id, index);
+                const clipid = (0, util_2.getId)(id, index);
                 return (react_1.default.createElement(react_1.default.Fragment, { key: `frag-${index}` },
                     react_1.default.createElement("defs", null,
                         react_1.default.createElement("clipPath", { id: clipid },