@jbrowse/plugin-linear-genome-view 5.0.0-beta.19 → 5.0.0-beta.20

package/esm/searchUtils.js

@@ -12,12 +12,15 @@ const MAX_REFNAME_HITS = 10;
 // shared dispatch used by SearchBox.onSelect and the LGV ImportForm submit:
 // route a chosen result to a direct nav, a multi-result dialog, or a generic
 // locstring/refname resolution
+// Resolves whether the view moved: a hit that raised the picker, or a glob
+// refused as too wide, did not.
 export async function navigateToSelectedOption({ option, model, assemblyName, }) {
     if (option.hasLocation()) {
         await navToOption({ option, model, assemblyName });
+        return true;
     }
     else if (option.results?.length) {
-        await showSearchResults({
+        return showSearchResults({
             results: option.results,
             query: option.getLabel(),
             model,
@@ -25,7 +28,7 @@ export async function navigateToSelectedOption({ option, model, assemblyName, })
         });
     }
     else {
-        await handleSelectedRegion({
+        return handleSelectedRegion({
             input: option.getLabel(),
             assemblyName,
             model,
@@ -159,9 +162,9 @@ export function notifySearchFailure(session, e) {
     console.error(e);
     session.notify(e instanceof SearchResultsNotFoundError ? e.message : `${e}`, 'warning');
 }
-// if input is a known ref or locstring, navigate directly;
-// otherwise search and: pop a dialog for multiple results, navigate for one,
-// or fall back to treating input as a locstring
+// if input parses as one or more locstrings, navigate directly; otherwise
+// search and: pop a dialog for multiple results, navigate for one, or report
+// the miss
 //
 // Returns whether the view actually moved. Three branches deliberately do not
 // navigate — a glob too wide to open, a multi-hit search whose hits disagree
@@ -178,16 +181,11 @@ export async function handleSelectedRegion({ input, model, assemblyName, grow, s
     const assembly = await assemblyManager
         .waitForAssembly(assemblyName)
         .catch(() => undefined);
-    // the same predicate navToLocstrings hands parseLocStrings, so a locstring
-    // that passes here is one the parse below will accept
+    await Promise.all(assembliesNamedIn(input).map(name => assemblyManager.requireAssembly(name)));
     const isRef = (ref) => !!assembly && assemblyManager.isValidRefName(ref, assemblyName);
-    // navigate treating input as one or more whitespace-separated locstrings
-    const navToLocstrings = () => model.navToLocations(parseLocStrings(input, assemblyName, (ref, asm) => assemblyManager.isValidRefName(ref, asm)), assemblyName, grow);
-    if (input
-        .split(/\s+/)
-        .filter(Boolean)
-        .every(entry => checkRef(entry, isRef))) {
-        await navToLocstrings();
+    const parsed = parseOrError(() => parseLocStrings(input, assemblyName, (ref, asm) => assemblyManager.isValidRefName(ref, asm)));
+    if (parsed.locations) {
+        await model.navToLocations(parsed.locations, assemblyName, grow);
         return true;
     }
     else if (input.includes('*') && !!assembly) {
@@ -273,34 +271,30 @@ export async function handleSelectedRegion({ input, model, assemblyName, grow, s
             return true;
         }
         else {
-            // no search hits: still try to resolve the input as a locstring (bare
-            // refname, "ref start end" triplet, etc). If that also can't find a
-            // refname and the input names no sequence and no coordinate — a gene
-            // name, or a phrase like "breast cancer" — reframe the unknown-ref error
-            // as a name miss; keep the specific ref error for coordinate-shaped input
-            try {
-                await navToLocstrings();
-                return true;
-            }
-            catch (e) {
-                const isPlainName = !input.includes(':') &&
-                    input
-                        .trim()
-                        .split(/\s+/)
-                        .every(token => !isRef(token) && !/^\d[\d,]*$/.test(token));
-                if (e instanceof UnknownRefNameError && isPlainName) {
-                    throw nameNotFound(input, assemblyName, found);
-                }
-                else {
-                    throw e;
-                }
-            }
+            // no search hits and no locstring either. An input naming no sequence
+            // and no coordinate — a gene name, or a phrase like "breast cancer" — is
+            // reported as a name miss; coordinate-shaped input keeps its ref error
+            const isPlainName = !input.includes(':') &&
+                input
+                    .trim()
+                    .split(/\s+/)
+                    .every(token => !isRef(token) && !/^\d[\d,]*$/.test(token));
+            throw parsed.error instanceof UnknownRefNameError && isPlainName
+                ? nameNotFound(input, assemblyName, found)
+                : parsed.error;
         }
     }
 }
-export function checkRef(str, isRef) {
-    const [ref, rest] = splitLast(str, ':');
-    return isRef(str) || (isRef(ref) && /^\d/.test(rest));
+function parseOrError(parse) {
+    try {
+        return { locations: parse() };
+    }
+    catch (error) {
+        return { error };
+    }
+}
+function assembliesNamedIn(input) {
+    return [...input.matchAll(/(?:^|\s)\{([^}]+)\}/g)].map(([, name]) => name);
 }
 async function searchNames({ queryString, searchType, assemblyName, textSearchManager, assembly, signal, }) {
     const report = await textSearchManager?.searchIndexes({
@@ -378,8 +372,3 @@ function searchRefNames(assembly, queryString, searchType) {
         weak: hits.filter(h => h.tier === 'substring').map(h => h.result),
     };
 }
-// splits on the last instance of a character
-export function splitLast(str, split) {
-    const i = str.lastIndexOf(split);
-    return i === -1 ? [str, ''] : [str.slice(0, i), str.slice(i + 1)];
-}

package/esm/shared/useWindowDrag.js

@@ -18,15 +18,17 @@ export function useWindowDrag(ref, startX, handlers) {
         const mouseMove = (event) => {
             onMove(event.clientX - left);
         };
-        const mouseUp = ({ clientX, clientY }) => {
-            const endX = clientX - left;
-            onEnd({
-                startX,
-                endX,
-                isClick: Math.abs(endX - startX) <= 3,
-                clientX,
-                clientY,
-            });
+        const mouseUp = ({ button, clientX, clientY }) => {
+            if (button === 0) {
+                const endX = clientX - left;
+                onEnd({
+                    startX,
+                    endX,
+                    isClick: Math.abs(endX - startX) <= 3,
+                    clientX,
+                    clientY,
+                });
+            }
         };
         const keyDown = (event) => {
             if (event.key === 'Escape') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-linear-genome-view",
-  "version": "5.0.0-beta.19",
+  "version": "5.0.0-beta.20",
   "type": "module",
   "description": "JBrowse 2 linear genome view",
   "keywords": [
@@ -26,11 +26,11 @@
     "@mui/material": "^9.5.0",
     "mobx": "^7.1.3",
     "mobx-react": "^10.0.3",
-    "@jbrowse/core": "^5.0.0-beta.19",
-    "@jbrowse/display-kit": "^5.0.0-beta.19",
-    "@jbrowse/launch-args": "^5.0.0-beta.19",
-    "@jbrowse/display-ui": "^5.0.0-beta.19",
-    "@jbrowse/render-core": "^5.0.0-beta.19"
+    "@jbrowse/core": "^5.0.0-beta.20",
+    "@jbrowse/display-ui": "^5.0.0-beta.20",
+    "@jbrowse/display-kit": "^5.0.0-beta.20",
+    "@jbrowse/render-core": "^5.0.0-beta.20",
+    "@jbrowse/launch-args": "^5.0.0-beta.20"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
@@ -41,7 +41,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@jbrowse/display-test-utils": "^5.0.0-beta.19"
+    "@jbrowse/display-test-utils": "^5.0.0-beta.20"
   },
   "scripts": {
     "prebuild": "pnpm clean",