@nulib/clover 4.0.0-beta.0 → 4.0.0

package/dist/components/Canvas/ControlMenu.mjs

@@ -9,6 +9,7 @@ const ControlMenu = ({
   onClose,
   "data-testid": testId,
   className,
+  holds,
   children
 }) => {
   const ref = useRef(null);
@@ -17,8 +18,8 @@ const ControlMenu = ({
     const menu = ref.current;
     const item = (menu == null ? void 0 : menu.querySelector('input[type="radio"]:checked')) ?? (menu == null ? void 0 : menu.querySelector(
       'input[type="radio"]:not(:disabled)'
-    )) ?? (menu == null ? void 0 : menu.querySelector("input"));
-    const row = item == null ? void 0 : item.closest("label");
+    )) ?? (menu == null ? void 0 : menu.querySelector("input")) ?? (menu == null ? void 0 : menu.querySelector('[role="option"][tabindex="0"]'));
+    const row = item == null ? void 0 : item.closest('label, [role="option"]');
     if (menu && row) {
       const bottom = row.offsetTop + row.offsetHeight;
       if (bottom > menu.scrollTop + menu.clientHeight) {
@@ -28,10 +29,11 @@ const ControlMenu = ({
     }
     item == null ? void 0 : item.focus({ preventScroll: true });
     const onPointerDown = (event) => {
-      var _a, _b;
+      var _a, _b, _c;
       const target = event.target;
       if ((_a = ref.current) == null ? void 0 : _a.contains(target)) return;
       if ((_b = document.getElementById(triggerId)) == null ? void 0 : _b.contains(target)) return;
+      if (target && ((_c = holds == null ? void 0 : holds()) == null ? void 0 : _c.contains(target))) return;
       onClose(false);
     };
     const onKeyDown = (event) => {
@@ -50,7 +52,7 @@ const ControlMenu = ({
       document.removeEventListener("pointerdown", onPointerDown);
       document.removeEventListener("keydown", onKeyDown, true);
     };
-  }, [triggerId, onClose]);
+  }, [triggerId, onClose, holds]);
   return /* @__PURE__ */ jsx(
     "div",
     {

package/dist/components/Canvas/Controls.mjs

@@ -1,7 +1,7 @@
 "use client";
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { useState, useCallback } from "react";
-import { Comment, Information } from "../Body/glyphs.mjs";
+import { Comment, Place, Information } from "../Body/glyphs.mjs";
 import Button from "../../ui/Button.mjs";
 import ControlCluster from "../../ui/ControlCluster.mjs";
 import { ZoomIn, ZoomOut, ZoomExitFullScreen, ZoomFullScreen, Rotate, Reset, Choice } from "../../ui/controlGlyphs.mjs";
@@ -32,6 +32,9 @@ const Controls = ({
   captionId,
   captionOpen = false,
   onCaptionToggle,
+  placeId,
+  placeOpen = false,
+  onPlaceToggle,
   language,
   children
 }) => {
@@ -54,6 +57,7 @@ const Controls = ({
   );
   const showAnnotations = config.annotations && annotations.length > 0 && onAnnotationSelect;
   const showInformation = config.information && captionId && onCaptionToggle;
+  const showPlace = config.map && placeId && onPlaceToggle;
   const choiceId = `choice-${instance}`;
   const ownChoiceLabel = choices.length === 1 ? localize(choices[0].label, language) : null;
   const choiceLabel = (ownChoiceLabel == null ? void 0 : ownChoiceLabel.text) || t("canvasChoice");
@@ -180,6 +184,18 @@ const Controls = ({
               children: /* @__PURE__ */ jsx(Comment, {})
             }
           ),
+          showPlace && /* @__PURE__ */ jsx(
+            Button,
+            {
+              id: `place-${instance}`,
+              label: t("mapLabel"),
+              lang: langOf("mapLabel"),
+              onClick: onPlaceToggle,
+              expanded: placeOpen,
+              controls: placeId,
+              children: /* @__PURE__ */ jsx(Place, {})
+            }
+          ),
           showInformation && /* @__PURE__ */ jsx(
             Button,
             {