@jbrowse/core 3.1.0 → 3.3.0

package/pluggableElementTypes/renderers/RpcRenderedSvgGroup.js

@@ -1,37 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const material_1 = require("@mui/material");
 const mobx_react_1 = require("mobx-react");
-const client_1 = require("react-dom/client");
-const ui_1 = require("../../ui");
-const util_1 = require("../../util");
 const RpcRenderedSvgGroup = (0, mobx_react_1.observer)(function RpcRenderedSvgGroup(props) {
-    const { html, theme, RenderingComponent, ...rest } = props;
-    const ref = (0, react_1.useRef)(null);
-    const rootRef = (0, react_1.useRef)(null);
-    (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 : (0, client_1.hydrateRoot)(ref.current, (0, jsx_runtime_1.jsx)(material_1.ThemeProvider, { theme: jbrowseTheme, children: (0, jsx_runtime_1.jsx)(RenderingComponent, { ...rest }) }));
-        });
-        return () => {
-            if (renderTimeout !== undefined) {
-                clearTimeout(renderTimeout);
-            }
-            const root = rootRef.current;
-            rootRef.current = null;
-            setTimeout(() => {
-                root === null || root === void 0 ? void 0 : root.unmount();
-            });
-        };
-    }, [RenderingComponent, theme, rest]);
-    return (0, jsx_runtime_1.jsx)("g", { ref: ref, dangerouslySetInnerHTML: { __html: html } });
+    const { html, RenderingComponent, ...rest } = props;
+    return (0, jsx_runtime_1.jsx)(RenderingComponent, { ...rest });
 });
 exports.default = RpcRenderedSvgGroup;

package/pluggableElementTypes/renderers/ServerSideRenderedContent.d.ts

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

package/pluggableElementTypes/renderers/ServerSideRenderedContent.js

@@ -1,36 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const styles_1 = require("@mui/material/styles");
 const mobx_react_1 = require("mobx-react");
-const client_1 = require("react-dom/client");
-const ui_1 = require("../../ui");
-const util_1 = require("../../util");
-const ServerSideRenderedContent = (0, mobx_react_1.observer)(function ServerSideRenderedContent({ theme, html, RenderingComponent, ...rest }) {
-    const ref = (0, react_1.useRef)(null);
-    const rootRef = (0, react_1.useRef)(null);
-    (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 : (0, client_1.hydrateRoot)(ref.current, (0, jsx_runtime_1.jsx)(styles_1.ThemeProvider, { theme: jbrowseTheme, children: (0, jsx_runtime_1.jsx)(RenderingComponent, { ...rest }) }));
-        });
-        return () => {
-            if (renderTimeout !== undefined) {
-                clearTimeout(renderTimeout);
-            }
-            const root = rootRef.current;
-            rootRef.current = null;
-            setTimeout(() => {
-                root === null || root === void 0 ? void 0 : root.unmount();
-            });
-        };
-    }, [theme, rest, RenderingComponent]);
-    return (0, jsx_runtime_1.jsx)("div", { ref: ref, dangerouslySetInnerHTML: { __html: html } });
+const ServerSideRenderedContent = (0, mobx_react_1.observer)(function ServerSideRenderedContent({ html, RenderingComponent, ...props }) {
+    return (0, jsx_runtime_1.jsx)(RenderingComponent, { ...props });
 });
 exports.default = ServerSideRenderedContent;

package/pluggableElementTypes/renderers/ServerSideRendererType.js

@@ -28,18 +28,17 @@ class ServerSideRenderer extends RendererType_1.default {
         };
     }
     deserializeResultsInClient(res, args) {
-        if (args.exportSVG) {
-            return {
+        return args.exportSVG
+            ? {
                 ...res,
                 html: this.supportsSVG
                     ? res.html
                     : '<text y="12" fill="black">SVG export not supported for this track</text>',
+            }
+            : {
+                ...res,
+                reactElement: ((0, jsx_runtime_1.jsx)(ServerSideRenderedContent_1.default, { ...args, ...res, RenderingComponent: this.ReactComponent })),
             };
-        }
-        return {
-            ...res,
-            reactElement: ((0, jsx_runtime_1.jsx)(ServerSideRenderedContent_1.default, { ...args, ...res, RenderingComponent: this.ReactComponent })),
-        };
     }
     deserializeArgsInWorker(args) {
         const deserialized = { ...args };

package/rpc/methods/CoreFreeResources.js

@@ -12,9 +12,9 @@ class CoreFreeResources extends RpcMethodType_1.default {
     }
     async execute(args) {
         (0, dataAdapterCache_1.freeAdapterResources)(args);
-        this.pluginManager.getRendererTypes().forEach(renderer => {
+        for (const renderer of this.pluginManager.getRendererTypes()) {
             renderer.freeResources(args);
-        });
+        }
     }
     async serializeArguments(args, _rpcDriver) {
         return args;