Restore getSnapshot on individual displayedRegions

GMOD · Jun 21, 2021 · 8ed5e00 · 8ed5e00
1 parent fb246ee
commit 8ed5e00
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 39 deletions.
diff --git a/packages/core/assemblyManager/assembly.ts b/packages/core/assemblyManager/assembly.ts
@@ -391,5 +391,3 @@ async function loadAssemblyReaction(
   return { adapterRegionsWithAssembly, refNameAliases }
 }
 export type Assembly = Instance<ReturnType<typeof assemblyFactory>>
-
-export type AssemblyRegions = Assembly['regions']
diff --git a/plugins/linear-genome-view/src/LinearGenomeView/index.test.ts b/plugins/linear-genome-view/src/LinearGenomeView/index.test.ts
@@ -736,8 +736,6 @@ describe('Get Sequence for selected displayed regions', () => {
     model.setDisplayedRegions([
       { assemblyName: 'volvox', refName: 'ctgA', start: 0, end: 800 },
     ])
-    expect(model.displayedParentRegions.length).toEqual(1)
-    expect(model.displayedParentRegionsLength).toEqual(50001)
     model.setOffsets(
       {
         refName: 'ctgA',

diff --git a/plugins/linear-genome-view/src/LinearGenomeView/index.tsx b/plugins/linear-genome-view/src/LinearGenomeView/index.tsx
@@ -95,27 +95,31 @@ export const RESIZE_HANDLE_HEIGHT = 3
 export const INTER_REGION_PADDING_WIDTH = 2
 
 export function stateModelFactory(pluginManager: PluginManager) {
-  const model = types
-    .model('LinearGenomeView', {
-      id: ElementId,
-      type: types.literal('LinearGenomeView'),
-      offsetPx: 0,
-      bpPerPx: 1,
-      displayedRegions: types.array(MUIRegion),
-      // we use an array for the tracks because the tracks are displayed in a specific
-      // order that we need to keep.
-      tracks: types.array(
-        pluginManager.pluggableMstType('track', 'stateModel'),
-      ),
-      hideHeader: false,
-      hideHeaderOverview: false,
-      trackSelectorType: types.optional(
-        types.enumeration(['hierarchical']),
-        'hierarchical',
-      ),
-      trackLabels: 'overlapping' as 'overlapping' | 'hidden' | 'offset',
-      showCenterLine: false,
-    })
+  return types
+    .compose(
+      BaseViewModel,
+      types.model('LinearGenomeView', {
+        id: ElementId,
+        type: types.literal('LinearGenomeView'),
+        offsetPx: 0,
+        bpPerPx: 1,
+        displayedRegions: types.array(MUIRegion),
+
+        // we use an array for the tracks because the tracks are displayed in a
+        // specific order that we need to keep.
+        tracks: types.array(
+          pluginManager.pluggableMstType('track', 'stateModel'),
+        ),
+        hideHeader: false,
+        hideHeaderOverview: false,
+        trackSelectorType: types.optional(
+          types.enumeration(['hierarchical']),
+          'hierarchical',
+        ),
+        trackLabels: 'overlapping' as 'overlapping' | 'hidden' | 'offset',
+        showCenterLine: false,
+      }),
+    )
     .volatile(() => ({
       volatileWidth: undefined as number | undefined,
       minimumBlockWidth: 3,
@@ -332,7 +336,7 @@ export function stateModelFactory(pluginManager: PluginManager) {
           const region = self.displayedRegions[0]
           const offset = bp
           return {
-            ...region,
+            ...getSnapshot(region),
             oob: true,
             coord: region.reversed
               ? Math.floor(region.end - offset) + 1
@@ -351,7 +355,7 @@ export function stateModelFactory(pluginManager: PluginManager) {
           const offset = bp - bpSoFar
           if (len + bpSoFar > bp && bpSoFar <= bp) {
             return {
-              ...region,
+              ...getSnapshot(region),
               oob: false,
               offset,
               coord: region.reversed
@@ -379,7 +383,7 @@ export function stateModelFactory(pluginManager: PluginManager) {
           const len = region.end - region.start
           const offset = bp - bpSoFar + len
           return {
-            ...region,
+            ...getSnapshot(region),
             oob: true,
             offset,
             coord: region.reversed
@@ -646,15 +650,7 @@ export function stateModelFactory(pluginManager: PluginManager) {
         self.showCenterLine = !self.showCenterLine
       },
 
-      setDisplayedRegions(
-        regions: {
-          start: number
-          end: number
-          refName: string
-          assemblyName: string
-          reversed?: boolean
-        }[],
-      ) {
+      setDisplayedRegions(regions: Region[]) {
         self.displayedRegions = cast(regions)
         self.zoomTo(self.bpPerPx)
       },
@@ -1376,8 +1372,6 @@ export function stateModelFactory(pluginManager: PluginManager) {
         saveAs(blob, 'image.svg')
       },
     }))
-
-  return types.compose(BaseViewModel, model)
 }
 
 export { renderToSvg }