@jbrowse/plugin-linear-genome-view 1.5.1 → 1.5.5

package/src/LinearGenomeView/components/SearchResultsDialog.tsx

@@ -6,7 +6,6 @@ import {
   Dialog,
   DialogActions,
   DialogContent,
-  DialogContentText,
   DialogTitle,
   Divider,
   IconButton,
@@ -18,10 +17,9 @@ import {
   TableRow,
   Typography,
   Paper,
+  makeStyles,
 } from '@material-ui/core'
 import CloseIcon from '@material-ui/icons/Close'
-import { makeStyles } from '@material-ui/core/styles'
-import BaseResult from '@jbrowse/core/TextSearch/BaseResults'
 import { LinearGenomeViewModel } from '../..'
 
 export const useStyles = makeStyles(theme => ({
@@ -101,8 +99,8 @@ export default function SearchResultsDialog({
 
   return (
     <Dialog open maxWidth="xl" onClose={handleClose}>
-      <DialogTitle id="search-results-dialog">
-        Search Results
+      <DialogTitle>
+        Search results
         {handleClose ? (
           <IconButton
             data-testid="close-resultsDialog"
@@ -117,18 +115,15 @@ export default function SearchResultsDialog({
       </DialogTitle>
       <Divider />
       <DialogContent>
-        {model.searchResults?.length === 0 ||
-        model.searchResults === undefined ? (
+        {!model.searchResults?.length ? (
           <Typography>
-            {`No results found for `}
-            <b>{model.searchQuery}</b>
+            No results found for <b>{model.searchQuery}</b>
           </Typography>
         ) : (
           <>
-            <DialogContentText id="alert-dialog-slide-description">
-              {`Showing results for `}
-              <b>{model.searchQuery}</b>
-            </DialogContentText>
+            <Typography>
+              Showing results for <b>{model.searchQuery}</b>
+            </Typography>
             <TableContainer component={Paper}>
               <Table>
                 <TableHead>
@@ -140,8 +135,8 @@ export default function SearchResultsDialog({
                   </TableRow>
                 </TableHead>
                 <TableBody>
-                  {model.searchResults.map((result: BaseResult, index) => (
-                    <TableRow key={`${result.getLabel()}-${index}`}>
+                  {model.searchResults.map(result => (
+                    <TableRow key={`${result.getId()}`}>
                       <TableCell component="th" scope="row">
                         {result.getLabel()}
                       </TableCell>
@@ -151,18 +146,6 @@ export default function SearchResultsDialog({
                       <TableCell align="right">
                         {getTrackName(result.getTrackId()) || 'N/A'}
                       </TableCell>
-                      <TableCell align="right">
-                        <Button
-                          onClick={() => {
-                            handleClick(result.getLocation())
-                            handleClose()
-                          }}
-                          color="primary"
-                          variant="contained"
-                        >
-                          Go to location
-                        </Button>
-                      </TableCell>
                       <TableCell align="right">
                         <Button
                           onClick={() => {
@@ -177,7 +160,7 @@ export default function SearchResultsDialog({
                           color="primary"
                           variant="contained"
                         >
-                          Show Track
+                          Go
                         </Button>
                       </TableCell>
                     </TableRow>
@@ -190,12 +173,7 @@ export default function SearchResultsDialog({
       </DialogContent>
       <Divider />
       <DialogActions>
-        <Button
-          onClick={() => {
-            handleClose()
-          }}
-          color="primary"
-        >
+        <Button onClick={() => handleClose()} color="primary">
           Cancel
         </Button>
       </DialogActions>

package/src/LinearGenomeView/components/__snapshots__/LinearGenomeView.test.js.snap

@@ -17,7 +17,7 @@ exports[`<LinearGenomeView /> renders one track, one region 1`] = `
         >
           <div
             class="makeStyles-scaleBarVisibleRegion"
-            style="width: 800px; left: 0px; background: rgba(121, 134, 203, 0.3);"
+            style="width: 800px; left: 0px; background: rgba(121, 134, 203, 0.3); border-color: #7986cb;"
           />
           <div
             class="makeStyles-scaleBarContig"
@@ -207,6 +207,29 @@ exports[`<LinearGenomeView /> renders one track, one region 1`] = `
                       d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
                     />
                   </svg>
+                  <button
+                    class="MuiButtonBase-root MuiIconButton-root"
+                    tabindex="0"
+                    type="button"
+                  >
+                    <span
+                      class="MuiIconButton-label"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="MuiTouchRipple-root"
+                    />
+                  </button>
                 </div>
                 <div
                   class="MuiAutocomplete-endAdornment"
@@ -581,7 +604,7 @@ exports[`<LinearGenomeView /> renders two tracks, two regions 1`] = `
         >
           <div
             class="makeStyles-scaleBarVisibleRegion"
-            style="width: 580px; left: 0px; background: rgba(121, 134, 203, 0.3);"
+            style="width: 580px; left: 0px; background: rgba(121, 134, 203, 0.3); border-color: #7986cb;"
           />
           <div
             class="makeStyles-scaleBarContig"
@@ -751,7 +774,7 @@ exports[`<LinearGenomeView /> renders two tracks, two regions 1`] = `
             class="MuiAutocomplete-root"
             data-testid="autocomplete"
             role="combobox"
-            style="width: 235.22500000000002px;"
+            style="width: 255.22500000000002px;"
           >
             <div
               class="MuiFormControl-root MuiTextField-root makeStyles-headerRefName MuiFormControl-fullWidth"
@@ -787,6 +810,29 @@ exports[`<LinearGenomeView /> renders two tracks, two regions 1`] = `
                       d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
                     />
                   </svg>
+                  <button
+                    class="MuiButtonBase-root MuiIconButton-root"
+                    tabindex="0"
+                    type="button"
+                  >
+                    <span
+                      class="MuiIconButton-label"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="MuiTouchRipple-root"
+                    />
+                  </button>
                 </div>
                 <div
                   class="MuiAutocomplete-endAdornment"

package/src/declare.d.ts

@@ -1 +0,0 @@
-declare module 'normalize-wheel'