@crisp-ui-kit/crisp 0.16.0 → 0.17.0

package/dist/cjs/components/multiselect/multiselect.js

@@ -37,6 +37,7 @@ exports.MultiSelect = MultiSelect;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const lucide_react_1 = require("lucide-react");
 const React = __importStar(require("react"));
+const select_1 = require("../select");
 const multiselect_recipe_1 = require("./multiselect.recipe");
 const TONES = [
     "brand",
@@ -122,26 +123,24 @@ function MultiSelect({ options, value: valueProp, defaultValue, onValueChange, p
             setInternalValue(next);
         onValueChange?.(next);
     };
-    const onNavKeys = (e) => {
-        if (e.key === "ArrowDown") {
-            e.preventDefault();
-            setHighlight((h) => Math.min(h + 1, filtered.length - 1));
-        }
-        else if (e.key === "ArrowUp") {
-            e.preventDefault();
-            setHighlight((h) => Math.max(h - 1, 0));
-        }
-        else if (e.key === "Enter") {
-            e.preventDefault();
+    // crisp's shared popup-listbox model (#198). Hand-rolling a second one is
+    // how MultiSelect ended up with no Home/End, arrows that dead-end instead of
+    // wrapping, and a popup left open behind a Tab — while Select, the same
+    // widget with single selection, had all three.
+    const { onKeyDown: onNavKeys } = (0, select_1.useListboxKeyboard)({
+        // every rendered option is selectable: MultiSelect has no disabled state
+        enabledIndexes: filtered.map((_, i) => i),
+        highlight,
+        setHighlight,
+        commit: () => {
             const opt = filtered[highlight];
             if (opt)
                 toggle(opt.value);
-        }
-        else if (e.key === "Escape") {
-            e.preventDefault();
-            close();
-        }
-    };
+        },
+        close,
+        // Tab is already moving focus out; `close` would drag it back to the trigger
+        dismiss: () => setOpen(false),
+    });
     React.useEffect(() => {
         if (!open)
             return;

package/dist/cjs/components/radiogroup/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.radiogroupRecipe = exports.RadioGroup = exports.Radio = void 0;
+exports.useRadioGroupKeyboard = exports.radiogroupRecipe = exports.RadioGroup = exports.Radio = void 0;
 var radiogroup_1 = require("./radiogroup");
 Object.defineProperty(exports, "Radio", { enumerable: true, get: function () { return radiogroup_1.Radio; } });
 Object.defineProperty(exports, "RadioGroup", { enumerable: true, get: function () { return radiogroup_1.RadioGroup; } });
 var radiogroup_recipe_1 = require("./radiogroup.recipe");
 Object.defineProperty(exports, "radiogroupRecipe", { enumerable: true, get: function () { return radiogroup_recipe_1.radiogroupRecipe; } });
+var radiogroup_keyboard_1 = require("./radiogroup-keyboard");
+Object.defineProperty(exports, "useRadioGroupKeyboard", { enumerable: true, get: function () { return radiogroup_keyboard_1.useRadioGroupKeyboard; } });

package/dist/cjs/components/radiogroup/radiogroup-keyboard.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useRadioGroupKeyboard = useRadioGroupKeyboard;
+/**
+ * The WAI-ARIA radio group keyboard model: ←/→/↑/↓ move focus to the next or
+ * previous enabled radio, wrapping, and check it on arrival. Home/End jump to
+ * the ends.
+ *
+ * Mount the returned handler on the element carrying `role="radiogroup"`. It
+ * reads the radios out of the DOM rather than an options array, so a surface
+ * that renders its own chrome — `Segmented`'s pill switcher — shares the model
+ * without sharing a data shape.
+ *
+ * Extracted from `RadioGroup`, whose version was the working one. `Segmented`
+ * mounted its handler per button and closed over that button's index, so it
+ * selected a neighbour without moving focus and every later press recomputed
+ * the same step (#200). The same reason `useMenuKeyboard`,
+ * `useTablistKeyboard` and `useListboxKeyboard` exist.
+ *
+ * Moving focus is not a detail: roving `tabIndex` follows the selection, so a
+ * handler that selects without focusing leaves focus on a `tabindex="-1"`
+ * element while the tab stop is somewhere else.
+ *
+ * Home/End are not in APG's radio group pattern. They are kept because
+ * `Segmented` already offered them, and the shared model should be the union
+ * rather than quietly dropping behaviour one surface had.
+ */
+function useRadioGroupKeyboard({ select, }) {
+    const onKeyDown = (e) => {
+        const KEYS = [
+            "ArrowDown",
+            "ArrowRight",
+            "ArrowUp",
+            "ArrowLeft",
+            "Home",
+            "End",
+        ];
+        if (!KEYS.includes(e.key))
+            return;
+        const radios = Array.from(e.currentTarget.querySelectorAll('[role="radio"]:not([disabled])'));
+        if (!radios.length)
+            return;
+        const idx = radios.indexOf(document.activeElement);
+        let next;
+        if (e.key === "Home")
+            next = radios[0];
+        else if (e.key === "End")
+            next = radios[radios.length - 1];
+        else {
+            const fwd = e.key === "ArrowDown" || e.key === "ArrowRight";
+            // focus outside the group: enter at the near end rather than stepping
+            // off an index of -1, which would land two from the back going backwards
+            if (idx < 0)
+                next = fwd ? radios[0] : radios[radios.length - 1];
+            else
+                next = radios[(idx + (fwd ? 1 : -1) + radios.length) % radios.length];
+        }
+        if (!next)
+            return;
+        e.preventDefault();
+        next.focus();
+        const value = next.dataset.value;
+        if (value !== undefined)
+            select(value);
+    };
+    return { onKeyDown };
+}

package/dist/cjs/components/radiogroup/radiogroup.js

@@ -38,6 +38,7 @@ exports.Radio = Radio;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = __importStar(require("react"));
 const radiogroup_recipe_1 = require("./radiogroup.recipe");
+const radiogroup_keyboard_1 = require("./radiogroup-keyboard");
 const RadioContext = React.createContext(null);
 /**
  * A radio group — measured from Attio's settings. `default` renders rows (a ring
@@ -55,19 +56,7 @@ function RadioGroup({ value, defaultValue, onValueChange, variant = "default", n
             setInternal(v);
         onValueChange?.(v);
     }, [value, onValueChange]);
-    const onKeyDown = (e) => {
-        if (!["ArrowDown", "ArrowRight", "ArrowUp", "ArrowLeft"].includes(e.key))
-            return;
-        const radios = Array.from(e.currentTarget.querySelectorAll('[role="radio"]:not([disabled])'));
-        const idx = radios.indexOf(document.activeElement);
-        const fwd = e.key === "ArrowDown" || e.key === "ArrowRight";
-        const next = radios[(idx + (fwd ? 1 : -1) + radios.length) % radios.length];
-        if (next) {
-            e.preventDefault();
-            next.focus();
-            next.dataset.value && select(next.dataset.value);
-        }
-    };
+    const { onKeyDown } = (0, radiogroup_keyboard_1.useRadioGroupKeyboard)({ select });
     return ((0, jsx_runtime_1.jsx)(RadioContext.Provider, { value: { value: selected, select, name: groupName, variant }, children: (0, jsx_runtime_1.jsx)("div", { role: "radiogroup", "aria-label": ariaLabel, "data-variant": variant, className: (0, radiogroup_recipe_1.radiogroupRecipe)({ className }), ...rest, onKeyDown: onKeyDown, children: children }) }));
 }
 RadioGroup.displayName = "RadioGroup";

package/dist/cjs/components/segmented/segmented.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Segmented = Segmented;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = __importStar(require("react"));
+const radiogroup_1 = require("../radiogroup");
 const segmented_recipe_1 = require("./segmented.recipe");
 /**
  * A segmented control (single-choice toggle) — measured from Attio's view
@@ -64,32 +65,19 @@ function Segmented({ options, value, defaultValue, onValueChange, "aria-label":
             setInternal(v);
         onValueChange?.(v);
     };
-    const onKeyDown = (e, i) => {
-        const enabled = options.filter((o) => !o.disabled);
-        const pos = enabled.findIndex((o) => o.value === options[i].value);
-        let next = -1;
-        if (e.key === "ArrowRight" || e.key === "ArrowDown")
-            next = (pos + 1) % enabled.length;
-        else if (e.key === "ArrowLeft" || e.key === "ArrowUp")
-            next = (pos - 1 + enabled.length) % enabled.length;
-        else if (e.key === "Home")
-            next = 0;
-        else if (e.key === "End")
-            next = enabled.length - 1;
-        if (next < 0)
-            return;
-        e.preventDefault();
-        select(enabled[next].value);
-    };
-    return ((0, jsx_runtime_1.jsxs)("div", { ref: rootRef, className: (0, segmented_recipe_1.segmentedRecipe)({ className }), ...rest, role: "radiogroup", "aria-label": ariaLabel, children: [thumb && ((0, jsx_runtime_1.jsx)("span", { className: "segmented-thumb", "aria-hidden": "true", style: {
+    // crisp's shared radio group model (#200). The per-button handler this
+    // replaces closed over its own index, so it selected a neighbour without
+    // moving focus and every press after the first recomputed the same step.
+    const { onKeyDown } = (0, radiogroup_1.useRadioGroupKeyboard)({ select });
+    return ((0, jsx_runtime_1.jsxs)("div", { ref: rootRef, className: (0, segmented_recipe_1.segmentedRecipe)({ className }), ...rest, role: "radiogroup", "aria-label": ariaLabel, onKeyDown: onKeyDown, children: [thumb && ((0, jsx_runtime_1.jsx)("span", { className: "segmented-thumb", "aria-hidden": "true", style: {
                     width: thumb.width,
                     transform: `translateX(${thumb.left}px)`,
-                } })), options.map((opt, i) => {
+                } })), options.map((opt) => {
                 const on = opt.value === selected;
                 const iconOnly = opt.label == null && opt.icon != null;
-                return ((0, jsx_runtime_1.jsxs)("button", { type: "button", role: "radio", "aria-checked": on, "aria-label": opt["aria-label"], disabled: opt.disabled, "data-selected": on ? "" : undefined, tabIndex: on ? 0 : -1, className: iconOnly
+                return ((0, jsx_runtime_1.jsxs)("button", { type: "button", role: "radio", "aria-checked": on, "aria-label": opt["aria-label"], disabled: opt.disabled, "data-selected": on ? "" : undefined, "data-value": opt.value, tabIndex: on ? 0 : -1, className: iconOnly
                         ? "segmented-item segmented-item--icon"
-                        : "segmented-item", onClick: () => select(opt.value), onKeyDown: (e) => onKeyDown(e, i), children: [opt.icon, opt.label] }, opt.value));
+                        : "segmented-item", onClick: () => select(opt.value), children: [opt.icon, opt.label] }, opt.value));
             })] }));
 }
 Segmented.displayName = "Segmented";

package/dist/cjs/components/select/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectRecipe = exports.Select = void 0;
+exports.selectRecipe = exports.Select = exports.useListboxKeyboard = void 0;
+var listbox_keyboard_1 = require("./listbox-keyboard");
+Object.defineProperty(exports, "useListboxKeyboard", { enumerable: true, get: function () { return listbox_keyboard_1.useListboxKeyboard; } });
 var select_1 = require("./select");
 Object.defineProperty(exports, "Select", { enumerable: true, get: function () { return select_1.Select; } });
 var select_recipe_1 = require("./select.recipe");

package/dist/cjs/components/select/listbox-keyboard.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useListboxKeyboard = useListboxKeyboard;
+/**
+ * The WAI-ARIA listbox keyboard model for a POPUP listbox: ↑/↓ to move the
+ * highlight (wrapping, skipping disabled options), Home/End to jump, Enter to
+ * choose, Escape to close, Tab to dismiss.
+ *
+ * Extracted from `Select`, whose set was the complete one, so `MultiSelect` —
+ * the same widget with multiple selection — stops being a second partial copy
+ * that had no Home/End and stayed open on Tab (#198). The same reason
+ * `useMenuKeyboard` and `useTablistKeyboard` exist.
+ *
+ * NOT for `WheelPicker`: that is an always-visible multi-column wheel that
+ * commits on move, so Enter, Escape and Tab have no meaning in it.
+ */
+function useListboxKeyboard({ enabledIndexes, highlight, setHighlight, commit, close, dismiss = close, }) {
+    const move = (dir) => {
+        if (enabledIndexes.length === 0)
+            return;
+        const pos = enabledIndexes.indexOf(highlight);
+        // nothing highlighted yet: ↓ enters at the top, ↑ at the bottom
+        const nextPos = pos < 0
+            ? dir > 0
+                ? 0
+                : enabledIndexes.length - 1
+            : (pos + dir + enabledIndexes.length) % enabledIndexes.length;
+        setHighlight(enabledIndexes[nextPos] ?? 0);
+    };
+    const onKeyDown = (e) => {
+        switch (e.key) {
+            case "ArrowDown":
+                e.preventDefault();
+                move(1);
+                break;
+            case "ArrowUp":
+                e.preventDefault();
+                move(-1);
+                break;
+            case "Home":
+                e.preventDefault();
+                // the `?? 0` these used to end in armed option 0 on a list with no
+                // options — the arrows guarded against that and Home/End did not
+                if (enabledIndexes.length)
+                    setHighlight(enabledIndexes[0]);
+                break;
+            case "End":
+                e.preventDefault();
+                if (enabledIndexes.length)
+                    setHighlight(enabledIndexes[enabledIndexes.length - 1]);
+                break;
+            case "Enter":
+                e.preventDefault();
+                commit();
+                break;
+            case "Escape":
+                e.preventDefault();
+                close();
+                break;
+            case "Tab":
+                // not preventDefault: Tab must still move focus, it just must not
+                // leave an open popup floating behind it
+                dismiss();
+                break;
+        }
+    };
+    return { onKeyDown };
+}

package/dist/cjs/components/select/select.js

@@ -37,6 +37,7 @@ exports.Select = Select;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const lucide_react_1 = require("lucide-react");
 const React = __importStar(require("react"));
+const listbox_keyboard_1 = require("./listbox-keyboard");
 const select_recipe_1 = require("./select.recipe");
 function optionText(o) {
     if (o.keywords)
@@ -116,48 +117,14 @@ function Select({ options, value, defaultValue, onValueChange, placeholder = "Se
         setOpen(false);
         triggerRef.current?.focus({ preventScroll: true });
     };
-    const moveHighlight = (dir) => {
-        if (enabledIndexes.length === 0)
-            return;
-        const pos = enabledIndexes.indexOf(highlight);
-        const nextPos = pos < 0
-            ? dir > 0
-                ? 0
-                : enabledIndexes.length - 1
-            : (pos + dir + enabledIndexes.length) % enabledIndexes.length;
-        setHighlight(enabledIndexes[nextPos] ?? 0);
-    };
-    const onNavKeys = (e) => {
-        switch (e.key) {
-            case "ArrowDown":
-                e.preventDefault();
-                moveHighlight(1);
-                break;
-            case "ArrowUp":
-                e.preventDefault();
-                moveHighlight(-1);
-                break;
-            case "Home":
-                e.preventDefault();
-                setHighlight(enabledIndexes[0] ?? 0);
-                break;
-            case "End":
-                e.preventDefault();
-                setHighlight(enabledIndexes[enabledIndexes.length - 1] ?? 0);
-                break;
-            case "Enter":
-                e.preventDefault();
-                pick(filtered[highlight]);
-                break;
-            case "Escape":
-                e.preventDefault();
-                close();
-                break;
-            case "Tab":
-                setOpen(false);
-                break;
-        }
-    };
+    const { onKeyDown: onNavKeys } = (0, listbox_keyboard_1.useListboxKeyboard)({
+        enabledIndexes,
+        highlight,
+        setHighlight,
+        commit: () => pick(filtered[highlight]),
+        close,
+        dismiss: () => setOpen(false),
+    });
     const onTriggerKeyDown = (e) => {
         if (!open) {
             if (e.key === "ArrowDown" || e.key === "Enter" || e.key === " ") {

package/dist/esm/components/multiselect/multiselect.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Check, ChevronDown, Search } from "lucide-react";
 import * as React from "react";
+import { useListboxKeyboard } from "../select/index.js";
 import { multiselectRecipe } from "./multiselect.recipe.js";
 const TONES = [
     "brand",
@@ -86,26 +87,24 @@ export function MultiSelect({ options, value: valueProp, defaultValue, onValueCh
             setInternalValue(next);
         onValueChange?.(next);
     };
-    const onNavKeys = (e) => {
-        if (e.key === "ArrowDown") {
-            e.preventDefault();
-            setHighlight((h) => Math.min(h + 1, filtered.length - 1));
-        }
-        else if (e.key === "ArrowUp") {
-            e.preventDefault();
-            setHighlight((h) => Math.max(h - 1, 0));
-        }
-        else if (e.key === "Enter") {
-            e.preventDefault();
+    // crisp's shared popup-listbox model (#198). Hand-rolling a second one is
+    // how MultiSelect ended up with no Home/End, arrows that dead-end instead of
+    // wrapping, and a popup left open behind a Tab — while Select, the same
+    // widget with single selection, had all three.
+    const { onKeyDown: onNavKeys } = useListboxKeyboard({
+        // every rendered option is selectable: MultiSelect has no disabled state
+        enabledIndexes: filtered.map((_, i) => i),
+        highlight,
+        setHighlight,
+        commit: () => {
             const opt = filtered[highlight];
             if (opt)
                 toggle(opt.value);
-        }
-        else if (e.key === "Escape") {
-            e.preventDefault();
-            close();
-        }
-    };
+        },
+        close,
+        // Tab is already moving focus out; `close` would drag it back to the trigger
+        dismiss: () => setOpen(false),
+    });
     React.useEffect(() => {
         if (!open)
             return;

package/dist/esm/components/radiogroup/index.js

@@ -1,2 +1,3 @@
 export { Radio, RadioGroup, } from "./radiogroup.js";
 export { radiogroupRecipe } from "./radiogroup.recipe.js";
+export { useRadioGroupKeyboard, } from "./radiogroup-keyboard.js";

package/dist/esm/components/radiogroup/radiogroup-keyboard.js

@@ -0,0 +1,64 @@
+/**
+ * The WAI-ARIA radio group keyboard model: ←/→/↑/↓ move focus to the next or
+ * previous enabled radio, wrapping, and check it on arrival. Home/End jump to
+ * the ends.
+ *
+ * Mount the returned handler on the element carrying `role="radiogroup"`. It
+ * reads the radios out of the DOM rather than an options array, so a surface
+ * that renders its own chrome — `Segmented`'s pill switcher — shares the model
+ * without sharing a data shape.
+ *
+ * Extracted from `RadioGroup`, whose version was the working one. `Segmented`
+ * mounted its handler per button and closed over that button's index, so it
+ * selected a neighbour without moving focus and every later press recomputed
+ * the same step (#200). The same reason `useMenuKeyboard`,
+ * `useTablistKeyboard` and `useListboxKeyboard` exist.
+ *
+ * Moving focus is not a detail: roving `tabIndex` follows the selection, so a
+ * handler that selects without focusing leaves focus on a `tabindex="-1"`
+ * element while the tab stop is somewhere else.
+ *
+ * Home/End are not in APG's radio group pattern. They are kept because
+ * `Segmented` already offered them, and the shared model should be the union
+ * rather than quietly dropping behaviour one surface had.
+ */
+export function useRadioGroupKeyboard({ select, }) {
+    const onKeyDown = (e) => {
+        const KEYS = [
+            "ArrowDown",
+            "ArrowRight",
+            "ArrowUp",
+            "ArrowLeft",
+            "Home",
+            "End",
+        ];
+        if (!KEYS.includes(e.key))
+            return;
+        const radios = Array.from(e.currentTarget.querySelectorAll('[role="radio"]:not([disabled])'));
+        if (!radios.length)
+            return;
+        const idx = radios.indexOf(document.activeElement);
+        let next;
+        if (e.key === "Home")
+            next = radios[0];
+        else if (e.key === "End")
+            next = radios[radios.length - 1];
+        else {
+            const fwd = e.key === "ArrowDown" || e.key === "ArrowRight";
+            // focus outside the group: enter at the near end rather than stepping
+            // off an index of -1, which would land two from the back going backwards
+            if (idx < 0)
+                next = fwd ? radios[0] : radios[radios.length - 1];
+            else
+                next = radios[(idx + (fwd ? 1 : -1) + radios.length) % radios.length];
+        }
+        if (!next)
+            return;
+        e.preventDefault();
+        next.focus();
+        const value = next.dataset.value;
+        if (value !== undefined)
+            select(value);
+    };
+    return { onKeyDown };
+}

package/dist/esm/components/radiogroup/radiogroup.js

@@ -1,6 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import { radiogroupRecipe } from "./radiogroup.recipe.js";
+import { useRadioGroupKeyboard } from "./radiogroup-keyboard.js";
 const RadioContext = React.createContext(null);
 /**
  * A radio group — measured from Attio's settings. `default` renders rows (a ring
@@ -18,19 +19,7 @@ export function RadioGroup({ value, defaultValue, onValueChange, variant = "defa
             setInternal(v);
         onValueChange?.(v);
     }, [value, onValueChange]);
-    const onKeyDown = (e) => {
-        if (!["ArrowDown", "ArrowRight", "ArrowUp", "ArrowLeft"].includes(e.key))
-            return;
-        const radios = Array.from(e.currentTarget.querySelectorAll('[role="radio"]:not([disabled])'));
-        const idx = radios.indexOf(document.activeElement);
-        const fwd = e.key === "ArrowDown" || e.key === "ArrowRight";
-        const next = radios[(idx + (fwd ? 1 : -1) + radios.length) % radios.length];
-        if (next) {
-            e.preventDefault();
-            next.focus();
-            next.dataset.value && select(next.dataset.value);
-        }
-    };
+    const { onKeyDown } = useRadioGroupKeyboard({ select });
     return (_jsx(RadioContext.Provider, { value: { value: selected, select, name: groupName, variant }, children: _jsx("div", { role: "radiogroup", "aria-label": ariaLabel, "data-variant": variant, className: radiogroupRecipe({ className }), ...rest, onKeyDown: onKeyDown, children: children }) }));
 }
 RadioGroup.displayName = "RadioGroup";

package/dist/esm/components/segmented/segmented.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from "react";
+import { useRadioGroupKeyboard } from "../radiogroup/index.js";
 import { segmentedRecipe } from "./segmented.recipe.js";
 /**
  * A segmented control (single-choice toggle) — measured from Attio's view
@@ -28,32 +29,19 @@ export function Segmented({ options, value, defaultValue, onValueChange, "aria-l
             setInternal(v);
         onValueChange?.(v);
     };
-    const onKeyDown = (e, i) => {
-        const enabled = options.filter((o) => !o.disabled);
-        const pos = enabled.findIndex((o) => o.value === options[i].value);
-        let next = -1;
-        if (e.key === "ArrowRight" || e.key === "ArrowDown")
-            next = (pos + 1) % enabled.length;
-        else if (e.key === "ArrowLeft" || e.key === "ArrowUp")
-            next = (pos - 1 + enabled.length) % enabled.length;
-        else if (e.key === "Home")
-            next = 0;
-        else if (e.key === "End")
-            next = enabled.length - 1;
-        if (next < 0)
-            return;
-        e.preventDefault();
-        select(enabled[next].value);
-    };
-    return (_jsxs("div", { ref: rootRef, className: segmentedRecipe({ className }), ...rest, role: "radiogroup", "aria-label": ariaLabel, children: [thumb && (_jsx("span", { className: "segmented-thumb", "aria-hidden": "true", style: {
+    // crisp's shared radio group model (#200). The per-button handler this
+    // replaces closed over its own index, so it selected a neighbour without
+    // moving focus and every press after the first recomputed the same step.
+    const { onKeyDown } = useRadioGroupKeyboard({ select });
+    return (_jsxs("div", { ref: rootRef, className: segmentedRecipe({ className }), ...rest, role: "radiogroup", "aria-label": ariaLabel, onKeyDown: onKeyDown, children: [thumb && (_jsx("span", { className: "segmented-thumb", "aria-hidden": "true", style: {
                     width: thumb.width,
                     transform: `translateX(${thumb.left}px)`,
-                } })), options.map((opt, i) => {
+                } })), options.map((opt) => {
                 const on = opt.value === selected;
                 const iconOnly = opt.label == null && opt.icon != null;
-                return (_jsxs("button", { type: "button", role: "radio", "aria-checked": on, "aria-label": opt["aria-label"], disabled: opt.disabled, "data-selected": on ? "" : undefined, tabIndex: on ? 0 : -1, className: iconOnly
+                return (_jsxs("button", { type: "button", role: "radio", "aria-checked": on, "aria-label": opt["aria-label"], disabled: opt.disabled, "data-selected": on ? "" : undefined, "data-value": opt.value, tabIndex: on ? 0 : -1, className: iconOnly
                         ? "segmented-item segmented-item--icon"
-                        : "segmented-item", onClick: () => select(opt.value), onKeyDown: (e) => onKeyDown(e, i), children: [opt.icon, opt.label] }, opt.value));
+                        : "segmented-item", onClick: () => select(opt.value), children: [opt.icon, opt.label] }, opt.value));
             })] }));
 }
 Segmented.displayName = "Segmented";

package/dist/esm/components/select/index.js

@@ -1,2 +1,3 @@
+export { useListboxKeyboard, } from "./listbox-keyboard.js";
 export { Select } from "./select.js";
 export { selectRecipe } from "./select.recipe.js";

package/dist/esm/components/select/listbox-keyboard.js

@@ -0,0 +1,65 @@
+/**
+ * The WAI-ARIA listbox keyboard model for a POPUP listbox: ↑/↓ to move the
+ * highlight (wrapping, skipping disabled options), Home/End to jump, Enter to
+ * choose, Escape to close, Tab to dismiss.
+ *
+ * Extracted from `Select`, whose set was the complete one, so `MultiSelect` —
+ * the same widget with multiple selection — stops being a second partial copy
+ * that had no Home/End and stayed open on Tab (#198). The same reason
+ * `useMenuKeyboard` and `useTablistKeyboard` exist.
+ *
+ * NOT for `WheelPicker`: that is an always-visible multi-column wheel that
+ * commits on move, so Enter, Escape and Tab have no meaning in it.
+ */
+export function useListboxKeyboard({ enabledIndexes, highlight, setHighlight, commit, close, dismiss = close, }) {
+    const move = (dir) => {
+        if (enabledIndexes.length === 0)
+            return;
+        const pos = enabledIndexes.indexOf(highlight);
+        // nothing highlighted yet: ↓ enters at the top, ↑ at the bottom
+        const nextPos = pos < 0
+            ? dir > 0
+                ? 0
+                : enabledIndexes.length - 1
+            : (pos + dir + enabledIndexes.length) % enabledIndexes.length;
+        setHighlight(enabledIndexes[nextPos] ?? 0);
+    };
+    const onKeyDown = (e) => {
+        switch (e.key) {
+            case "ArrowDown":
+                e.preventDefault();
+                move(1);
+                break;
+            case "ArrowUp":
+                e.preventDefault();
+                move(-1);
+                break;
+            case "Home":
+                e.preventDefault();
+                // the `?? 0` these used to end in armed option 0 on a list with no
+                // options — the arrows guarded against that and Home/End did not
+                if (enabledIndexes.length)
+                    setHighlight(enabledIndexes[0]);
+                break;
+            case "End":
+                e.preventDefault();
+                if (enabledIndexes.length)
+                    setHighlight(enabledIndexes[enabledIndexes.length - 1]);
+                break;
+            case "Enter":
+                e.preventDefault();
+                commit();
+                break;
+            case "Escape":
+                e.preventDefault();
+                close();
+                break;
+            case "Tab":
+                // not preventDefault: Tab must still move focus, it just must not
+                // leave an open popup floating behind it
+                dismiss();
+                break;
+        }
+    };
+    return { onKeyDown };
+}

package/dist/esm/components/select/select.js

@@ -1,6 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Check, ChevronDown, Search } from "lucide-react";
 import * as React from "react";
+import { useListboxKeyboard } from "./listbox-keyboard.js";
 import { selectRecipe } from "./select.recipe.js";
 function optionText(o) {
     if (o.keywords)
@@ -80,48 +81,14 @@ export function Select({ options, value, defaultValue, onValueChange, placeholde
         setOpen(false);
         triggerRef.current?.focus({ preventScroll: true });
     };
-    const moveHighlight = (dir) => {
-        if (enabledIndexes.length === 0)
-            return;
-        const pos = enabledIndexes.indexOf(highlight);
-        const nextPos = pos < 0
-            ? dir > 0
-                ? 0
-                : enabledIndexes.length - 1
-            : (pos + dir + enabledIndexes.length) % enabledIndexes.length;
-        setHighlight(enabledIndexes[nextPos] ?? 0);
-    };
-    const onNavKeys = (e) => {
-        switch (e.key) {
-            case "ArrowDown":
-                e.preventDefault();
-                moveHighlight(1);
-                break;
-            case "ArrowUp":
-                e.preventDefault();
-                moveHighlight(-1);
-                break;
-            case "Home":
-                e.preventDefault();
-                setHighlight(enabledIndexes[0] ?? 0);
-                break;
-            case "End":
-                e.preventDefault();
-                setHighlight(enabledIndexes[enabledIndexes.length - 1] ?? 0);
-                break;
-            case "Enter":
-                e.preventDefault();
-                pick(filtered[highlight]);
-                break;
-            case "Escape":
-                e.preventDefault();
-                close();
-                break;
-            case "Tab":
-                setOpen(false);
-                break;
-        }
-    };
+    const { onKeyDown: onNavKeys } = useListboxKeyboard({
+        enabledIndexes,
+        highlight,
+        setHighlight,
+        commit: () => pick(filtered[highlight]),
+        close,
+        dismiss: () => setOpen(false),
+    });
     const onTriggerKeyDown = (e) => {
         if (!open) {
             if (e.key === "ArrowDown" || e.key === "Enter" || e.key === " ") {

package/dist/types/components/radiogroup/index.d.ts

@@ -1,2 +1,3 @@
 export { Radio, RadioGroup, type RadioGroupProps, type RadioProps, } from "./radiogroup";
 export { radiogroupRecipe } from "./radiogroup.recipe";
+export { type UseRadioGroupKeyboardOptions, useRadioGroupKeyboard, } from "./radiogroup-keyboard";

package/dist/types/components/radiogroup/radiogroup-keyboard.d.ts

@@ -0,0 +1,32 @@
+import type * as React from "react";
+export type UseRadioGroupKeyboardOptions = {
+    /** Select a radio by its `data-value`. */
+    select: (value: string) => void;
+};
+/**
+ * The WAI-ARIA radio group keyboard model: ←/→/↑/↓ move focus to the next or
+ * previous enabled radio, wrapping, and check it on arrival. Home/End jump to
+ * the ends.
+ *
+ * Mount the returned handler on the element carrying `role="radiogroup"`. It
+ * reads the radios out of the DOM rather than an options array, so a surface
+ * that renders its own chrome — `Segmented`'s pill switcher — shares the model
+ * without sharing a data shape.
+ *
+ * Extracted from `RadioGroup`, whose version was the working one. `Segmented`
+ * mounted its handler per button and closed over that button's index, so it
+ * selected a neighbour without moving focus and every later press recomputed
+ * the same step (#200). The same reason `useMenuKeyboard`,
+ * `useTablistKeyboard` and `useListboxKeyboard` exist.
+ *
+ * Moving focus is not a detail: roving `tabIndex` follows the selection, so a
+ * handler that selects without focusing leaves focus on a `tabindex="-1"`
+ * element while the tab stop is somewhere else.
+ *
+ * Home/End are not in APG's radio group pattern. They are kept because
+ * `Segmented` already offered them, and the shared model should be the union
+ * rather than quietly dropping behaviour one surface had.
+ */
+export declare function useRadioGroupKeyboard({ select, }: UseRadioGroupKeyboardOptions): {
+    onKeyDown: (e: React.KeyboardEvent) => void;
+};

package/dist/types/components/select/index.d.ts

@@ -1,2 +1,3 @@
+export { type UseListboxKeyboardOptions, useListboxKeyboard, } from "./listbox-keyboard";
 export { Select, type SelectOption, type SelectProps } from "./select";
 export { selectRecipe } from "./select.recipe";

package/dist/types/components/select/listbox-keyboard.d.ts

@@ -0,0 +1,38 @@
+import type * as React from "react";
+export type UseListboxKeyboardOptions = {
+    /**
+     * Indexes into the rendered option list that may be highlighted, in order.
+     * Disabled options are left out, so the arrows step over them rather than
+     * landing on something that cannot be chosen.
+     */
+    enabledIndexes: number[];
+    /** The highlighted index, or -1 when nothing is highlighted yet. */
+    highlight: number;
+    setHighlight: (index: number) => void;
+    /** Choose the highlighted option. Enter. */
+    commit: () => void;
+    /** Close the popup. Escape. */
+    close: () => void;
+    /**
+     * Close WITHOUT the focus handling `close` does, for Tab — the browser is
+     * already moving focus to the next element, so anything that pulls it back
+     * lands the user in the wrong place. Defaults to `close`.
+     */
+    dismiss?: () => void;
+};
+/**
+ * The WAI-ARIA listbox keyboard model for a POPUP listbox: ↑/↓ to move the
+ * highlight (wrapping, skipping disabled options), Home/End to jump, Enter to
+ * choose, Escape to close, Tab to dismiss.
+ *
+ * Extracted from `Select`, whose set was the complete one, so `MultiSelect` —
+ * the same widget with multiple selection — stops being a second partial copy
+ * that had no Home/End and stayed open on Tab (#198). The same reason
+ * `useMenuKeyboard` and `useTablistKeyboard` exist.
+ *
+ * NOT for `WheelPicker`: that is an always-visible multi-column wheel that
+ * commits on move, so Enter, Escape and Tab have no meaning in it.
+ */
+export declare function useListboxKeyboard({ enabledIndexes, highlight, setHighlight, commit, close, dismiss, }: UseListboxKeyboardOptions): {
+    onKeyDown: (e: React.KeyboardEvent) => void;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crisp-ui-kit/crisp",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "A lean React design system, measured pixel-for-pixel from Attio.",
   "license": "MIT",
   "type": "module",