@jirawatpyk/aura-react 5.0.1 → 5.1.1

package/dist/esm/Table.js

@@ -26,8 +26,9 @@ const Table = React.forwardRef(function Table2(props, ref) {
       className: "aura-tbl-wrap",
       "data-density": density,
       tabIndex: scrolls ? 0 : void 0,
-      role: scrolls ? "region" : void 0,
-      "aria-labelledby": scrolls && caption != null ? capId : void 0
+      role: scrolls && (caption != null || rest["aria-label"]) ? "region" : void 0,
+      "aria-labelledby": scrolls && caption != null ? capId : void 0,
+      "aria-label": scrolls && caption == null ? rest["aria-label"] : void 0
     },
     /* @__PURE__ */ React.createElement("table", { ref, className: cx("aura-tbl", className), ...rest }, caption != null ? /* @__PURE__ */ React.createElement("caption", { id: capId, className: cx("aura-tbl__caption", captionHidden && "aura-sr-only") }, caption) : null, children)
   );

package/dist/esm/Tabs.js

@@ -5,19 +5,23 @@ import { cx, uid, useMaybeControlled } from "./internal.js";
 import { useLinkComponent } from "./locale.js";
 const Tabs = React.forwardRef(function Tabs2(props, ref) {
   const items = props.tabs || [], base = uid();
+  const asLinks = items.length > 0 && items.every(function(t) {
+    return !!t.href;
+  });
+  const firstOn = items.filter(function(t) {
+    return !t.disabled;
+  })[0];
   const st = useMaybeControlled(
     props.value,
-    props.defaultValue || items[0] && items[0].id,
+    props.defaultValue || (asLinks ? void 0 : firstOn && firstOn.id),
     props.onChange
   );
+  const cur = asLinks && "value" in props ? props.value : st[0];
   const refs = React.useRef({});
   const current = items.filter(function(t) {
-    return t.id === st[0];
-  })[0] || items[0];
+    return t.id === cur;
+  })[0] || firstOn || items[0];
   const Link = useLinkComponent(props.linkComponent);
