@jbrowse/plugin-circular-view 2.10.2 → 2.11.0

package/dist/CircularView/components/CircularView.d.ts

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

package/dist/CircularView/components/CircularView.js

@@ -38,7 +38,7 @@ const CircularView = (0, mobx_react_1.observer)(({ model }) => {
         model.initialized;
     const showImportForm = !initialized && !model.disableImportForm;
     const showFigure = initialized && !showImportForm;
-    return (react_1.default.createElement(react_1.default.Fragment, null, showImportForm || model.error ? (react_1.default.createElement(ImportForm_1.default, { model: model })) : showFigure ? (react_1.default.createElement(CircularViewLoaded, { model: model })) : null));
+    return showImportForm || model.error ? (react_1.default.createElement(ImportForm_1.default, { model: model })) : showFigure ? (react_1.default.createElement(CircularViewLoaded, { model: model })) : null;
 });
 const CircularViewLoaded = (0, mobx_react_1.observer)(function ({ model, }) {
     const { width, height, id, offsetRadians, centerXY, figureWidth, figureHeight, hideVerticalResizeHandle, } = model;

package/dist/CircularView/components/ExportSvgDialog.js

@@ -32,6 +32,10 @@ function LoadingMessage() {
         react_1.default.createElement(material_1.CircularProgress, { size: 20, style: { marginRight: 20 } }),
         react_1.default.createElement(material_1.Typography, { display: "inline" }, "Creating SVG")));
 }
+function TextField2({ children, ...rest }) {
+    return (react_1.default.createElement("div", null,
+        react_1.default.createElement(material_1.TextField, { ...rest }, children)));
+}
 function useSvgLocal(key, val) {
     return (0, util_1.useLocalStorage)('svg-' + key, val);
 }
