@alphakits/ui 2.5.0 → 2.5.2

package/dist/modal/components/modals/index.css

@@ -1 +1 @@
-.container_WE0K{position:fixed;inset:0;display:flex;align-items:center;justify-content:center}.content_p1kc{background:var(--color-bg-primary);box-shadow:0 0 10px #0003}@media print{.content_p1kc{width:100%!important}}.button_js2W{position:absolute!important;top:34px;right:32px;z-index:999}.button_js2W.doubleModal_1ZTt{right:384px}.inner_Zsdb{height:100%;box-sizing:border-box;overflow:auto}.right_e065{position:fixed;top:0;right:0;bottom:0;transition:width .2s,opacity .2s,right .2s;transition-delay:width .1s;transition-timing-function:ease-in}.bg_8ZfP{transition:opacity .2s;background:#00000080;position:fixed;display:block;border:0;inset:0}@media screen and (max-width:823px){.right_e065,.center_nguy{max-width:100%!important;inset:0!important}.content_p1kc{width:100%!important;height:100%!important;max-height:100%!important;box-shadow:none!important;margin:0!important;border-radius:0!important}.button_js2W{top:24px!important;right:16px!important}}
+.container_WE0K{position:fixed;inset:0;display:flex;align-items:center;justify-content:center}.content_p1kc{background:var(--color-bg-primary);box-shadow:0 0 10px #0003}@media print{.content_p1kc{width:100%!important}}.button_js2W{position:absolute!important;top:34px;right:32px;z-index:999}.button_js2W.doubleModal_1ZTt{right:384px}.inner_Zsdb{height:100%;box-sizing:border-box;overflow:auto}.right_e065{position:fixed;top:0;right:0;bottom:0;transition:width .2s,opacity .2s,right .2s;transition-delay:width .1s;transition-timing-function:ease-in}.bg_8ZfP{transition:opacity .2s;background:#00000080;position:fixed;display:block;border:0;inset:0}.bottomSheet_CI-8{inset:0!important;width:100%!important;max-width:100%!important;height:100dvh;max-height:100dvh;border-radius:0!important;overflow:hidden;transform:translateY(100%);transition:transform .25s cubic-bezier(.32,.72,0,1)}@supports not (height: 100dvh){.bottomSheet_CI-8{height:100vh;max-height:100vh}}.bottomSheet_CI-8.open_eGDW{transform:translateY(0)}@media screen and (max-width:823px){.right_e065,.center_nguy{max-width:100%!important;right:0!important;left:0!important}.content_p1kc{box-shadow:none!important;margin:0!important}.button_js2W{top:16px!important;right:16px!important}}

package/dist/modal/components/modals/index.module.css.js

@@ -1,21 +1,25 @@
 import * as __css from './index.css';
 export const __cssModule = __css;
-const t = "container_WE0K", n = "content_p1kc", o = "button_js2W", e = "doubleModal_1ZTt", c = "inner_Zsdb", s = "right_e065", b = "bg_8ZfP", r = {
+const t = "container_WE0K", o = "content_p1kc", n = "button_js2W", e = "doubleModal_1ZTt", c = "inner_Zsdb", s = "right_e065", b = "bg_8ZfP", r = "bottomSheet_CI-8", i = "open_eGDW", _ = {
   container: t,
-  content: n,
-  button: o,
+  content: o,
+  button: n,
   doubleModal: e,
   inner: c,
   right: s,
-  bg: b
+  bg: b,
+  bottomSheet: r,
+  open: i
 };
 export {
   b as bg,
-  o as button,
+  r as bottomSheet,
+  n as button,
   t as container,
-  n as content,
-  r as default,
+  o as content,
+  _ as default,
   e as doubleModal,
   c as inner,
+  i as open,
   s as right
 };

package/dist/modal/components/modals/modal.js

@@ -1,93 +1,159 @@
-import { jsxs as d, jsx as i } from "react/jsx-runtime";
-import y from "@alphakits/icons/dist/CloseM";
-import k from "classnames";
-import { useState as v, useLayoutEffect as x, useCallback as w, useEffect as E } from "react";
-import { Button as g } from "../../../button/component.js";
-import { showConfirm as F } from "../../../confirm-popup/component.js";
+import { jsxs as E, jsx as l } from "react/jsx-runtime";
+import O from "@alphakits/icons/dist/CloseM";
+import C from "classnames";
+import { useState as L, useRef as w, useLayoutEffect as N, useEffect as k, useCallback as S } from "react";
+import { Button as z } from "../../../button/component.js";
+import { showConfirm as j } from "../../../confirm-popup/component.js";
+import { useMatchMedia as B } from "../../../mq/use-match-media.js";
 import s from "./index.module.css.js";
-const C = {
+const R = {
   s: 488,
   m: 888,
   full: "96%"
-}, b = 102, N = (e) => e === "full" ? `calc(-96vw - ${b}px)` : -C[e] - b, j = ({ modal: e, t: r, index: m, dirtyModals: a, closeModal: l, currentModalId: c }) => {
-  const f = N(e.props.size), [h, p] = v(f);
-  x(() => {
-    const o = requestAnimationFrame(() => p(0));
+}, T = 102, D = "(max-width: 823px)", K = (e) => e === "full" ? `calc(-96vw - ${T}px)` : -R[e] - T, _ = [
+  'a[href]:not([tabindex="-1"])',
+  'area[href]:not([tabindex="-1"])',
+  'button:not([disabled]):not([tabindex="-1"])',
+  'input:not([disabled]):not([type="hidden"]):not([tabindex="-1"])',
+  'select:not([disabled]):not([tabindex="-1"])',
+  'textarea:not([disabled]):not([tabindex="-1"])',
+  '[contenteditable="true"]:not([tabindex="-1"])',
+  '[tabindex]:not([tabindex="-1"])',
+  'iframe:not([tabindex="-1"])',
+  'object:not([tabindex="-1"])',
+  'embed:not([tabindex="-1"])',
+  'audio[controls]:not([tabindex="-1"])',
+  'video[controls]:not([tabindex="-1"])',
+  'details > summary:first-of-type:not([tabindex="-1"])'
+].join(","), F = (e) => e ? Array.from(e.querySelectorAll(_)).filter((r) => {
+  if (r.hidden || r.getAttribute("aria-hidden") === "true") return !1;
+  const a = window.getComputedStyle(r);
+  return a.visibility === "hidden" || a.display === "none" ? !1 : r.offsetWidth > 0 || r.offsetHeight > 0 || r.getClientRects().length > 0;
+}) : [], W = ({ modal: e, t: c, index: r, dirtyModals: a, closeModal: m, currentModalId: u }) => {
+  const A = K(e.props.size), [b] = B(D), [p, y] = L(!1), i = w(null), x = w(null);
+  N(() => {
+    const o = requestAnimationFrame(() => y(!0));
     return () => cancelAnimationFrame(o);
-  }, [e.id]);
-  const u = w(
-    (o) => a[o] ? F({
-      title: r("common:exitConfirm"),
-      confirmText: r("common:Да"),
-      cancelText: r("common:Нет"),
+  }, [e.id]), k(() => {
+    if (e.id !== u) return;
+    x.current = document.activeElement || null;
+    const o = setTimeout(() => {
+      const n = F(i.current)[0] || i.current;
+      n && typeof n.focus == "function" && n.focus({ preventScroll: !0 });
+    }, 50);
+    return () => {
+      clearTimeout(o);
+      const t = document.activeElement;
+      if (!t || !i.current?.contains(t)) return;
+      const n = x.current;
+      if (n && typeof n.focus == "function" && document.body.contains(n))
+        try {
+          n.focus({ preventScroll: !0 });
+        } catch {
+          document.body.focus();
+        }
+    };
+  }, [e.id, u]);
+  const h = S(
+    (o) => a[o] ? j({
+      title: c("common:exitConfirm"),
+      confirmText: c("common:Да"),
+      cancelText: c("common:Нет"),
       confirmView: "negative"
     }) : Promise.resolve(!0),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [a, r]
-  ), t = w(
+    [a, c]
+  ), f = S(
     async (o) => {
-      const { id: n } = e;
-      await u(o || n) && (p(f), setTimeout(() => {
-        e.props.closeCallback && e.props.closeCallback(), l(o || n);
+      const { id: t } = e;
+      await h(o || t) && (y(!1), setTimeout(() => {
+        e.props.closeCallback && e.props.closeCallback(), m(o || t);
       }, 250));
     },
-    [l, u, e, f]
+    [m, h, e]
   );
-  return E(() => {
-    const o = (n) => {
-      (n.key === "27" || n.key === "Escape") && t(c);
+  return k(() => {
+    const o = (t) => {
+      if (t.key === "27" || t.key === "Escape") {
+        f(u);
+        return;
+      }
+      if (t.key !== "Tab") return;
+      const n = F(i.current);
+      if (!n.length) {
+        t.preventDefault(), i.current && i.current.focus({ preventScroll: !0 });
+        return;
+      }
+      const v = n[0], g = n[n.length - 1], d = document.activeElement;
+      if (t.shiftKey && (d === v || !i.current?.contains(d))) {
+        t.preventDefault(), g.focus({ preventScroll: !0 });
+        return;
+      }
+      !t.shiftKey && (d === g || !i.current?.contains(d)) && (t.preventDefault(), v.focus({ preventScroll: !0 }));
     };
-    return e.id === c && window?.addEventListener("keydown", o), () => {
+    return e.id === u && window?.addEventListener("keydown", o), () => {
       window?.removeEventListener("keydown", o);
     };
-  }, [t, c, e.id]), /* @__PURE__ */ d(
+  }, [f, u, e.id]), /* @__PURE__ */ E(
     "div",
     {
       className: s.container,
       style: {
-        zIndex: 9999998 + m
+        zIndex: 9999998 + r
       },
       children: [
-        /* @__PURE__ */ i(
+        /* @__PURE__ */ l(
           "div",
           {
-            className: k(s.right, s.content),
+            ref: i,
+            className: C(s.right, s.content, {
+              [s.open]: p,
+              [s.bottomSheet]: b
+            }),
             style: {
-              zIndex: 9999999 + m,
-              width: C[e.props.size],
-              right: h
+              zIndex: 9999999 + r,
+              width: R[e.props.size],
+              // На десктопе right-slide управляется JS-ом (старая
+              // схема — анимация ширины и right'а синхронны). На
+              // мобиле right=0 всегда, а появление контролируется
+              // CSS-классом .open → transform: translateY(0).
+              right: b || p ? 0 : A
             },
-            children: /* @__PURE__ */ d("div", { className: s.inner, children: [
-              /* @__PURE__ */ i(
+            role: "dialog",
+            "aria-modal": "true",
+            "aria-labelledby": `modal-title-${e.id}`,
+            tabIndex: -1,
+            children: /* @__PURE__ */ E("div", { className: s.inner, children: [
+              /* @__PURE__ */ l(
                 e.modal,
                 {
                   ...e.props,
                   modalId: e.id,
-                  close: () => t()
+                  close: () => f()
                 }
               ),
-              /* @__PURE__ */ i(
-                g,
+              /* @__PURE__ */ l(
+                z,
                 {
-                  className: k(s.button, {
+                  className: C(s.button, {
                     [s.doubleModal]: e.props.isDouble
                   }),
                   view: "secondary",
                   size: "xs",
-                  leftAddons: /* @__PURE__ */ i(y, {}),
-                  onClick: () => t()
+                  leftAddons: /* @__PURE__ */ l(O, {}),
+                  onClick: () => f()
                 }
               )
             ] })
           }
         ),
-        /* @__PURE__ */ i(
+        /* @__PURE__ */ l(
           "button",
           {
             className: s.bg,
-            "aria-label": "close_backdrop",
+            "aria-label": "Close dialog",
             type: "button",
-            onClick: () => t()
+            onClick: () => f()
           }
         )
       ]
@@ -95,5 +161,5 @@ const C = {
   );
 };
 export {
-  j as Modal
+  W as Modal
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alphakits/ui",
-    "version": "2.5.0",
+    "version": "2.5.2",
     "files": [
         "dist"
     ],