@altinn/altinn-components 0.38.19 → 0.38.20

package/dist/components/Modal/ModalBase.js

@@ -1,16 +1,16 @@
 "use client";
 import { jsx as f } from "react/jsx-runtime";
-import { useRef as S, useEffect as u } from "react";
+import { useRef as x, useEffect as u } from "react";
 import "../../index-L8X2o7IH.js";
 import "../RootProvider/RootProvider.js";
 import "../Snackbar/useSnackbar.js";
-import { Section as x } from "../Page/Section.js";
+import { Section as C } from "../Page/Section.js";
 import '../../assets/ModalBase.css';const R = "_modal_4vfmr_1", I = "_content_4vfmr_35", d = {
   modal: R,
   content: I
 }, Y = ({
-  open: c,
-  onClose: a,
+  open: a,
+  onClose: r,
   closedBy: n = "any",
   children: v,
   backdropColor: p = "inherit",
@@ -20,16 +20,22 @@ import '../../assets/ModalBase.css';const R = "_modal_4vfmr_1", I = "_content_4v
   spacing: b = 0,
   variant: k = "default"
 }) => {
-  const r = S(null);
+  const c = x(null);
   return u(() => {
-    const e = r.current, o = (t) => {
+    const e = c.current, o = (t) => {
       var m;
       const { clientY: s, clientX: l, target: L } = t;
-      if (t instanceof KeyboardEvent)
-        return n === "none" && t.key === "Escape" && t.preventDefault();
+      if (t instanceof KeyboardEvent && t.key === "Escape") {
+        if (n === "none") {
+          t.preventDefault();
+          return;
+        }
+        r();
+        return;
+      }
       if (!((m = window.getSelection()) != null && m.toString()) && e && L === e && n === "any") {
-        const { top: _, left: w, right: C, bottom: D } = e.getBoundingClientRect();
-        _ <= s && s <= D && w <= l && l <= C || e == null || e.close();
+        const { top: _, left: w, right: D, bottom: S } = e.getBoundingClientRect();
+        _ <= s && s <= S && w <= l && l <= D || e == null || e.close();
       }
     }, i = () => {
       const t = e == null ? void 0 : e.querySelector("[autofocus]");
@@ -38,24 +44,24 @@ import '../../assets/ModalBase.css';const R = "_modal_4vfmr_1", I = "_content_4v
     return e == null || e.addEventListener("animationend", i), e == null || e.addEventListener("click", o), e == null || e.addEventListener("keydown", o), () => {
       e == null || e.removeEventListener("animationend", i), e == null || e.removeEventListener("click", o), e == null || e.removeEventListener("keydown", o);
     };
-  }, [n]), u(() => {
-    const e = r.current;
-    e && (c ? e.open || e.showModal() : e.open && e.close());
-  }, [c]), /* @__PURE__ */ f(
+  }, [n, r]), u(() => {
+    const e = c.current;
+    e && (a ? e.open || e.showModal() : e.open && e.close());
+  }, [a]), /* @__PURE__ */ f(
     "dialog",
     {
-      ref: r,
+      ref: c,
       "aria-modal": "true",
       "aria-labelledby": "modal-title",
       onCancel: (e) => {
-        e.preventDefault(), n === "any" && a();
+        e.preventDefault(), n === "any" && r();
       },
       "data-backdrop-color": p,
       className: d.modal,
       "data-variant": k,
-      onClose: n !== "none" ? a : void 0,
+      onClose: n !== "none" ? r : void 0,
       children: /* @__PURE__ */ f(
-        x,
+        C,
         {
           className: d.content,
           "aria-label": "modal content",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altinn/altinn-components",
-  "version": "0.38.19",
+  "version": "0.38.20",
   "main": "dist/index.js",
   "files": [
     "dist/",