glitchgrab 1.31.0 → 1.32.0

package/dist/index.js

@@ -989,6 +989,7 @@ function AnnotationCanvas({ imageSrc, onSave, onCancel }) {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "div",
     {
+      "data-glitchgrab-layer": "",
       style: {
         position: "fixed",
         inset: 0,
@@ -1565,13 +1566,29 @@ function ReportDialog({
   const isPushToTalkRef = (0, import_react.useRef)(false);
   (0, import_react.useEffect)(() => {
     if (!isOpen) return;
-    const dialogs = Array.from(
-      document.querySelectorAll(
-        '[role="dialog"][data-state="open"]'
-      )
-    );
-    dialogs.forEach((d) => d.setAttribute("inert", ""));
-    return () => dialogs.forEach((d) => d.removeAttribute("inert"));
+    const HOST_LAYERS = '[role="dialog"],[role="alertdialog"],[role="menu"],[role="listbox"]';
+    const inerted = /* @__PURE__ */ new Set();
+    const applyInert = () => {
+      document.querySelectorAll(HOST_LAYERS).forEach((el) => {
+        if (el.closest("[data-glitchgrab-layer]")) return;
+        if (el.querySelector("[data-glitchgrab-layer]")) return;
+        if (inerted.has(el) || el.hasAttribute("inert")) return;
+        el.setAttribute("inert", "");
+        inerted.add(el);
+      });
+    };
+    applyInert();
+    const observer = new MutationObserver((mutations) => {
+      const structural = mutations.some(
+        (m) => m.addedNodes.length > 0 || m.removedNodes.length > 0
+      );
+      if (structural) applyInert();
+    });
+    observer.observe(document.body, { childList: true, subtree: true });
+    return () => {
+      observer.disconnect();
+      inerted.forEach((el) => el.removeAttribute("inert"));
+    };
   }, [isOpen]);
   const [step, setStep] = (0, import_react.useState)(1);
   const [reportType, setReportType] = (0, import_react.useState)("BUG");
@@ -1662,6 +1679,8 @@ function ReportDialog({
   };
   const handleOpen = async () => {
     setSubmitted(false);
+    closePreview();
+    setAnnotatingIndex(null);
     if (availableTypes.length === 1) {
       setReportType(availableTypes[0]);
       setStep(2);
@@ -1688,14 +1707,15 @@ function ReportDialog({
     if (!isOpen) return;
     const handleEsc = (e) => {
       if (e.key === "Escape") {
-        if (previewZoomed) setPreviewZoomed(false);
+        if (annotatingIndex !== null) setAnnotatingIndex(null);
+        else if (previewZoomed) setPreviewZoomed(false);
         else if (previewIndex !== null) closePreview();
         else handleClose();
       }
     };
     document.addEventListener("keydown", handleEsc);
     return () => document.removeEventListener("keydown", handleEsc);
-  }, [isOpen, previewIndex, previewZoomed]);
+  }, [isOpen, previewIndex, previewZoomed, annotatingIndex]);
   (0, import_react.useEffect)(() => {
     if (previewIndex === null || annotatingIndex !== null) return;
     const handlePointerDown = (e) => {
@@ -1830,6 +1850,8 @@ function ReportDialog({
   const handleClose = () => {
     stopVoice();
     setIsOpen(false);
+    closePreview();
+    setAnnotatingIndex(null);
     setStep(1);
     setRating(0);
     setHoveredStar(0);
@@ -2080,6 +2102,7 @@ function ReportDialog({
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
         "div",
         {
+          "data-glitchgrab-layer": "",
           style: {
             position: "fixed",
             inset: 0,
@@ -3505,10 +3528,11 @@ function ReportDialog({
         style: { display: "none" }
       }
     ),
-    previewIndex !== null && screenshots[previewIndex] && (0, import_react_dom.createPortal)(
+    isOpen && previewIndex !== null && screenshots[previewIndex] && (0, import_react_dom.createPortal)(
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
         "div",
         {
+          "data-glitchgrab-layer": "",
           style: {
             position: "fixed",
             inset: 0,
@@ -3661,7 +3685,7 @@ function ReportDialog({
       ),
       document.body
     ),
-    annotatingIndex !== null && screenshots[annotatingIndex] && (0, import_react_dom.createPortal)(
+    isOpen && annotatingIndex !== null && screenshots[annotatingIndex] && (0, import_react_dom.createPortal)(
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
         AnnotationCanvas,
         {