react-msaview 3.1.9 → 3.1.11

package/src/components/SequenceTextArea.tsx

@@ -9,6 +9,7 @@ import Checkbox2 from './Checkbox2'
 const useStyles = makeStyles()({
   textAreaFont: {
     fontFamily: 'Courier New',
+    wordWrap: 'break-word',
   },
   dialogContent: {
     background: 'lightgrey',

package/src/components/dialogs/SettingsDialog.tsx

@@ -82,7 +82,7 @@ const TreeSettings = observer(function TreeSettings({
         onChange={() => model.setDrawLabels(!drawLabels)}
         label="Draw labels"
       />
-      {!noTree ? (
+      {noTree ? null : (
         <div>
           <Checkbox2
             checked={treeWidthMatchesArea}
@@ -91,7 +91,7 @@ const TreeSettings = observer(function TreeSettings({
             }
             label="Make tree width fit to tree area?"
           />
-          {!treeWidthMatchesArea ? (
+          {treeWidthMatchesArea ? null : (
             <div className={classes.flex}>
               <Typography>Tree width ({treeWidth}px)</Typography>
               <Slider
@@ -102,9 +102,9 @@ const TreeSettings = observer(function TreeSettings({
                 onChange={(_, val) => model.setTreeWidth(val as number)}
               />
             </div>
-          ) : null}
+          )}
         </div>
-      ) : null}
+      )}
     </div>
   )
 })

package/src/components/msa/MSACanvas.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react'
 import { observer } from 'mobx-react'
-import normalizeWheel from 'normalize-wheel'
 
 // locals
 import { MsaViewModel } from '../../model'
@@ -23,10 +22,9 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
     if (!curr) {
       return
     }
-    function onWheel(origEvent: WheelEvent) {
-      const event = normalizeWheel(origEvent)
-      deltaX.current += event.pixelX
-      deltaY.current += event.pixelY
+    function onWheel(event: WheelEvent) {
+      deltaX.current += event.deltaX
+      deltaY.current += event.deltaY
 
       if (!scheduled.current) {
         scheduled.current = true
@@ -38,8 +36,8 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
           scheduled.current = false
         })
       }
-      origEvent.preventDefault()
-      origEvent.stopPropagation()
+      event.preventDefault()
+      event.stopPropagation()
     }
     curr.addEventListener('wheel', onWheel)
     return () => {
@@ -121,9 +119,7 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
         overflow: 'hidden',
       }}
     >
-      {!MSA && !msaFilehandle ? null : !MSA ? (
-        <Loading />
-      ) : (
+      {!MSA && !msaFilehandle ? null : MSA ? (
         blocks2d.map(([bx, by]) => (
           <MSACanvasBlock
             key={`${bx}_${by}`}
@@ -132,6 +128,8 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
             offsetY={by}
           />
         ))
+      ) : (
+        <Loading />
       )}
     </div>
   )

package/src/components/tree/TreeCanvas.tsx

@@ -1,5 +1,4 @@
 import React, { useEffect, useRef, useState } from 'react'
-import normalizeWheel from 'normalize-wheel'
 import { observer } from 'mobx-react'
 
 // locals
@@ -20,9 +19,8 @@ const TreeCanvas = observer(function ({ model }: { model: MsaViewModel }) {
     if (!curr) {
       return
     }
-    function onWheel(origEvent: WheelEvent) {
-      const event = normalizeWheel(origEvent)
-      deltaY.current += event.pixelY
+    function onWheel(event: WheelEvent) {
+      deltaY.current += event.deltaY
 
       if (!scheduled.current) {
         scheduled.current = true
@@ -32,8 +30,8 @@ const TreeCanvas = observer(function ({ model }: { model: MsaViewModel }) {
           scheduled.current = false
         })
       }
-      origEvent.preventDefault()
-      origEvent.stopPropagation()
+      event.preventDefault()
+      event.stopPropagation()
     }
     curr.addEventListener('wheel', onWheel)
     return () => {

package/src/model.ts

@@ -58,7 +58,7 @@ import {
   loadInterProScanResults,
 } from './launchInterProScan'
 
-interface Accession {
+export interface Accession {
   accession: string
   name: string
   description: string
@@ -580,7 +580,7 @@ function stateModelFactory() {
        */
       get mouseOverRowName() {
         const { mouseRow } = self
-        return mouseRow !== undefined ? this.rowNames[mouseRow] : undefined
+        return mouseRow === undefined ? undefined : this.rowNames[mouseRow]
       },
 
       /**

package/src/version.ts

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