@jbrowse/core 4.1.8 → 4.1.10

package/esm/pluggableElementTypes/renderers/FeatureRendererType.d.ts

@@ -45,17 +45,7 @@ export default class FeatureRendererType extends ServerSideRendererType {
         html?: string;
     } | {
         blockKey: string;
-        reactElement: import("react").FunctionComponentElement<{
-            res: ServerSideResultsSerialized;
-            args: ServerSideRenderArgs;
-            ReactComponent: import("react").ComponentType<any>;
-            supportsSVG: boolean;
-        }> | import("react").FunctionComponentElement<{
-            res: ServerSideResultsSerialized;
-            args: ServerSideRenderArgs;
-            ReactComponent: import("react").ComponentType<any>;
-            renderingProps?: Record<string, unknown>;
-        }>;
+        reactElement: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | undefined;
         html?: string;
     }>;
     serializeArgsInClient(args: RenderArgs): ServerSideRenderArgsSerialized;

package/esm/pluggableElementTypes/renderers/ServerSideRendererType.d.ts

@@ -1,22 +1,50 @@
 import RendererType from './RendererType.tsx';
-import type { RenderResults } from './RendererType.tsx';
-import type { RenderArgs, RenderArgsDeserialized, RenderArgsSerialized, ResultsDeserialized, ResultsSerialized } from './ServerSideRendererTypes.ts';
+import SerializableFilterChain from './util/serializableFilterChain.ts';
+import type { RenderProps, RenderResults } from './RendererType.tsx';
+import type { SerializedFilterChain } from './util/serializableFilterChain.ts';
+import type { AnyConfigurationModel } from '../../configuration/index.ts';
 import type RpcManager from '../../rpc/RpcManager.ts';
