@jbrowse/product-core 4.3.0 → 5.0.0-beta.2

package/esm/Session/DrawerWidgets.js

@@ -2,64 +2,147 @@ import { isConfigurationModel } from '@jbrowse/core/configuration';
 import { localStorageGetItem, localStorageSetItem } from '@jbrowse/core/util';
 import { addDisposer, getEnv, isAlive, isStateTreeNode, types, } from '@jbrowse/mobx-state-tree';
 import { autorun } from 'mobx';
-import { isBaseSession } from "./BaseSession.js";
+import { isBaseSession } from './BaseSession.js';
 const minDrawerWidth = 128;
+const minMainWidth = 150;
+const drawerPositions = ['left', 'right'];
+// localStorage holds whatever a previous version, another tab, or a hand-edit
+// left there, and `drawerPosition` is now an enumeration that throws on a value
+// outside the set.
+function storedDrawerPosition() {
+    const stored = localStorageGetItem('drawerPosition');
+    return drawerPositions.find(position => position === stored) ?? 'right';
+}
+// The one clamp both resize paths share. `drawerWidth` is a
+// `types.refinement(types.integer, >= minDrawerWidth)`, so the three things this
+// does are load-bearing rather than cosmetic — MST throws on an assignment that
+// misses either bound:
+//
+// - Rounded, because a drag delta is fractional whenever `clientX` is (browser
+//   zoom, fractional devicePixelRatio, pen/touch), and ResizeHandle passes that
+//   delta straight through.
+// - Bounded by the width the drawer and the main area actually share, which the
+//   caller measures. `window.innerWidth` is the default and is right only for a
+//   full-window app: an embedded view is whatever box the host gave it, and
+//   clamping a 600px embed's drawer against a 1600px window let a drag collapse
+//   the view beside it to nothing and overflow the embed.
+// - The minimum applied *last*, because a container narrower than
+//   minDrawerWidth + minMainWidth has no width satisfying both bounds. The
+//   floor has to win there; the drawer simply crowds the main area.
+function clampDrawerWidth(width, availableWidth) {
+    const max = availableWidth - minMainWidth;
+    return Math.max(minDrawerWidth, Math.min(Math.round(width), max));
+}
+/**
+ * #stateModel DrawerWidgetSessionMixin
+ */
 export function DrawerWidgetSessionMixin(pluginManager) {
     const widgetStateModelType = pluginManager.pluggableMstType('widget', 'stateModel');
     return types
         .model({
-        drawerPosition: types.optional(types.string, () => localStorageGetItem('drawerPosition') || 'right'),
-        drawerWidth: types.optional(types.refinement(types.integer, width => width >= minDrawerWidth), 384),
-        widgets: types.map(widgetStateModelType),
-        activeWidgets: types.map(types.safeReference(widgetStateModelType)),
-        minimized: types.optional(types.boolean, false),
+        /**
+         * #property
+         */
+        drawerPosition: types.optional(types.enumeration('DrawerPosition', [
+            ...drawerPositions,
+        ]), storedDrawerPosition),
+        /**
+         * #property
+         */
+        drawerWidth: types.stripDefault(types.refinement(types.integer, width => width >= minDrawerWidth), 384),
+        /**
+         * #property
+         */
+        widgets: types.stripDefault(types.map(widgetStateModelType), {}),
+        /**
+         * #property
+         */
+        activeWidgets: types.stripDefault(types.map(types.safeReference(widgetStateModelType)), {}),
+        /**
+         * #property
+         */
+        minimized: types.stripDefault(types.boolean, false),
     })
         .views(self => ({
+        /**
+         * #getter
+         */
+        // annotated rather than inferred: a widget's state model comes from a
+        // plugin, so `pluggableMstType` is `IAnyType` and its Instance is `any` —
+        // which silently made this getter, and every read of it off a concrete
+        // session, unchecked. `Widget` is the contract `SessionWithWidgets`
+        // already declares, so this only brings the concrete model into line with
+        // what plugins narrowing to that interface have always seen.
         get visibleWidget() {
             if (isAlive(self)) {
-                return [...self.activeWidgets.values()][self.activeWidgets.size - 1];
+                // returns most recently added item in active widgets
+                return [...self.activeWidgets.values()].at(-1);
             }
             return undefined;
         },
+    }))
+        .volatile(() => ({
+        /**
+         * #volatile
+         * true while the visible widget is shown in a modal dialog instead of the
+         * drawer. Volatile because a restored session that opened straight into a
+         * modal, with no drawer behind it, is disorienting
+         */
+        poppedOut: false,
+    }))
+        .views(self => ({
+        /**
+         * #getter
+         * whether the drawer column is on screen: there is something to show, it
+         * is not minimized to the FAB, and it is not currently a modal instead.
+         *
+         * A getter rather than each host's own `&&`, because the hosts drifted --
+         * the app shell tested `poppedOut` and the embedded view did not, so the
+         * day a popout button reaches the embedded drawer header it would render
+         * the modal and the drawer at once.
+         */
+        get drawerVisible() {
+            return Boolean(self.visibleWidget) && !self.minimized && !self.poppedOut;
+        },
     }))
         .actions(self => ({
+        /**
+         * #action
+         */
         setDrawerPosition(arg) {
             self.drawerPosition = arg;
-            localStorage.setItem('drawerPosition', arg);
         },
-        updateDrawerWidth(drawerWidth) {
-            if (drawerWidth === self.drawerWidth) {
-                return self.drawerWidth;
-            }
-            let newDrawerWidth = drawerWidth;
-            if (newDrawerWidth < minDrawerWidth) {
-                newDrawerWidth = minDrawerWidth;
-            }
-            self.drawerWidth = newDrawerWidth;
-            return newDrawerWidth;
+        /**
+         * #action
+         */
+        updateDrawerWidth(drawerWidth, availableWidth = window.innerWidth) {
+            self.drawerWidth = clampDrawerWidth(drawerWidth, availableWidth);
+            return self.drawerWidth;
         },
-        resizeDrawer(distance) {
-            if (self.drawerPosition === 'left') {
-                distance *= -1;
-            }
+        /**
+         * #action
+         */
+        resizeDrawer(distance, availableWidth = window.innerWidth) {
+            const signed = self.drawerPosition === 'left' ? -distance : distance;
             const oldDrawerWidth = self.drawerWidth;
-            const newDrawerWidth = this.updateDrawerWidth(oldDrawerWidth - distance);
-            return oldDrawerWidth - newDrawerWidth;
+            self.drawerWidth = clampDrawerWidth(oldDrawerWidth - signed, availableWidth);
+            return oldDrawerWidth - self.drawerWidth;
         },
+        /**
+         * #action
+         */
         addWidget(typeName, id, initialState = {}, conf) {
-            const typeDefinition = pluginManager.getElementType('widget', typeName);
-            if (!typeDefinition) {
-                throw new Error(`unknown widget type ${typeName}`);
-            }
-            const data = {
+            self.widgets.set(id, {
                 ...initialState,
                 id,
                 type: typeName,
-                configuration: conf || { type: typeName },
-            };
-            self.widgets.set(id, data);
+                configuration: conf ?? { type: typeName },
+            });
             return self.widgets.get(id);
         },
+        /**
+         * #action
+         */
         showWidget(widget) {
             if (self.activeWidgets.has(widget.id)) {
                 self.activeWidgets.delete(widget.id);
@@ -67,28 +150,62 @@ export function DrawerWidgetSessionMixin(pluginManager) {
             self.activeWidgets.set(widget.id, widget);
             self.minimized = false;
         },
-        hasWidget(widget) {
-            return self.activeWidgets.has(widget.id);
-        },
+        /**
+         * #action
+         */
         hideWidget(widget) {
             self.activeWidgets.delete(widget.id);
+            if (self.activeWidgets.size === 0) {
+                self.poppedOut = false;
+            }
         },
+        /**
+         * #action
+         */
         minimizeWidgetDrawer() {
             self.minimized = true;
         },
+        /**
+         * #action
+         */
         showWidgetDrawer() {
             self.minimized = false;
         },
+        /**
+         * #action
+         * show the visible widget in a modal dialog, freeing the drawer column
+         */
+        popoutWidget() {
+            self.poppedOut = true;
+        },
+        /**
+         * #action
+         */
+        returnWidgetToDrawer() {
+            self.poppedOut = false;
+        },
+        /**
+         * #action
+         */
         hideAllWidgets() {
             self.activeWidgets.clear();
+            self.poppedOut = false;
         },
-        editConfiguration(configuration) {
+        /**
+         * #action
+         * opens a configuration editor to configure the given thing,
+         * and sets the current task to be configuring it
+         * @param configuration - can be an MST model or a frozen/plain object with trackId
+         */
+        editConfiguration(configuration, opts) {
             let targetConfig;
             if (isStateTreeNode(configuration) &&
                 isConfigurationModel(configuration)) {
+                // Already an MST model (e.g., from track.configuration), use directly
                 targetConfig = configuration;
             }
             else if ('trackId' in configuration) {
+                // Frozen/plain object - create a temporary MST model for editing
                 const trackSchema = pluginManager.pluggableConfigSchemaType('track');
                 targetConfig = trackSchema.create(configuration, getEnv(self));
             }
@@ -96,7 +213,9 @@ export function DrawerWidgetSessionMixin(pluginManager) {
                 throw new Error('must pass a configuration model or frozen config with trackId to editConfiguration');
             }
             const editor = this.addWidget('ConfigurationEditorWidget', 'configEditor', {});
+            // Set target via action since it's now volatile
             editor.setTarget(targetConfig);
+            editor.setExpandedDisplayId(opts?.expandedDisplayId);
             this.showWidget(editor);
         },
         afterAttach() {
@@ -106,20 +225,20 @@ export function DrawerWidgetSessionMixin(pluginManager) {
         },
     }))
         .postProcessSnapshot(snap => {
+        // drawerPosition is a personal per-browser layout preference, not shared
+        // view state: destructure it out so it never lands in the snapshot. It
+        // stays localStorage-backed, so each browser keeps its own value.
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (!snap) {
             return snap;
         }
-        const { drawerPosition, drawerWidth, widgets, activeWidgets, minimized, ...rest } = snap;
+        const { drawerPosition, ...rest } = snap;
         return {
             ...rest,
-            ...(drawerPosition !== 'right' ? { drawerPosition } : {}),
-            ...(drawerWidth !== 384 ? { drawerWidth } : {}),
-            ...(Object.keys(widgets ?? {}).length ? { widgets } : {}),
-            ...(Object.keys(activeWidgets ?? {}).length ? { activeWidgets } : {}),
-            ...(minimized ? { minimized } : {}),
         };
     });
 }
+/** Type guard for SessionWithDrawerWidgets */
 export function isSessionWithDrawerWidgets(session) {
     return (isBaseSession(session) &&
         'widgets' in session &&