Avoid rendering undefined

GMOD · May 17, 2024 · 82f60a8 · 82f60a8
1 parent 1bdf5ce
commit 82f60a8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 31 deletions.
diff --git a/plugins/grid-bookmark/src/GridBookmarkWidget/components/Highlight/Highlight.tsx b/plugins/grid-bookmark/src/GridBookmarkWidget/components/Highlight/Highlight.tsx
@@ -43,9 +43,9 @@ const Highlight = observer(function Highlight({ model }: { model: LGV }) {
 
   const set = new Set(model.assemblyNames)
 
-  return showBookmarkHighlights
-    ? bookmarkWidget?.bookmarks
-        ?.filter(value => set.has(value.assemblyName))
+  return showBookmarkHighlights && bookmarkWidget?.bookmarks
+    ? bookmarkWidget.bookmarks
+        .filter(value => set.has(value.assemblyName))
         .map(r => {
           const asm = assemblyManager.get(r.assemblyName)
           const refName = asm?.getCanonicalRefName(r.refName) ?? r.refName

diff --git a/plugins/grid-bookmark/src/GridBookmarkWidget/components/Highlight/OverviewHighlight.tsx b/plugins/grid-bookmark/src/GridBookmarkWidget/components/Highlight/OverviewHighlight.tsx
@@ -44,8 +44,8 @@ const OverviewHighlight = observer(function OverviewHighlight({
   }, [session, bookmarkWidget])
 
   const assemblyNames = new Set(model.assemblyNames)
-  return showBookmarkHighlights
-    ? bookmarkWidget?.bookmarks
+  return showBookmarkHighlights && bookmarkWidget?.bookmarks
+    ? bookmarkWidget.bookmarks
         .filter(r => assemblyNames.has(r.assemblyName))
         .map(r => {
           const asm = assemblyManager.get(r.assemblyName)

diff --git a/plugins/linear-genome-view/src/LinearGenomeView/components/Highlight.tsx b/plugins/linear-genome-view/src/LinearGenomeView/components/Highlight.tsx
@@ -43,38 +43,13 @@ const Highlight = observer(function Highlight({
   const [open, setOpen] = useState(false)
   const anchorEl = useRef(null)
   const color = useTheme().palette.highlight?.main ?? 'goldenrod'
-
   const session = getSession(model) as SessionWithWidgets
   const { assemblyManager } = session
 
   const dismissHighlight = () => {
     model.removeHighlight(highlight)
   }
 
-  const menuItems = [
-    {
-      label: 'Dismiss highlight',
-      icon: CloseIcon,
-      onClick: () => dismissHighlight(),
-    },
-    {
-      label: 'Bookmark highlighted region',
-      icon: BookmarkIcon,
-      onClick: () => {
-        let bookmarkWidget = session.widgets.get('GridBookmark')
-        if (!bookmarkWidget) {
-          bookmarkWidget = session.addWidget(
-            'GridBookmarkWidget',
-            'GridBookmark',
-          )
-        }
-        // @ts-ignore
-        bookmarkWidget.addBookmark(highlight as Region)
-        dismissHighlight()
-      },
-    },
-  ]
-
   function handleClose() {
     setOpen(false)
   }
@@ -134,7 +109,29 @@ const Highlight = observer(function Highlight({
         }}
         open={open}
         onClose={handleClose}
-        menuItems={menuItems}
+        menuItems={[
+          {
+            label: 'Dismiss highlight',
+            icon: CloseIcon,
+            onClick: () => dismissHighlight(),
+          },
+          {
+            label: 'Bookmark highlighted region',
+            icon: BookmarkIcon,
+            onClick: () => {
+              let bookmarkWidget = session.widgets.get('GridBookmark')
+              if (!bookmarkWidget) {
+                bookmarkWidget = session.addWidget(
+                  'GridBookmarkWidget',
+                  'GridBookmark',
+                )
+              }
+              // @ts-ignore
+              bookmarkWidget.addBookmark(highlight as Region)
+              dismissHighlight()
+            },
+          },
+        ]}
       />
     </div>
   ) : null