-  const asLinks = items.length > 0 && items.every(function(t) {
-    return !!t.href;
-  });
   if (asLinks)
     return /* @__PURE__ */ React.createElement(
       "nav",
@@ -27,7 +31,7 @@ const Tabs = React.forwardRef(function Tabs2(props, ref) {
         className: cx("aura-tabs aura-tabs--links", props.className)
       },
       /* @__PURE__ */ React.createElement("div", { className: "aura-tabs__list" }, items.map(function(t) {
-        const on = t.id === st[0];
+        const on = t.id === cur;
         const inner = [
           t.icon ? /* @__PURE__ */ React.createElement(Icon, { key: "i", name: t.icon }) : null,
           t.label,

package/dist/esm/TextField.js

@@ -28,8 +28,8 @@ const TextField = React.forwardRef(function TextField2(props, ref) {
         className: "aura-input__control",
         placeholder: props.placeholder,
         required: props.required,
-        "aria-invalid": props.error ? true : void 0,
-        "aria-describedby": describedBy(id, props)
+        "aria-invalid": props.error ? true : rest["aria-invalid"],
+        "aria-describedby": [describedBy(id, props), rest["aria-describedby"]].filter(Boolean).join(" ") || void 0
       }
     ), props.suffix ? /* @__PURE__ */ React.createElement("span", { className: "aura-input__suffix" }, props.suffix) : null)
   );

package/dist/esm/Textarea.js

@@ -27,8 +27,8 @@ const Textarea = React.forwardRef(function Textarea2(props, ref) {
         className: "aura-input aura-textarea",
         placeholder: props.placeholder,
         required: props.required,
-        "aria-invalid": props.error ? true : void 0,
-        "aria-describedby": describedBy(id, props)
+        "aria-invalid": props.error ? true : rest["aria-invalid"],
+        "aria-describedby": [describedBy(id, props), rest["aria-describedby"]].filter(Boolean).join(" ") || void 0
       }
     )
   );

package/dist/esm/ThemeStyle.js

@@ -1,15 +1,25 @@
 'use client';
 import * as React from "react";
 import { createTheme } from "./theme.js";
+import { devWarnOnce } from "./internal.js";
 function ThemeStyle(props) {
   const css = React.useMemo(
     function() {
-      return createTheme({ brand: props.brand, signal: props.signal, primary: props.primary, name: props.name }).css(
-        props.selector
-      );
+      try {
+        return createTheme({
+          brand: props.brand,
+          signal: props.signal,
+          primary: props.primary,
+          name: props.name
+        }).css(props.selector);
+      } catch (e) {
+        devWarnOnce("theme-style", "ThemeStyle ignored: " + e.message);
+        return null;
+      }
     },
     [props.brand, props.signal, props.primary, props.name, props.selector]
   );
+  if (css === null) return null;
   return /* @__PURE__ */ React.createElement("style", { "data-aura-theme": props.name || props.brand, dangerouslySetInnerHTML: { __html: css } });
 }
 export {

package/dist/esm/Toaster.js

@@ -158,6 +158,7 @@ function Toaster(props) {
   const s = React.useState(toastState.list);
   React.useEffect(function() {
     toastState.subs.push(s[1]);
+    s[1](toastState.list.slice());
     return function() {
       toastState.subs = toastState.subs.filter(function(f) {
         return f !== s[1];

package/dist/esm/Tooltip.js

@@ -1,11 +1,11 @@
 'use client';
 import * as React from "react";
-import { uid, useIsoLayoutEffect, useMergedRef } from "./internal.js";
+import { uid, useIsoLayoutEffect, useMergedRef, useMounted } from "./internal.js";
 import { createPortal } from "react-dom";
 const Tooltip = React.forwardRef(function Tooltip2(props, ref) {
   const id = uid(), st = React.useState(false), open = props.open !== void 0 ? props.open : st[0], set = st[1];
   const anchor = React.useRef(null), anchorMerged = useMergedRef(ref, anchor), tip = React.useRef(null), timer = React.useRef(void 0);
-  const pos = React.useState(null);
+  const pos = React.useState(null), mounted = useMounted();
   function show(now) {
     clearTimeout(timer.current);
     timer.current = setTimeout(
@@ -19,34 +19,55 @@ const Tooltip = React.forwardRef(function Tooltip2(props, ref) {
     clearTimeout(timer.current);
     set(false);
   }
+  function hideSoon() {
+    clearTimeout(timer.current);
+    timer.current = setTimeout(function() {
+      set(false);
+    }, 120);
+  }
+  React.useEffect(function() {
+    return function() {
+      clearTimeout(timer.current);
+    };
+  }, []);
+  function place() {
+    if (!anchor.current || !tip.current) return;
+    const r = anchor.current.getBoundingClientRect(), t = tip.current.getBoundingClientRect();
+    const vw = window.innerWidth, vh = window.innerHeight, gap = 8, m = 8;
+    let side = props.side || "top";
+    if (side === "top" && r.top - t.height - gap < m && r.bottom + gap + t.height <= vh - m) side = "bottom";
+    else if (side === "bottom" && r.bottom + gap + t.height > vh - m && r.top - t.height - gap >= m) side = "top";
+    else if (side === "left" && r.left - t.width - gap < m && r.right + gap + t.width <= vw - m) side = "right";
+    else if (side === "right" && r.right + gap + t.width > vw - m && r.left - t.width - gap >= m) side = "left";
+    const clampX = function(x) {
+      return Math.max(m, Math.min(x, vw - t.width - m));
+    };
+    const clampY = function(y) {
+      return Math.max(m, Math.min(y, vh - t.height - m));
+    };
+    let top, left;
+    if (side === "top" || side === "bottom") {
+      top = clampY(side === "top" ? r.top - t.height - gap : r.bottom + gap);
+      left = clampX(r.left + r.width / 2 - t.width / 2);
+    } else {
+      left = side === "left" ? r.left - t.width - gap : r.right + gap;
+      left = clampX(left);
+      top = clampY(r.top + r.height / 2 - t.height / 2);
+    }
+    pos[1]({ top, left });
+  }
   useIsoLayoutEffect(
     function() {
-      if (!open || !anchor.current || !tip.current) return;
-      const r = anchor.current.getBoundingClientRect(), t = tip.current.getBoundingClientRect();
-      const vw = window.innerWidth, vh = window.innerHeight, gap = 8, m = 8;
-      let side = props.side || "top";
-      if (side === "top" && r.top - t.height - gap < m && r.bottom + gap + t.height <= vh - m) side = "bottom";
-      else if (side === "bottom" && r.bottom + gap + t.height > vh - m && r.top - t.height - gap >= m) side = "top";
-      else if (side === "left" && r.left - t.width - gap < m && r.right + gap + t.width <= vw - m) side = "right";
-      else if (side === "right" && r.right + gap + t.width > vw - m && r.left - t.width - gap >= m) side = "left";
-      const clampX = function(x) {
-        return Math.max(m, Math.min(x, vw - t.width - m));
-      };
-      const clampY = function(y) {
-        return Math.max(m, Math.min(y, vh - t.height - m));
+      if (!open) return;
+      place();
+      window.addEventListener("scroll", place, true);
+      window.addEventListener("resize", place);
+      return function() {
+        window.removeEventListener("scroll", place, true);
+        window.removeEventListener("resize", place);
       };
-      let top, left;
-      if (side === "top" || side === "bottom") {
-        top = clampY(side === "top" ? r.top - t.height - gap : r.bottom + gap);
-        left = clampX(r.left + r.width / 2 - t.width / 2);
-      } else {
-        left = side === "left" ? r.left - t.width - gap : r.right + gap;
-        left = clampX(left);
-        top = clampY(r.top + r.height / 2 - t.height / 2);
-      }
-      pos[1]({ top, left });
     },
-    [open]
+    [open, mounted]
   );
   React.useEffect(
     function() {
@@ -70,7 +91,7 @@ const Tooltip = React.forwardRef(function Tooltip2(props, ref) {
       onMouseEnter: function() {
         show(false);
       },
-      onMouseLeave: hide,
+      onMouseLeave: hideSoon,
       onFocus: function() {
         show(true);
       },
@@ -78,14 +99,18 @@ const Tooltip = React.forwardRef(function Tooltip2(props, ref) {
     },
     React.cloneElement(child, { "aria-describedby": open ? id : child.props["aria-describedby"] })
   );
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, trigger, open ? createPortal(
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, trigger, open && mounted ? createPortal(
     /* @__PURE__ */ React.createElement(
       "div",
       {
         ref: tip,
         id,
         role: "tooltip",
-        className: "aura-tooltip",
+        onMouseEnter: function() {
+          clearTimeout(timer.current);
+        },
+        onMouseLeave: hideSoon,
+        className: "aura-tooltip aura-tooltip--hoverable",
         style: { top: pos[0] ? pos[0].top : -9999, left: pos[0] ? pos[0].left : -9999 }
       },
       props.content

package/dist/esm/colorScheme.js

@@ -37,16 +37,20 @@ function useColorScheme(options) {
         if (readScheme(fallback) === "system") apply("system");
         cb();
       }
+      function onStorage(e) {
+        if (e.key === key) apply(valid(e.newValue) ? e.newValue : fallback);
+        cb();
+      }
       if (mq) mq.addEventListener("change", onSystem);
       window.addEventListener(EVENT, cb);
-      window.addEventListener("storage", cb);
+      window.addEventListener("storage", onStorage);
       return function() {
         if (mq) mq.removeEventListener("change", onSystem);
         window.removeEventListener(EVENT, cb);
-        window.removeEventListener("storage", cb);
+        window.removeEventListener("storage", onStorage);
       };
     },
-    [fallback]
+    [fallback, key]
   );
   const snapshot = React.useSyncExternalStore(
     subscribe,

package/dist/esm/colorSchemeScript.js

@@ -6,9 +6,9 @@ function valid(v) {
   return typeof v === "string" && SCHEMES.indexOf(v) >= 0;
 }
 function colorSchemeScript(options) {
-  const key = JSON.stringify(options && options.storageKey || DEFAULT_KEY);
-  const fallback = JSON.stringify(options && options.defaultScheme || "system");
-  return "(function(){try{var s=localStorage.getItem(" + key + ");if(s!=='light'&&s!=='dark'&&s!=='system')s=" + fallback + `;var d=document.documentElement;d.setAttribute("data-theme",s);var dark=s==='dark'||(s==='system'&&window.matchMedia('(prefers-color-scheme: dark)').matches);d.classList.toggle("dark",dark);}catch(e){}})();`;
+  const key = JSON.stringify(options && options.storageKey || DEFAULT_KEY).replace(/</g, "\\u003c");
+  const fallback = JSON.stringify(options && options.defaultScheme || "system").replace(/</g, "\\u003c");
+  return "(function(){try{var s=localStorage.getItem(" + key + ");if(s!=='light'&&s!=='dark'&&s!=='system')s=" + fallback + `;var d=document.documentElement;d.setAttribute("data-theme",s);var m=window.matchMedia('(prefers-color-scheme: dark)');d.classList.toggle('dark',s==='dark'||(s==='system'&&m.matches));if(m.addEventListener)m.addEventListener('change',function(e){if(d.getAttribute('data-theme')==='system')d.classList.toggle('dark',e.matches)});}catch(e){}})();`;
 }
 export {
   DEFAULT_KEY,

package/dist/esm/dates.js

@@ -46,7 +46,8 @@ const DATE_TEXT = {
     rangePlaceholder: "\u0E27\u0E27/\u0E14\u0E14/\u0E1B\u0E1B\u0E1B\u0E1B \u2013 \u0E27\u0E27/\u0E14\u0E14/\u0E1B\u0E1B\u0E1B\u0E1B",
     clearDates: "\u0E25\u0E49\u0E32\u0E07\u0E0A\u0E48\u0E27\u0E07\u0E27\u0E31\u0E19\u0E17\u0E35\u0E48",
     chooseStart: "\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E27\u0E31\u0E19\u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19",
-    chooseEnd: "\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E27\u0E31\u0E19\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14"
+    chooseEnd: "\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E27\u0E31\u0E19\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14",
+    dateUnavailable: "\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E27\u0E31\u0E19\u0E17\u0E35\u0E48\u0E19\u0E35\u0E49\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49 \u0E25\u0E2D\u0E07\u0E40\u0E1B\u0E34\u0E14\u0E1B\u0E0F\u0E34\u0E17\u0E34\u0E19\u0E14\u0E39\u0E27\u0E31\u0E19\u0E17\u0E35\u0E48\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E44\u0E14\u0E49"
   },
   en: {
     prevYears: "Previous years",
@@ -63,7 +64,8 @@ const DATE_TEXT = {
     rangePlaceholder: "DD/MM/YYYY \u2013 DD/MM/YYYY",
     clearDates: "Clear dates",
     chooseStart: "Choose the start date",
-    chooseEnd: "Choose the end date"
+    chooseEnd: "Choose the end date",
+    dateUnavailable: "That date can't be chosen. Open the calendar to see the dates you can pick."
   },
   sv: {
     prevYears: "Tidigare \xE5r",
@@ -80,7 +82,8 @@ const DATE_TEXT = {
     rangePlaceholder: "\xE5\xE5\xE5\xE5-mm-dd \u2013 \xE5\xE5\xE5\xE5-mm-dd",
     clearDates: "Rensa datumen",
     chooseStart: "V\xE4lj startdatum",
-    chooseEnd: "V\xE4lj slutdatum"
+    chooseEnd: "V\xE4lj slutdatum",
+    dateUnavailable: "Det datumet g\xE5r inte att v\xE4lja. \xD6ppna kalendern f\xF6r att se vilka datum som g\xE5r."
   }
 };
 function dateText(locale) {

package/dist/esm/internal.js

@@ -12,14 +12,21 @@ function omit(src, keys) {
 }
 function useMaybeControlled(value, initial, onChange) {
   const s = React.useState(initial);
+  const wasSet = React.useState(value !== void 0);
+  if (value !== void 0 && !wasSet[0]) wasSet[1](true);
+  else if (value === void 0 && wasSet[0]) {
+    wasSet[1](false);
+    s[1](initial);
+  }
   const controlled = value !== void 0;
-  return [
-    controlled ? value : s[0],
-    function(next) {
-      if (!controlled) s[1](next);
-      if (onChange) onChange(next);
-    }
-  ];
+  const latest = React.useRef({ controlled, onChange, set: s[1] });
+  latest.current = { controlled, onChange, set: s[1] };
+  const set = React.useCallback(function(next) {
+    const l = latest.current;
+    if (!l.controlled) l.set(next);
+    if (l.onChange) l.onChange(next);
+  }, []);
+  return [controlled ? value : s[0], set];
 }
 const collator = typeof Intl !== "undefined" ? new Intl.Collator(["th", "en"], { numeric: true, sensitivity: "base" }) : null;
 function compare(a, b) {
@@ -83,12 +90,30 @@ const TONES = ["neutral", "accent", "success", "warning", "danger"];
 function tone(t) {
   return TONES.indexOf(t) >= 0 ? t : "neutral";
 }
+const warned = {};
+function plainClick(e) {
+  return !e.defaultPrevented && e.button === 0 && !e.metaKey && !e.ctrlKey && !e.shiftKey && !e.altKey;
+}
+function devWarnOnce(key, message) {
+  if (warned[key]) return;
+  let dev = false;
+  try {
+    dev = true;
+  } catch (e) {
+    dev = false;
+  }
+  if (!dev) return;
+  warned[key] = true;
+  console.warn("[AURA] " + message);
+}
 export {
   FOCUSABLE,
   collator,
   compare,
   cx,
+  devWarnOnce,
   omit,
+  plainClick,
   tone,
   trapTab,
   uid,

package/dist/esm/locale.js

@@ -8,17 +8,18 @@ function AuraProvider(props) {
   const timeZone = props.timeZone || outer && outer.timeZone || null;
   const value = React.useMemo(
     function() {
-      const base = props.locale && STRINGS[props.locale] || STRINGS.en;
+      const own = !!props.locale || !outer || !outer.locale;
+      const base = own ? props.locale && STRINGS[props.locale] || STRINGS.en : outer.strings;
       return {
-        locale: props.locale || "en",
-        calendar: props.calendar || null,
+        locale: props.locale || outer && outer.locale || "en",
+        calendar: props.calendar || (own ? null : outer.calendar),
         strings: props.strings ? Object.assign({}, base, props.strings) : base,
-        linkComponent: props.linkComponent || null,
+        linkComponent: props.linkComponent || outer && outer.linkComponent || null,
         density,
         timeZone
       };
     },
-    [props.locale, props.calendar, props.strings, props.linkComponent, density, timeZone]
+    [props.locale, props.calendar, props.strings, props.linkComponent, density, timeZone, outer]
   );
   return /* @__PURE__ */ React.createElement(LocaleContext.Provider, { value }, props.density ? /* @__PURE__ */ React.createElement("div", { className: "aura-density", "data-density": props.density }, props.children) : props.children);
 }

package/dist/esm/status.js

@@ -2,6 +2,7 @@
 const TONE_WORDS = {
   ready: ["ready", "done", "complete", "completed", "approved", "live", "passed"],
   progress: ["in progress", "in review", "review", "syncing", "running", "pending"],
+  warning: ["warning", "problem", "degraded", "at risk"],
   blocked: ["blocked", "failed", "error", "rejected", "on hold", "cancelled"]
 };
 function toneFor(status) {
@@ -9,7 +10,7 @@ function toneFor(status) {
   for (const t in TONE_WORDS) if (TONE_WORDS[t].indexOf(s) >= 0) return t;
   return "neutral";
 }
-const TONE_ORDER = { neutral: 0, progress: 1, ready: 2, blocked: 3 };
+const TONE_ORDER = { neutral: 0, progress: 1, ready: 2, warning: 3, blocked: 4 };
 export {
   TONE_ORDER,
   toneFor as statusTone,

package/dist/esm/theme.js

@@ -245,6 +245,8 @@ function createTheme(opts) {
   }
   if (s) check("light", "ink", "accent-lime (signal)", 4.5, INK, s[200]);
   function css(selector) {
+    if (selector !== void 0 && /[<{};@\r\n]|\/\*|\*\//.test(selector))
+      throw new Error('createTheme: "' + selector + '" is not a plain CSS selector');
     const light = selector ? selector : ':root, [data-theme="light"]';
     const dark = selector ? selector + ".dark, .dark " + selector + ", " + selector + '[data-theme="dark"], [data-theme="dark"] ' + selector : '.dark, [data-theme="dark"]';
     const system = selector ? '[data-theme="system"] ' + selector + ", " + selector + '[data-theme="system"]' : '[data-theme="system"]';
@@ -253,7 +255,7 @@ function createTheme(opts) {
         return "  --aura-" + k + ": " + m[k] + ";";
       }).join("\n") + "\n}";
     }
-    return "/* AURA theme" + (o.name ? ' "' + o.name + '"' : "") + ": brand " + o.brand + (o.signal ? ", signal " + o.signal : "") + (o.primary === "brand" ? ", brand primary buttons" : "") + ". Load after aura.css. Generated by createTheme. */\n" + block(light, L) + "\n" + block(dark, D) + "\n@media (prefers-color-scheme: dark) {\n" + block(system, D) + "\n}\n";
+    return "/* AURA theme" + (o.name ? ' "' + String(o.name).replace(/[*/<>\\]/g, "") + '"' : "") + ": brand " + o.brand + (o.signal ? ", signal " + o.signal : "") + (o.primary === "brand" ? ", brand primary buttons" : "") + ". Load after aura.css. Generated by createTheme. */\n" + block(light, L) + "\n" + block(dark, D) + "\n@media (prefers-color-scheme: dark) {\n" + block(system, D) + "\n}\n";
   }
   return {
     name: o.name || null,

package/dist/esm/useModal.js

@@ -1,6 +1,29 @@
 'use client';
 import * as React from "react";
 import { FOCUSABLE, useMounted } from "./internal.js";
+let locks = 0, savedOverflow = "";
+function lockScroll() {
+  const body = document.body;
+  if (locks === 0) savedOverflow = body.style.overflow;
+  locks++;
+  body.style.overflow = "hidden";
+  let done = false;
+  return function() {
+    if (done) return;
+    done = true;
+    locks--;
+    if (locks === 0) body.style.overflow = savedOverflow;
+  };
+}
+function tabbable(el) {
+  const all = Array.prototype.filter.call(el.querySelectorAll(FOCUSABLE), function(c) {
+    return c.tabIndex >= 0;
+  });
+  const shown = all.filter(function(c) {
+    return c.getClientRects().length > 0;
+  });
+  return shown.length ? shown : all;
+}
 function useModal(open, ref, opts) {
   const mounted = useMounted();
   const prev = React.useRef(null);
@@ -9,13 +32,22 @@ function useModal(open, ref, opts) {
     function() {
       if (!open || !mounted) return;
       prev.current = document.activeElement;
-      const body = document.body, overflow = body.style.overflow;
-      body.style.overflow = "hidden";
+      const unlock = lockScroll();
       const el = ref.current;
-      const target = el && (el.querySelector("[data-autofocus]") || el.querySelector(o.bodySelector + " " + FOCUSABLE) || el.querySelector(o.footSelector + " " + FOCUSABLE) || el);
+      const firstIn = function(scope) {
+        if (!scope || !el) return null;
+        const sel = FOCUSABLE.split(",").map(function(s) {
+          return scope + " " + s;
+        }).join(",");
+        const list = el.querySelectorAll(sel);
+        for (let i = 0; i < list.length; i++)
+          if (list[i].tabIndex >= 0 && list[i].getClientRects().length > 0) return list[i];
+        return null;
+      };
+      const target = el && (el.querySelector("[data-autofocus]") || firstIn(o.bodySelector) || firstIn(o.footSelector) || el);
       if (target && o.autoFocus !== false) target.focus();
       return function() {
-        body.style.overflow = overflow;
+        unlock();
         if (prev.current && prev.current.focus) prev.current.focus();
       };
     },
@@ -27,17 +59,18 @@ function useModal(open, ref, opts) {
       if (o.onEscape) o.onEscape();
       return;
     }
-    if (e.key !== "Tab" || !ref.current) return;
-    const list = Array.prototype.slice.call(ref.current.querySelectorAll(FOCUSABLE));
+    if (e.key !== "Tab" || !ref.current || e.defaultPrevented) return;
+    if (!ref.current.contains(e.target)) return;
+    const list = tabbable(ref.current);
     if (!list.length) {
       e.preventDefault();
       return;
     }
-    const first = list[0], last = list[list.length - 1];
-    if (e.shiftKey && (document.activeElement === first || document.activeElement === ref.current)) {
+    const first = list[0], last = list[list.length - 1], active = document.activeElement, stray = active === ref.current;
+    if (e.shiftKey && (active === first || stray)) {
       e.preventDefault();
       last.focus();
-    } else if (!e.shiftKey && document.activeElement === last) {
+    } else if (!e.shiftKey && (active === last || stray)) {
       e.preventDefault();
       first.focus();
     }