@@ -46,9 +50,8 @@ function ExportSvgDialog({ model, handleClose, }) {
     return (react_1.default.createElement(ui_1.Dialog, { open: true, onClose: handleClose, title: "Export SVG" },
         react_1.default.createElement(material_1.DialogContent, null,
             error ? (react_1.default.createElement(ui_1.ErrorMessage, { error: error })) : loading ? (react_1.default.createElement(LoadingMessage, null)) : null,
-            react_1.default.createElement(material_1.TextField, { helperText: "filename", value: filename, onChange: event => setFilename(event.target.value) }),
-            react_1.default.createElement("br", null),
-            session.allThemes ? (react_1.default.createElement(material_1.TextField, { select: true, label: "Theme", value: themeName, onChange: event => setThemeName(event.target.value) }, Object.entries(session.allThemes()).map(([key, val]) => (react_1.default.createElement(material_1.MenuItem, { key: key, value: key }, 
+            react_1.default.createElement(TextField2, { helperText: "filename", value: filename, onChange: event => setFilename(event.target.value) }),
+            session.allThemes ? (react_1.default.createElement(TextField2, { select: true, label: "Theme", value: themeName, onChange: event => setThemeName(event.target.value) }, Object.entries(session.allThemes()).map(([key, val]) => (react_1.default.createElement(material_1.MenuItem, { key: key, value: key }, 
             // @ts-expect-error
             val.name || '(Unknown name)'))))) : null,
             offscreenCanvas ? (react_1.default.createElement(material_1.FormControlLabel, { control: react_1.default.createElement(material_1.Checkbox, { checked: rasterizeLayers, onChange: () => setRasterizeLayers(val => !val) }), label: "Rasterize canvas based tracks? File may be much larger if this is turned off" })) : (react_1.default.createElement(material_1.Typography, null, "Note: rasterizing layers not yet supported in this browser, so SVG size may be large"))),
@@ -68,6 +71,8 @@ function ExportSvgDialog({ model, handleClose, }) {
                     catch (e) {
                         console.error(e);
                         setError(e);
+                    }
+                    finally {
                         setLoading(false);
                     }
                 } }, "Submit"))));

package/dist/CircularView/svgcomponents/SVGCircularView.js

@@ -15,7 +15,7 @@ const Ruler_1 = __importDefault(require("../components/Ruler"));
 async function renderToSvg(model, opts) {
     var _a;
     await (0, mobx_1.when)(() => model.initialized);
-    const { themeName = 'default', Wrapper = ({ children }) => react_1.default.createElement(react_1.default.Fragment, null, children) } = opts;
+    const { themeName = 'default', Wrapper = ({ children }) => children } = opts;
     const session = (0, util_1.getSession)(model);
     const theme = (_a = session.allThemes) === null || _a === void 0 ? void 0 : _a.call(session)[themeName];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

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

package/esm/CircularView/components/CircularView.js

@@ -33,7 +33,7 @@ const CircularView = observer(({ model }) => {
         model.initialized;
     const showImportForm = !initialized && !model.disableImportForm;
     const showFigure = initialized && !showImportForm;
-    return (React.createElement(React.Fragment, null, showImportForm || model.error ? (React.createElement(ImportForm, { model: model })) : showFigure ? (React.createElement(CircularViewLoaded, { model: model })) : null));
+    return showImportForm || model.error ? (React.createElement(ImportForm, { model: model })) : showFigure ? (React.createElement(CircularViewLoaded, { model: model })) : null;
 });
 const CircularViewLoaded = observer(function ({ model, }) {
     const { width, height, id, offsetRadians, centerXY, figureWidth, figureHeight, hideVerticalResizeHandle, } = model;

package/esm/CircularView/components/ExportSvgDialog.js

@@ -7,6 +7,10 @@ function LoadingMessage() {
         React.createElement(CircularProgress, { size: 20, style: { marginRight: 20 } }),
         React.createElement(Typography, { display: "inline" }, "Creating SVG")));
 }
+function TextField2({ children, ...rest }) {
+    return (React.createElement("div", null,
+        React.createElement(TextField, { ...rest }, children)));
+}
 function useSvgLocal(key, val) {
     return useLocalStorage('svg-' + key, val);
 }
@@ -21,9 +25,8 @@ export default function ExportSvgDialog({ model, handleClose, }) {
     return (React.createElement(Dialog, { open: true, onClose: handleClose, title: "Export SVG" },
         React.createElement(DialogContent, null,
             error ? (React.createElement(ErrorMessage, { error: error })) : loading ? (React.createElement(LoadingMessage, null)) : null,
-            React.createElement(TextField, { helperText: "filename", value: filename, onChange: event => setFilename(event.target.value) }),
-            React.createElement("br", null),
-            session.allThemes ? (React.createElement(TextField, { 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 }, 
+            React.createElement(TextField2, { helperText: "filename", value: filename, onChange: event => setFilename(event.target.value) }),
+            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,
             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"))),
@@ -43,6 +46,8 @@ export default function ExportSvgDialog({ model, handleClose, }) {
                     catch (e) {
                         console.error(e);
                         setError(e);
+                    }
+                    finally {
                         setLoading(false);
                     }
                 } }, "Submit"))));

package/esm/CircularView/svgcomponents/SVGCircularView.js

@@ -9,7 +9,7 @@ import Ruler from '../components/Ruler';
 export async function renderToSvg(model, opts) {
     var _a;
     await when(() => model.initialized);
-    const { themeName = 'default', Wrapper = ({ children }) => React.createElement(React.Fragment, null, children) } = opts;
+    const { themeName = 'default', Wrapper = ({ children }) => children } = opts;
     const session = getSession(model);
     const theme = (_a = session.allThemes) === null || _a === void 0 ? void 0 : _a.call(session)[themeName];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-circular-view",
-  "version": "2.10.2",
+  "version": "2.11.0",
   "description": "JBrowse 2 circular view",
   "keywords": [
     "jbrowse",
@@ -57,5 +57,5 @@
   "distModule": "esm/index.js",
   "srcModule": "src/index.ts",
   "module": "esm/index.js",
-  "gitHead": "7ca3b7db337ebd88853e2d96cdab940ed550c4fb"
+  "gitHead": "3d43a820b9274a6160aa4dc15616147f390d9094"
 }