@jbrowse/product-core 3.7.0 → 4.0.1

package/esm/Session/MultipleViews.js

@@ -1,15 +1,15 @@
 import { localStorageGetBoolean, localStorageSetBoolean, } from '@jbrowse/core/util';
+import { addDisposer, cast, types } from '@jbrowse/mobx-state-tree';
 import { autorun } from 'mobx';
-import { addDisposer, cast, types } from 'mobx-state-tree';
-import { BaseSessionModel, isBaseSession } from './BaseSession';
-import { DrawerWidgetSessionMixin } from './DrawerWidgets';
+import { BaseSessionModel, isBaseSession } from "./BaseSession.js";
+import { DrawerWidgetSessionMixin } from "./DrawerWidgets.js";
 export function MultipleViewsSessionMixin(pluginManager) {
     return types
-        .compose(BaseSessionModel(pluginManager), DrawerWidgetSessionMixin(pluginManager))
-        .props({
+        .compose(BaseSessionModel(pluginManager), DrawerWidgetSessionMixin(pluginManager), types.model({
         views: types.array(pluginManager.pluggableMstType('view', 'stateModel')),
         stickyViewHeaders: types.optional(types.boolean, () => localStorageGetBoolean('stickyViewHeaders', true)),
-    })
+        useWorkspaces: types.optional(types.boolean, () => localStorageGetBoolean('useWorkspaces', false)),
+    }))
         .actions(self => ({
         moveViewDown(id) {
             const idx = self.views.findIndex(v => v.id === id);
@@ -50,7 +50,7 @@ export function MultipleViewsSessionMixin(pluginManager) {
         },
         removeView(view) {
             for (const [, widget] of self.activeWidgets) {
-                if (widget.view && widget.view.id === view.id) {
+                if (widget.view?.id === view.id) {
                     self.hideWidget(widget);
                 }
             }
@@ -59,12 +59,29 @@ export function MultipleViewsSessionMixin(pluginManager) {
         setStickyViewHeaders(sticky) {
             self.stickyViewHeaders = sticky;
         },
+        setUseWorkspaces(useWorkspaces) {
+            self.useWorkspaces = useWorkspaces;
+        },
         afterAttach() {
-            addDisposer(self, autorun(() => {
+            addDisposer(self, autorun(function stickyViewHeadersAutorun() {
                 localStorageSetBoolean('stickyViewHeaders', self.stickyViewHeaders);
-            }));
+            }, { name: 'StickyViewHeaders' }));
+            addDisposer(self, autorun(function useWorkspacesAutorun() {
+                localStorageSetBoolean('useWorkspaces', self.useWorkspaces);
+            }, { name: 'UseWorkspaces' }));
         },
-    }));
+    }))
+        .postProcessSnapshot(snap => {
+        if (!snap) {
+            return snap;
+        }
+        const { stickyViewHeaders, useWorkspaces, ...rest } = snap;
+        return {
+            ...rest,
+            ...(!stickyViewHeaders ? { stickyViewHeaders } : {}),
+            ...(useWorkspaces ? { useWorkspaces } : {}),
+        };
+    });
 }
 export function isSessionWithMultipleViews(session) {
     return isBaseSession(session) && 'views' in session;

package/esm/Session/ReferenceManagement.d.ts

@@ -1,15 +1,15 @@
 import type PluginManager from '@jbrowse/core/PluginManager';
 import type { BaseTrackConfig } from '@jbrowse/core/pluggableElementTypes';
-import type { IAnyStateTreeNode, Instance } from 'mobx-state-tree';
+import type { IAnyStateTreeNode, Instance } from '@jbrowse/mobx-state-tree';
 export interface ReferringNode {
     node: IAnyStateTreeNode;
     key: string;
 }
-export declare function ReferenceManagementSessionMixin(_pluginManager: PluginManager): import("mobx-state-tree").IModelType<{}, {
+export declare function ReferenceManagementSessionMixin(_pluginManager: PluginManager): import("@jbrowse/mobx-state-tree").IModelType<{}, {
     getReferring(object: IAnyStateTreeNode): ReferringNode[];
 } & {
     removeReferring(referring: ReferringNode[], track: BaseTrackConfig, callbacks: ((arg: string) => void)[], dereferenceTypeCount: Record<string, number>): void;
-}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
+}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>;
 export type SessionWithReferenceManagementType = ReturnType<typeof ReferenceManagementSessionMixin>;
 export type SessionWithReferenceManagement = Instance<SessionWithReferenceManagementType>;
 export declare function isSessionWithReferenceManagement(thing: IAnyStateTreeNode): thing is SessionWithReferenceManagement;

package/esm/Session/ReferenceManagement.js

@@ -1,18 +1,24 @@
 import { getContainingView, isSessionModelWithWidgets, } from '@jbrowse/core/util';
-import { getMembers, getParent, getSnapshot, getType, isModelType, isReferenceType, types, walk, } from 'mobx-state-tree';
-import { isBaseSession } from './BaseSession';
+import { getMembers, getParent, getSnapshot, getType, isModelType, isReferenceType, types, walk, } from '@jbrowse/mobx-state-tree';
+import { isBaseSession } from "./BaseSession.js";
 export function ReferenceManagementSessionMixin(_pluginManager) {
     return types
         .model('ReferenceManagementSessionMixin', {})
         .views(self => ({
         getReferring(object) {
             const refs = [];
+            const targetTrackId = object.trackId;
             walk(getParent(self), node => {
                 if (isModelType(getType(node))) {
                     const members = getMembers(node);
                     for (const [key, value] of Object.entries(members.properties)) {
-                        if (isReferenceType(value) && node[key] === object) {
-                            refs.push({ node, key });
+                        if (isReferenceType(value)) {
+                            const ref = node[key];
+                            const refTrackId = ref?.trackId;
+                            if (ref === object ||
+                                (targetTrackId && refTrackId && refTrackId === targetTrackId)) {
+                                refs.push({ node, key });
+                            }
                         }
                     }
                 }