col-browser 2.2.3 → 2.2.5

package/umd/col-browser.js

@@ -70816,6 +70816,9 @@ html body {
           params.facetLimit = FACET_LIMIT;
         }
         delete params.fuzzy;
+        if (params.type && String(params.type).toUpperCase() !== "FUZZY") {
+          delete params.type;
+        }
         if (!params.limit) {
           params.limit = PAGE_SIZE;
         }
@@ -70936,6 +70939,7 @@ html body {
         taxGroups
       } = this.state;
       const { datasetKey, defaultTaxonKey, citation } = this.props;
+      const isFuzzy = String(params.type || "").toUpperCase() === "FUZZY";
       const facetRanks = get(facets, "rank") ? facets.rank.map((r2) => ({
         value: r2.value,
         label: `${startCase(r2.value)} (${r2.count.toLocaleString("en-GB")})`
@@ -71047,61 +71051,53 @@ html body {
                     autoFocus: false
                   }
                 ) }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { style: { marginTop: "10px" }, children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx(Form, { layout: "inline", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FormItem, { label: "Matching", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { marginTop: "10px" }, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(Form, { layout: "inline", children: [
+                  (this.state.datasetOrigin === "xrelease" || this.state.datasetOrigin === "project") && /* @__PURE__ */ jsxRuntimeExports.jsx(FormItem, { label: "Content", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
                     RadioGroup,
                     {
+                      style: { marginLeft: "8px" },
                       size: "small",
                       onChange: (evt) => {
-                        this.updateSearch({ type: evt.target.value });
+                        this.updateSearch({ sectorMode: evt.target.value.split(",").filter((v2) => v2 !== "") });
                       },
-                      value: params.type || "WHOLE_WORDS",
+                      value: isArray(params == null ? void 0 : params.sectorMode) ? (_a2 = params == null ? void 0 : params.sectorMode) == null ? void 0 : _a2.join(",") : (params == null ? void 0 : params.sectorMode) || "",
                       optionType: "button",
                       options: [
-                        { value: "EXACT", label: "Exact" },
-                        { value: "WHOLE_WORDS", label: "Words" },
-                        { value: "PREFIX", label: "Prefix" },
-                        { value: "FUZZY", label: "Fuzzy" }
+                        { value: "", label: "All" },
+                        { value: "attach,union", label: "Base" },
+                        { value: "merge", label: "Extended" }
                       ]
                     }
-                  ) }) }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs(Form, { layout: "inline", children: [
-                    (this.state.datasetOrigin === "xrelease" || this.state.datasetOrigin === "project") && /* @__PURE__ */ jsxRuntimeExports.jsx(FormItem, { label: "Content", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                      RadioGroup,
-                      {
-                        style: { marginLeft: "8px" },
-                        size: "small",
-                        onChange: (evt) => {
-                          this.updateSearch({ sectorMode: evt.target.value.split(",").filter((v2) => v2 !== "") });
-                        },
-                        value: isArray(params == null ? void 0 : params.sectorMode) ? (_a2 = params == null ? void 0 : params.sectorMode) == null ? void 0 : _a2.join(",") : (params == null ? void 0 : params.sectorMode) || "",
-                        optionType: "button",
-                        options: [
-                          { value: "", label: "All" },
-                          { value: "attach,union", label: "Base" },
-                          { value: "merge", label: "Extended" }
-                        ]
-                      }
-                    ) }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsx(FormItem, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                      Select,
-                      {
-                        mode: "multiple",
-                        allowClear: true,
-                        size: "small",
-                        style: { minWidth: 200 },
-                        placeholder: "Search fields",
-                        value: isArray(params == null ? void 0 : params.content) ? params.content : (params == null ? void 0 : params.content) ? [params.content] : [],
-                        onChange: (value) => this.updateSearch({ content: value.length ? value : null }),
-                        options: [
-                          { value: "SCIENTIFIC_NAME", label: "Scientific name" },
-                          { value: "AUTHORSHIP", label: "Authorship" },
-                          { value: "VERNACULAR_NAME", label: "Vernacular name" }
-                        ]
-                      }
-                    ) })
-                  ] })
-                ] })
+                  ) }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(FormItem, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    Select,
+                    {
+                      mode: "multiple",
+                      allowClear: true,
+                      size: "small",
+                      style: { minWidth: 200 },
+                      placeholder: "Search fields",
+                      value: isArray(params == null ? void 0 : params.content) ? params.content : (params == null ? void 0 : params.content) ? [params.content] : [],
+                      onChange: (value) => this.updateSearch({ content: value.length ? value : null }),
+                      options: [
+                        { value: "SCIENTIFIC_NAME", label: "Scientific name" },
+                        { value: "AUTHORSHIP", label: "Authorship" },
+                        { value: "VERNACULAR_NAME", label: "Vernacular name" }
+                      ]
+                    }
+                  ) }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(FormItem, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    Button$1,
+                    {
+                      size: "small",
+                      color: isFuzzy ? "primary" : "default",
+                      variant: "outlined",
+                      "aria-pressed": isFuzzy,
+                      onClick: () => this.updateSearch({ type: isFuzzy ? null : "FUZZY" }),
+                      children: "Fuzzy"
+                    }
+                  ) })
+                ] }) })
               ] }),
               /* @__PURE__ */ jsxRuntimeExports.jsxs(Col, { xs: 24, sm: 24, md: 12, children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -78246,6 +78242,7 @@ html body {
   }) => {
     var _a2;
     const containerRef = reactExports.useRef(null);
+    const wrapperRef = reactExports.useRef(null);
     const mapRef = reactExports.useRef(null);
     const popupRef = reactExports.useRef(null);
     const recordMapRef = reactExports.useRef(/* @__PURE__ */ new Map());
@@ -78347,6 +78344,10 @@ html body {
         new maplibregl.NavigationControl({ showCompass: false }),
         "top-left"
       );
+      map.addControl(
+        new maplibregl.FullscreenControl({ container: wrapperRef.current }),
+        "top-right"
+      );
       mapRef.current = map;
       map.on("load", () => {
         setStyleReady(true);
@@ -78735,93 +78736,102 @@ html body {
       );
     }
     const focalName = ((_a2 = focalTaxon == null ? void 0 : focalTaxon.name) == null ? void 0 : _a2.scientificName) || "This taxon";
-    return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "col-distributions-map", style: { position: "relative" }, children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx(
-        "div",
-        {
-          ref: containerRef,
-          style: { height: 360, width: "100%", background: "#f5f5f5" }
-        }
-      ),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(
-        LayerControl,
-        {
-          open: controlOpen,
-          onOpen: openControl,
-          onClose: () => setControlOpen(false),
-          focalName,
-          focalReady,
-          focalVisible,
-          onToggleFocal: () => setFocalVisible((v2) => !v2),
-          gbifEnabled: !!gbifChecklistKey,
-          gbifVisible,
-          gbifAvailable,
-          onToggleGbif: handleToggleGbif,
-          descendantStatus: descendantState.status,
-          descendantsByRank,
-          descendantColors,
-          visibleTaxonIds,
-          onToggleTaxon: toggleTaxon,
-          onToggleRankGroup: toggleRankGroup,
-          onRetry: () => {
-            fetchTriggeredRef.current = false;
-            setDescendantState({ status: "idle", taxa: [] });
-            triggerDescendantFetch();
-          }
-        }
-      ),
-      !showDescendantLegend && (presentMeans.length > 0 || gbifChecklistKey && gbifAvailable !== false && gbifVisible) && /* @__PURE__ */ jsxRuntimeExports.jsxs(
-        "div",
-        {
-          style: {
-            position: "absolute",
-            bottom: 8,
-            left: 8,
-            zIndex: 1,
-            background: "#fff",
-            borderRadius: 4,
-            boxShadow: "0 1px 4px rgba(0,0,0,0.2)",
-            padding: "6px 8px",
-            fontSize: 12,
-            lineHeight: 1.5
-          },
-          children: [
-            presentMeans.map((m2) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
-              "div",
-              {
-                style: { display: "flex", alignItems: "center", gap: 6 },
-                children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx(
-                    "span",
-                    {
-                      style: {
-                        display: "inline-block",
-                        width: 12,
-                        height: 12,
-                        background: m2.color,
-                        border: "1px solid rgba(0,0,0,0.15)",
-                        borderRadius: 2
-                      }
-                    }
-                  ),
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: m2.label })
-                ]
+    return /* @__PURE__ */ jsxRuntimeExports.jsxs(
+      "div",
+      {
+        className: "col-distributions-map",
+        ref: wrapperRef,
+        style: { position: "relative" },
+        children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "div",
+            {
+              ref: containerRef,
+              className: "col-distributions-map__canvas",
+              style: { height: 360, width: "100%", background: "#f5f5f5" }
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            LayerControl,
+            {
+              open: controlOpen,
+              onOpen: openControl,
+              onClose: () => setControlOpen(false),
+              focalName,
+              focalReady,
+              focalVisible,
+              onToggleFocal: () => setFocalVisible((v2) => !v2),
+              gbifEnabled: !!gbifChecklistKey,
+              gbifVisible,
+              gbifAvailable,
+              onToggleGbif: handleToggleGbif,
+              descendantStatus: descendantState.status,
+              descendantsByRank,
+              descendantColors,
+              visibleTaxonIds,
+              onToggleTaxon: toggleTaxon,
+              onToggleRankGroup: toggleRankGroup,
+              onRetry: () => {
+                fetchTriggeredRef.current = false;
+                setDescendantState({ status: "idle", taxa: [] });
+                triggerDescendantFetch();
+              }
+            }
+          ),
+          !showDescendantLegend && (presentMeans.length > 0 || gbifChecklistKey && gbifAvailable !== false && gbifVisible) && /* @__PURE__ */ jsxRuntimeExports.jsxs(
+            "div",
+            {
+              style: {
+                position: "absolute",
+                bottom: 8,
+                left: 8,
+                zIndex: 1,
+                background: "#fff",
+                borderRadius: 4,
+                boxShadow: "0 1px 4px rgba(0,0,0,0.2)",
+                padding: "6px 8px",
+                fontSize: 12,
+                lineHeight: 1.5
               },
-              m2.key
-            )),
-            gbifChecklistKey && gbifAvailable !== false && gbifVisible && /* @__PURE__ */ jsxRuntimeExports.jsx(GbifLegendEntry, {})
-          ]
-        }
-      ),
-      showDescendantLegend && /* @__PURE__ */ jsxRuntimeExports.jsx(
-        IncludedTaxaLegend,
-        {
-          visibleGroups: descendantLegend.visibleGroups,
-          unmappableGroups: descendantLegend.unmappableGroups,
-          showGbif: !!gbifChecklistKey && gbifAvailable !== false && gbifVisible
-        }
-      )
-    ] });
+              children: [
+                presentMeans.map((m2) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                  "div",
+                  {
+                    style: { display: "flex", alignItems: "center", gap: 6 },
+                    children: [
+                      /* @__PURE__ */ jsxRuntimeExports.jsx(
+                        "span",
+                        {
+                          style: {
+                            display: "inline-block",
+                            width: 12,
+                            height: 12,
+                            background: m2.color,
+                            border: "1px solid rgba(0,0,0,0.15)",
+                            borderRadius: 2
+                          }
+                        }
+                      ),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: m2.label })
+                    ]
+                  },
+                  m2.key
+                )),
+                gbifChecklistKey && gbifAvailable !== false && gbifVisible && /* @__PURE__ */ jsxRuntimeExports.jsx(GbifLegendEntry, {})
+              ]
+            }
+          ),
+          showDescendantLegend && /* @__PURE__ */ jsxRuntimeExports.jsx(
+            IncludedTaxaLegend,
+            {
+              visibleGroups: descendantLegend.visibleGroups,
+              unmappableGroups: descendantLegend.unmappableGroups,
+              showGbif: !!gbifChecklistKey && gbifAvailable !== false && gbifVisible
+            }
+          )
+        ]
+      }
+    );
   };
   const LayerControl = ({
     open: open2,
@@ -78853,7 +78863,8 @@ html body {
           title: "Layers",
           style: {
             position: "absolute",
-            top: 10,
+            // Sits just below the maplibre fullscreen control (top-right).
+            top: 48,
             right: 10,
             zIndex: 2,
             width: 30,
@@ -78876,7 +78887,8 @@ html body {
       {
         style: {
           position: "absolute",
-          top: 10,
+          // Aligns with the collapsed "+" button, below the fullscreen control.
+          top: 48,
           right: 10,
           zIndex: 2,
           background: "#fff",
@@ -79146,8 +79158,7 @@ html body {
         ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ListView, { datasetKey, data })
       ] });
     }
-    const mapNudge = label && showMap ? { marginTop: -3 } : null;
-    const content = /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { ...mapNudge, ...style2 }, children: body });
+    const content = /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: style2, children: body });
     return label ? /* @__PURE__ */ jsxRuntimeExports.jsx(PresentationItem$1, { md: md2, label, children: content }) : content;
   };
   const rankStyle = {