@flytedan/flytebot-design-system 0.35.0 → 0.36.0

package/dist/index.js

@@ -3488,14 +3488,9 @@ function MultiSelectPanel({
   const [unmatchedTokens, setUnmatchedTokens] = React25.useState([]);
   const [pasteError, setPasteError] = React25.useState(null);
   const pasteWrapRef = React25.useRef(null);
-  const [resolvedAt, setResolvedAt] = React25.useState(0);
   React25.useEffect(() => {
     if (mode2 === "paste") pasteWrapRef.current?.querySelector("textarea")?.focus();
   }, [mode2]);
-  React25.useLayoutEffect(() => {
-    if (resolvedAt === 0) return;
-    pasteWrapRef.current?.querySelector("textarea")?.focus();
-  }, [resolvedAt]);
   const doResolve = () => {
     if (!field.resolve) return;
     const tokens = Array.from(new Set(pasteText.split(/[\n,]/).map((t) => t.trim()).filter(Boolean)));
@@ -3518,7 +3513,6 @@ function MultiSelectPanel({
         return;
       }
       setPasteText("");
-      setResolvedAt((n) => n + 1);
     }, (err) => {
       if (!mountedRef.current) return;
       setPasteLoading(false);
@@ -3637,7 +3631,28 @@ function MultiSelectPanel({
       );
     }) }) : null
   ] });
-  const footer = mode2 === "paste" ? /* @__PURE__ */ jsx45(Button, { size: "sm", variant: "secondary", onClick: doResolve, disabled: pasteLoading || !pasteText.trim(), children: pasteLoading ? "Resolving\u2026" : "Resolve" }) : void 0;
+  const resolveDisabled = pasteLoading || !pasteText.trim();
+  const footer = mode2 === "paste" ? /* @__PURE__ */ jsx45(
+    Button,
+    {
+      size: "sm",
+      variant: "secondary",
+      "aria-disabled": resolveDisabled,
+      onClick: (e) => {
+        if (resolveDisabled) {
+          e.preventDefault();
+          return;
+        }
+        doResolve();
+      },
+      onKeyDown: (e) => {
+        if (resolveDisabled && (e.key === "Enter" || e.key === " ")) {
+          e.preventDefault();
+        }
+      },
+      children: pasteLoading ? "Resolving\u2026" : "Resolve"
+    }
+  ) : void 0;
   return /* @__PURE__ */ jsx45(
     Popover,
     {
@@ -3706,17 +3721,25 @@ function useReseedFromProps(value, applies, reseed) {
     if (!sameValue(value, applies())) reseed(value);
   }, [value, applies, reseed]);
 }
