@jbrowse/plugin-variants 4.1.13 → 4.1.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -45,15 +45,24 @@ const ClusterDialogAuto = observer(function ClusterDialogAuto({ model, children,
|
|
|
45
45
|
setProgress(arg);
|
|
46
46
|
},
|
|
47
47
|
}));
|
|
48
|
+
const existingLayoutMap = Object.fromEntries(model.layout.map(s => [s.name, s]));
|
|
48
49
|
if (isHaplotypeClustering && sampleInfo) {
|
|
49
50
|
const expandedSources = expandSourcesToHaplotypes({
|
|
50
51
|
sources: sourcesVolatile,
|
|
51
52
|
sampleInfo,
|
|
52
53
|
});
|
|
53
|
-
model.setLayout(ret.order.map(idx =>
|
|
54
|
+
model.setLayout(ret.order.map(idx => {
|
|
55
|
+
const source = expandedSources[idx];
|
|
56
|
+
const existing = existingLayoutMap[source.name];
|
|
57
|
+
return existing ? { ...source, ...existing } : source;
|
|
58
|
+
}), false);
|
|
54
59
|
}
|
|
55
60
|
else {
|
|
56
|
-
model.setLayout(ret.order.map(idx =>
|
|
61
|
+
model.setLayout(ret.order.map(idx => {
|
|
62
|
+
const source = sourcesVolatile[idx];
|
|
63
|
+
const existing = existingLayoutMap[source.name];
|
|
64
|
+
return existing ? { ...source, ...existing } : source;
|
|
65
|
+
}), false);
|
|
57
66
|
}
|
|
58
67
|
model.setClusterTree(ret.tree);
|
|
59
68
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { SampleInfo, Source } from '../../types.ts';
|
|
2
2
|
import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
|
|
3
3
|
export interface ReducedModel {
|
|
4
|
+
layout: Source[];
|
|
4
5
|
sourcesWithoutLayout?: Source[];
|
|
5
6
|
sourcesVolatile?: Source[];
|
|
6
7
|
minorAlleleFrequencyFilter?: number;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jbrowse/plugin-variants",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.14",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "JBrowse 2 variant adapters, tracks, etc.",
|
|
6
6
|
"keywords": [
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@mui/icons-material": "^7.3.8",
|
|
30
30
|
"@mui/material": "^7.3.8",
|
|
31
31
|
"@mui/x-charts-vendor": "^8.26.0",
|
|
32
|
-
"@mui/x-data-grid": "^8.27.
|
|
32
|
+
"@mui/x-data-grid": "^8.27.3",
|
|
33
33
|
"@types/file-saver-es": "^2.0.3",
|
|
34
34
|
"copy-to-clipboard": "^3.3.3",
|
|
35
35
|
"escape-html": "^1.0.3",
|
|
@@ -38,10 +38,10 @@
|
|
|
38
38
|
"mobx": "^6.15.0",
|
|
39
39
|
"mobx-react": "^9.2.1",
|
|
40
40
|
"rxjs": "^7.8.2",
|
|
41
|
-
"@jbrowse/
|
|
42
|
-
"@jbrowse/
|
|
43
|
-
"@jbrowse/
|
|
44
|
-
"@jbrowse/
|
|
41
|
+
"@jbrowse/plugin-circular-view": "^4.1.14",
|
|
42
|
+
"@jbrowse/core": "^4.1.14",
|
|
43
|
+
"@jbrowse/plugin-linear-genome-view": "^4.1.14",
|
|
44
|
+
"@jbrowse/sv-core": "^4.1.14"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"react": ">=18.0.0"
|