react-msaview 3.1.11 → 3.2.0

package/src/parseNewick.ts

@@ -85,7 +85,7 @@ export default function parse(s: string) {
         if (x === ')' || x === '(' || x === ',') {
           tree.name = token
         } else if (x === ':') {
-          tree.length = parseFloat(token)
+          tree.length = Number.parseFloat(token)
         }
       }
     }

package/src/parsers/ClustalMSA.ts

@@ -1,5 +1,5 @@
 import { parse } from 'clustal-js'
-import { NodeWithIds } from '../util'
+import type { NodeWithIds } from '../util'
 export default class ClustalMSA {
   private MSA: ReturnType<typeof parse>
 

package/src/parsers/FastaMSA.ts

@@ -1,4 +1,4 @@
-import { NodeWithIds } from '../util'
+import type { NodeWithIds } from '../util'
 
 function parseSmallFasta(text: string) {
   return text

package/src/parsers/StockholmMSA.ts

@@ -1,7 +1,7 @@
 import Stockholm from 'stockholm-js'
 import parseNewick from '../parseNewick'
 
-import { NodeWithIds, generateNodeIds } from '../util'
+import { type NodeWithIds, generateNodeIds } from '../util'
 interface StockholmEntry {
   gf: {
     DE?: string[]

package/src/renderToSvg.tsx

@@ -2,10 +2,10 @@ import React from 'react'
 import { createRoot } from 'react-dom/client'
 import { when } from 'mobx'
 import { renderToStaticMarkup } from '@jbrowse/core/util'
-import { Theme } from '@mui/material'
+import type { Theme } from '@mui/material'
 
 // locals
-import { MsaViewModel } from './model'
+import type { MsaViewModel } from './model'
 import { renderTreeCanvas } from './components/tree/renderTreeCanvas'
 import { renderMSABlock } from './components/msa/renderMSABlock'
 import { colorContrast } from './util'
@@ -17,7 +17,7 @@ export async function renderToSvg(
   model: MsaViewModel,
   opts: { theme: Theme; includeMinimap?: boolean; exportType: string },
 ) {
-  await when(() => !!model.initialized)
+  await when(() => !!model.dataInitialized)
   const { width, height, scrollX, scrollY } = model
   const { exportType, theme, includeMinimap } = opts
 
@@ -31,7 +31,8 @@ export async function renderToSvg(
       offsetX: 0,
       includeMinimap,
     })
-  } else if (exportType === 'viewport') {
+  }
+  if (exportType === 'viewport') {
     return render({
       width,
       height,
@@ -41,9 +42,8 @@ export async function renderToSvg(
       offsetX: -scrollX,
       includeMinimap,
     })
-  } else {
-    throw new Error('unknown export type')
   }
+  throw new Error('unknown export type')
 }
 
 async function render({
@@ -84,30 +84,6 @@ async function render({
   )
 }
 
-// function renderMultiline({ model }: { model: MsaViewModel }) {
-//   const { treeAreaWidth, height } = model
-//   const clipId = 'tree'
-//   return (
-//     <Wrapper model={model}>
-//       <defs>
-//         <clipPath id={clipId}>
-//           <rect x={0} y={0} width={treeAreaWidth} height={height} />
-//         </clipPath>
-//       </defs>
-//       <g
-//         clipPath={`url(#${clipId})`}
-//         /* eslint-disable-next-line react/no-danger */
-//         dangerouslySetInnerHTML={{ __html: ctx1.getSvg().innerHTML }}
-//       />
-//       <g
-//         transform={`translate(${treeAreaWidth} 0)`}
-//         /* eslint-disable-next-line react/no-danger */
-//         dangerouslySetInnerHTML={{ __html: ctx2.getSvg().innerHTML }}
-//       />
-//     </Wrapper>
-//   )
-// }
-
 function CoreRendering({
   model,
   theme,

package/src/reparseTree.ts

@@ -1,4 +1,4 @@
-import { NodeWithIds } from './util'
+import type { NodeWithIds } from './util'
 
 export function reparseTree(tree: NodeWithIds): NodeWithIds {
   return {

package/src/util.ts

@@ -1,6 +1,6 @@
-import { HierarchyNode } from 'd3-hierarchy'
+import type { HierarchyNode } from 'd3-hierarchy'
 import { max } from 'd3-array'
-import { Theme } from '@mui/material'
+import type { Theme } from '@mui/material'
 import { colord, extend } from 'colord'
 import namesPlugin from 'colord/plugins/names'
 
@@ -106,8 +106,6 @@ export function collapse(d: HierarchyNode<NodeWithIds>) {
     // @ts-expect-error
     d._children = d.children
     // @ts-expect-error
-    d._children.forEach(collapse)
-    // @ts-expect-error
     d.children = null
   }
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = '3.1.11'
+export const version = '3.2.0'