-function usePreserveFocusAcrossRemount(seed) {
-  const pendingId = React25.useRef(null);
-  const capture = (ids) => {
+function usePreserveFocusAcrossRemount(seed, fields) {
+  const pendingName = React25.useRef(null);
+  const fieldsRef = useLatest(fields);
+  const capture = () => {
     const active = document.activeElement;
-    pendingId.current = active instanceof HTMLElement && ids.includes(active.id) ? active.id : null;
+    pendingName.current = null;
+    if (!(active instanceof HTMLElement)) return;
+    for (const [name, ref] of Object.entries(fieldsRef.current)) {
+      if (ref.current?.contains(active)) {
+        pendingName.current = name;
+        break;
+      }
+    }
   };
   React25.useLayoutEffect(() => {
-    const id = pendingId.current;
-    if (!id) return;
-    pendingId.current = null;
-    document.getElementById(id)?.focus();
+    const name = pendingName.current;
+    if (!name) return;
+    pendingName.current = null;
+    fieldsRef.current[name]?.current?.querySelector("input,textarea,select,button")?.focus();
   }, [seed]);
   return capture;
 }
@@ -3730,9 +3753,11 @@ function RangePanel({
 }) {
   const [draft, setDraft] = React25.useState(() => rangeDraft(value));
   const [seed, setSeed] = React25.useState(0);
-  const preserveFocus = usePreserveFocusAcrossRemount(seed);
-  const minId = field.key + "-min";
-  const maxId = field.key + "-max";
+  const minId = React25.useId();
+  const maxId = React25.useId();
+  const minWrapRef = React25.useRef(null);
+  const maxWrapRef = React25.useRef(null);
+  const preserveFocus = usePreserveFocusAcrossRemount(seed, { min: minWrapRef, max: maxWrapRef });
   const draftRef = React25.useRef(draft);
   const shown = () => {
     const { min, max } = draftRef.current;
@@ -3743,7 +3768,7 @@ function RangePanel({
   };
   const validity = useTextValidity(publish);
   useReseedFromProps(value, shown, (next) => {
-    preserveFocus([minId, maxId]);
+    preserveFocus();
     draftRef.current = rangeDraft(next);
     setDraft(draftRef.current);
     validity.reset();
@@ -3773,7 +3798,7 @@ function RangePanel({
       label: field.label,
       footer: /* @__PURE__ */ jsx45(Button, { size: "sm", variant: "secondary", onClick: onClose, disabled: doneDisabled, children: "Done" }),
       children: /* @__PURE__ */ jsxs39("span", { className: "fd-stack fd-gap-sm", children: [
-        /* @__PURE__ */ jsx45(
+        /* @__PURE__ */ jsx45("span", { ref: minWrapRef, children: /* @__PURE__ */ jsx45(
           NumberInput,
           {
             id: minId,
@@ -3788,8 +3813,8 @@ function RangePanel({
             onValidityChange: validity.report("min")
           },
           "min-" + seed
-        ),
-        /* @__PURE__ */ jsx45(
+        ) }),
+        /* @__PURE__ */ jsx45("span", { ref: maxWrapRef, children: /* @__PURE__ */ jsx45(
           NumberInput,
           {
             id: maxId,
@@ -3805,7 +3830,7 @@ function RangePanel({
             onValidityChange: validity.report("max")
           },
           "max-" + seed
-        )
+        ) })
       ] })
     }
   );
@@ -3832,8 +3857,9 @@ function DatePanel({
   const daysConfirmed = React25.useRef(value?.kind === "withinDays");
   const [between, setBetween] = React25.useState(initial.between);
   const [seed, setSeed] = React25.useState(0);
-  const preserveFocus = usePreserveFocusAcrossRemount(seed);
-  const daysId = field.key + "-days";
+  const daysId = React25.useId();
+  const daysWrapRef = React25.useRef(null);
+  const preserveFocus = usePreserveFocusAcrossRemount(seed, { days: daysWrapRef });
   const shownWithinDays = () => {
     const days = daysRef.current;
     return applicable(field, days == null ? void 0 : { kind: "withinDays", days }, validity.allValid());
@@ -3849,7 +3875,7 @@ function DatePanel({
     return daysConfirmed.current ? shownWithinDays() : void 0;
   };
   useReseedFromProps(value, applies, (next) => {
-    preserveFocus([daysId]);
+    preserveFocus();
     const d = dateDraft(field, next);
     setKind(d.kind);
     daysRef.current = d.days;
@@ -3916,7 +3942,7 @@ function DatePanel({
             onChange: (k) => switchKind(k)
           }
         ),
-        kind === "withinDays" ? /* @__PURE__ */ jsx45(
+        kind === "withinDays" ? /* @__PURE__ */ jsx45("span", { ref: daysWrapRef, children: /* @__PURE__ */ jsx45(
           NumberInput,
           {
             id: daysId,
@@ -3930,7 +3956,7 @@ function DatePanel({
             onValidityChange: validity.report("days")
           },
           "days-" + seed
-        ) : /* @__PURE__ */ jsx45(
+        ) }) : /* @__PURE__ */ jsx45(
           DatePicker,
           {
             range: true,