Skip to content

Commit 9158297

Browse files
committed
Bump deps
1 parent 9f2d40b commit 9158297

File tree

7 files changed

+4954
-4335
lines changed

7 files changed

+4954
-4335
lines changed

plugins/linear-genome-view/src/BaseLinearDisplay/models/BaseLinearDisplayModel.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import BlockState from './serverSideRenderedBlock'
3535
import configSchema from './configSchema'
3636
import TrackHeightMixin from './TrackHeightMixin'
3737
import FeatureDensityMixin from './FeatureDensityMixin'
38-
import { nanoid } from '@jbrowse/core/util/nanoid'
3938

4039
type LGV = LinearGenomeViewModel
4140

@@ -336,10 +335,9 @@ function stateModelFactory() {
336335
'LinearGenomeView',
337336
{
338337
...rest,
339-
id: nanoid(),
340338
tracks: rest.tracks.map(track => {
341339
const { id, ...rest } = track
342-
return { ...rest, id: nanoid() }
340+
return { ...rest }
343341
}),
344342
displayedRegions: res,
345343
},

plugins/linear-genome-view/src/BaseLinearDisplay/models/serverSideRenderedBlock.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,6 @@ export function renderBlockData(
242242
const layoutId = getContainingView(display).id
243243
const cannotBeRenderedReason = display.regionCannotBeRendered(self.region)
244244

245-
const asm = assemblyManager.get(regionAsm)!
246-
const regions = [getSnapshot(self.region)]
247-
const parentRegions = regions.map(region => {
248-
const r = asm?.getCanonicalRefName(region.refName)
249-
return asm.regions?.find(b => b.refName === r)
250-
})
251245
return {
252246
rendererType,
253247
rpcManager,
@@ -261,8 +255,7 @@ export function renderBlockData(
261255
}
262256
},
263257
assemblyName: self.region.assemblyName,
264-
regions,
265-
parentRegions,
258+
regions: [getSnapshot(self.region)],
266259
adapterConfig,
267260
rendererType: rendererType.name,
268261
sessionId,

plugins/linear-genome-view/src/LinearGenomeView/components/Header.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,14 @@ const Controls = ({ model }: { model: LGV }) => {
112112
}
113113

114114
const LinearGenomeViewHeader = observer(({ model }: { model: LGV }) => {
115-
const Wrapper = model.hideHeaderOverview ? React.Fragment : OverviewScalebar
116115
return !model.hideHeader ? (
117-
<Wrapper model={model}>
116+
model.hideHeaderOverview ? (
118117
<Controls model={model} />
119-
</Wrapper>
118+
) : (
119+
<OverviewScalebar model={model}>
120+
<Controls model={model} />
121+
</OverviewScalebar>
122+
)
120123
) : null
121124
})
122125

plugins/sequence/src/DivSequenceRenderer/components/DivSequenceRendering.test.tsx

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import DivRenderingConfigSchema from '../configSchema'
77
test('renders with one, zoomed way out', () => {
88
const { container } = render(
99
<DivSequenceRendering
10-
rowHeight={13}
1110
regions={[
1211
{ assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
1312
]}
@@ -38,7 +37,6 @@ test('renders with one, zoomed way out', () => {
3837
test('renders with one feature with no seq, zoomed in, should throw', () => {
3938
const { container } = render(
4039
<DivSequenceRendering
41-
rowHeight={13}
4240
regions={[
4341
{ assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
4442
]}
@@ -61,7 +59,6 @@ test('renders with one feature with no seq, zoomed in, should throw', () => {
6159
test('renders with one feature with an incorrect seq, zoomed in, should throw', () => {
6260
const { container } = render(
6361
<DivSequenceRendering
64-
rowHeight={13}
6562
regions={[
6663
{ assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
6764
]}
@@ -92,7 +89,6 @@ test('renders with one feature with an incorrect seq, zoomed in, should throw',
9289
test('renders with one feature with a correct seq, zoomed in, should render nicely', () => {
9390
const { container } = render(
9491
<DivSequenceRendering
95-
rowHeight={13}
9692
regions={[
9793
{ assemblyName: 'volvox', refName: 'zonk', start: 0, end: 1000 },
9894
]}
@@ -123,7 +119,6 @@ test('renders with one feature with a correct seq, zoomed in, should render nice
123119
test('renders with one feature reversed with a correct seq, zoomed in, should render nicely', () => {
124120
const { container } = render(
125121
<DivSequenceRendering
126-
rowHeight={13}
127122
regions={[
128123
{
129124
assemblyName: 'volvox',

plugins/sequence/src/LinearReferenceSequenceDisplay/components/SetHeightDialog.tsx

-68
This file was deleted.

plugins/svg/src/SvgFeatureRenderer/components/util.ts

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export interface Glyph
2020
selected?: boolean
2121
config: AnyConfigurationModel
2222
region: Region
23-
parentRegion: Region
2423
bpPerPx: number
2524
topLevel?: boolean
2625
[key: string]: unknown

0 commit comments

Comments
 (0)