-export type { RenderArgs, RenderArgsDeserialized, RenderArgsSerialized, ResultsDeserialized, ResultsSerialized, ResultsSerializedSvgExport, } from './ServerSideRendererTypes.ts';
+import type { LastStopTokenCheck } from '../../util/stopToken.ts';
+import type { SnapshotIn, SnapshotOrInstance } from '@jbrowse/mobx-state-tree';
+import type { ThemeOptions } from '@mui/material';
+interface BaseRenderArgs extends RenderProps {
+    sessionId: string;
+    trackInstanceId: string;
+    stopToken?: string;
+    theme: ThemeOptions;
+    exportSVG?: {
+        rasterizeLayers?: boolean;
+    };
+}
+export interface RenderArgs extends BaseRenderArgs {
+    config: SnapshotOrInstance<AnyConfigurationModel>;
+    filters?: SerializableFilterChain;
+    renderingProps?: Record<string, unknown>;
+}
+export interface RenderArgsSerialized extends BaseRenderArgs {
+    statusCallback?: (arg: string) => void;
+    config: SnapshotIn<AnyConfigurationModel>;
+    filters?: SerializedFilterChain;
+}
+export interface RenderArgsDeserialized extends BaseRenderArgs {
+    config: AnyConfigurationModel;
+    filters?: SerializableFilterChain;
+    stopTokenCheck?: LastStopTokenCheck;
+}
+export type ResultsSerialized = Omit<RenderResults, 'reactElement'> & {
+    imageData?: ImageBitmap;
+};
+export interface ResultsSerializedSvgExport extends ResultsSerialized {
+    canvasRecordedData: unknown;
+    width: number;
+    height: number;
+    reactElement: unknown;
+}
+export type ResultsDeserialized = RenderResults;
 export default class ServerSideRenderer extends RendererType {
     private createReactElement;
     renderDirect(args: RenderArgs): Promise<RenderResults | {
-        reactElement: import("react").FunctionComponentElement<{
-            res: ResultsSerialized;
-            args: RenderArgs;
-            ReactComponent: import("react").ComponentType<any>;
-            supportsSVG: boolean;
-        }> | import("react").FunctionComponentElement<{
-            res: ResultsSerialized;
-            args: RenderArgs;
-            ReactComponent: import("react").ComponentType<any>;
-            renderingProps?: Record<string, unknown>;
-        }>;
+        reactElement: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | undefined;
         html?: string;
     }>;
     serializeArgsInClient(args: RenderArgs): RenderArgsSerialized;

package/esm/pluggableElementTypes/renderers/ServerSideRendererType.js

@@ -1,8 +1,6 @@
 import { createElement } from 'react';
 import { getSnapshot, isStateTreeNode } from '@jbrowse/mobx-state-tree';
-import RenderResult from "./RenderResult.js";
 import RendererType from "./RendererType.js";
-import SvgRenderResult from "./SvgRenderResult.js";
 import SerializableFilterChain from "./util/serializableFilterChain.js";
 import { getSerializedSvg, updateStatus } from "../../util/index.js";
 import { isRpcResult } from "../../util/rpc.js";
@@ -12,19 +10,20 @@ function isCanvasRecordedSvgExport(e) {
 }
 export default class ServerSideRenderer extends RendererType {
     createReactElement(res, args) {
-        return args.exportSVG
-            ? createElement(SvgRenderResult, {
-                res,
-                args,
-                ReactComponent: this.ReactComponent,
-                supportsSVG: this.supportsSVG,
-            })
-            : createElement(RenderResult, {
-                res,
-                args,
-                ReactComponent: this.ReactComponent,
-                renderingProps: args.renderingProps,
-            });
+        if (args.exportSVG) {
+            if (res.html) {
+                return undefined;
+            }
+            if (this.supportsSVG) {
+                return createElement(this.ReactComponent, { ...args, ...res });
+            }
+            return createElement('text', { y: '12', fill: 'black' }, 'SVG export not supported for this track');
+        }
+        return createElement(this.ReactComponent, {
+            ...args,
+            ...res,
+            ...args.renderingProps,
+        });
     }
     async renderDirect(args) {
         const { renderingProps, ...rest } = args;

package/esm/rpc/methods/CoreRender.d.ts

@@ -2,19 +2,9 @@ import RpcMethodType from '../../pluggableElementTypes/RpcMethodType.ts';
 import type { RenderArgs, RenderArgsSerialized, RenderResults, ResultsSerialized } from './util.ts';
 export default class CoreRender extends RpcMethodType {
     name: string;
-    serializeArguments(args: RenderArgs, rpcDriver: string): Promise<import("../../pluggableElementTypes/renderers/ServerSideRendererTypes.ts").RenderArgsSerialized>;
+    serializeArguments(args: RenderArgs, rpcDriver: string): Promise<import("../../pluggableElementTypes/renderers/ServerSideRendererType.ts").RenderArgsSerialized>;
     executeDirect(args: RenderArgs): Promise<RenderResults | {
-        reactElement: import("react").FunctionComponentElement<{
-            res: ResultsSerialized;
-            args: import("../../pluggableElementTypes/renderers/ServerSideRendererTypes.ts").RenderArgs;
-            ReactComponent: import("react").ComponentType<any>;
-            supportsSVG: boolean;
-        }> | import("react").FunctionComponentElement<{
-            res: ResultsSerialized;
-            args: import("../../pluggableElementTypes/renderers/ServerSideRendererTypes.ts").RenderArgs;
-            ReactComponent: import("react").ComponentType<any>;
-            renderingProps?: Record<string, unknown>;
-        }>;
+        reactElement: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | undefined;
         html?: string;
     }>;
     execute(args: RenderArgsSerialized & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "4.1.8",
+  "version": "4.1.10",
   "type": "module",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
@@ -476,7 +476,7 @@
     "@emotion/react": "^11.14.0",
     "@emotion/serialize": "^1.3.3",
     "@emotion/utils": "^1.4.2",
-    "@floating-ui/react": "^0.27.17",
+    "@floating-ui/react": "^0.27.18",
     "@gmod/abortable-promise-cache": "^3.0.4",
     "@gmod/bgzf-filehandle": "^6.0.12",
     "@gmod/http-range-fetcher": "^5.0.7",

package/esm/pluggableElementTypes/renderers/RenderResult.d.ts

@@ -1,8 +0,0 @@
-import type { ComponentType } from 'react';
-import type { RenderArgs, ResultsSerialized } from './ServerSideRendererTypes.ts';
-export default function RenderResult({ res, args, ReactComponent, renderingProps, }: {
-    res: ResultsSerialized;
-    args: RenderArgs;
-    ReactComponent: ComponentType<any>;
-    renderingProps?: Record<string, unknown>;
-}): import("react/jsx-runtime").JSX.Element;

package/esm/pluggableElementTypes/renderers/RenderResult.js

@@ -1,4 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-export default function RenderResult({ res, args, ReactComponent, renderingProps, }) {
-    return _jsx(ReactComponent, { ...args, ...res, ...renderingProps });
-}

package/esm/pluggableElementTypes/renderers/ServerSideRendererTypes.d.ts

@@ -1,42 +0,0 @@
-import type { RenderProps, RenderResults } from './RendererType.tsx';
-import type SerializableFilterChain from './util/serializableFilterChain.ts';
-import type { SerializedFilterChain } from './util/serializableFilterChain.ts';
-import type { AnyConfigurationModel } from '../../configuration/index.ts';
-import type { LastStopTokenCheck } from '../../util/stopToken.ts';
-import type { SnapshotIn, SnapshotOrInstance } from '@jbrowse/mobx-state-tree';
-import type { ThemeOptions } from '@mui/material';
-interface BaseRenderArgs extends RenderProps {
-    sessionId: string;
-    trackInstanceId: string;
-    stopToken?: string;
-    theme: ThemeOptions;
-    exportSVG?: {
-        rasterizeLayers?: boolean;
-    };
-}
-export interface RenderArgs extends BaseRenderArgs {
-    config: SnapshotOrInstance<AnyConfigurationModel>;
-    filters?: SerializableFilterChain;
-    renderingProps?: Record<string, unknown>;
-}
-export interface RenderArgsSerialized extends BaseRenderArgs {
-    statusCallback?: (arg: string) => void;
-    config: SnapshotIn<AnyConfigurationModel>;
-    filters?: SerializedFilterChain;
-}
-export interface RenderArgsDeserialized extends BaseRenderArgs {
-    config: AnyConfigurationModel;
-    filters?: SerializableFilterChain;
-    stopTokenCheck?: LastStopTokenCheck;
-}
-export type ResultsSerialized = Omit<RenderResults, 'reactElement'> & {
-    imageData?: ImageBitmap;
-};
-export interface ResultsSerializedSvgExport extends ResultsSerialized {
-    canvasRecordedData: unknown;
-    width: number;
-    height: number;
-    reactElement: unknown;
-}
-export type ResultsDeserialized = RenderResults;
-export {};

package/esm/pluggableElementTypes/renderers/ServerSideRendererTypes.js

@@ -1 +0,0 @@
-export {};

package/esm/pluggableElementTypes/renderers/SvgRenderResult.d.ts

@@ -1,8 +0,0 @@
-import type { ComponentType } from 'react';
-import type { RenderArgs, ResultsSerialized } from './ServerSideRendererTypes.ts';
-export default function SvgRenderResult({ res, args, ReactComponent, supportsSVG, }: {
-    res: ResultsSerialized;
-    args: RenderArgs;
-    ReactComponent: ComponentType<any>;
-    supportsSVG: boolean;
-}): import("react/jsx-runtime").JSX.Element | null;

package/esm/pluggableElementTypes/renderers/SvgRenderResult.js

@@ -1,10 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-export default function SvgRenderResult({ res, args, ReactComponent, supportsSVG, }) {
-    if (res.html) {
-        return null;
-    }
-    if (supportsSVG) {
-        return _jsx(ReactComponent, { ...args, ...res });
-    }
-    return (_jsx("text", { y: "12", fill: "black", children: "SVG export not supported for this track" }));
-}