react-msaview 9.2.0 → 9.4.0

package/dist/useWheelScroll.js

@@ -1,19 +1,65 @@
 import { useEffect, useRef, useState } from 'react';
 import { WheelZoomSmoother } from './wheelZoom.js';
 const zoomSettleMs = 150;
-export function useWheelScroll({ ref, onScrollX, onScrollY, onZoom, onZoomSettle, onWheelScroll, scrollZoom, }) {
+// a wheel event this soon after one the view took belongs to the same gesture,
+// so the view keeps it at an edge rather than handing the momentum to the page
+const wheelLatchMs = 150;
+/**
+ * Whether a vertical wheel `delta` moves a view at `scrollY`. At the top or
+ * bottom, or when every row fits, the page scrolls instead, so an embedded
+ * viewer never traps the reader scrolling past it.
+ */
+export function canScrollY(model, delta) {
+    const { scrollY, maxScrollY } = model;
+    return delta > 0 ? scrollY > maxScrollY : delta < 0 && scrollY < 0;
+}
+// Safari reads a touch-action holding pinch-zoom as invalid and falls back to
+// auto, which hands every swipe to the page
+const pinchZoom = typeof CSS !== 'undefined' && CSS.supports('touch-action', 'pinch-zoom')
+    ? 'pinch-zoom'
+    : undefined;
+function withPinch(pan) {
+    return pinchZoom ? `${pan} ${pinchZoom}` : pan;
+}
+/**
+ * The CSS touch-action for a pannable area: the browser keeps a touch pan
+ * along every axis the view cannot scroll, and pinch zoom on the page where it
+ * supports that value.
+ */
+export function panTouchAction(model, axes) {
+    const x = axes.includes('x') && model.maxScrollX < 0;
+    const y = axes.includes('y') && model.maxScrollY < 0;
+    return x && y
+        ? (pinchZoom ?? 'none')
+        : x
+            ? withPinch('pan-y')
+            : y
+                ? withPinch('pan-x')
+                : 'auto';
+}
+/**
+ * Wheel scrolling, wheel zoom and pointer-drag panning of `model` over `ref`,
+ * along `axes`. The returned `onPointerDown` starts a pan with a mouse, a pen
+ * or a finger; put `touchAction` on the same element.
+ */
+export function useWheelScroll({ ref, model, axes, zoom, onWheelScroll, }) {
     const scheduled = useRef(false);
     const zoomFrame = useRef(undefined);
     const zoomSettle = useRef(undefined);
     const deltaX = useRef(0);
     const deltaY = useRef(0);
+    const lastTaken = useRef(Number.NEGATIVE_INFINITY);
     const zoomSmoother = useRef(new WheelZoomSmoother());
     const zoomX = useRef(0);
     const zoomY = useRef(0);
     const lastZoomTime = useRef(null);
-    const prevX = useRef(0);
-    const prevY = useRef(0);
-    const [mouseDragging, setMouseDragging] = useState(false);
+    const prev = useRef({ x: 0, y: 0 });
+    const latest = useRef({ x: 0, y: 0 });
+    const panFrame = useRef(false);
+    // the pointer that started the pan; a second finger neither moves nor ends it
+    const [panPointer, setPanPointer] = useState();
+    const x = axes.includes('x');
+    const y = axes.includes('y');
     useEffect(() => {
         const curr = ref.current;
         if (!curr) {
@@ -24,11 +70,10 @@ export function useWheelScroll({ ref, onScrollX, onScrollY, onZoom, onZoomSettle
             // scrollZoom is on, a plain vertical-dominant wheel zooms too; holding
             // shift is the escape hatch to pan instead.
             const isCtrlZoom = event.ctrlKey || event.metaKey;
-            const isScrollZoom = scrollZoom &&
+            const isScrollZoom = model.scrollZoom &&
                 !event.shiftKey &&
                 Math.abs(event.deltaY) >= Math.abs(event.deltaX);
-            if (onZoom && (isCtrlZoom || isScrollZoom)) {
-                const zoom = onZoom;
+            if (zoom && (isCtrlZoom || isScrollZoom)) {
                 const rect = curr.getBoundingClientRect();
                 zoomSmoother.current.add(event.deltaY, event.deltaMode, isCtrlZoom);
                 zoomX.current = event.clientX - rect.left;
@@ -38,10 +83,10 @@ export function useWheelScroll({ ref, onScrollX, onScrollY, onZoom, onZoomSettle
                     const frame = (now) => {
                         const elapsed = lastZoomTime.current === null ? 16.67 : now - lastZoomTime.current;
                         lastZoomTime.current = now;
-                        zoom(zoomSmoother.current.step(Math.min(100, elapsed)), zoomX.current, zoomY.current);
+                        model.wheelZoomToPos(zoomSmoother.current.step(Math.min(100, elapsed)), zoomX.current, zoomY.current);
                         clearTimeout(zoomSettle.current);
                         zoomSettle.current = setTimeout(() => {
-                            onZoomSettle?.();
+                            model.endWheelZoom();
                         }, zoomSettleMs);
                         zoomFrame.current = zoomSmoother.current.idle
                             ? undefined
@@ -53,29 +98,29 @@ export function useWheelScroll({ ref, onScrollX, onScrollY, onZoom, onZoomSettle
                 event.stopPropagation();
                 return;
             }
-            // only swallow the wheel event on an axis we actually handle, otherwise a
-            // vertical wheel over an x-only scroller (e.g. a Track) blocks page scroll
-            const consumeX = !!onScrollX && event.deltaX !== 0;
-            const consumeY = !!onScrollY && event.deltaY !== 0;
-            if (consumeX || consumeY) {
-                onWheelScroll?.(event);
-                if (onScrollX) {
-                    deltaX.current += event.deltaX;
-                }
-                if (onScrollY) {
-                    deltaY.current += event.deltaY;
+            // the dominant axis decides: a trackpad's vertical swipe carries a pixel
+            // or two of deltaX, which must not hold the page at the bottom row. A
+            // horizontal wheel stays taken at the edges, where the page would read
+            // it as a swipe back through history.
+            const { deltaX: dx, deltaY: dy } = event;
+            const vertical = Math.abs(dy) >= Math.abs(dx);
+            const latched = event.timeStamp - lastTaken.current < wheelLatchMs;
+            const takeY = y && dy !== 0 && (latched || canScrollY(model, dy) || !vertical);
+            const takeX = x && dx !== 0 && (!vertical || takeY);
+            if (takeX || takeY) {
+                if (takeY && vertical) {
+                    lastTaken.current = event.timeStamp;
                 }
+                onWheelScroll?.(event);
+                deltaX.current += takeX ? event.deltaX : 0;
+                deltaY.current += takeY ? event.deltaY : 0;
                 if (!scheduled.current) {
                     scheduled.current = true;
                     requestAnimationFrame(() => {
-                        if (onScrollX) {
-                            onScrollX(-deltaX.current);
-                            deltaX.current = 0;
-                        }
-                        if (onScrollY) {
-                            onScrollY(-deltaY.current);
-                            deltaY.current = 0;
-                        }
+                        model.doScrollX(-deltaX.current);
+                        model.doScrollY(-deltaY.current);
+                        deltaX.current = 0;
+                        deltaY.current = 0;
                         scheduled.current = false;
                     });
                 }
@@ -92,59 +137,51 @@ export function useWheelScroll({ ref, onScrollX, onScrollY, onZoom, onZoomSettle
             }
             clearTimeout(zoomSettle.current);
         };
-    }, [
-        ref,
-        onScrollX,
-        onScrollY,
-        onZoom,
-        onZoomSettle,
-        onWheelScroll,
-        scrollZoom,
-    ]);
+    }, [ref, model, x, y, zoom, onWheelScroll]);
     useEffect(() => {
-        if (!mouseDragging) {
+        if (panPointer === undefined) {
             return;
         }
-        function globalMouseMove(event) {
+        // a frame applies the distance from the last applied position to the
+        // newest one, so a move landing while a frame is pending is not dropped
+        function onMove(event) {
+            if (event.pointerId !== panPointer) {
+                return;
+            }
             event.preventDefault();
-            const distanceX = event.clientX - prevX.current;
-            const distanceY = event.clientY - prevY.current;
-            if ((distanceX && onScrollX) || (distanceY && onScrollY)) {
-                if (!scheduled.current) {
-                    scheduled.current = true;
-                    requestAnimationFrame(() => {
-                        onScrollX?.(distanceX);
-                        onScrollY?.(distanceY);
-                        scheduled.current = false;
-                        prevX.current = event.clientX;
-                        prevY.current = event.clientY;
-                    });
-                }
+            latest.current = { x: event.clientX, y: event.clientY };
+            if (!panFrame.current) {
+                panFrame.current = true;
+                requestAnimationFrame(() => {
+                    const to = latest.current;
+                    model.doScrollX(x ? to.x - prev.current.x : 0);
+                    model.doScrollY(y ? to.y - prev.current.y : 0);
+                    prev.current = to;
+                    panFrame.current = false;
+                });
             }
         }
-        function globalMouseUp() {
-            prevX.current = 0;
-            prevY.current = 0;
-            setMouseDragging(false);
+        function onUp(event) {
+            if (event.pointerId === panPointer) {
+                setPanPointer(undefined);
+            }
         }
-        window.addEventListener('mousemove', globalMouseMove, true);
-        window.addEventListener('mouseup', globalMouseUp, true);
+        window.addEventListener('pointermove', onMove, true);
+        window.addEventListener('pointerup', onUp, true);
+        window.addEventListener('pointercancel', onUp, true);
         return () => {
-            window.removeEventListener('mousemove', globalMouseMove, true);
-            window.removeEventListener('mouseup', globalMouseUp, true);
+            window.removeEventListener('pointermove', onMove, true);
+            window.removeEventListener('pointerup', onUp, true);
+            window.removeEventListener('pointercancel', onUp, true);
         };
-    }, [mouseDragging, onScrollX, onScrollY]);
-    function onMouseDown(event) {
-        if (event.button === 0) {
-            prevX.current = event.clientX;
-            prevY.current = event.clientY;
-            setMouseDragging(true);
+    }, [panPointer, model, x, y]);
+    function onPointerDown(event) {
+        if (event.button === 0 && event.isPrimary && panPointer === undefined) {
+            prev.current = { x: event.clientX, y: event.clientY };
+            latest.current = prev.current;
+            setPanPointer(event.pointerId);
         }
     }
-    function onMouseUp(event) {
-        event.preventDefault();
-        setMouseDragging(false);
-    }
-    return { onMouseDown, onMouseUp };
+    return { onPointerDown, touchAction: panTouchAction(model, axes) };
 }
 //# sourceMappingURL=useWheelScroll.js.map

package/dist/useWheelScroll.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWheelScroll.js","sourceRoot":"","sources":["../src/useWheelScroll.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useWheelScroll.js","sourceRoot":"","sources":["../src/useWheelScroll.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "9.2.0";
+export declare const version = "9.4.0";

package/dist/version.js

@@ -1,2 +1,2 @@
-export const version = '9.2.0';
+export const version = '9.4.0';
 //# sourceMappingURL=version.js.map

package/dist/viewerSnapshot.js

@@ -1,9 +1,10 @@
 import { createJBrowseTheme } from '@jbrowse/core/ui/theme';
+import { letterColors } from './scales.js';
 export function colorSchemeSnapshot(scheme) {
     return typeof scheme === 'string'
         ? { colorSchemeName: scheme }
         : scheme
-            ? { customColorScheme: scheme.map }
+            ? { customColorScheme: letterColors(scheme) }
             : {};
 }
 /**

package/dist/viewerSnapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewerSnapshot.js","sourceRoot":"","sources":["../src/viewerSnapshot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"viewerSnapshot.js","sourceRoot":"","sources":["../src/viewerSnapshot.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-msaview",
   "author": "Colin",
-  "version": "9.2.0",
+  "version": "9.4.0",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -50,10 +50,10 @@
   },
   "dependencies": {
     "@gmod/newick": "^1.0.3",
-    "@jbrowse/svgcanvas": "9.2.0",
+    "@jbrowse/svgcanvas": "9.4.0",
     "colord": "^2.10.0",
     "flatbush": "^4.6.2",
-    "msa-parsers": "9.2.0"
+    "msa-parsers": "9.4.0"
   },
   "scripts": {
     "clean": "rimraf dist bundle",

package/src/components/DragHandle.tsx

@@ -85,11 +85,12 @@ export default function DragHandle({
       onMouseLeave={() => {
         setHovered(false)
       }}
-      onMouseDown={event => {
+      onPointerDown={event => {
         startDrag(event, getStart())
       }}
       style={{
         position,
+        touchAction: 'none',
         zIndex,
         cursor: cursor(axis),
         background: hovered ? fillHovered(theme) : fill(theme),

package/src/components/MSAViewer.tsx

@@ -12,6 +12,7 @@ import { ThemeProvider } from '@mui/material/styles'
 import { compareStructural, reaction, when } from 'mobx'
 
 import MSAModelF from '../model.ts'
+import { letterColors } from '../scales.ts'
 import {
   fileLocations,
   resolveTheme,
@@ -57,8 +58,9 @@ export interface MSAViewerProps {
   /** a URL the viewer fetches the GFF from; `gffFilehandle` wins */
   gffUrl?: string
   /**
-   * a scheme name from the built-in table, or `{map}`, a color per residue
-   * letter that leaves every other letter uncolored
+   * a scheme name from the built-in table, or `{domain, range}`, a color per
+   * residue letter that leaves every other letter uncolored. The earlier
+   * `{map}` still reads
    */
   colorScheme?: ColorScheme
   height?: number
@@ -103,15 +105,16 @@ export interface MSAViewerProps {
   /** extra fields per row name, such as a lineage or a host (see docs/layers.md) */
   rowData?: RowDataInput
   /**
-   * what the viewer's marks read from a table: `{channel, field, scale?}`,
-   * where `channel` is `tipLabel`, `rowTint` or `branch` over `rowData`, or
-   * `featureFill` or `featureLabel` over the annotations (see docs/layers.md)
+   * what the viewer's marks read from a table:
+   * `{channel, field, range?, domain?, title?}`, where `channel` is
+   * `tipLabel`, `rowTint` or `branch` over `rowData`, or `featureFill` or
+   * `featureLabel` over the annotations (see docs/layers.md)
    */
   encodings?: Encoding[]
   /**
    * panels between the tree and the alignment, one cell per row:
-   * `{kind: 'strip', field, scale?, width?, header?}` colors each row by a
-   * `rowData` field (see docs/layers.md)
+   * `{kind: 'strip', field, range?, domain?, title?, width?, header?}` colors
+   * each row by a `rowData` field (see docs/layers.md)
    */
   rowPanels?: RowPanelSpec[]
   /** draw the phylogenetic tree (default true); false leaves a labels-only gutter */
@@ -357,7 +360,7 @@ const syncedProps = [
       if (typeof scheme === 'string') {
         m.setColorSchemeName(scheme)
       } else if (scheme) {
-        m.setCustomColorScheme(scheme.map)
+        m.setCustomColorScheme(letterColors(scheme))
       }
     },
   ),

package/src/components/Track.tsx

@@ -1,4 +1,4 @@
-import React, { lazy, useCallback, useRef, useState } from 'react'
+import React, { lazy, useRef, useState } from 'react'
 
 import BaseTooltip from '@jbrowse/core/ui/BaseTooltip'
 import { makeStyles } from '@jbrowse/core/util/tss-react'
@@ -153,13 +153,7 @@ const Track = observer(function ({
     model: { height },
   } = track
   const ref = useRef<HTMLDivElement>(null)
-  const onScrollX = useCallback(
-    (d: number) => {
-      model.doScrollX(d)
-    },
-    [model],
-  )
-  useWheelScroll({ ref, onScrollX })
+  useWheelScroll({ ref, model, axes: 'x' })
   const { classes } = useStyles()
   const { anchor, onMouseMove, onMouseDown, onMouseLeave } = useTrackHover({
     model,

package/src/components/VerticalScrollbar.tsx

@@ -23,7 +23,7 @@ const VerticalScrollbar = observer(({ model }: { model: MsaViewModel }) => {
 
   return (
     <div
-      onMouseDown={event => {
+      onPointerDown={event => {
         if (event.button === 0 && event.target === event.currentTarget) {
           const y =
             event.clientY - event.currentTarget.getBoundingClientRect().top

package/src/components/header/Header.tsx

@@ -2,7 +2,8 @@ import React, { useEffect } from 'react'
 
 import useMeasure from '@jbrowse/core/util/useMeasure'
 import Tune from '@mui/icons-material/Tune'
-import { AppBar, Button, IconButton, Toolbar, Tooltip } from '@mui/material'
+import { Button, IconButton, Toolbar, Tooltip } from '@mui/material'
+import AppBar from '@mui/material/AppBar'
 import { observer } from 'mobx-react'
 
 import StatusMessage from '../StatusMessage.tsx'

package/src/components/minimap/Minimap.tsx

@@ -78,7 +78,7 @@ const Minimap = observer(function ({ model }: { model: MsaViewModel }) {
         ref={ref}
         width={barWidth}
         height={barHeight}
-        onMouseDown={event => {
+        onPointerDown={event => {
           if (event.button === 0 && unit > 0) {
             const x =
               event.clientX - event.currentTarget.getBoundingClientRect().left

package/src/components/msa/MSACanvas.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useRef } from 'react'
+import React, { useRef } from 'react'
 
 import { observer } from 'mobx-react'
 
@@ -19,7 +19,6 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
     height,
     msaCanvasWidth,
     blocks2d,
-    scrollZoom,
     scrollX,
     scrollY,
     zoomSnapshot,
@@ -33,36 +32,13 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
     ? zoomSnapshotScale(model, zoomSnapshot)
     : undefined
   const ref = useRef<HTMLDivElement>(null)
-  const onScrollX = useCallback(
-    (d: number) => {
-      model.doScrollX(d)
-    },
-    [model],
-  )
-  const onScrollY = useCallback(
-    (d: number) => {
-      model.doScrollY(d)
-    },
-    [model],
-  )
-  const onZoom = useCallback(
-    (scaleFactor: number, offsetX: number, offsetY: number) => {
-      model.wheelZoomToPos(scaleFactor, offsetX, offsetY)
-    },
-    [model],
-  )
-  const onZoomSettle = useCallback(() => {
-    model.endWheelZoom()
-  }, [model])
   const hint = useWheelZoomHint(model)
-  const { onMouseDown, onMouseUp } = useWheelScroll({
+  const { onPointerDown, touchAction } = useWheelScroll({
     ref,
-    onScrollX,
-    onScrollY,
-    onZoom,
-    onZoomSettle,
+    model,
+    axes: 'xy',
+    zoom: true,
     onWheelScroll: hint.onWheelScroll,
-    scrollZoom,
   })
 
   return (
@@ -78,20 +54,23 @@ const MSACanvas = observer(function ({ model }: { model: MsaViewModel }) {
           event.preventDefault()
         }
       }}
+      // a shifted press selects cells (useMsaBlockMouse), so it takes the
+      // focus Escape clears from, and leaves out the pan and the page's own
+      // text selection
       onMouseDown={event => {
-        // a shifted press selects cells (useMsaBlockMouse), so it takes the
-        // focus Escape clears from, and leaves out the pan and the page's own
-        // text selection
         if (event.shiftKey) {
           event.preventDefault()
           ref.current?.focus({ preventScroll: true })
-        } else {
-          onMouseDown(event)
         }
       }}
-      onMouseUp={onMouseUp}
+      onPointerDown={event => {
+        if (!event.shiftKey) {
+          onPointerDown(event)
+        }
+      }}
       style={{
         position: 'relative',
+        touchAction,
         height,
         width: msaCanvasWidth,
         overflow: 'hidden',

package/src/components/rowpanels/RowPanels.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useRef } from 'react'
+import React, { useRef } from 'react'
 
 import { observer } from 'mobx-react'
 
@@ -17,21 +17,19 @@ const RowPanel = observer(function ({
 }) {
   const ref = useRef<HTMLDivElement>(null)
   const { height, blocksY, scrollY } = model
-  const onScrollY = useCallback(
-    (d: number) => {
-      model.doScrollY(d)
-    },
-    [model],
-  )
-  const { onMouseDown, onMouseUp } = useWheelScroll({ ref, onScrollY })
+  const { onPointerDown, touchAction } = useWheelScroll({
+    ref,
+    model,
+    axes: 'y',
+  })
 
   return (
     <div
       ref={ref}
       data-testid={`rowpanel_${panel.id}`}
-      onMouseDown={onMouseDown}
-      onMouseUp={onMouseUp}
+      onPointerDown={onPointerDown}
       style={{
+        touchAction,
         height,
         width: panel.width,
         flexShrink: 0,

package/src/components/settings/SettingsPanel.tsx

@@ -3,7 +3,8 @@ import React, { useState } from 'react'
 import ArrowDropDown from '@mui/icons-material/ArrowDropDown'
 import ArrowRight from '@mui/icons-material/ArrowRight'
 import Close from '@mui/icons-material/Close'
-import { Box, ButtonBase, IconButton, Typography } from '@mui/material'
+import { Box, IconButton, Typography } from '@mui/material'
+import ButtonBase from '@mui/material/ButtonBase'
 import { observer } from 'mobx-react'
 
 import { settingsPanelWidth } from '../../constants.ts'

package/src/components/tree/TreeCanvas.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useRef } from 'react'
+import React, { useRef } from 'react'
 
 import { isAlive } from '@jbrowse/mobx-state-tree'
 import { observer } from 'mobx-react'
@@ -20,13 +20,11 @@ const TreeCanvas = observer(function ({ model }: { model: MsaViewModel }) {
     scrollY,
     highResScaleFactor,
   } = model
-  const onScrollY = useCallback(
-    (d: number) => {
-      model.doScrollY(d)
-    },
-    [model],
-  )
-  const { onMouseDown, onMouseUp } = useWheelScroll({ ref, onScrollY })
+  const { onPointerDown, touchAction } = useWheelScroll({
+    ref,
+    model,
+    axes: 'y',
+  })
 
   const canvasWidth = effectiveTreeAreaWidth * highResScaleFactor
   const canvasHeight = height * highResScaleFactor
@@ -44,9 +42,9 @@ const TreeCanvas = observer(function ({ model }: { model: MsaViewModel }) {
   return (
     <div
       ref={ref}
-      onMouseDown={onMouseDown}
-      onMouseUp={onMouseUp}
+      onPointerDown={onPointerDown}
       style={{
+        touchAction,
         height,
         position: 'relative',
         width: effectiveTreeAreaWidth,