Bump deps

GMOD · Mar 12, 2024 · 9158297 · 9158297
1 parent 9f2d40b
commit 9158297
Show file tree

Hide file tree

Showing 7 changed files with 4,954 additions and 4,335 deletions.
diff --git a/plugins/linear-genome-view/src/BaseLinearDisplay/models/BaseLinearDisplayModel.tsx b/plugins/linear-genome-view/src/BaseLinearDisplay/models/BaseLinearDisplayModel.tsx
@@ -35,7 +35,6 @@ import BlockState from './serverSideRenderedBlock'
 import configSchema from './configSchema'
 import TrackHeightMixin from './TrackHeightMixin'
 import FeatureDensityMixin from './FeatureDensityMixin'
-import { nanoid } from '@jbrowse/core/util/nanoid'
 
 type LGV = LinearGenomeViewModel
 
@@ -336,10 +335,9 @@ function stateModelFactory() {
                         'LinearGenomeView',
                         {
                           ...rest,
-                          id: nanoid(),
                           tracks: rest.tracks.map(track => {
                             const { id, ...rest } = track
-                            return { ...rest, id: nanoid() }
+                            return { ...rest }
                           }),
                           displayedRegions: res,
                         },

diff --git a/plugins/linear-genome-view/src/BaseLinearDisplay/models/serverSideRenderedBlock.ts b/plugins/linear-genome-view/src/BaseLinearDisplay/models/serverSideRenderedBlock.ts
@@ -242,12 +242,6 @@ export function renderBlockData(
     const layoutId = getContainingView(display).id
     const cannotBeRenderedReason = display.regionCannotBeRendered(self.region)
 
-    const asm = assemblyManager.get(regionAsm)!
-    const regions = [getSnapshot(self.region)]
-    const parentRegions = regions.map(region => {
-      const r = asm?.getCanonicalRefName(region.refName)
-      return asm.regions?.find(b => b.refName === r)
-    })
     return {
       rendererType,
       rpcManager,
@@ -261,8 +255,7 @@ export function renderBlockData(
           }
         },
         assemblyName: self.region.assemblyName,
-        regions,
-        parentRegions,
+        regions: [getSnapshot(self.region)],
         adapterConfig,
         rendererType: rendererType.name,
         sessionId,

diff --git a/plugins/linear-genome-view/src/LinearGenomeView/components/Header.tsx b/plugins/linear-genome-view/src/LinearGenomeView/components/Header.tsx
@@ -112,11 +112,14 @@ const Controls = ({ model }: { model: LGV }) => {
 }
 
 const LinearGenomeViewHeader = observer(({ model }: { model: LGV }) => {
-  const Wrapper = model.hideHeaderOverview ? React.Fragment : OverviewScalebar
   return !model.hideHeader ? (
-    <Wrapper model={model}>
+    model.hideHeaderOverview ? (
       <Controls model={model} />
-    </Wrapper>
+    ) : (
+      <OverviewScalebar model={model}>
+        <Controls model={model} />
+      </OverviewScalebar>
+    )
   ) : null
 })
 

diff --git a/plugins/sequence/src/DivSequenceRenderer/components/DivSequenceRendering.test.tsx b/plugins/sequence/src/DivSequenceRenderer/components/DivSequenceRendering.test.tsx
@@ -7,7 +7,6 @@ import DivRenderingConfigSchema from '../configSchema'
 test('renders with one, zoomed way out', () => {
   const { container } = render(
     <DivSequenceRendering
-      rowHeight={13}
       regions={[
         { assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
       ]}
@@ -38,7 +37,6 @@ test('renders with one, zoomed way out', () => {
 test('renders with one feature with no seq, zoomed in, should throw', () => {
   const { container } = render(
     <DivSequenceRendering
-      rowHeight={13}
       regions={[
         { assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
       ]}
@@ -61,7 +59,6 @@ test('renders with one feature with no seq, zoomed in, should throw', () => {
 test('renders with one feature with an incorrect seq, zoomed in, should throw', () => {
   const { container } = render(
     <DivSequenceRendering
-      rowHeight={13}
       regions={[
         { assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
       ]}
@@ -92,7 +89,6 @@ test('renders with one feature with an incorrect seq, zoomed in, should throw',
 test('renders with one feature with a correct seq, zoomed in, should render nicely', () => {
   const { container } = render(
     <DivSequenceRendering
-      rowHeight={13}
       regions={[
         { assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
       ]}
@@ -123,7 +119,6 @@ test('renders with one feature with a correct seq, zoomed in, should render nice
 test('renders with one feature reversed with a correct seq, zoomed in, should render nicely', () => {
   const { container } = render(
     <DivSequenceRendering
-      rowHeight={13}
       regions={[
         {
           assemblyName: 'volvox',

diff --git a/plugins/sequence/src/LinearReferenceSequenceDisplay/components/SetHeightDialog.tsx b/plugins/sequence/src/LinearReferenceSequenceDisplay/components/SetHeightDialog.tsx
diff --git a/plugins/svg/src/SvgFeatureRenderer/components/util.ts b/plugins/svg/src/SvgFeatureRenderer/components/util.ts
@@ -20,7 +20,6 @@ export interface Glyph
     selected?: boolean
     config: AnyConfigurationModel
     region: Region
-    parentRegion: Region
     bpPerPx: number
     topLevel?: boolean
     [key: string]: unknown