@jbrowse/plugin-circular-view 2.16.1 → 2.18.0

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import PluginManager from '@jbrowse/core/PluginManager';
 import Plugin from '@jbrowse/core/Plugin';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default class CircularViewPlugin extends Plugin {
     name: string;
     install(pluginManager: PluginManager): void;
     configure(pluginManager: PluginManager): void;
 }
-export { baseChordDisplayConfig, BaseChordDisplayModel, BaseChordDisplayComponent, } from './BaseChordDisplay';
-export { type CircularViewModel, type CircularViewStateModel, } from './CircularView/models/model';
+export { BaseChordDisplayComponent, BaseChordDisplayModel, baseChordDisplayConfig, } from './BaseChordDisplay';
+export { type CircularViewModel, type CircularViewStateModel, } from './CircularView/model';

package/dist/index.js

@@ -3,14 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseChordDisplayComponent = exports.BaseChordDisplayModel = exports.baseChordDisplayConfig = void 0;
-const util_1 = require("@jbrowse/core/util");
+exports.baseChordDisplayConfig = exports.BaseChordDisplayModel = exports.BaseChordDisplayComponent = void 0;
 const Plugin_1 = __importDefault(require("@jbrowse/core/Plugin"));
-// locals
+const util_1 = require("@jbrowse/core/util");
+const DataUsage_1 = __importDefault(require("@mui/icons-material/DataUsage"));
 const CircularView_1 = __importDefault(require("./CircularView"));
 const LaunchCircularView_1 = __importDefault(require("./LaunchCircularView"));
