@jbrowse/core 2.6.2 → 2.7.0

package/assemblyManager/assemblyManager.d.ts

@@ -26,6 +26,8 @@ declare function assemblyManagerFactory(conf: IAnyType, pm: PluginManager): impo
             [x: string]: string | undefined;
         } | undefined;
         cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
     } & {
         readonly initialized: boolean;
         readonly name: string;
@@ -68,117 +70,119 @@ declare function assemblyManagerFactory(conf: IAnyType, pm: PluginManager): impo
         }>;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
 }, {
-    readonly assemblyNameMap: {
-        [key: string]: ({
-            configuration: any;
-        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-            error: unknown;
-            loaded: boolean;
-            loadingP: Promise<void> | undefined;
-            volatileRegions: import("./assembly").BasicRegion[] | undefined;
-            refNameAliases: {
-                [x: string]: string | undefined;
-            } | undefined;
-            lowerCaseRefNameAliases: {
-                [x: string]: string | undefined;
-            } | undefined;
-            cytobands: import("../util").Feature[] | undefined;
-        } & {
-            readonly initialized: boolean;
-            readonly name: string;
-            readonly regions: import("./assembly").BasicRegion[] | undefined;
-            readonly aliases: string[];
-            readonly displayName: string | undefined;
-            hasName(name: string): boolean;
-            readonly allAliases: string[];
-            readonly allRefNames: string[] | undefined;
-            readonly lowerCaseRefNames: string[] | undefined;
-            readonly allRefNamesWithLowerCase: string[] | undefined;
-            readonly rpcManager: RpcManager;
-            readonly refNameColors: string[];
-        } & {
-            readonly refNames: string[] | undefined;
-        } & {
-            getCanonicalRefName(refName: string): string | undefined;
-            getRefNameColor(refName: string): string | undefined;
-            isValidRefName(refName: string): boolean;
-        } & {
-            setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: import("./assembly").Loading): void;
-            setError(e: unknown): void;
-            setRegions(regions: import("../util").Region[]): void;
-            setRefNameAliases(aliases: {
-                [x: string]: string | undefined;
-            }, lcAliases: {
-                [x: string]: string | undefined;
-            }): void;
-            setCytobands(cytobands: import("../util").Feature[]): void;
-            setLoadingP(p?: Promise<void> | undefined): void;
-            load(): Promise<void>;
-            loadPre(): Promise<void>;
-        } & {
-            getAdapterMapEntry(adapterConf: unknown, options: import("../data_adapters/BaseAdapter").BaseOptions): Promise<import("./assembly").RefNameMap>;
-            getRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
-                [x: string]: string | undefined;
-            }>;
-            getReverseRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
-                [x: string]: string | undefined;
-            }>;
-        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
-            configuration: import("mobx-state-tree").IMaybe<import("mobx-state-tree").IReferenceType<IAnyType>>;
-        }, {
-            error: unknown;
-            loaded: boolean;
-            loadingP: Promise<void> | undefined;
-            volatileRegions: import("./assembly").BasicRegion[] | undefined;
-            refNameAliases: {
-                [x: string]: string | undefined;
-            } | undefined;
-            lowerCaseRefNameAliases: {
-                [x: string]: string | undefined;
-            } | undefined;
-            cytobands: import("../util").Feature[] | undefined;
-        } & {
-            readonly initialized: boolean;
-            readonly name: string;
-            readonly regions: import("./assembly").BasicRegion[] | undefined;
-            readonly aliases: string[];
-            readonly displayName: string | undefined;
-            hasName(name: string): boolean;
-            readonly allAliases: string[];
-            readonly allRefNames: string[] | undefined;
-            readonly lowerCaseRefNames: string[] | undefined;
-            readonly allRefNamesWithLowerCase: string[] | undefined;
-            readonly rpcManager: RpcManager;
-            readonly refNameColors: string[];
-        } & {
-            readonly refNames: string[] | undefined;
-        } & {
-            getCanonicalRefName(refName: string): string | undefined;
-            getRefNameColor(refName: string): string | undefined;
-            isValidRefName(refName: string): boolean;
-        } & {
-            setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: import("./assembly").Loading): void;
-            setError(e: unknown): void;
-            setRegions(regions: import("../util").Region[]): void;
-            setRefNameAliases(aliases: {
-                [x: string]: string | undefined;
-            }, lcAliases: {
-                [x: string]: string | undefined;
-            }): void;
-            setCytobands(cytobands: import("../util").Feature[]): void;
-            setLoadingP(p?: Promise<void> | undefined): void;
-            load(): Promise<void>;
-            loadPre(): Promise<void>;
-        } & {
-            getAdapterMapEntry(adapterConf: unknown, options: import("../data_adapters/BaseAdapter").BaseOptions): Promise<import("./assembly").RefNameMap>;
-            getRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
-                [x: string]: string | undefined;
-            }>;
-            getReverseRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
-                [x: string]: string | undefined;
-            }>;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
-    };
+    readonly assemblyNameMap: Record<string, ({
+        configuration: any;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        error: unknown;
+        loaded: boolean;
+        loadingP: Promise<void> | undefined;
+        volatileRegions: import("./assembly").BasicRegion[] | undefined;
+        refNameAliases: {
+            [x: string]: string | undefined;
+        } | undefined;
+        lowerCaseRefNameAliases: {
+            [x: string]: string | undefined;
+        } | undefined;
+        cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
+    } & {
+        readonly initialized: boolean;
+        readonly name: string;
+        readonly regions: import("./assembly").BasicRegion[] | undefined;
+        readonly aliases: string[];
+        readonly displayName: string | undefined;
+        hasName(name: string): boolean;
+        readonly allAliases: string[];
+        readonly allRefNames: string[] | undefined;
+        readonly lowerCaseRefNames: string[] | undefined;
+        readonly allRefNamesWithLowerCase: string[] | undefined;
+        readonly rpcManager: RpcManager;
+        readonly refNameColors: string[];
+    } & {
+        readonly refNames: string[] | undefined;
+    } & {
+        getCanonicalRefName(refName: string): string | undefined;
+        getRefNameColor(refName: string): string | undefined;
+        isValidRefName(refName: string): boolean;
+    } & {
+        setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: import("./assembly").Loading): void;
+        setError(e: unknown): void;
+        setRegions(regions: import("../util").Region[]): void;
+        setRefNameAliases(aliases: {
+            [x: string]: string | undefined;
+        }, lcAliases: {
+            [x: string]: string | undefined;
+        }): void;
+        setCytobands(cytobands: import("../util").Feature[]): void;
+        setLoadingP(p?: Promise<void> | undefined): void;
+        load(): Promise<void>;
+        loadPre(): Promise<void>;
+    } & {
+        getAdapterMapEntry(adapterConf: unknown, options: import("../data_adapters/BaseAdapter").BaseOptions): Promise<import("./assembly").RefNameMap>;
+        getRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
+            [x: string]: string | undefined;
+        }>;
+        getReverseRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
+            [x: string]: string | undefined;
+        }>;
+    } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        configuration: import("mobx-state-tree").IMaybe<import("mobx-state-tree").IReferenceType<IAnyType>>;
+    }, {
+        error: unknown;
+        loaded: boolean;
+        loadingP: Promise<void> | undefined;
+        volatileRegions: import("./assembly").BasicRegion[] | undefined;
+        refNameAliases: {
+            [x: string]: string | undefined;
+        } | undefined;
+        lowerCaseRefNameAliases: {
+            [x: string]: string | undefined;
+        } | undefined;
+        cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
+    } & {
+        readonly initialized: boolean;
+        readonly name: string;
+        readonly regions: import("./assembly").BasicRegion[] | undefined;
+        readonly aliases: string[];
+        readonly displayName: string | undefined;
+        hasName(name: string): boolean;
+        readonly allAliases: string[];
+        readonly allRefNames: string[] | undefined;
+        readonly lowerCaseRefNames: string[] | undefined;
+        readonly allRefNamesWithLowerCase: string[] | undefined;
+        readonly rpcManager: RpcManager;
+        readonly refNameColors: string[];
+    } & {
+        readonly refNames: string[] | undefined;
+    } & {
+        getCanonicalRefName(refName: string): string | undefined;
+        getRefNameColor(refName: string): string | undefined;
+        isValidRefName(refName: string): boolean;
+    } & {
+        setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: import("./assembly").Loading): void;
+        setError(e: unknown): void;
+        setRegions(regions: import("../util").Region[]): void;
+        setRefNameAliases(aliases: {
+            [x: string]: string | undefined;
+        }, lcAliases: {
+            [x: string]: string | undefined;
+        }): void;
+        setCytobands(cytobands: import("../util").Feature[]): void;
+        setLoadingP(p?: Promise<void> | undefined): void;
+        load(): Promise<void>;
+        loadPre(): Promise<void>;
+    } & {
+        getAdapterMapEntry(adapterConf: unknown, options: import("../data_adapters/BaseAdapter").BaseOptions): Promise<import("./assembly").RefNameMap>;
+        getRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
+            [x: string]: string | undefined;
+        }>;
+        getReverseRefNameMapForAdapter(adapterConf: unknown, opts: import("../data_adapters/BaseAdapter").BaseOptions): Promise<{
+            [x: string]: string | undefined;
+        }>;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined>;
 } & {
     /**
      * #method
@@ -197,6 +201,8 @@ declare function assemblyManagerFactory(conf: IAnyType, pm: PluginManager): impo
             [x: string]: string | undefined;
         } | undefined;
         cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
     } & {
         readonly initialized: boolean;
         readonly name: string;
@@ -251,6 +257,8 @@ declare function assemblyManagerFactory(conf: IAnyType, pm: PluginManager): impo
             [x: string]: string | undefined;
         } | undefined;
         cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
     } & {
         readonly initialized: boolean;
         readonly name: string;
@@ -327,6 +335,8 @@ declare function assemblyManagerFactory(conf: IAnyType, pm: PluginManager): impo
             [x: string]: string | undefined;
         } | undefined;
         cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
     } & {
         readonly initialized: boolean;
         readonly name: string;
@@ -381,6 +391,8 @@ declare function assemblyManagerFactory(conf: IAnyType, pm: PluginManager): impo
             [x: string]: string | undefined;
         } | undefined;
         cytobands: import("../util").Feature[] | undefined;
+    } & {
+        getConf(arg: string): any;
     } & {
         readonly initialized: boolean;
         readonly name: string;

package/assemblyManager/assemblyManager.js

@@ -127,7 +127,7 @@ function assemblyManagerFactory(conf, pm) {
             if (assembly) {
                 return assembly.isValidRefName(refName);
             }
-            throw new Error(`isValidRefName for ${assemblyName} failed, assembly does not exist`);
+            throw new Error(`Failed to look up refName ${refName} on ${assemblyName} because assembly does not exist`);
         },
     }))
         .actions(self => ({

package/configuration/configurationSchema.js

@@ -19,6 +19,7 @@ function isEmptyArray(thing) {
     return Array.isArray(thing) && thing.length === 0;
 }
 function preprocessConfigurationSchemaArguments(modelName, inputSchemaDefinition, inputOptions = {}) {
+    var _a;
     if (typeof modelName !== 'string') {
         throw new Error('first arg must be string name of the model that this config schema goes with');
     }
@@ -26,8 +27,7 @@ function preprocessConfigurationSchemaArguments(modelName, inputSchemaDefinition
     // extending, grab the slot definitions from that
     let schemaDefinition = inputSchemaDefinition;
     let options = inputOptions;
-    if (inputOptions.baseConfiguration &&
-        inputOptions.baseConfiguration.jbrowseSchemaDefinition) {
+    if ((_a = inputOptions.baseConfiguration) === null || _a === void 0 ? void 0 : _a.jbrowseSchemaDefinition) {
         schemaDefinition = {
             ...inputOptions.baseConfiguration.jbrowseSchemaDefinition,
             ...schemaDefinition,

package/configuration/configurationSlot.js

@@ -134,6 +134,9 @@ const typeModelExtensions = {
 //   str => functionRegexp.test(str),
 // )
 const JexlStringType = mobx_state_tree_1.types.refinement('JexlString', mobx_state_tree_1.types.string, str => str.startsWith('jexl:'));
+function json(value) {
+    return (value === null || value === void 0 ? void 0 : value.toJSON) ? value.toJSON() : `"${value}"`;
+}
 /**
  * builds a MST model for a configuration slot
  *
@@ -192,12 +195,6 @@ function ConfigSlot(slotName, { description = '', model, type, defaultValue, con
             if (self.isCallback) {
                 return undefined;
             }
-            function json(value) {
-                if (value && value.toJSON) {
-                    return value.toJSON();
-                }
-                return `"${value}"`;
-            }
             return json(self.value);
         },
     }))

package/data_adapters/BaseAdapter/index.d.ts

@@ -10,6 +10,4 @@ export { BaseSequenceAdapter } from './BaseSequenceAdapter';
 export type { BaseTextSearchAdapter } from './BaseTextSearchAdapter';
 export type { BaseRefNameAliasAdapter } from './BaseRefNameAliasAdapter';
 export type { RegionsAdapter } from './RegionsAdapter';
-export interface AnyAdapter {
-    new (config: AnyConfigurationModel, getSubAdapter?: getSubAdapterType, pluginManager?: PluginManager): AnyDataAdapter;
-}
+export type AnyAdapter = new (config: AnyConfigurationModel, getSubAdapter?: getSubAdapterType, pluginManager?: PluginManager) => AnyDataAdapter;

package/data_adapters/dataAdapterCache.js

@@ -22,9 +22,9 @@ async function getAdapter(pluginManager, sessionId, adapterConfigSnapshot) {
     // cache the adapter object
     const cacheKey = adapterConfigCacheKey(adapterConfigSnapshot);
     if (!adapterCache[cacheKey]) {
-        const adapterType = (adapterConfigSnapshot || {}).type;
+        const adapterType = adapterConfigSnapshot === null || adapterConfigSnapshot === void 0 ? void 0 : adapterConfigSnapshot.type;
         if (!adapterType) {
-            throw new Error('could not determine adapter type from adapter config snapshot');
+            throw new Error(`could not determine adapter type from adapter config snapshot ${JSON.stringify(adapterConfigSnapshot)}`);
         }
         const dataAdapterType = pluginManager.getAdapterType(adapterType);
         if (!dataAdapterType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -36,8 +36,8 @@
     "canvas-sequencer": "^3.1.0",
     "canvas2svg": "^1.0.16",
     "clone": "^2.1.2",
-    "clsx": "^1.0.4",
-    "color": "^3.1.3",
+    "clsx": "^2.0.0",
+    "colord": "^2.9.3",
     "copy-to-clipboard": "^3.3.1",
     "deepmerge": "^4.2.2",
     "detect-node": "^2.1.0",
@@ -55,14 +55,13 @@
     "rbush": "^3.0.1",
     "react-error-boundary": "^4.0.3",
     "serialize-error": "^8.0.0",
-    "shortid": "^2.2.13",
     "svg-path-generator": "^1.1.0"
   },
   "peerDependencies": {
     "@mui/material": "^5.0.0",
     "@mui/x-data-grid": "^6.0.1",
     "mobx": "^6.0.0",
-    "mobx-react": "^7.0.0",
+    "mobx-react": "^9.0.0",
     "mobx-state-tree": "^5.0.0",
     "prop-types": "^15.0.0",
     "react": ">=16.8.0",
@@ -74,5 +73,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "bbea587a402d9974acdd804a33f4b77f31a2fd5f"
+  "gitHead": "dbe7fb1af01fc89f833d2744635eb44a17365b41"
 }

package/pluggableElementTypes/AdapterType.d.ts

@@ -1,11 +1,11 @@
 import PluggableElementBase from './PluggableElementBase';
 import { AnyConfigurationSchemaType } from '../configuration';
 import { AnyAdapter } from '../data_adapters/BaseAdapter';
-export type AdapterMetadata = {
+export interface AdapterMetadata {
     category?: string;
     hiddenFromGUI?: boolean;
     description?: string;
-};
+}
 export default class AdapterType extends PluggableElementBase {
     AdapterClass?: AnyAdapter;
     getAdapterClass: () => Promise<AnyAdapter>;

package/pluggableElementTypes/RpcMethodType.js

@@ -56,9 +56,8 @@ class RpcMethodType extends PluggableElementBase_1.default {
         }
         catch (error) {
             if ((0, types_1.isAuthNeededException)(error)) {
-                const retryAccount = 
-                // @ts-expect-error
-                (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.createEphemeralInternetAccount(`HTTPBasicInternetAccount-${new URL(error.url).origin}`, {}, error.url);
+                const retryAccount = // @ts-expect-error
+                 (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.createEphemeralInternetAccount(`HTTPBasicInternetAccount-${new URL(error.url).origin}`, {}, error.url);
                 throw new types_1.RetryError('Retrying with created internet account', retryAccount.internetAccountId);
             }
             throw error;

package/pluggableElementTypes/models/BaseTrackModel.d.ts

@@ -45,16 +45,16 @@ export declare function createBaseTrackModel(pm: PluginManager, trackType: strin
     /**
      * #getter
      */
-    readonly canConfigure: any;
+    readonly canConfigure: boolean | ({
+        [x: string]: any;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        setSubschema(slotName: string, data: unknown): any;
+    } & import("mobx-state-tree").IStateTreeNode<AnyConfigurationSchemaType>) | undefined;
 } & {
     /**
      * #action
      */
     setMinimized(flag: boolean): void;
-    /**
-     * #action
-     */
-    activateConfigurationUI(): void;
     /**
      * #action
      */

package/pluggableElementTypes/models/BaseTrackModel.js

@@ -97,7 +97,7 @@ function createBaseTrackModel(pm, trackType, baseTrackConfig) {
             const { sessionTracks, adminMode } = session;
             return ((0, types_1.isSessionModelWithConfigEditing)(session) &&
                 (adminMode ||
-                    sessionTracks.find((track) => { var _a; return track.trackId === ((_a = self.configuration) === null || _a === void 0 ? void 0 : _a.trackId); })));
+                    (sessionTracks === null || sessionTracks === void 0 ? void 0 : sessionTracks.find(track => { var _a; return track.trackId === ((_a = self.configuration) === null || _a === void 0 ? void 0 : _a.trackId); }))));
         },
     }))
         .actions(self => ({
@@ -107,21 +107,6 @@ function createBaseTrackModel(pm, trackType, baseTrackConfig) {
         setMinimized(flag) {
             self.minimized = flag;
         },
-        /**
-         * #action
-         */
-        activateConfigurationUI() {
-            const session = (0, util_1.getSession)(self);
-            const view = (0, util_1.getContainingView)(self);
-            if ((0, types_1.isSessionModelWithConfigEditing)(session)) {
-                // @ts-expect-error
-                const trackConf = session.editTrackConfiguration(self.configuration);
-                if (trackConf && trackConf !== self.configuration) {
-                    view.hideTrack(self.configuration);
-                    view.showTrack(trackConf);
-                }
-            }
-        },
         /**
          * #action
          */

package/pluggableElementTypes/models/InternetAccountModel.d.ts

@@ -104,7 +104,7 @@ export declare const InternetAccount: import("mobx-state-tree").IModelType<{
      * @param resolve - Pass the token to this function
      * @param reject - If there is an error getting the token, call this function
      */
-    getTokenFromUser(resolve: (token: string) => void, reject: (error: Error) => void): void;
+    getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
     /**
      * #action
      */
@@ -131,7 +131,7 @@ export declare const InternetAccount: import("mobx-state-tree").IModelType<{
      * @param loc - UriLocation of the resource
      * @returns - Valid auth token
      */
-    validateToken(token: string, loc: UriLocation): Promise<string>;
+    validateToken(token: string, _loc: UriLocation): Promise<string>;
 } & {
     /**
      * #action

package/pluggableElementTypes/models/InternetAccountModel.js

@@ -114,7 +114,7 @@ exports.InternetAccount = mobx_state_tree_1.types
      * @param resolve - Pass the token to this function
      * @param reject - If there is an error getting the token, call this function
      */
-    getTokenFromUser(resolve, reject) {
+    getTokenFromUser(_resolve, _reject) {
         throw new Error('getTokenFromUser must be implemented by extending model');
     },
     /**
@@ -149,7 +149,7 @@ exports.InternetAccount = mobx_state_tree_1.types
      * @param loc - UriLocation of the resource
      * @returns - Valid auth token
      */
-    async validateToken(token, loc) {
+    async validateToken(token, _loc) {
         return token;
     },
 }))

package/pluggableElementTypes/renderers/BoxRendererType.d.ts

@@ -56,9 +56,7 @@ export interface ResultsDeserialized extends FeatureResultsDeserialized {
     layout: PrecomputedLayout<string>;
 }
 export default class BoxRendererType extends FeatureRendererType {
-    sessions: {
-        [key: string]: LayoutSession;
-    };
+    sessions: Record<string, LayoutSession>;
     getWorkerSession(props: LayoutSessionProps & {
         sessionId: string;
         layoutId: string;

package/pluggableElementTypes/renderers/CircularChordRendererType.d.ts

@@ -1,12 +1,15 @@
 import React from 'react';
 import { SimpleFeature, SimpleFeatureSerialized } from '../../util';
 import FeatureRenderer from './FeatureRendererType';
+import { ThemeOptions } from '@mui/material';
 export default class CircularChordRendererType extends FeatureRenderer {
     supportsSVG: boolean;
     deserializeResultsInClient(res: {
         features: SimpleFeatureSerialized[];
         html: string;
     }, args: {
+        displayModel: any;
+        theme: ThemeOptions;
         exportSVG?: {
             rasterizeLayers?: boolean;
         };

package/pluggableElementTypes/renderers/RpcRenderedSvgGroup.d.ts

@@ -1,8 +1,12 @@
 import React from 'react';
 import { AnyReactComponentType, Feature } from '../../util';
-declare const _default: (props: {
+import { ThemeOptions } from '@mui/material';
+interface Props {
     html: string;
     features: Map<string, Feature>;
+    theme: ThemeOptions;
+    displayModel: any;
     RenderingComponent: AnyReactComponentType;
-}) => React.JSX.Element;
-export default _default;
+}
+declare const RpcRenderedSvgGroup: (props: Props) => React.JSX.Element;
+export default RpcRenderedSvgGroup;

package/pluggableElementTypes/renderers/RpcRenderedSvgGroup.js

@@ -25,9 +25,46 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const mobx_react_1 = require("mobx-react");
-const react_dom_1 = require("react-dom");
+// locals
 const util_1 = require("../../util");
-exports.default = (0, mobx_react_1.observer)(function (props) {
+const material_1 = require("@mui/material");
+const ui_1 = require("../../ui");
+const mobx_state_tree_1 = require("mobx-state-tree");
+// eslint-disable-next-line react/no-deprecated
+const react_dom_1 = require("react-dom");
+const NewHydrate = (0, mobx_react_1.observer)(function RpcRenderedSvgGroup(props) {
+    const { html, theme, RenderingComponent, ...rest } = props;
+    const ref = (0, react_1.useRef)(null);
+    // this `any` is a react-dom/client::Root
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rootRef = (0, react_1.useRef)();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const root = (0, mobx_state_tree_1.getRoot)(props.displayModel);
+    const hydrateRoot = root.hydrateFn;
+    (0, react_1.useEffect)(() => {
+        const renderTimeout = (0, util_1.rIC)(() => {
+            var _a;
+            if (!ref.current) {
+                return;
+            }
+            const jbrowseTheme = (0, ui_1.createJBrowseTheme)(theme);
+            rootRef.current =
+                (_a = rootRef.current) !== null && _a !== void 0 ? _a : hydrateRoot(ref.current, react_1.default.createElement(material_1.ThemeProvider, { theme: jbrowseTheme },
+                    react_1.default.createElement(RenderingComponent, { ...rest })));
+        });
+        return () => {
+            clearTimeout(renderTimeout);
+            const root = rootRef.current;
+            rootRef.current = undefined;
+            setTimeout(() => {
+                root === null || root === void 0 ? void 0 : root.unmount();
+            });
+        };
+    }, [html, RenderingComponent, hydrateRoot, theme, props, rest]);
+    // eslint-disable-next-line react/no-danger
+    return react_1.default.createElement("g", { ref: ref, dangerouslySetInnerHTML: { __html: html } });
+});
+const OldHydrate = (0, mobx_react_1.observer)(function OldHydrate(props) {
     const { html, RenderingComponent } = props;
     const ref = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
@@ -58,3 +95,9 @@ exports.default = (0, mobx_react_1.observer)(function (props) {
     }, [html, RenderingComponent, props]);
     return react_1.default.createElement("g", { ref: ref });
 });
+const RpcRenderedSvgGroup = (0, mobx_react_1.observer)(function (props) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const root = (0, mobx_state_tree_1.getRoot)(props.displayModel);
+    return root.hydrateFn ? react_1.default.createElement(NewHydrate, { ...props }) : react_1.default.createElement(OldHydrate, { ...props });
+});
+exports.default = RpcRenderedSvgGroup;

package/pluggableElementTypes/renderers/ServerSideRenderedContent.d.ts

@@ -3,5 +3,5 @@ import { ResultsSerialized, RenderArgs } from './ServerSideRendererType';
 interface Props extends ResultsSerialized, RenderArgs {
     RenderingComponent: React.ComponentType<any>;
 }
-export default function ({ theme, html, RenderingComponent, ...rest }: Props): React.JSX.Element;
-export {};
+declare const ServerSideRenderedContent: (props: Props) => React.JSX.Element;
+export default ServerSideRenderedContent;