@jbrowse/plugin-variants 2.1.7 → 2.2.1

package/src/LinearVariantDisplay/index.ts

@@ -1,12 +1,12 @@
 import PluginManager from '@jbrowse/core/PluginManager'
-import { LinearVariantDisplayConfigFactory } from './configSchema'
 import { BaseLinearDisplayComponent } from '@jbrowse/plugin-linear-genome-view'
 import DisplayType from '@jbrowse/core/pluggableElementTypes/DisplayType'
 import stateModelFactory from './model'
+import configSchemaF from './configSchema'
 
 export default (pluginManager: PluginManager) => {
   pluginManager.addDisplayType(() => {
-    const configSchema = LinearVariantDisplayConfigFactory(pluginManager)
+    const configSchema = configSchemaF(pluginManager)
     return new DisplayType({
       name: 'LinearVariantDisplay',
       configSchema,

package/src/LinearVariantDisplay/model.ts

@@ -12,17 +12,33 @@ import { linearBasicDisplayModelFactory } from '@jbrowse/plugin-linear-genome-vi
 import { types } from 'mobx-state-tree'
 import { LinearVariantDisplayConfigModel } from './configSchema'
 
-export default function (configSchema: LinearVariantDisplayConfigModel) {
+/**
+ * #stateModel LinearVariantDisplay
+ * extends `LinearBasicDisplay`
+ * very similar to basic display, but provides custom widget on feature click
+ */
+export default function stateModelFactory(
+  configSchema: LinearVariantDisplayConfigModel,
+) {
   return types
     .compose(
       'LinearVariantDisplay',
       linearBasicDisplayModelFactory(configSchema),
       types.model({
+        /**
+         * #property
+         */
         type: types.literal('LinearVariantDisplay'),
+        /**
+         * #property
+         */
         configuration: ConfigurationReference(configSchema),
       }),
     )
     .actions(self => ({
+      /**
+       * #action
+       */
       async selectFeature(feature: Feature) {
         const session = getSession(self)
         if (isSessionModelWithWidgets(session)) {

package/src/StructuralVariantChordRenderer/configSchema.ts

@@ -0,0 +1,42 @@
+import { ConfigurationSchema } from '@jbrowse/core/configuration'
+/**
+ * #config StructuralVariantChordRenderer
+ */
+function x() {} // eslint-disable-line @typescript-eslint/no-unused-vars
+
+const configSchema = ConfigurationSchema(
+  'StructuralVariantChordRenderer',
+  {
+    /**
+     * #slot
+     */
+    strokeColor: {
+      type: 'color',
+      description: 'the line color of each arc',
+      defaultValue: 'rgba(255,133,0,0.32)',
+      contextVariable: ['feature'],
+    },
+    /**
+     * #slot
+     */
+    strokeColorSelected: {
+      type: 'color',
+      description: 'the line color of an arc that has been selected',
+      defaultValue: 'black',
+      contextVariable: ['feature'],
+    },
+    /**
+     * #slot
+     */
+    strokeColorHover: {
+      type: 'color',
+      description:
+        'the line color of an arc that is being hovered over with the mouse',
+      defaultValue: '#555',
+      contextVariable: ['feature'],
+    },
+  },
+  { explicitlyTyped: true },
+)
+
+export default configSchema

package/src/StructuralVariantChordRenderer/index.ts

@@ -1,41 +1,18 @@
 import ChordRendererType from '@jbrowse/core/pluggableElementTypes/renderers/CircularChordRendererType'
-import { ConfigurationSchema } from '@jbrowse/core/configuration'
 import PluginManager from '@jbrowse/core/PluginManager'
-
+import configSchema from './configSchema'
 import ReactComponent from './ReactComponent'
 
 const ChordRendererConfigF = (pluginManager: PluginManager) => {
-  const configSchema = ConfigurationSchema(
-    'StructuralVariantChordRenderer',
-    {
-      strokeColor: {
-        type: 'color',
-        description: 'the line color of each arc',
-        defaultValue: 'rgba(255,133,0,0.32)',
-        contextVariable: ['feature'],
-      },
-      strokeColorSelected: {
-        type: 'color',
-        description: 'the line color of an arc that has been selected',
-        defaultValue: 'black',
-        contextVariable: ['feature'],
-      },
-      strokeColorHover: {
-        type: 'color',
-        description:
-          'the line color of an arc that is being hovered over with the mouse',
-        defaultValue: '#555',
-        contextVariable: ['feature'],
-      },
-    },
-    { explicitlyTyped: true },
+  pluginManager.addRendererType(
+    () =>
+      new ChordRendererType({
+        name: 'StructuralVariantChordRenderer',
+        ReactComponent,
+        configSchema,
+        pluginManager,
+      }),
   )
-  return new ChordRendererType({
-    name: 'StructuralVariantChordRenderer',
-    ReactComponent,
-    configSchema,
-    pluginManager,
-  })
 }
 
 export default ChordRendererConfigF

package/src/VariantFeatureWidget/VariantFeatureWidget.test.js

@@ -13,13 +13,15 @@ describe('VariantTrack widget', () => {
     const pluginManager = new PluginManager([])
     const Session = types.model({
       rpcManager: types.optional(types.frozen(), {}),
-      pluginManager: types.optional(types.frozen(), {}),
       configuration: ConfigurationSchema('test', {}),
       widget: stateModelFactory(pluginManager),
     })
-    const model = Session.create({
-      widget: { type: 'VariantFeatureWidget' },
-    })
+    const model = Session.create(
+      {
+        widget: { type: 'VariantFeatureWidget' },
+      },
+      { pluginManager },
+    )
     model.widget.setFeatureData({
       refName: 'ctgA',
       start: 176,

package/src/VariantFeatureWidget/__snapshots__/VariantFeatureWidget.test.js.snap

@@ -29,7 +29,7 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
       >
         <svg
           aria-hidden="true"
-          class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium tss-rb1zhf-expandIcon css-i4bv87-MuiSvgIcon-root"
+          class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-125qixp-MuiSvgIcon-root-expandIcon"
           data-testid="ExpandMoreIcon"
           focusable="false"
           viewBox="0 0 24 24"
@@ -55,7 +55,7 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
             role="region"
           >
             <div
-              class="MuiAccordionDetails-root tss-1g973hk-expansionPanelDetails css-15v22id-MuiAccordionDetails-root"
+              class="MuiAccordionDetails-root css-rqrb7m-MuiAccordionDetails-root-expansionPanelDetails"
             >
               <p
                 class="MuiTypography-root MuiTypography-body1 css-ahj2mt-MuiTypography-root"
@@ -63,31 +63,29 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 Core details
               </p>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
-                  class="tss-1y9c7n2-fieldName"
+                  class="css-1y9c7n2-fieldName"
                 >
                   Position
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
-                  <div>
-                    ctgA:177..177 
-                  </div>
+                  ctgA:177 
                 </div>
               </div>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
-                  class="tss-1y9c7n2-fieldName"
+                  class="css-1y9c7n2-fieldName"
                 >
                   Name
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
                   <div>
                     rs123
@@ -95,15 +93,15 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 </div>
               </div>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
-                  class="tss-1y9c7n2-fieldName"
+                  class="css-1y9c7n2-fieldName"
                 >
                   Length
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
                   <div>
                     1
@@ -119,17 +117,17 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 Attributes
               </p>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
                   aria-label="reference base(s): Each base must be one of A,C,G,T,N (case insensitive)."
-                  class="tss-1qe2j6j-fieldDescription-fieldName"
+                  class="css-1qe2j6j-fieldDescription-fieldName"
                   data-mui-internal-clone-element="true"
                 >
                   REF
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
                   <div>
                     A
@@ -137,17 +135,17 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 </div>
               </div>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
                   aria-label="alternate base(s): Comma-separated list of alternate non-reference alleles"
-                  class="tss-1qe2j6j-fieldDescription-fieldName"
+                  class="css-1qe2j6j-fieldDescription-fieldName"
                   data-mui-internal-clone-element="true"
                 >
                   ALT
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
                   <div>
                     &lt;TRA&gt;
@@ -155,17 +153,17 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 </div>
               </div>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
                   aria-label="quality: Phred-scaled quality score for the assertion made in ALT"
-                  class="tss-1qe2j6j-fieldDescription-fieldName"
+                  class="css-1qe2j6j-fieldDescription-fieldName"
                   data-mui-internal-clone-element="true"
                 >
                   QUAL
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
                   <div>
                     10.4
@@ -173,16 +171,16 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 </div>
               </div>
               <div
-                class="tss-1m8nxnb-field"
+                class="css-1m8nxnb-field"
               >
                 <div
-                  class="tss-1y9c7n2-fieldName"
+                  class="css-1y9c7n2-fieldName"
                   style="width: 62px;"
                 >
                   INFO.MQ
                 </div>
                 <div
-                  class="tss-1omt041-fieldValue"
+                  class="css-1omt041-fieldValue"
                 >
                   <div>
                     5
@@ -190,7 +188,7 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                 </div>
               </div>
               <div
-                class="tss-1upvn7b-container2"
+                class="css-1upvn7b-container2"
               >
                 <button
                   class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-sghohy-MuiButtonBase-root-MuiButton-root"
@@ -203,7 +201,7 @@ exports[`VariantTrack widget renders with just the required model elements 1`] =
                   />
                 </button>
                 <div
-                  class="MuiFormControl-root tss-1x17dzq-formControl css-1nrlq1o-MuiFormControl-root"
+                  class="MuiFormControl-root css-147opmv-MuiFormControl-root-formControl"
                 >
                   <button
                     class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"

package/src/VariantTrack/configSchema.ts

@@ -0,0 +1,24 @@
+import { ConfigurationSchema } from '@jbrowse/core/configuration'
+import { createBaseTrackConfig } from '@jbrowse/core/pluggableElementTypes'
+import PluginManager from '@jbrowse/core/PluginManager'
+
+/**
+ * #config VariantTrack
+ * Mostly similar to feature track, but has `ChordDisplayType` registered to it,
+ * and custom feature details in `LinearVariantDisplay`
+ */
+function x() {} // eslint-disable-line @typescript-eslint/no-unused-vars
+
+const configSchema = (pluginManager: PluginManager) =>
+  ConfigurationSchema(
+    'VariantTrack',
+    {},
+    {
+      /**
+       * #baseConfiguration
+       */
+      baseConfiguration: createBaseTrackConfig(pluginManager),
+    },
+  )
+
+export default configSchema

package/src/VariantTrack/index.ts

@@ -1,26 +1,15 @@
 import PluginManager from '@jbrowse/core/PluginManager'
-import { ConfigurationSchema } from '@jbrowse/core/configuration'
 import TrackType from '@jbrowse/core/pluggableElementTypes/TrackType'
-import {
-  createBaseTrackConfig,
-  createBaseTrackModel,
-} from '@jbrowse/core/pluggableElementTypes/models'
+import { createBaseTrackModel } from '@jbrowse/core/pluggableElementTypes/models'
+import configSchemaF from './configSchema'
 
-export default (pluginManager: PluginManager) => {
-  pluginManager.addTrackType(() => {
-    const configSchema = ConfigurationSchema(
-      'VariantTrack',
-      {},
-      { baseConfiguration: createBaseTrackConfig(pluginManager) },
-    )
+export default (pm: PluginManager) => {
+  pm.addTrackType(() => {
+    const configSchema = configSchemaF(pm)
     return new TrackType({
       name: 'VariantTrack',
       configSchema,
-      stateModel: createBaseTrackModel(
-        pluginManager,
-        'VariantTrack',
-        configSchema,
-      ),
+      stateModel: createBaseTrackModel(pm, 'VariantTrack', configSchema),
     })
   })
 }