More typescripting

GMOD · Oct 5, 2023 · 9effb17 · 9effb17
1 parent f4d19aa
commit 9effb17
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 41 deletions.
diff --git a/srcjs/JBrowseR.jsx → srcjs/JBrowseR.tsx b/srcjs/JBrowseR.jsx → srcjs/JBrowseR.tsx
diff --git a/srcjs/components/View.jsx b/srcjs/components/View.jsx
diff --git a/srcjs/components/View.tsx b/srcjs/components/View.tsx
@@ -0,0 +1,34 @@
+import React from 'react'
+import {
+  createViewState,
+  JBrowseLinearGenomeView,
+} from '@jbrowse/react-linear-genome-view'
+
+import { messageShiny } from '../utils'
+
+export default function View(props: {
+  tracks: string
+  assembly: string
+  location: string
+  theme: string
+  text_index: string
+}) {
+  const { theme, text_index, assembly, tracks, location, ...rest } =
+    Object.fromEntries(
+      Object.entries(props).map(([key, value]) => [
+        key,
+        key === 'location' ? value : JSON.parse(value),
+      ]),
+    )
+  const state = createViewState({
+    ...rest,
+    onChange: messageShiny,
+    configuration: { theme },
+    aggregateTextSearchAdapters: text_index,
+    location,
+    assembly,
+    tracks,
+  })
+
+  return <JBrowseLinearGenomeView viewState={state} />
+}
diff --git a/srcjs/components/ViewHg19.jsx → srcjs/components/ViewHg19.tsx b/srcjs/components/ViewHg19.jsx → srcjs/components/ViewHg19.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   createViewState,
   JBrowseLinearGenomeView,
@@ -86,11 +87,11 @@ const defaultSession = {
   },
 }
 
-export default function Hg19View(props) {
+export default function Hg19View({ location }: { location: string }) {
   const state = createViewState({
     assembly,
     tracks,
-    location: props.location,
+    location,
     defaultSession,
     onChange: messageShiny,
   })

diff --git a/srcjs/components/ViewHg38.jsx → srcjs/components/ViewHg38.tsx b/srcjs/components/ViewHg38.jsx → srcjs/components/ViewHg38.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   createViewState,
   JBrowseLinearGenomeView,
@@ -86,12 +87,11 @@ const defaultSession = {
   },
 }
 
-export default function ViewHg38(props) {
-  console.log({ props })
+export default function ViewHg38({location}:{location:string}) {
   const state = createViewState({
     assembly,
     tracks,
-    location: props.location,
+    location,
     defaultSession,
     onChange: messageShiny,
   })

diff --git a/srcjs/utils.js → srcjs/utils.ts b/srcjs/utils.js → srcjs/utils.ts
@@ -7,7 +7,8 @@
  * @param patch The JSON patch received from
  * the LGV ViewState with what was changed.
  */
-export function messageShiny(patch) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function messageShiny(patch: any) {
   if (typeof Shiny === 'undefined') {
     return
   }
@@ -17,9 +18,9 @@ export function messageShiny(patch) {
   if (path.endsWith('featureData')) {
     Shiny.setInputValue('selectedFeature', value)
   } else if (path.endsWith('Feature') && value) {
-      const { featureData } = value
-      if (featureData) {
-        Shiny.setInputValue('selectedFeature', featureData)
-      }
+    const { featureData } = value
+    if (featureData) {
+      Shiny.setInputValue('selectedFeature', featureData)
     }
+  }
 }