-// icons
-const DataUsage_1 = __importDefault(require("@mui/icons-material/DataUsage"));
 class CircularViewPlugin extends Plugin_1.default {
     constructor() {
         super(...arguments);
@@ -34,6 +32,6 @@ class CircularViewPlugin extends Plugin_1.default {
 }
 exports.default = CircularViewPlugin;
 var BaseChordDisplay_1 = require("./BaseChordDisplay");
-Object.defineProperty(exports, "baseChordDisplayConfig", { enumerable: true, get: function () { return BaseChordDisplay_1.baseChordDisplayConfig; } });
-Object.defineProperty(exports, "BaseChordDisplayModel", { enumerable: true, get: function () { return BaseChordDisplay_1.BaseChordDisplayModel; } });
 Object.defineProperty(exports, "BaseChordDisplayComponent", { enumerable: true, get: function () { return BaseChordDisplay_1.BaseChordDisplayComponent; } });
+Object.defineProperty(exports, "BaseChordDisplayModel", { enumerable: true, get: function () { return BaseChordDisplay_1.BaseChordDisplayModel; } });
+Object.defineProperty(exports, "baseChordDisplayConfig", { enumerable: true, get: function () { return BaseChordDisplay_1.baseChordDisplayConfig; } });

package/esm/BaseChordDisplay/components/BaseChordDisplay.js

@@ -1,15 +1,16 @@
 import React from 'react';
 import { observer } from 'mobx-react';
-// locals
-import Loading from './Loading';
 import DisplayError from './DisplayError';
+import Loading from './Loading';
 const BaseChordDisplay = observer(function ({ display, }) {
     if (display.error) {
         return React.createElement(DisplayError, { model: display });
     }
-    if (!display.filled) {
+    else if (!display.filled) {
         return React.createElement(Loading, { model: display });
     }
-    return display.reactElement;
+    else {
+        return display.reactElement;
+    }
 });
 export default BaseChordDisplay;

package/esm/BaseChordDisplay/components/Loading.js

@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from 'react';
-import { makeStyles } from 'tss-react/mui';
+import React, { useEffect, useState } from 'react';
 import { observer } from 'mobx-react';
+import { makeStyles } from 'tss-react/mui';
 const useStyles = makeStyles()(theme => {
     const offset = 2;
     const duration = 1.4;
@@ -45,7 +45,6 @@ const useStyles = makeStyles()(theme => {
 });
 const Loading = observer(function ({ model: { renderProps: { radius }, }, }) {
     const { classes } = useStyles();
-    // only show the loading message after 400ms to prevent excessive flickering
     const [shown, setShown] = useState(false);
     useEffect(() => {
         const timeout = setTimeout(() => {

package/esm/BaseChordDisplay/{models/configSchema.d.ts → configSchema.d.ts}

@@ -1,7 +1,4 @@
 declare const baseChordDisplayConfig: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-    /**
-     * #slot
-     */
     onChordClick: {
         type: string;
         description: string;

package/esm/BaseChordDisplay/{models/configSchema.js → configSchema.js}

@@ -1,12 +1,6 @@
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
-/**
- * #config BaseChordDisplay
- */
-function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+function x() { }
 const baseChordDisplayConfig = ConfigurationSchema('BaseChordDisplay', {
-    /**
-     * #slot
-     */
     onChordClick: {
         type: 'boolean',
         description: 'callback that should be run when a chord in the track is clicked',
@@ -14,9 +8,6 @@ const baseChordDisplayConfig = ConfigurationSchema('BaseChordDisplay', {
         contextVariable: ['feature', 'track', 'pluginManager'],
     },
 }, {
-    /**
-     * #identifier
-     */
     explicitIdentifier: 'displayId',
 });
 export { baseChordDisplayConfig };

package/esm/BaseChordDisplay/index.d.ts

@@ -1,3 +1,3 @@
 export { default as BaseChordDisplayComponent } from './components/BaseChordDisplay';
-export { BaseChordDisplayModel } from './models/model';
-export { baseChordDisplayConfig } from './models/configSchema';
+export { BaseChordDisplayModel } from './model';
+export { baseChordDisplayConfig } from './configSchema';

package/esm/BaseChordDisplay/index.js

@@ -1,3 +1,3 @@
 export { default as BaseChordDisplayComponent } from './components/BaseChordDisplay';
-export { BaseChordDisplayModel } from './models/model';
-export { baseChordDisplayConfig } from './models/configSchema';
+export { BaseChordDisplayModel } from './model';
+export { baseChordDisplayConfig } from './configSchema';

package/{dist/BaseChordDisplay/models → esm/BaseChordDisplay}/model.d.ts

@@ -1,9 +1,7 @@
 import React from 'react';
-import CircularChordRendererType from '@jbrowse/core/pluggableElementTypes/renderers/CircularChordRendererType';
-import RendererType from '@jbrowse/core/pluggableElementTypes/renderers/RendererType';
-import { AnyReactComponentType, Feature } from '@jbrowse/core/util';
-import { ExportSvgOptions } from '../../CircularView/models/model';
-import { ThemeOptions } from '@mui/material';
+import type { ExportSvgOptions } from '../CircularView/model';
+import type { AnyReactComponentType, Feature } from '@jbrowse/core/util';
+import type { ThemeOptions } from '@mui/material';
 export declare const BaseChordDisplayModel: 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>;
@@ -54,9 +52,7 @@ export declare const BaseChordDisplayModel: import("mobx-state-tree").IModelType
             rendererTypeName: string;
             error: unknown;
             message: string | undefined;
-        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree" /**
-         * #getter
-         */).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>>;
@@ -88,63 +84,26 @@ export declare const BaseChordDisplayModel: import("mobx-state-tree").IModelType
     renderingComponent: undefined | AnyReactComponentType;
     refNameMap: Record<string, string> | undefined;
 } & {
-    /**
-     * #action
-     */
     onChordClick(feature: Feature): void;
 } & {
-    /**
-     * #getter
-     */
-    readonly blockDefinitions: import("../../CircularView/models/slices").Slice[];
-    /**
-     * #method
-     */
+    readonly blockDefinitions: import("../CircularView/slices").Slice[];
     renderProps(): any;
-    /**
-     * #getter
-     * the pluggable element type object for this display's renderer
-     */
-    readonly rendererType: RendererType | undefined;
-    /**
-     * #method
-     */
-    isCompatibleWithRenderer(renderer: RendererType): renderer is CircularChordRendererType;
-    /**
-     * #getter
-     * returns a string feature ID if the globally-selected object
-     * is probably a feature
-     */
+    readonly rendererType: import("@jbrowse/core/pluggableElementTypes").RendererType | undefined;
     readonly selectedFeatureId: string | undefined;
 } & {
-    /**
-     * #action
-     */
     renderStarted(): void;
-    /**
-     * #action
-     */
     renderSuccess({ message, data, reactElement, html, renderingComponent, }: {
-        message: string;
-        data: any;
-        html: string;
-        reactElement: React.ReactElement;
-        renderingComponent: AnyReactComponentType;
+        message?: string;
+        data?: any;
+        html?: string;
+        reactElement?: React.ReactElement;
+        renderingComponent?: AnyReactComponentType;
     }): void;
-    /**
-     * #action
-     */
     renderError(error: unknown): void;
-    /**
-     * #action
-     */
     setRefNameMap(refNameMap: Record<string, string>): void;
 } & {
     afterAttach(): void;
 } & {
-    /**
-     * #method
-     */
     renderSvg(opts: ExportSvgOptions & {
         theme?: ThemeOptions;
     }): Promise<React.JSX.Element>;

package/esm/BaseChordDisplay/{models/model.js → model.js}

@@ -1,39 +1,19 @@
 import React from 'react';
-import clone from 'clone';
-import { getParent, isAlive, types } from 'mobx-state-tree';
-// jbrowse
 import { ConfigurationReference, getConf } from '@jbrowse/core/configuration';
 import { BaseDisplay } from '@jbrowse/core/pluggableElementTypes/models';
-import CircularChordRendererType from '@jbrowse/core/pluggableElementTypes/renderers/CircularChordRendererType';
-import { getContainingView, getSession, getEnv, isFeature, makeAbortableReaction, ReactRendering, } from '@jbrowse/core/util';
+import { ReactRendering, getContainingView, getEnv, getSession, isFeature, makeAbortableReaction, } from '@jbrowse/core/util';
 import { getParentRenderProps, getRpcSessionId, getTrackAssemblyNames, } from '@jbrowse/core/util/tracks';
-// locals
-import { renderReactionData, renderReactionEffect } from './renderReaction';
+import { getParent, isAlive, types } from 'mobx-state-tree';
 import { baseChordDisplayConfig } from './configSchema';
-/**
- * #stateModel BaseChordDisplay
- * extends
- * - [BaseDisplay](../basedisplay)
- */
-function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+import { renderReactionData, renderReactionEffect } from './renderReaction';
+function x() { }
 export const BaseChordDisplayModel = types
     .compose('BaseChordDisplay', BaseDisplay, types.model({
-    /**
-     * #property
-     */
     bezierRadiusRatio: 0.1,
-    /**
-     * #property
-     */
     assemblyName: types.maybe(types.string),
-    /**
-     * #property
-     */
     configuration: ConfigurationReference(baseChordDisplayConfig),
 }))
     .volatile(() => ({
-    // NOTE: all this volatile stuff has to be filled in at once
-    // so that it stays consistent
     filled: false,
     reactElement: undefined,
     data: undefined,
@@ -46,42 +26,32 @@ export const BaseChordDisplayModel = types
     const { pluginManager } = getEnv(self);
     const track = self;
     return {
-        /**
-         * #action
-         */
         onChordClick(feature) {
             getConf(self, 'onChordClick', { feature, track, pluginManager });
         },
     };
 })
     .views(self => ({
-    /**
-     * #getter
-     */
     get blockDefinitions() {
         const view = getContainingView(self);
         const origSlices = view.staticSlices;
         if (!self.refNameMap) {
             return origSlices;
         }
-        const slices = clone(origSlices);
-        slices.forEach(slice => {
+        const slices = structuredClone(origSlices);
+        for (const slice of slices) {
             const regions = slice.region.elided
                 ? slice.region.regions
                 : [slice.region];
-            regions.forEach(region => {
-                var _a;
-                const renamed = (_a = self.refNameMap) === null || _a === void 0 ? void 0 : _a[region.refName];
+            for (const region of regions) {
+                const renamed = self.refNameMap[region.refName];
                 if (renamed && region.refName !== renamed) {
                     region.refName = renamed;
                 }
-            });
-        });
+            }
+        }
         return slices;
     },
-    /**
-     * #method
-     */
     renderProps() {
         const view = getContainingView(self);
         return {
@@ -93,41 +63,18 @@ export const BaseChordDisplayModel = types
             onChordClick: self.onChordClick,
         };
     },
-    /**
-     * #getter
-     * the pluggable element type object for this display's renderer
-     */
     get rendererType() {
         return getEnv(self).pluginManager.getRendererType(self.rendererTypeName);
     },
-    /**
-     * #method
-     */
-    isCompatibleWithRenderer(renderer) {
-        return !!(renderer instanceof CircularChordRendererType);
-    },
-    /**
-     * #getter
-     * returns a string feature ID if the globally-selected object
-     * is probably a feature
-     */
     get selectedFeatureId() {
         if (!isAlive(self)) {
             return undefined;
         }
-        const session = getSession(self);
-        const { selection } = session;
-        // does it quack like a feature?
-        if (isFeature(selection)) {
-            return selection.id();
-        }
-        return undefined;
+        const { selection } = getSession(self);
+        return isFeature(selection) ? selection.id() : undefined;
     },
 }))
     .actions(self => ({
-    /**
-     * #action
-     */
     renderStarted() {
         self.filled = false;
         self.message = '';
@@ -137,9 +84,6 @@ export const BaseChordDisplayModel = types
         self.error = undefined;
         self.renderingComponent = undefined;
     },
-    /**
-     * #action
-     */
     renderSuccess({ message, data, reactElement, html, renderingComponent, }) {
         if (message) {
             self.filled = false;
@@ -160,12 +104,8 @@ export const BaseChordDisplayModel = types
             self.renderingComponent = renderingComponent;
         }
     },
-    /**
-     * #action
-     */
     renderError(error) {
         console.error(error);
-        // the rendering failed for some reason
         self.filled = false;
         self.message = '';
         self.reactElement = undefined;
@@ -174,33 +114,36 @@ export const BaseChordDisplayModel = types
         self.error = error;
         self.renderingComponent = undefined;
     },
-    /**
-     * #action
-     */
     setRefNameMap(refNameMap) {
         self.refNameMap = refNameMap;
     },
 }))
     .actions(self => ({
     afterAttach() {
-        makeAbortableReaction(self, renderReactionData, 
-        // @ts-expect-error
-        renderReactionEffect, {
+        makeAbortableReaction(self, renderReactionData, renderReactionEffect, {
             name: `${self.type} ${self.id} rendering`,
-            // delay: self.renderDelay || 300,
             fireImmediately: true,
         }, self.renderStarted, self.renderSuccess, self.renderError);
-        makeAbortableReaction(self, () => ({
-            assemblyNames: getTrackAssemblyNames(self.parentTrack),
-            adapter: getConf(getParent(self, 2), 'adapter'),
-            assemblyManager: getSession(self).assemblyManager,
-        }), async ({ assemblyNames, adapter, assemblyManager }, signal) => {
-            return assemblyManager.getRefNameMapForAdapter(adapter, assemblyNames[0], { signal, sessionId: getRpcSessionId(self) });
+        makeAbortableReaction(self, () => {
+            return {
+                assemblyNames: getTrackAssemblyNames(self.parentTrack),
+                adapter: getConf(getParent(self, 2), 'adapter'),
+                assemblyManager: getSession(self).assemblyManager,
+            };
+        }, async (args, stopToken) => {
+            return args
+                ? args.assemblyManager.getRefNameMapForAdapter(args.adapter, args.assemblyNames[0], {
+                    stopToken,
+                    sessionId: getRpcSessionId(self),
+                })
+                : undefined;
         }, {
             name: `${self.type} ${self.id} getting refNames`,
             fireImmediately: true,
         }, () => { }, refNameMap => {
-            self.setRefNameMap(refNameMap);
+            if (refNameMap) {
+                self.setRefNameMap(refNameMap);
+            }
         }, error => {
             console.error(error);
             self.setError(error);
@@ -208,16 +151,13 @@ export const BaseChordDisplayModel = types
     },
 }))
     .views(self => ({
-    /**
-     * #method
-     */
     async renderSvg(opts) {
         const data = renderReactionData(self);
         const rendering = await renderReactionEffect({
             ...data,
             exportSVG: opts,
             theme: opts.theme || data.renderProps.theme,
-        }, undefined, self);
+        });
         return React.createElement(ReactRendering, { rendering: rendering });
     },
 }));

package/esm/BaseChordDisplay/renderReaction.d.ts

@@ -0,0 +1,27 @@
+export declare function renderReactionData(self: any): {
+    rendererType: any;
+    rpcManager: import("@jbrowse/core/rpc/RpcManager").default;
+    renderProps: any;
+    renderArgs: {
+        assemblyName: string;
+        adapterConfig: any;
+        rendererType: any;
+        regions: import("@jbrowse/core/util").Region[] & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<import("@jbrowse/core/util").Region[], import("@jbrowse/core/util").Region[], import("@jbrowse/core/util").Region[]>, [undefined]>>;
+        blockDefinitions: any;
+        sessionId: string;
+        timeout: number;
+    };
+};
+export declare function renderReactionEffect(props?: any, stopToken?: string): Promise<{
+    message: any;
+    html?: undefined;
+    data?: undefined;
+    reactElement?: undefined;
+    renderingComponent?: undefined;
+} | {
+    html: any;
+    data: any;
+    reactElement: any;
+    renderingComponent: any;
+    message?: undefined;
+}>;

package/esm/BaseChordDisplay/{models/renderReaction.js → renderReaction.js}

@@ -1,6 +1,5 @@
-import clone from 'clone';
+import { getContainingView, getSession } from '@jbrowse/core/util';
 import { getRpcSessionId } from '@jbrowse/core/util/tracks';
-import { getSession, getContainingView } from '@jbrowse/core/util';
 export function renderReactionData(self) {
     const view = getContainingView(self);
     const { rendererType } = self;
@@ -11,16 +10,16 @@ export function renderReactionData(self) {
         renderProps: self.renderProps(),
         renderArgs: {
             assemblyName: view.displayedRegions[0].assemblyName,
-            adapterConfig: clone(self.adapterConfig),
+            adapterConfig: structuredClone(self.adapterConfig),
             rendererType: rendererType.name,
-            regions: clone(view.displayedRegions),
+            regions: structuredClone(view.displayedRegions),
             blockDefinitions: self.blockDefinitions,
             sessionId: getRpcSessionId(self),
             timeout: 1000000,
         },
     };
 }
-export async function renderReactionEffect(props, signal, self) {
+export async function renderReactionEffect(props, stopToken) {
     var _a;
     if (!props) {
         throw new Error('cannot render with no props');
@@ -29,18 +28,14 @@ export async function renderReactionEffect(props, signal, self) {
     if (cannotBeRenderedReason) {
         return { message: cannotBeRenderedReason };
     }
-    // don't try to render 0 or NaN radius or no regions
     if (!renderProps.radius || !((_a = renderArgs.regions) === null || _a === void 0 ? void 0 : _a.length)) {
         return { message: 'Skipping render' };
     }
-    // check renderertype compatibility
-    if (!self.isCompatibleWithRenderer(rendererType)) {
-        throw new Error(`renderer ${rendererType.name} is not compatible with this display type`);
-    }
     const { html, ...data } = await rendererType.renderInClient(rpcManager, {
         ...renderArgs,
         ...renderProps,
         exportSVG,
+        stopToken,
     });
     return {
         html,

package/esm/CircularView/components/CircularView.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CircularViewModel } from '../models/model';
+import type { CircularViewModel } from '../model';
 declare const CircularView: ({ model }: {
     model: CircularViewModel;
 }) => React.JSX.Element | null;

package/esm/CircularView/components/CircularView.js

@@ -1,12 +1,11 @@
 import React from 'react';
-import { observer } from 'mobx-react';
 import { ResizeHandle } from '@jbrowse/core/ui';
 import { assembleLocString } from '@jbrowse/core/util';
+import { observer } from 'mobx-react';
 import { makeStyles } from 'tss-react/mui';
-// locals
-import Ruler from './Ruler';
 import Controls from './Controls';
 import ImportForm from './ImportForm';
+import Ruler from './Ruler';
 const dragHandleHeight = 3;
 const useStyles = makeStyles()(theme => ({
     root: {

package/esm/CircularView/components/Controls.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CircularViewModel } from '../models/model';
+import type { CircularViewModel } from '../model';
 declare const Controls: ({ model }: {
     model: CircularViewModel;
 }) => React.JSX.Element;

package/esm/CircularView/components/Controls.js

@@ -1,19 +1,18 @@
 import React, { useState } from 'react';
-import { observer } from 'mobx-react';
-import { IconButton } from '@mui/material';
-import { makeStyles } from 'tss-react/mui';
+import { TrackSelector as TrackSelectorIcon } from '@jbrowse/core/ui/Icons';
 import JBrowseMenu from '@jbrowse/core/ui/Menu';
-// icons
-import ZoomOutIcon from '@mui/icons-material/ZoomOut';
-import ZoomInIcon from '@mui/icons-material/ZoomIn';
-import RotateLeftIcon from '@mui/icons-material/RotateLeft';
-import RotateRightIcon from '@mui/icons-material/RotateRight';
-import LockOpenIcon from '@mui/icons-material/LockOpen';
+import { getSession } from '@jbrowse/core/util';
 import LockIcon from '@mui/icons-material/Lock';
-import PhotoCamera from '@mui/icons-material/PhotoCamera';
+import LockOpenIcon from '@mui/icons-material/LockOpen';
 import MoreVert from '@mui/icons-material/MoreVert';
-import { TrackSelector as TrackSelectorIcon } from '@jbrowse/core/ui/Icons';
-import { getSession } from '@jbrowse/core/util';
+import PhotoCamera from '@mui/icons-material/PhotoCamera';
+import RotateLeftIcon from '@mui/icons-material/RotateLeft';
+import RotateRightIcon from '@mui/icons-material/RotateRight';
+import ZoomInIcon from '@mui/icons-material/ZoomIn';
+import ZoomOutIcon from '@mui/icons-material/ZoomOut';
+import { IconButton } from '@mui/material';
+import { observer } from 'mobx-react';
+import { makeStyles } from 'tss-react/mui';
 import ExportSvgDialog from './ExportSvgDialog';
 const useStyles = makeStyles()(theme => ({
     controls: {

package/esm/CircularView/components/ExportSvgDialog.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ExportSvgOptions } from '../models/model';
+import type { ExportSvgOptions } from '../model';
 export default function ExportSvgDialog({ model, handleClose, }: {
     model: {
         exportSvg(opts: ExportSvgOptions): Promise<void>;

package/esm/CircularView/components/ExportSvgDialog.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
-import { Button, Checkbox, CircularProgress, DialogActions, DialogContent, FormControlLabel, MenuItem, TextField, Typography, } from '@mui/material';
 import { Dialog, ErrorMessage } from '@jbrowse/core/ui';
 import { getSession, useLocalStorage } from '@jbrowse/core/util';
+import { Button, Checkbox, CircularProgress, DialogActions, DialogContent, FormControlLabel, MenuItem, TextField, Typography, } from '@mui/material';
 function LoadingMessage() {
     return (React.createElement("div", null,
         React.createElement(CircularProgress, { size: 20, style: { marginRight: 20 } }),
@@ -30,9 +30,7 @@ export default function ExportSvgDialog({ model, handleClose, }) {
                 } }),
             session.allThemes ? (React.createElement(TextField2, { select: true, label: "Theme", value: themeName, onChange: event => {
                     setThemeName(event.target.value);
-                } }, Object.entries(session.allThemes()).map(([key, val]) => (React.createElement(MenuItem, { key: key, value: key }, 
-            // @ts-expect-error
-            val.name || '(Unknown name)'))))) : null,
+                } }, Object.entries(session.allThemes()).map(([key, val]) => (React.createElement(MenuItem, { key: key, value: key }, val.name || '(Unknown name)'))))) : null,
             offscreenCanvas ? (React.createElement(FormControlLabel, { control: React.createElement(Checkbox, { checked: rasterizeLayers, onChange: () => {
                         setRasterizeLayers(val => !val);
                     } }), label: "Rasterize canvas based tracks? File may be much larger if this is turned off" })) : (React.createElement(Typography, null, "Note: rasterizing layers not yet supported in this browser, so SVG size may be large"))),

package/esm/CircularView/components/ImportForm.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CircularViewModel } from '../models/model';
+import type { CircularViewModel } from '../model';
 declare const ImportForm: ({ model }: {
     model: CircularViewModel;
 }) => React.JSX.Element;

package/esm/CircularView/components/ImportForm.js

@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
+import { AssemblySelector, ErrorMessage } from '@jbrowse/core/ui';
+import { getSession } from '@jbrowse/core/util';
 import { Button, Container, Grid } from '@mui/material';
-import { makeStyles } from 'tss-react/mui';
 import { observer } from 'mobx-react';
-import { getSession } from '@jbrowse/core/util';
-import { ErrorMessage, AssemblySelector } from '@jbrowse/core/ui';
+import { makeStyles } from 'tss-react/mui';
 const useStyles = makeStyles()(theme => ({
     importFormContainer: {
         padding: theme.spacing(6),

package/esm/CircularView/components/Ruler.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { Slice } from '../models/slices';
-import { CircularViewModel } from '../models/model';
+import type { CircularViewModel } from '../model';
+import type { Slice } from '../slices';
 declare const Ruler: ({ model, slice, }: {
     model: CircularViewModel;
     slice: Slice;