@jbrowse/core 2.11.1 → 2.11.2

package/BaseFeatureWidget/BaseFeatureDetail/DataGridDetails.js

@@ -32,9 +32,7 @@ const x_data_grid_1 = require("@mui/x-data-grid");
 const material_1 = require("@mui/material");
 // locals
 const util_1 = require("../../util");
-const ResizeBar_1 = __importDefault(require("../../ui/ResizeBar"));
 const FieldName_1 = __importDefault(require("./FieldName"));
-const useResizeBar_1 = require("../../ui/useResizeBar");
 const ui_1 = require("../../ui");
 const useStyles = (0, mui_1.makeStyles)()(theme => ({
     margin: {
@@ -49,7 +47,6 @@ const useStyles = (0, mui_1.makeStyles)()(theme => ({
 }));
 function DataGridDetails({ value, prefix, name, }) {
     const { classes } = useStyles();
-    const { ref, scrollLeft } = (0, useResizeBar_1.useResizeBar)();
     const [checked, setChecked] = (0, react_1.useState)(false);
     const keys = Object.keys(value[0]).sort();
     const unionKeys = new Set(keys);
@@ -77,13 +74,12 @@ function DataGridDetails({ value, prefix, name, }) {
     else {
         colNames = [...unionKeys];
     }
-    const [widths, setWidths] = (0, react_1.useState)(colNames.map(e => (0, util_1.measureGridWidth)(rows.map(r => r[e]))));
+    const widths = colNames.map(e => (0, util_1.measureGridWidth)(rows.map(r => r[e])));
     if (unionKeys.size < keys.length + 5) {
         return (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement(FieldName_1.default, { prefix: prefix, name: name }),
             react_1.default.createElement(material_1.FormControlLabel, { control: react_1.default.createElement(material_1.Checkbox, { checked: checked, onChange: event => setChecked(event.target.checked) }), label: react_1.default.createElement(material_1.Typography, { variant: "body2" }, "Show options") }),
-            react_1.default.createElement("div", { className: classes.margin, ref: ref },
-                react_1.default.createElement(ResizeBar_1.default, { widths: widths, setWidths: setWidths, scrollLeft: scrollLeft }),
+            react_1.default.createElement("div", { className: classes.margin },
                 react_1.default.createElement(x_data_grid_1.DataGrid, { disableRowSelectionOnClick: true, 
                     // @ts-expect-error the rows gets confused by the renderCell of the
                     // columns below

package/configuration/util.js

@@ -41,17 +41,10 @@ function readConfObject(confObject, slotPath, args = {}) {
             //   })`,
             // )
         }
-        if (slot.expr) {
-            const appliedFunc = slot.expr.evalSync(args);
-            if ((0, mobx_state_tree_1.isStateTreeNode)(appliedFunc)) {
-                return JSON.parse(JSON.stringify((0, mobx_state_tree_1.getSnapshot)(appliedFunc)));
-            }
-            return appliedFunc;
-        }
-        if ((0, mobx_state_tree_1.isStateTreeNode)(slot)) {
-            return JSON.parse(JSON.stringify((0, mobx_state_tree_1.getSnapshot)(slot)));
-        }
-        return slot;
+        const val = slot.expr ? slot.expr.evalSync(args) : slot;
+        return (0, mobx_state_tree_1.isStateTreeNode)(val)
+            ? JSON.parse(JSON.stringify((0, mobx_state_tree_1.getSnapshot)(val)))
+            : val;
     }
     if (Array.isArray(slotPath)) {
         const slotName = slotPath[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -31,6 +31,7 @@
     "@babel/runtime": "^7.17.9",
     "@gmod/bgzf-filehandle": "^1.4.3",
     "@mui/icons-material": "^5.0.1",
+    "@mui/x-data-grid": "^7.0.0",
     "@types/clone": "^2.0.0",
     "abortable-promise-cache": "^1.5.0",
     "canvas-sequencer": "^3.1.0",
@@ -58,7 +59,6 @@
   },
   "peerDependencies": {
     "@mui/material": "^5.0.0",
-    "@mui/x-data-grid": "^7.0.0",
     "mobx": "^6.0.0",
     "mobx-react": "^9.0.0",
     "mobx-state-tree": "^5.0.0",
@@ -72,5 +72,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "11b28d66d782eb06f92ccb993108bb6c3c82819e"
+  "gitHead": "511048cb6965f0bf624c96de244e7fd47fce17d6"
 }

package/pluggableElementTypes/models/BaseDisplayModel.d.ts

@@ -121,9 +121,9 @@ export declare const BaseDisplay: import("mobx-state-tree").IModelType<{
      * #method
      * @param region -
      * @returns falsy if the region is fine to try rendering. Otherwise,
-     *  return a react node + string of text.
-     *  string of text describes why it cannot be rendered
-     *  react node allows user to force load at current setting
+     * return a react node + string of text. string of text describes why it
+     * cannot be rendered react node allows user to force load at current
+     * setting
      */
     regionCannotBeRendered(): null;
 } & {

package/pluggableElementTypes/models/BaseDisplayModel.js

@@ -119,9 +119,9 @@ function stateModelFactory() {
          * #method
          * @param region -
          * @returns falsy if the region is fine to try rendering. Otherwise,
-         *  return a react node + string of text.
-         *  string of text describes why it cannot be rendered
-         *  react node allows user to force load at current setting
+         * return a react node + string of text. string of text describes why it
+         * cannot be rendered react node allows user to force load at current
+         * setting
          */
         regionCannotBeRendered( /* region */) {
             return null;

package/pluggableElementTypes/renderers/util/serializableFilterChain.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jexlStrings_1 = require("../../../util/jexlStrings");
 class SerializableFilterChain {
     constructor({ filters = [] }) {
-        this.filterChain = filters.map(inputFilter => {
+        this.filterChain = filters
+            .map(f => f.trim())
+            .filter(f => !!f)
+            .map(inputFilter => {
             if (typeof inputFilter === 'string') {
                 const expr = (0, jexlStrings_1.stringToJexlExpression)(inputFilter);
                 return { expr, string: inputFilter };

package/rpc/methods/util.d.ts

@@ -1,4 +1,5 @@
-import ServerSideRendererType, { RenderArgs as ServerSideRenderArgs, RenderArgsSerialized as ServerSideRenderArgsSerialized } from '../../pluggableElementTypes/renderers/ServerSideRendererType';
+import { ServerSideRendererType } from '../../pluggableElementTypes';
+import { RenderArgs as ServerSideRenderArgs, RenderArgsSerialized as ServerSideRenderArgsSerialized } from '../../pluggableElementTypes/renderers/ServerSideRendererType';
 import { Region } from '../../util';
 export interface RenderArgs extends ServerSideRenderArgs {
     adapterConfig: {};
@@ -10,5 +11,5 @@ export interface RenderArgsSerialized extends ServerSideRenderArgsSerialized {
     adapterConfig: {};
     rendererType: string;
 }
-export declare function validateRendererType<T>(rendererType: string, RendererType: T): T & ServerSideRendererType;
+export declare function validateRendererType<T>(rendererType: string, RendererType: T): ServerSideRendererType;
 export { type RenderResults, type ResultsSerialized, } from '../../pluggableElementTypes/renderers/ServerSideRendererType';

package/rpc/methods/util.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateRendererType = void 0;
-const ServerSideRendererType_1 = __importDefault(require("../../pluggableElementTypes/renderers/ServerSideRendererType"));
 function validateRendererType(rendererType, RendererType) {
     if (!RendererType) {
         throw new Error(`renderer "${rendererType}" not found`);
@@ -13,9 +9,6 @@ function validateRendererType(rendererType, RendererType) {
     if (!RendererType.ReactComponent) {
         throw new Error(`renderer ${rendererType} has no ReactComponent, it may not be completely implemented yet`);
     }
-    if (!(RendererType instanceof ServerSideRendererType_1.default)) {
-        throw new TypeError('CoreRender requires a renderer that is a subclass of ServerSideRendererType');
-    }
     return RendererType;
 }
 exports.validateRendererType = validateRendererType;