@genspectrum/dashboard-components 1.17.0 → 1.18.1

package/dist/components.js

@@ -332,15 +332,22 @@ function n$1(t2) {
   })(t2, e2, o2);
 }
 const lapisContext = createContext("lapis-context");
-const annotations = z$2.array(z$2.string());
+const mutationEntrySchema = z$2.union([
+  z$2.string(),
+  z$2.object({ mutation: z$2.string(), name: z$2.string().optional(), description: z$2.string().optional() })
+]);
+const positionEntrySchema = z$2.union([
+  z$2.string(),
+  z$2.object({ position: z$2.string(), name: z$2.string().optional(), description: z$2.string().optional() })
+]);
 const mutationAnnotationSchema = z$2.object({
   name: z$2.string(),
   description: z$2.string(),
   symbol: z$2.string(),
-  nucleotideMutations: annotations.optional(),
-  nucleotidePositions: annotations.optional(),
-  aminoAcidMutations: annotations.optional(),
-  aminoAcidPositions: annotations.optional()
+  nucleotideMutations: z$2.array(mutationEntrySchema).optional(),
+  nucleotidePositions: z$2.array(positionEntrySchema).optional(),
+  aminoAcidMutations: z$2.array(mutationEntrySchema).optional(),
+  aminoAcidPositions: z$2.array(positionEntrySchema).optional()
 });
 const mutationAnnotationsSchema = z$2.array(mutationAnnotationSchema, {
   errorMap: () => ({ message: "invalid mutation annotations" })
@@ -2152,46 +2159,69 @@ const MutationAnnotationsContext = createContext$1({
   }
 });
 const MutationAnnotationsContextProvider = ({ value, children }) => {
-  const parseResult = T$1(() => {
-    const parseResult2 = mutationAnnotationsSchema.safeParse(value);
-    if (!parseResult2.success) {
-      return parseResult2;
-    }
-    return { success: true, value: getMutationAnnotationsContext(value) };
-  }, [value]);
-  if (!parseResult.success) {
-    return /* @__PURE__ */ u$1(ResizeContainer, { size: { width: "100%" }, children: /* @__PURE__ */ u$1(ErrorDisplay, { error: parseResult.error, layout: "vertical" }) });
+  const parseResult = T$1(() => mutationAnnotationsSchema.safeParse(value), [value]);
+  const contextValue = T$1(
+    () => parseResult.success ? { success: true, value: buildAnnotationIndex(parseResult.data) } : { success: false, error: parseResult.error },
+    [parseResult]
+  );
+  if (!contextValue.success) {
+    return /* @__PURE__ */ u$1(ResizeContainer, { size: { width: "100%" }, children: /* @__PURE__ */ u$1(ErrorDisplay, { error: contextValue.error, layout: "vertical" }) });
   }
-  return /* @__PURE__ */ u$1(MutationAnnotationsContext.Provider, { value: parseResult.value, children });
+  return /* @__PURE__ */ u$1(MutationAnnotationsContext.Provider, { value: contextValue.value, children });
 };
-function getMutationAnnotationsContext(value) {
-  const nucleotideMap = /* @__PURE__ */ new Map();
-  const nucleotidePositions = /* @__PURE__ */ new Map();
-  const aminoAcidMap = /* @__PURE__ */ new Map();
-  const aminoAcidPositions = /* @__PURE__ */ new Map();
+function buildAnnotationIndex(value) {
+  const nucleotideMutationMap = /* @__PURE__ */ new Map();
+  const nucleotidePositionMap = /* @__PURE__ */ new Map();
+  const aminoAcidMutationMap = /* @__PURE__ */ new Map();
+  const aminoAcidPositionMap = /* @__PURE__ */ new Map();
   value.forEach((annotation) => {
-    new Set(annotation.nucleotideMutations).forEach((code) => {
-      addAnnotationToMap(nucleotideMap, code, annotation);
+    var _a, _b, _c, _d;
+    (_a = annotation.nucleotideMutations) == null ? void 0 : _a.forEach((entry) => {
+      addToMap(
+        nucleotideMutationMap,
+        typeof entry === "string" ? entry : entry.mutation,
+        resolve(annotation, entry)
+      );
     });
-    new Set(annotation.aminoAcidMutations).forEach((code) => {
-      addAnnotationToMap(aminoAcidMap, code, annotation);
+    (_b = annotation.aminoAcidMutations) == null ? void 0 : _b.forEach((entry) => {
+      addToMap(
+        aminoAcidMutationMap,
+        typeof entry === "string" ? entry : entry.mutation,
+        resolve(annotation, entry)
+      );
     });
-    new Set(annotation.nucleotidePositions).forEach((position) => {
-      addAnnotationToMap(nucleotidePositions, position, annotation);
+    (_c = annotation.nucleotidePositions) == null ? void 0 : _c.forEach((entry) => {
+      addToMap(
+        nucleotidePositionMap,
+        typeof entry === "string" ? entry : entry.position,
+        resolve(annotation, entry)
+      );
     });
-    new Set(annotation.aminoAcidPositions).forEach((position) => {
-      addAnnotationToMap(aminoAcidPositions, position, annotation);
+    (_d = annotation.aminoAcidPositions) == null ? void 0 : _d.forEach((entry) => {
+      addToMap(
+        aminoAcidPositionMap,
+        typeof entry === "string" ? entry : entry.position,
+        resolve(annotation, entry)
+      );
     });
   });
   return {
     rawAnnotations: value,
-    nucleotide: { mutation: nucleotideMap, position: nucleotidePositions },
-    "amino acid": { mutation: aminoAcidMap, position: aminoAcidPositions }
+    nucleotide: { mutation: nucleotideMutationMap, position: nucleotidePositionMap },
+    "amino acid": { mutation: aminoAcidMutationMap, position: aminoAcidPositionMap }
   };
 }
-function addAnnotationToMap(map2, code, annotation) {
-  const oldAnnotations = map2.get(code.toUpperCase()) ?? [];
-  map2.set(code.toUpperCase(), [...oldAnnotations, annotation]);
+function resolve(annotation, entry) {
+  const overrides = typeof entry === "object" ? entry : void 0;
+  return {
+    annotation,
+    name: (overrides == null ? void 0 : overrides.name) ?? annotation.name,
+    description: (overrides == null ? void 0 : overrides.description) ?? annotation.description
+  };
+}
+function addToMap(map2, code, resolved) {
+  const existing = map2.get(code.toUpperCase()) ?? [];
+  map2.set(code.toUpperCase(), [...existing, resolved]);
 }
 function useRawMutationAnnotations() {
   return x$1(MutationAnnotationsContext).rawAnnotations;
@@ -2203,15 +2233,15 @@ function useMutationAnnotationsProvider() {
 function getMutationAnnotationsProvider(mutationAnnotations) {
   return (mutation, sequenceType) => {
     const position = mutation.segment === void 0 ? `${mutation.position}` : `${mutation.segment.toUpperCase()}:${mutation.position}`;
-    const possiblePositionAnnotations = mutationAnnotations[sequenceType].position.get(position);
-    const possibleExactAnnotations = mutationAnnotations[sequenceType].mutation.get(mutation.code.toUpperCase());
-    const annotations2 = possiblePositionAnnotations && possibleExactAnnotations ? [...possiblePositionAnnotations, ...possibleExactAnnotations] : possiblePositionAnnotations ?? possibleExactAnnotations;
-    const uniqueNames = /* @__PURE__ */ new Set();
-    return annotations2 == null ? void 0 : annotations2.filter((annotation) => {
-      if (uniqueNames.has(annotation.name)) {
+    const exactMatches = mutationAnnotations[sequenceType].mutation.get(mutation.code.toUpperCase());
+    const positionMatches = mutationAnnotations[sequenceType].position.get(position);
+    const combined = exactMatches && positionMatches ? [...exactMatches, ...positionMatches] : exactMatches ?? positionMatches;
+    const seenNames = /* @__PURE__ */ new Set();
+    return combined == null ? void 0 : combined.filter((resolved) => {
+      if (seenNames.has(resolved.annotation.name)) {
         return false;
       }
-      uniqueNames.add(annotation.name);
+      seenNames.add(resolved.annotation.name);
       return true;
     });
   };
@@ -2339,10 +2369,10 @@ const AnnotatedMutationWithoutContext = ({
       "Annotations for ",
       mutation.code
     ] }),
-    mutationAnnotations.map((annotation) => /* @__PURE__ */ u$1(Fragment, { children: [
-      /* @__PURE__ */ u$1(InfoHeadline2, { children: annotation.name }),
-      /* @__PURE__ */ u$1(InfoParagraph, { children: /* @__PURE__ */ u$1("div", { dangerouslySetInnerHTML: { __html: DOMPurify.sanitize(annotation.description) } }) })
-    ] }, annotation.name))
+    mutationAnnotations.map((resolved) => /* @__PURE__ */ u$1(Fragment, { children: [
+      /* @__PURE__ */ u$1(InfoHeadline2, { children: resolved.name }),
+      /* @__PURE__ */ u$1(InfoParagraph, { children: /* @__PURE__ */ u$1("div", { dangerouslySetInnerHTML: { __html: DOMPurify.sanitize(resolved.description) } }) })
+    ] }, resolved.annotation.name))
   ] });
   return /* @__PURE__ */ u$1(Fragment, { children: [
     innerLabel,
@@ -2352,7 +2382,7 @@ const AnnotatedMutationWithoutContext = ({
         buttonClassName: "select-text cursor-pointer",
         modalContent,
         modalRef,
-        children: /* @__PURE__ */ u$1("sup", { className: "hover:underline focus-visible:underline decoration-red-600", children: mutationAnnotations.map((annotation) => annotation.symbol).map((symbol, index) => /* @__PURE__ */ u$1(Fragment, { children: [
+        children: /* @__PURE__ */ u$1("sup", { className: "hover:underline focus-visible:underline decoration-red-600", children: mutationAnnotations.map((resolved) => resolved.annotation.symbol).map((symbol, index) => /* @__PURE__ */ u$1(Fragment, { children: [
           /* @__PURE__ */ u$1("span", { className: "text-red-600", children: symbol }),
           index !== mutationAnnotations.length - 1 && ","
         ] }, symbol)) })
@@ -7289,7 +7319,7 @@ function mutationOrAnnotationMatchesTextFilter(mutation, sequenceType, textFilte
     return false;
   }
   return mutationAnnotations.some(
-    (annotation) => annotation.description.includes(textFilter) || annotation.name.includes(textFilter) || annotation.symbol.includes(textFilter)
+    (resolved) => resolved.annotation.description.includes(textFilter) || resolved.annotation.name.includes(textFilter) || resolved.annotation.symbol.includes(textFilter)
   );
 }
 function mutationMatchesAnnotationFilter(mutation, sequenceType, annotationNameFilter, annotationProvider) {
@@ -7300,7 +7330,7 @@ function mutationMatchesAnnotationFilter(mutation, sequenceType, annotationNameF
   if (mutationAnnotations === void 0 || mutationAnnotations.length === 0) {
     return false;
   }
-  return mutationAnnotations.some((annotation) => annotationNameFilter.has(annotation.name));
+  return mutationAnnotations.some((resolved) => annotationNameFilter.has(resolved.annotation.name));
 }
 async function queryDatesInDataset(lapisFilter, lapis, granularity, lapisDateField, signal) {
   const { dateFrom, dateTo } = getDateRangeFromFilter(lapisFilter, lapisDateField, granularity);
@@ -15394,7 +15424,16 @@ function DownshiftMultiCombobox({
     },
     environment
   });
-  const { isOpen, getToggleButtonProps, getMenuProps, getInputProps, highlightedIndex, getItemProps, closeMenu } = useCombobox({
+  const {
+    isOpen,
+    getToggleButtonProps,
+    getMenuProps,
+    getInputProps,
+    highlightedIndex,
+    getItemProps,
+    closeMenu,
+    selectItem
+  } = useCombobox({
     items: availableItems,
     itemToString(item) {
       return itemToString2(item);
@@ -15434,6 +15473,7 @@ function DownshiftMultiCombobox({
   const clearAll = () => {
     dispatchEvent([]);
     setItemsFilter("");
+    selectItem(null);
   };
   const buttonRef = A$1(null);
   return /* @__PURE__ */ u$1("div", { ref: divRef, className: "relative w-full", children: [
@@ -15459,7 +15499,10 @@ function DownshiftMultiCombobox({
                     "aria-label": `remove ${itemToString2(selectedItem)}`,
                     className: "cursor-pointer hover:text-red-600",
                     type: "button",
-                    onClick: () => removeSelectedItem(selectedItem),
+                    onClick: () => {
+                      removeSelectedItem(selectedItem);
+                      selectItem(null);
+                    },
                     tabIndex: -1,
                     children: "×"
                   }