jbrowse-plugin-mafviewer 1.1.2 → 1.1.4

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.2",
+  "version": "1.1.4",
   "license": "MIT",
   "name": "jbrowse-plugin-mafviewer",
   "keywords": [

package/src/BigMafAdapter/BigMafAdapter.ts

@@ -1,9 +1,13 @@
 import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter'
 import { Feature, Region, SimpleFeature } from '@jbrowse/core/util'
+import { openLocation } from '@jbrowse/core/util/io'
 import { ObservableCreate } from '@jbrowse/core/util/rxjs'
 import { getSnapshot } from 'mobx-state-tree'
 import { firstValueFrom, toArray } from 'rxjs'
 
+import parseNewick from '../parseNewick'
+import { normalize } from '../util'
+
 interface OrganismRecord {
   chr: string
   start: number
@@ -105,5 +109,21 @@ export default class BigMafAdapter extends BaseFeatureDataAdapter {
       observer.complete()
     })
   }
+
+  async getSamples(_query: Region) {
+    const nhLoc = this.getConf('nhLocation')
+    const nh =
+      nhLoc.uri === '/path/to/my.nh'
+        ? undefined
+        : await openLocation(nhLoc).readFile('utf8')
+
+    // TODO: we may need to resolve the exact set of rows in the visible region
+    // here
+    return {
+      samples: normalize(this.getConf('samples')),
+      tree: nh ? parseNewick(nh) : undefined,
+    }
+  }
+
   freeResources(): void {}
 }

package/src/LinearMafDisplay/components/Tree.tsx

@@ -3,7 +3,15 @@ import React from 'react'
 import { observer } from 'mobx-react'
 
 const Tree = observer(function ({ model }: { model: any }) {
-  const { hierarchy, showBranchLen } = model
+  const {
+    // this is needed for redrawing after zoom change, similar to react-msaview
+    // renderTreeCanvas
+    // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+    rowHeight: _rowHeight,
+
+    hierarchy,
+    showBranchLen,
+  } = model
 
   return (
     <>

package/src/LinearMafDisplay/stateModel.ts

@@ -213,8 +213,9 @@ export default function stateModelFactory(
     }))
     .views(self => {
       const {
+        // eslint-disable-next-line @typescript-eslint/unbound-method
         trackMenuItems: superTrackMenuItems,
-
+        // eslint-disable-next-line @typescript-eslint/unbound-method
         renderProps: superRenderProps,
       } = self
       return {
@@ -316,6 +317,7 @@ export default function stateModelFactory(
       },
     }))
     .actions(self => {
+      // eslint-disable-next-line @typescript-eslint/unbound-method
       const { renderSvg: superRenderSvg } = self
       return {
         /**

package/src/MafAddTrackWorkflow/AddTrackWorkflow.tsx

@@ -71,6 +71,7 @@ export default function MultiMAFWidget({ model }: { model: AddTrackModel }) {
             {['BigMafAdapter', 'MafTabixAdapter', 'BgzipTaffyAdapter'].map(
               r => (
                 <FormControlLabel
+                  key={r}
                   value={r}
                   control={<Radio />}
                   checked={fileTypeChoice === r}
@@ -101,9 +102,10 @@ export default function MultiMAFWidget({ model }: { model: AddTrackModel }) {
               >
                 {['TBI', 'CSI'].map(r => (
                   <FormControlLabel
+                    key={r}
                     value={r}
                     control={<Radio />}
-                    checked={fileTypeChoice === r}
+                    checked={indexTypeChoice === r}
                     label={r}
                   />
                 ))}

package/src/MafTabixAdapter/MafTabixAdapter.ts

@@ -67,9 +67,20 @@ export default class MafTabixAdapter extends BaseFeatureDataAdapter {
 
         for (const [j, elt] of data.entries()) {
           const ad = elt.split(':')
-          const idx = ad[0]!.lastIndexOf('.')
-          const org = ad[0]!.slice(0, idx)
-          const last = ad[0]!.slice(idx + 1)
+          const ag = ad[0]!.split('.')
+          const [n1, n2 = '', ...rest] = ag
+          let org
+          let last = ''
+          if (ag.length === 2) {
+            org = n1
+            last = n2!
+          } else if (!Number.isNaN(+n2!)) {
+            org = `${n1}.${n2}`
+            last = rest.join('.')
+          } else {
+            org = n1
+            last = [n2, ...rest].join('.')
+          }
           if (org) {
             alignments[org] = {
               chr: last,