react-aria 3.50.0 → 3.52.0

package/dist/private/radio/useRadioGroup.mjs

@@ -7,6 +7,7 @@ import {radioGroupData as $640b6b92b30fd41a$export$37b65e5b5444d35c} from "./uti
 import {useField as $191c9b6d48a0a4e2$export$294aa081a6c6f55d} from "../label/useField.mjs";
 import {useFocusWithin as $2c9edc598a03d523$export$420e68273165f4ec} from "../interactions/useFocusWithin.mjs";
 import {useId as $390e54f620492c70$export$f680877a34711e37} from "../utils/useId.mjs";
+import {useKeyboard as $8296dad1a4c5e0dc$export$8f71654801c2f7cd} from "../interactions/useKeyboard.mjs";
 import {useLocale as $2eb8e6d23f3d0cb0$export$43bb16f9c6d9e3f7} from "../i18n/I18nProvider.mjs";
 
 /*
@@ -29,6 +30,7 @@ import {useLocale as $2eb8e6d23f3d0cb0$export$43bb16f9c6d9e3f7} from "../i18n/I1
 
 
 
+
 function $eecdee08e0d8a75f$export$62b9571f283ff5c2(props, state) {
     let { name: name, form: form, isReadOnly: isReadOnly, isRequired: isRequired, isDisabled: isDisabled, orientation: orientation = 'vertical', validationBehavior: validationBehavior = 'aria' } = props;
     let { direction: direction } = (0, $2eb8e6d23f3d0cb0$export$43bb16f9c6d9e3f7)();
@@ -55,27 +57,7 @@ function $eecdee08e0d8a75f$export$62b9571f283ff5c2(props, state) {
         onFocusWithin: props.onFocus,
         onFocusWithinChange: props.onFocusChange
     });
-    let onKeyDown = (e)=>{
-        let nextDir;
-        switch(e.key){
-            case 'ArrowRight':
-                if (direction === 'rtl' && orientation !== 'vertical') nextDir = 'prev';
-                else nextDir = 'next';
-                break;
-            case 'ArrowLeft':
-                if (direction === 'rtl' && orientation !== 'vertical') nextDir = 'next';
-                else nextDir = 'prev';
-                break;
-            case 'ArrowDown':
-                nextDir = 'next';
-                break;
-            case 'ArrowUp':
-                nextDir = 'prev';
-                break;
-            default:
-                return;
-        }
-        e.preventDefault();
+    function getNextElement(nextDir, e) {
         let walker = (0, $535772f9d2c1f38d$export$2d6ec8fc375ceafa)(e.currentTarget, {
             from: (0, $23f2114a1b82827e$export$e58f029f0fbfdb29)(e),
             accept: (node)=>node instanceof (0, $d447af545b77c9f1$export$f21a1ffae260145a)(node).HTMLInputElement && node.type === 'radio'
@@ -98,8 +80,29 @@ function $eecdee08e0d8a75f$export$62b9571f283ff5c2(props, state) {
             // Call focus on nextElem so that keyboard navigation scrolls the radio into view
             nextElem.focus();
             state.setSelectedValue(nextElem.value);
+            return true;
         }
-    };
+        return false;
+    }
+    let { keyboardProps: keyboardProps } = (0, $8296dad1a4c5e0dc$export$8f71654801c2f7cd)({
+        shortcuts: {
+            ArrowRight: (e)=>{
+                let nextDir = direction === 'rtl' && orientation !== 'vertical' ? 'prev' : 'next';
+                return getNextElement(nextDir, e);
+            },
+            ArrowLeft: (e)=>{
+                let nextDir = direction === 'rtl' && orientation !== 'vertical' ? 'next' : 'prev';
+                return getNextElement(nextDir, e);
+            },
+            ArrowDown: (e)=>{
+                return getNextElement('next', e);
+            },
+            ArrowUp: (e)=>{
+                return getNextElement('prev', e);
+            }
+        },
+        allowRepeats: true
+    });
     let groupName = (0, $390e54f620492c70$export$f680877a34711e37)(name);
     (0, $640b6b92b30fd41a$export$37b65e5b5444d35c).set(state, {
         name: groupName,
@@ -112,7 +115,7 @@ function $eecdee08e0d8a75f$export$62b9571f283ff5c2(props, state) {
         radioGroupProps: (0, $bbaa08b3cd72f041$export$9d1611c77c2fe928)(domProps, {
             // https://www.w3.org/TR/wai-aria-1.2/#radiogroup
             role: 'radiogroup',
-            onKeyDown: onKeyDown,
+            ...keyboardProps,
             'aria-invalid': state.isInvalid || undefined,
             'aria-errormessage': props['aria-errormessage'],
             'aria-readonly': isReadOnly || undefined,

package/dist/private/radio/useRadioGroup.mjs.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;;;;;AA2CM,SAAS,0CAAc,KAA0B,EAAE,KAAsB;IAC9E,IAAI,QACF,IAAI,QACJ,IAAI,cACJ,UAAU,cACV,UAAU,cACV,UAAU,eACV,cAAc,gCACd,qBAAqB,QACtB,GAAG;IACJ,IAAI,aAAC,SAAS,EAAC,GAAG,CAAA,GAAA,yCAAQ;IAE1B,IAAI,aAAC,SAAS,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAC,GAAG,MAAM,iBAAiB;IAC9E,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAC,GAAG,CAAA,GAAA,yCAAO,EAAE;QAC3E,GAAG,KAAK;QACR,iDAAiD;QACjD,6CAA6C;QAC7C,kBAAkB;QAClB,WAAW,MAAM,SAAS;QAC1B,cAAc,MAAM,YAAY,IAAI;IACtC;IAEA,IAAI,WAAW,CAAA,GAAA,yCAAa,EAAE,OAAO;QAAC,WAAW;IAAI;IAErD,yEAAyE;IACzE,wEAAwE;IACxE,8CAA8C;IAC9C,IAAI,oBAAC,gBAAgB,EAAC,GAAG,CAAA,GAAA,yCAAa,EAAE;QACtC,cAAa,CAAC;YACZ,MAAM,MAAM,GAAG;YACf,IAAI,CAAC,MAAM,aAAa,EACtB,MAAM,mBAAmB,CAAC;QAE9B;QACA,eAAe,MAAM,OAAO;QAC5B,qBAAqB,MAAM,aAAa;IAC1C;IAEA,IAAI,YAAY,CAAA;QACd,IAAI;QACJ,OAAQ,EAAE,GAAG;YACX,KAAK;gBACH,IAAI,cAAc,SAAS,gBAAgB,YACzC,UAAU;qBAEV,UAAU;gBAEZ;YACF,KAAK;gBACH,IAAI,cAAc,SAAS,gBAAgB,YACzC,UAAU;qBAEV,UAAU;gBAEZ;YACF,KAAK;gBACH,UAAU;gBACV;YACF,KAAK;gBACH,UAAU;gBACV;YACF;gBACE;QACJ;QACA,EAAE,cAAc;QAChB,IAAI,SAAS,CAAA,GAAA,yCAAqB,EAAE,EAAE,aAAa,EAAE;YACnD,MAAM,CAAA,GAAA,yCAAa,EAAE;YACrB,QAAQ,CAAA,OAAQ,gBAAgB,CAAA,GAAA,yCAAa,EAAE,MAAM,gBAAgB,IAAI,KAAK,IAAI,KAAK;QACzF;QACA,IAAI;QACJ,IAAI,YAAY,QAAQ;YACtB,WAAW,OAAO,QAAQ;YAC1B,IAAI,CAAC,UAAU;gBACb,OAAO,WAAW,GAAG,EAAE,aAAa;gBACpC,WAAW,OAAO,UAAU;YAC9B;QACF,OAAO;YACL,WAAW,OAAO,YAAY;YAC9B,IAAI,CAAC,UAAU;gBACb,OAAO,WAAW,GAAG,EAAE,aAAa;gBACpC,WAAW,OAAO,SAAS;YAC7B;QACF;QACA,IAAI,UAAU;YACZ,iFAAiF;YACjF,SAAS,KAAK;YACd,MAAM,gBAAgB,CAAC,SAAS,KAAK;QACvC;IACF;IAEA,IAAI,YAAY,CAAA,GAAA,yCAAI,EAAE;IACtB,CAAA,GAAA,yCAAa,EAAE,GAAG,CAAC,OAAO;QACxB,MAAM;cACN;QACA,eAAe,iBAAiB,EAAE;QAClC,gBAAgB,kBAAkB,EAAE;4BACpC;IACF;IAEA,OAAO;QACL,iBAAiB,CAAA,GAAA,yCAAS,EAAE,UAAU;YACpC,iDAAiD;YACjD,MAAM;uBACN;YACA,gBAAgB,MAAM,SAAS,IAAI;YACnC,qBAAqB,KAAK,CAAC,oBAAoB;YAC/C,iBAAiB,cAAc;YAC/B,iBAAiB,cAAc;YAC/B,iBAAiB,cAAc;YAC/B,oBAAoB;YACpB,GAAG,UAAU;YACb,GAAG,gBAAgB;QACrB;oBACA;0BACA;2BACA;mBACA;0BACA;2BACA;IACF;AACF","sources":["packages/react-aria/src/radio/useRadioGroup.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  AriaValidationProps,\n  DOMAttributes,\n  DOMProps,\n  InputDOMProps,\n  ValidationResult\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {getEventTarget} from '../utils/shadowdom/DOMFunctions';\nimport {getFocusableTreeWalker} from '../focus/FocusScope';\nimport {getOwnerWindow} from '../utils/domHelpers';\nimport {mergeProps} from '../utils/mergeProps';\nimport {radioGroupData} from './utils';\nimport {RadioGroupProps, RadioGroupState} from 'react-stately/useRadioGroupState';\nimport {useField} from '../label/useField';\nimport {useFocusWithin} from '../interactions/useFocusWithin';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\n\nexport interface AriaRadioGroupProps\n  extends RadioGroupProps, InputDOMProps, DOMProps, AriaLabelingProps, AriaValidationProps {}\n\nexport interface RadioGroupAria extends ValidationResult {\n  /** Props for the radio group wrapper element. */\n  radioGroupProps: DOMAttributes;\n  /** Props for the radio group's visible label (if any). */\n  labelProps: DOMAttributes;\n  /** Props for the radio group description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the radio group error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a radio group component.\n * Radio groups allow users to select a single item from a list of mutually exclusive options.\n *\n * @param props - Props for the radio group.\n * @param state - State for the radio group, as returned by `useRadioGroupState`.\n */\nexport function useRadioGroup(props: AriaRadioGroupProps, state: RadioGroupState): RadioGroupAria {\n  let {\n    name,\n    form,\n    isReadOnly,\n    isRequired,\n    isDisabled,\n    orientation = 'vertical',\n    validationBehavior = 'aria'\n  } = props;\n  let {direction} = useLocale();\n\n  let {isInvalid, validationErrors, validationDetails} = state.displayValidation;\n  let {labelProps, fieldProps, descriptionProps, errorMessageProps} = useField({\n    ...props,\n    // Radio group is not an HTML input element so it\n    // shouldn't be labeled by a <label> element.\n    labelElementType: 'span',\n    isInvalid: state.isInvalid,\n    errorMessage: props.errorMessage || validationErrors\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  // When the radio group loses focus, reset the focusable radio to null if\n  // there is no selection. This allows tabbing into the group from either\n  // direction to go to the first or last radio.\n  let {focusWithinProps} = useFocusWithin({\n    onBlurWithin(e) {\n      props.onBlur?.(e);\n      if (!state.selectedValue) {\n        state.setLastFocusedValue(null);\n      }\n    },\n    onFocusWithin: props.onFocus,\n    onFocusWithinChange: props.onFocusChange\n  });\n\n  let onKeyDown = e => {\n    let nextDir;\n    switch (e.key) {\n      case 'ArrowRight':\n        if (direction === 'rtl' && orientation !== 'vertical') {\n          nextDir = 'prev';\n        } else {\n          nextDir = 'next';\n        }\n        break;\n      case 'ArrowLeft':\n        if (direction === 'rtl' && orientation !== 'vertical') {\n          nextDir = 'next';\n        } else {\n          nextDir = 'prev';\n        }\n        break;\n      case 'ArrowDown':\n        nextDir = 'next';\n        break;\n      case 'ArrowUp':\n        nextDir = 'prev';\n        break;\n      default:\n        return;\n    }\n    e.preventDefault();\n    let walker = getFocusableTreeWalker(e.currentTarget, {\n      from: getEventTarget(e) as Element,\n      accept: node => node instanceof getOwnerWindow(node).HTMLInputElement && node.type === 'radio'\n    });\n    let nextElem;\n    if (nextDir === 'next') {\n      nextElem = walker.nextNode();\n      if (!nextElem) {\n        walker.currentNode = e.currentTarget;\n        nextElem = walker.firstChild();\n      }\n    } else {\n      nextElem = walker.previousNode();\n      if (!nextElem) {\n        walker.currentNode = e.currentTarget;\n        nextElem = walker.lastChild();\n      }\n    }\n    if (nextElem) {\n      // Call focus on nextElem so that keyboard navigation scrolls the radio into view\n      nextElem.focus();\n      state.setSelectedValue(nextElem.value);\n    }\n  };\n\n  let groupName = useId(name);\n  radioGroupData.set(state, {\n    name: groupName,\n    form,\n    descriptionId: descriptionProps.id,\n    errorMessageId: errorMessageProps.id,\n    validationBehavior\n  });\n\n  return {\n    radioGroupProps: mergeProps(domProps, {\n      // https://www.w3.org/TR/wai-aria-1.2/#radiogroup\n      role: 'radiogroup',\n      onKeyDown,\n      'aria-invalid': state.isInvalid || undefined,\n      'aria-errormessage': props['aria-errormessage'],\n      'aria-readonly': isReadOnly || undefined,\n      'aria-required': isRequired || undefined,\n      'aria-disabled': isDisabled || undefined,\n      'aria-orientation': orientation,\n      ...fieldProps,\n      ...focusWithinProps\n    }),\n    labelProps,\n    descriptionProps,\n    errorMessageProps,\n    isInvalid,\n    validationErrors,\n    validationDetails\n  };\n}\n"],"names":[],"version":3,"file":"useRadioGroup.mjs.map"}
+{"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;;;;;;AA4CM,SAAS,0CAAc,KAA0B,EAAE,KAAsB;IAC9E,IAAI,QACF,IAAI,QACJ,IAAI,cACJ,UAAU,cACV,UAAU,cACV,UAAU,eACV,cAAc,gCACd,qBAAqB,QACtB,GAAG;IACJ,IAAI,aAAC,SAAS,EAAC,GAAG,CAAA,GAAA,yCAAQ;IAE1B,IAAI,aAAC,SAAS,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAC,GAAG,MAAM,iBAAiB;IAC9E,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAC,GAAG,CAAA,GAAA,yCAAO,EAAE;QAC3E,GAAG,KAAK;QACR,iDAAiD;QACjD,6CAA6C;QAC7C,kBAAkB;QAClB,WAAW,MAAM,SAAS;QAC1B,cAAc,MAAM,YAAY,IAAI;IACtC;IAEA,IAAI,WAAW,CAAA,GAAA,yCAAa,EAAE,OAAO;QAAC,WAAW;IAAI;IAErD,yEAAyE;IACzE,wEAAwE;IACxE,8CAA8C;IAC9C,IAAI,oBAAC,gBAAgB,EAAC,GAAG,CAAA,GAAA,yCAAa,EAAE;QACtC,cAAa,CAAC;YACZ,MAAM,MAAM,GAAG;YACf,IAAI,CAAC,MAAM,aAAa,EACtB,MAAM,mBAAmB,CAAC;QAE9B;QACA,eAAe,MAAM,OAAO;QAC5B,qBAAqB,MAAM,aAAa;IAC1C;IAEA,SAAS,eAAe,OAAwB,EAAE,CAAC;QACjD,IAAI,SAAS,CAAA,GAAA,yCAAqB,EAAE,EAAE,aAAa,EAAE;YACnD,MAAM,CAAA,GAAA,yCAAa,EAAE;YACrB,QAAQ,CAAA,OAAQ,gBAAgB,CAAA,GAAA,yCAAa,EAAE,MAAM,gBAAgB,IAAI,KAAK,IAAI,KAAK;QACzF;QACA,IAAI;QACJ,IAAI,YAAY,QAAQ;YACtB,WAAW,OAAO,QAAQ;YAC1B,IAAI,CAAC,UAAU;gBACb,OAAO,WAAW,GAAG,EAAE,aAAa;gBACpC,WAAW,OAAO,UAAU;YAC9B;QACF,OAAO;YACL,WAAW,OAAO,YAAY;YAC9B,IAAI,CAAC,UAAU;gBACb,OAAO,WAAW,GAAG,EAAE,aAAa;gBACpC,WAAW,OAAO,SAAS;YAC7B;QACF;QAEA,IAAI,UAAU;YACZ,iFAAiF;YACjF,SAAS,KAAK;YACd,MAAM,gBAAgB,CAAC,SAAS,KAAK;YACrC,OAAO;QACT;QACA,OAAO;IACT;IAEA,IAAI,iBAAC,aAAa,EAAC,GAAG,CAAA,GAAA,yCAAU,EAAE;QAChC,WAAW;YACT,YAAY,CAAA;gBACV,IAAI,UACF,cAAc,SAAS,gBAAgB,aAAa,SAAS;gBAC/D,OAAO,eAAe,SAAS;YACjC;YACA,WAAW,CAAA;gBACT,IAAI,UACF,cAAc,SAAS,gBAAgB,aAAa,SAAS;gBAC/D,OAAO,eAAe,SAAS;YACjC;YACA,WAAW,CAAA;gBACT,OAAO,eAAe,QAAQ;YAChC;YACA,SAAS,CAAA;gBACP,OAAO,eAAe,QAAQ;YAChC;QACF;QACA,cAAc;IAChB;IAEA,IAAI,YAAY,CAAA,GAAA,yCAAI,EAAE;IACtB,CAAA,GAAA,yCAAa,EAAE,GAAG,CAAC,OAAO;QACxB,MAAM;cACN;QACA,eAAe,iBAAiB,EAAE;QAClC,gBAAgB,kBAAkB,EAAE;4BACpC;IACF;IAEA,OAAO;QACL,iBAAiB,CAAA,GAAA,yCAAS,EAAE,UAAU;YACpC,iDAAiD;YACjD,MAAM;YACN,GAAG,aAAa;YAChB,gBAAgB,MAAM,SAAS,IAAI;YACnC,qBAAqB,KAAK,CAAC,oBAAoB;YAC/C,iBAAiB,cAAc;YAC/B,iBAAiB,cAAc;YAC/B,iBAAiB,cAAc;YAC/B,oBAAoB;YACpB,GAAG,UAAU;YACb,GAAG,gBAAgB;QACrB;oBACA;0BACA;2BACA;mBACA;0BACA;2BACA;IACF;AACF","sources":["packages/react-aria/src/radio/useRadioGroup.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  AriaValidationProps,\n  DOMAttributes,\n  DOMProps,\n  InputDOMProps,\n  ValidationResult\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {getEventTarget} from '../utils/shadowdom/DOMFunctions';\nimport {getFocusableTreeWalker} from '../focus/FocusScope';\nimport {getOwnerWindow} from '../utils/domHelpers';\nimport {mergeProps} from '../utils/mergeProps';\nimport {radioGroupData} from './utils';\nimport {RadioGroupProps, RadioGroupState} from 'react-stately/useRadioGroupState';\nimport {useField} from '../label/useField';\nimport {useFocusWithin} from '../interactions/useFocusWithin';\nimport {useId} from '../utils/useId';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocale} from '../i18n/I18nProvider';\n\nexport interface AriaRadioGroupProps\n  extends RadioGroupProps, InputDOMProps, DOMProps, AriaLabelingProps, AriaValidationProps {}\n\nexport interface RadioGroupAria extends ValidationResult {\n  /** Props for the radio group wrapper element. */\n  radioGroupProps: DOMAttributes;\n  /** Props for the radio group's visible label (if any). */\n  labelProps: DOMAttributes;\n  /** Props for the radio group description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the radio group error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a radio group component.\n * Radio groups allow users to select a single item from a list of mutually exclusive options.\n *\n * @param props - Props for the radio group.\n * @param state - State for the radio group, as returned by `useRadioGroupState`.\n */\nexport function useRadioGroup(props: AriaRadioGroupProps, state: RadioGroupState): RadioGroupAria {\n  let {\n    name,\n    form,\n    isReadOnly,\n    isRequired,\n    isDisabled,\n    orientation = 'vertical',\n    validationBehavior = 'aria'\n  } = props;\n  let {direction} = useLocale();\n\n  let {isInvalid, validationErrors, validationDetails} = state.displayValidation;\n  let {labelProps, fieldProps, descriptionProps, errorMessageProps} = useField({\n    ...props,\n    // Radio group is not an HTML input element so it\n    // shouldn't be labeled by a <label> element.\n    labelElementType: 'span',\n    isInvalid: state.isInvalid,\n    errorMessage: props.errorMessage || validationErrors\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  // When the radio group loses focus, reset the focusable radio to null if\n  // there is no selection. This allows tabbing into the group from either\n  // direction to go to the first or last radio.\n  let {focusWithinProps} = useFocusWithin({\n    onBlurWithin(e) {\n      props.onBlur?.(e);\n      if (!state.selectedValue) {\n        state.setLastFocusedValue(null);\n      }\n    },\n    onFocusWithin: props.onFocus,\n    onFocusWithinChange: props.onFocusChange\n  });\n\n  function getNextElement(nextDir: 'next' | 'prev', e) {\n    let walker = getFocusableTreeWalker(e.currentTarget, {\n      from: getEventTarget(e) as Element,\n      accept: node => node instanceof getOwnerWindow(node).HTMLInputElement && node.type === 'radio'\n    });\n    let nextElem;\n    if (nextDir === 'next') {\n      nextElem = walker.nextNode();\n      if (!nextElem) {\n        walker.currentNode = e.currentTarget;\n        nextElem = walker.firstChild();\n      }\n    } else {\n      nextElem = walker.previousNode();\n      if (!nextElem) {\n        walker.currentNode = e.currentTarget;\n        nextElem = walker.lastChild();\n      }\n    }\n\n    if (nextElem) {\n      // Call focus on nextElem so that keyboard navigation scrolls the radio into view\n      nextElem.focus();\n      state.setSelectedValue(nextElem.value);\n      return true;\n    }\n    return false;\n  }\n\n  let {keyboardProps} = useKeyboard({\n    shortcuts: {\n      ArrowRight: e => {\n        let nextDir: 'next' | 'prev' =\n          direction === 'rtl' && orientation !== 'vertical' ? 'prev' : 'next';\n        return getNextElement(nextDir, e);\n      },\n      ArrowLeft: e => {\n        let nextDir: 'next' | 'prev' =\n          direction === 'rtl' && orientation !== 'vertical' ? 'next' : 'prev';\n        return getNextElement(nextDir, e);\n      },\n      ArrowDown: e => {\n        return getNextElement('next', e);\n      },\n      ArrowUp: e => {\n        return getNextElement('prev', e);\n      }\n    },\n    allowRepeats: true\n  });\n\n  let groupName = useId(name);\n  radioGroupData.set(state, {\n    name: groupName,\n    form,\n    descriptionId: descriptionProps.id,\n    errorMessageId: errorMessageProps.id,\n    validationBehavior\n  });\n\n  return {\n    radioGroupProps: mergeProps(domProps, {\n      // https://www.w3.org/TR/wai-aria-1.2/#radiogroup\n      role: 'radiogroup',\n      ...keyboardProps,\n      'aria-invalid': state.isInvalid || undefined,\n      'aria-errormessage': props['aria-errormessage'],\n      'aria-readonly': isReadOnly || undefined,\n      'aria-required': isRequired || undefined,\n      'aria-disabled': isDisabled || undefined,\n      'aria-orientation': orientation,\n      ...fieldProps,\n      ...focusWithinProps\n    }),\n    labelProps,\n    descriptionProps,\n    errorMessageProps,\n    isInvalid,\n    validationErrors,\n    validationDetails\n  };\n}\n"],"names":[],"version":3,"file":"useRadioGroup.mjs.map"}

package/dist/private/searchfield/useSearchField.cjs

@@ -1,6 +1,7 @@
 var $262100337fa41653$exports = require("../textfield/useTextField.cjs");
-var $2f95486cfdaa743c$exports = require("../utils/chain.cjs");
 var $8da25e3b188114a7$exports = require("./intlStrings.cjs");
+var $89b39774f3b79dbb$exports = require("../utils/mergeProps.cjs");
+var $6d2f10bb8b359da5$exports = require("../interactions/useKeyboard.cjs");
 var $d4e8e26182baab6e$exports = require("../i18n/useLocalizedStringFormatter.cjs");
 
 
@@ -27,30 +28,31 @@ $parcel$export(module.exports, "useSearchField", function () { return $8aea6621a
 
 
 
+
 function $8aea6621ab2ae7e7$export$9bb30bbe003b82e0(props, state, inputRef) {
     let stringFormatter = (0, $d4e8e26182baab6e$exports.useLocalizedStringFormatter)((0, ($parcel$interopDefault($8da25e3b188114a7$exports))), '@react-aria/searchfield');
     let { isDisabled: isDisabled, isReadOnly: isReadOnly, onSubmit: onSubmit, onClear: onClear, type: type = 'search' } = props;
-    let onKeyDown = (e)=>{
-        const key = e.key;
-        if (key === 'Enter' && (isDisabled || isReadOnly)) e.preventDefault();
-        if (isDisabled || isReadOnly) return;
-        // for backward compatibility;
-        // otherwise, "Enter" on an input would trigger a form submit, the default browser behavior
-        if (key === 'Enter' && onSubmit) {
-            e.preventDefault();
-            onSubmit(state.value);
-        }
-        if (key === 'Escape') {
-            // Also check the inputRef value for the case where the value was set directly on the input element instead of going through
-            // the hook
-            if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) e.continuePropagation();
-            else {
-                e.preventDefault();
+    let { keyboardProps: keyboardProps } = (0, $6d2f10bb8b359da5$exports.useKeyboard)({
+        isDisabled: isDisabled || isReadOnly,
+        shortcuts: {
+            Enter: ()=>{
+                if (onSubmit) {
+                    // for backward compatibility;
+                    // otherwise, "Enter" on an input would trigger a form submit, the default browser behavior
+                    onSubmit(state.value);
+                    return;
+                }
+                return false;
+            },
+            Escape: ()=>{
+                // Also check the inputRef value for the case where the value was set directly on the input element instead of going through
+                // the hook
+                if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) return false;
                 state.setValue('');
-                if (onClear) onClear();
+                onClear?.();
             }
         }
-    };
+    });
     let onClearButtonClick = ()=>{
         state.setValue('');
         if (onClear) onClear();
@@ -64,16 +66,20 @@ function $8aea6621ab2ae7e7$export$9bb30bbe003b82e0(props, state, inputRef) {
         ...props,
         value: state.value,
         onChange: state.setValue,
-        onKeyDown: !isReadOnly ? (0, $2f95486cfdaa743c$exports.chain)(onKeyDown, props.onKeyDown) : props.onKeyDown,
+        onKeyDown: props.onKeyDown,
+        onKeyUp: props.onKeyUp,
         type: type
     }, inputRef);
     return {
         labelProps: labelProps,
-        inputProps: {
+        // An edge case, in Autocomplete, if the keyboard hanlders are not in this order, then
+        // Escape runs autocomplete/listbox first, then the search-field shortcut returns false and
+        // continues propagation, leaking Escape to a parent Dialog.
+        inputProps: (0, $89b39774f3b79dbb$exports.mergeProps)(keyboardProps, {
             ...inputProps,
             // already handled by useSearchFieldState
             defaultValue: undefined
-        },
+        }),
         clearButtonProps: {
             'aria-label': stringFormatter.format('Clear search'),
             excludeFromTabOrder: true,

package/dist/private/searchfield/useSearchField.cjs.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;AA+CM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,QAA4C;IAE5C,IAAI,kBAAkB,CAAA,GAAA,qDAA0B,EAAE,CAAA,GAAA,mDAAW,GAAG;IAChE,IAAI,cAAC,UAAU,cAAE,UAAU,YAAE,QAAQ,WAAE,OAAO,QAAE,OAAO,UAAS,GAAG;IAEnE,IAAI,YAAY,CAAA;QACd,MAAM,MAAM,EAAE,GAAG;QAEjB,IAAI,QAAQ,WAAY,CAAA,cAAc,UAAS,GAC7C,EAAE,cAAc;QAGlB,IAAI,cAAc,YAChB;QAGF,8BAA8B;QAC9B,2FAA2F;QAC3F,IAAI,QAAQ,WAAW,UAAU;YAC/B,EAAE,cAAc;YAChB,SAAS,MAAM,KAAK;QACtB;QAEA,IAAI,QAAQ;YACV,4HAA4H;YAC5H,WAAW;YACX,IAAI,MAAM,KAAK,KAAK,MAAO,CAAA,CAAC,SAAS,OAAO,IAAI,SAAS,OAAO,CAAC,KAAK,KAAK,EAAC,GAC1E,EAAE,mBAAmB;iBAChB;gBACL,EAAE,cAAc;gBAChB,MAAM,QAAQ,CAAC;gBACf,IAAI,SACF;YAEJ;;IAEJ;IAEA,IAAI,qBAAqB;QACvB,MAAM,QAAQ,CAAC;QAEf,IAAI,SACF;IAEJ;IAEA,IAAI,eAAe;QACjB,+FAA+F;QAC/F,mCAAmC;QACnC,SAAS,OAAO,EAAE;IACpB;IAEA,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAE,GAAG,YAAW,GAAG,CAAA,GAAA,sCAAW,EAC5F;QACE,GAAG,KAAK;QACR,OAAO,MAAM,KAAK;QAClB,UAAU,MAAM,QAAQ;QACxB,WAAW,CAAC,aAAa,CAAA,GAAA,+BAAI,EAAE,WAAW,MAAM,SAAS,IAAI,MAAM,SAAS;cAC5E;IACF,GACA;IAGF,OAAO;oBACL;QACA,YAAY;YACV,GAAG,UAAU;YACb,yCAAyC;YACzC,cAAc;QAChB;QACA,kBAAkB;YAChB,cAAc,gBAAgB,MAAM,CAAC;YACrC,qBAAqB;YACrB,qBAAqB;YACrB,YAAY,cAAc;YAC1B,SAAS;0BACT;QACF;0BACA;2BACA;QACA,GAAG,UAAU;IACf;AACF","sources":["packages/react-aria/src/searchfield/useSearchField.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '../button/useButton';\nimport {AriaTextFieldProps, useTextField} from '../textfield/useTextField';\nimport {chain} from '../utils/chain';\nimport {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';\nimport {InputHTMLAttributes, LabelHTMLAttributes} from 'react';\nimport intlMessages from '../../intl/searchfield/*.json';\nimport {SearchFieldProps, SearchFieldState} from 'react-stately/useSearchFieldState';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\n\nexport interface AriaSearchFieldProps extends SearchFieldProps, Omit<AriaTextFieldProps, 'type'> {\n  /**\n   * An enumerated attribute that defines what action label or icon to preset for the enter key on\n   * virtual keyboards. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint).\n   */\n  enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';\n  /**\n   * The type of input to render. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype).\n   *\n   * @default 'search'\n   */\n  type?: 'text' | 'search' | 'url' | 'tel' | 'email' | 'password' | (string & {});\n}\n\nexport interface SearchFieldAria extends ValidationResult {\n  /** Props for the text field's visible label element (if any). */\n  labelProps: LabelHTMLAttributes<HTMLLabelElement>;\n  /** Props for the input element. */\n  inputProps: InputHTMLAttributes<HTMLInputElement>;\n  /** Props for the clear button. */\n  clearButtonProps: AriaButtonProps;\n  /** Props for the searchfield's description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the searchfield's error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a search field.\n *\n * @param props - Props for the search field.\n * @param state - State for the search field, as returned by `useSearchFieldState`.\n * @param inputRef - A ref to the input element.\n */\nexport function useSearchField(\n  props: AriaSearchFieldProps,\n  state: SearchFieldState,\n  inputRef: RefObject<HTMLInputElement | null>\n): SearchFieldAria {\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');\n  let {isDisabled, isReadOnly, onSubmit, onClear, type = 'search'} = props;\n\n  let onKeyDown = e => {\n    const key = e.key;\n\n    if (key === 'Enter' && (isDisabled || isReadOnly)) {\n      e.preventDefault();\n    }\n\n    if (isDisabled || isReadOnly) {\n      return;\n    }\n\n    // for backward compatibility;\n    // otherwise, \"Enter\" on an input would trigger a form submit, the default browser behavior\n    if (key === 'Enter' && onSubmit) {\n      e.preventDefault();\n      onSubmit(state.value);\n    }\n\n    if (key === 'Escape') {\n      // Also check the inputRef value for the case where the value was set directly on the input element instead of going through\n      // the hook\n      if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) {\n        e.continuePropagation();\n      } else {\n        e.preventDefault();\n        state.setValue('');\n        if (onClear) {\n          onClear();\n        }\n      }\n    }\n  };\n\n  let onClearButtonClick = () => {\n    state.setValue('');\n\n    if (onClear) {\n      onClear();\n    }\n  };\n\n  let onPressStart = () => {\n    // this is in PressStart for mobile so that touching the clear button doesn't remove focus from\n    // the input and close the keyboard\n    inputRef.current?.focus();\n  };\n\n  let {labelProps, inputProps, descriptionProps, errorMessageProps, ...validation} = useTextField(\n    {\n      ...props,\n      value: state.value,\n      onChange: state.setValue,\n      onKeyDown: !isReadOnly ? chain(onKeyDown, props.onKeyDown) : props.onKeyDown,\n      type\n    },\n    inputRef\n  );\n\n  return {\n    labelProps,\n    inputProps: {\n      ...inputProps,\n      // already handled by useSearchFieldState\n      defaultValue: undefined\n    },\n    clearButtonProps: {\n      'aria-label': stringFormatter.format('Clear search'),\n      excludeFromTabOrder: true,\n      preventFocusOnPress: true,\n      isDisabled: isDisabled || isReadOnly,\n      onPress: onClearButtonClick,\n      onPressStart\n    },\n    descriptionProps,\n    errorMessageProps,\n    ...validation\n  };\n}\n"],"names":[],"version":3,"file":"useSearchField.cjs.map"}
+{"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;AAiDM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,QAA4C;IAE5C,IAAI,kBAAkB,CAAA,GAAA,qDAA0B,EAAE,CAAA,GAAA,mDAAW,GAAG;IAChE,IAAI,cAAC,UAAU,cAAE,UAAU,YAAE,QAAQ,WAAE,OAAO,QAAE,OAAO,UAAS,GAAG;IAEnE,IAAI,iBAAC,aAAa,EAAC,GAAG,CAAA,GAAA,qCAAU,EAAE;QAChC,YAAY,cAAc;QAC1B,WAAW;YACT,OAAO;gBACL,IAAI,UAAU;oBACZ,8BAA8B;oBAC9B,2FAA2F;oBAC3F,SAAS,MAAM,KAAK;oBACpB;gBACF;gBACA,OAAO;YACT;YACA,QAAQ;gBACN,4HAA4H;gBAC5H,WAAW;gBACX,IAAI,MAAM,KAAK,KAAK,MAAO,CAAA,CAAC,SAAS,OAAO,IAAI,SAAS,OAAO,CAAC,KAAK,KAAK,EAAC,GAC1E,OAAO;gBAET,MAAM,QAAQ,CAAC;gBACf;YACF;QACF;IACF;IAEA,IAAI,qBAAqB;QACvB,MAAM,QAAQ,CAAC;QAEf,IAAI,SACF;IAEJ;IAEA,IAAI,eAAe;QACjB,+FAA+F;QAC/F,mCAAmC;QACnC,SAAS,OAAO,EAAE;IACpB;IAEA,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAE,GAAG,YAAW,GAAG,CAAA,GAAA,sCAAW,EAC5F;QACE,GAAG,KAAK;QACR,OAAO,MAAM,KAAK;QAClB,UAAU,MAAM,QAAQ;QACxB,WAAW,MAAM,SAAS;QAC1B,SAAS,MAAM,OAAO;cACtB;IACF,GACA;IAGF,OAAO;oBACL;QACA,sFAAsF;QACtF,2FAA2F;QAC3F,4DAA4D;QAC5D,YAAY,CAAA,GAAA,oCAAS,EAAE,eAAe;YACpC,GAAG,UAAU;YACb,yCAAyC;YACzC,cAAc;QAChB;QACA,kBAAkB;YAChB,cAAc,gBAAgB,MAAM,CAAC;YACrC,qBAAqB;YACrB,qBAAqB;YACrB,YAAY,cAAc;YAC1B,SAAS;0BACT;QACF;0BACA;2BACA;QACA,GAAG,UAAU;IACf;AACF","sources":["packages/react-aria/src/searchfield/useSearchField.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '../button/useButton';\nimport {AriaTextFieldProps, useTextField} from '../textfield/useTextField';\nimport {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';\nimport {InputHTMLAttributes, LabelHTMLAttributes} from 'react';\nimport intlMessages from '../../intl/searchfield/*.json';\n// @ts-ignore\nimport {mergeProps} from '../utils/mergeProps';\nimport {SearchFieldProps, SearchFieldState} from 'react-stately/useSearchFieldState';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\n\nexport interface AriaSearchFieldProps extends SearchFieldProps, Omit<AriaTextFieldProps, 'type'> {\n  /**\n   * An enumerated attribute that defines what action label or icon to preset for the enter key on\n   * virtual keyboards. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint).\n   */\n  enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';\n  /**\n   * The type of input to render. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype).\n   *\n   * @default 'search'\n   */\n  type?: 'text' | 'search' | 'url' | 'tel' | 'email' | 'password' | (string & {});\n}\n\nexport interface SearchFieldAria extends ValidationResult {\n  /** Props for the text field's visible label element (if any). */\n  labelProps: LabelHTMLAttributes<HTMLLabelElement>;\n  /** Props for the input element. */\n  inputProps: InputHTMLAttributes<HTMLInputElement>;\n  /** Props for the clear button. */\n  clearButtonProps: AriaButtonProps;\n  /** Props for the searchfield's description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the searchfield's error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a search field.\n *\n * @param props - Props for the search field.\n * @param state - State for the search field, as returned by `useSearchFieldState`.\n * @param inputRef - A ref to the input element.\n */\nexport function useSearchField(\n  props: AriaSearchFieldProps,\n  state: SearchFieldState,\n  inputRef: RefObject<HTMLInputElement | null>\n): SearchFieldAria {\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');\n  let {isDisabled, isReadOnly, onSubmit, onClear, type = 'search'} = props;\n\n  let {keyboardProps} = useKeyboard({\n    isDisabled: isDisabled || isReadOnly,\n    shortcuts: {\n      Enter: () => {\n        if (onSubmit) {\n          // for backward compatibility;\n          // otherwise, \"Enter\" on an input would trigger a form submit, the default browser behavior\n          onSubmit(state.value);\n          return;\n        }\n        return false;\n      },\n      Escape: () => {\n        // Also check the inputRef value for the case where the value was set directly on the input element instead of going through\n        // the hook\n        if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) {\n          return false;\n        }\n        state.setValue('');\n        onClear?.();\n      }\n    }\n  });\n\n  let onClearButtonClick = () => {\n    state.setValue('');\n\n    if (onClear) {\n      onClear();\n    }\n  };\n\n  let onPressStart = () => {\n    // this is in PressStart for mobile so that touching the clear button doesn't remove focus from\n    // the input and close the keyboard\n    inputRef.current?.focus();\n  };\n\n  let {labelProps, inputProps, descriptionProps, errorMessageProps, ...validation} = useTextField(\n    {\n      ...props,\n      value: state.value,\n      onChange: state.setValue,\n      onKeyDown: props.onKeyDown,\n      onKeyUp: props.onKeyUp,\n      type\n    },\n    inputRef\n  );\n\n  return {\n    labelProps,\n    // An edge case, in Autocomplete, if the keyboard hanlders are not in this order, then\n    // Escape runs autocomplete/listbox first, then the search-field shortcut returns false and\n    // continues propagation, leaking Escape to a parent Dialog.\n    inputProps: mergeProps(keyboardProps, {\n      ...inputProps,\n      // already handled by useSearchFieldState\n      defaultValue: undefined\n    }),\n    clearButtonProps: {\n      'aria-label': stringFormatter.format('Clear search'),\n      excludeFromTabOrder: true,\n      preventFocusOnPress: true,\n      isDisabled: isDisabled || isReadOnly,\n      onPress: onClearButtonClick,\n      onPressStart\n    },\n    descriptionProps,\n    errorMessageProps,\n    ...validation\n  };\n}\n"],"names":[],"version":3,"file":"useSearchField.cjs.map"}

package/dist/private/searchfield/useSearchField.js

@@ -1,6 +1,7 @@
 import {useTextField as $032ede929f47bd98$export$712718f7aec83d5} from "../textfield/useTextField.js";
-import {chain as $2cf8bb4b9e45dc81$export$e08e3b67e392101e} from "../utils/chain.js";
 import $iV2l4$intlStringsjs from "./intlStrings.js";
+import {mergeProps as $64c36edd757dfa16$export$9d1611c77c2fe928} from "../utils/mergeProps.js";
+import {useKeyboard as $bf74df7506f65576$export$8f71654801c2f7cd} from "../interactions/useKeyboard.js";
 import {useLocalizedStringFormatter as $1adfa757ef3cd864$export$f12b703ca79dfbb1} from "../i18n/useLocalizedStringFormatter.js";
 
 
@@ -21,30 +22,31 @@ function $parcel$interopDefault(a) {
 
 
 
+
 function $6e608ea3a9bed486$export$9bb30bbe003b82e0(props, state, inputRef) {
     let stringFormatter = (0, $1adfa757ef3cd864$export$f12b703ca79dfbb1)((0, ($parcel$interopDefault($iV2l4$intlStringsjs))), '@react-aria/searchfield');
     let { isDisabled: isDisabled, isReadOnly: isReadOnly, onSubmit: onSubmit, onClear: onClear, type: type = 'search' } = props;
-    let onKeyDown = (e)=>{
-        const key = e.key;
-        if (key === 'Enter' && (isDisabled || isReadOnly)) e.preventDefault();
-        if (isDisabled || isReadOnly) return;
-        // for backward compatibility;
-        // otherwise, "Enter" on an input would trigger a form submit, the default browser behavior
-        if (key === 'Enter' && onSubmit) {
-            e.preventDefault();
-            onSubmit(state.value);
-        }
-        if (key === 'Escape') {
-            // Also check the inputRef value for the case where the value was set directly on the input element instead of going through
-            // the hook
-            if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) e.continuePropagation();
-            else {
-                e.preventDefault();
+    let { keyboardProps: keyboardProps } = (0, $bf74df7506f65576$export$8f71654801c2f7cd)({
+        isDisabled: isDisabled || isReadOnly,
+        shortcuts: {
+            Enter: ()=>{
+                if (onSubmit) {
+                    // for backward compatibility;
+                    // otherwise, "Enter" on an input would trigger a form submit, the default browser behavior
+                    onSubmit(state.value);
+                    return;
+                }
+                return false;
+            },
+            Escape: ()=>{
+                // Also check the inputRef value for the case where the value was set directly on the input element instead of going through
+                // the hook
+                if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) return false;
                 state.setValue('');
-                if (onClear) onClear();
+                onClear === null || onClear === void 0 ? void 0 : onClear();
             }
         }
-    };
+    });
     let onClearButtonClick = ()=>{
         state.setValue('');
         if (onClear) onClear();
@@ -59,16 +61,20 @@ function $6e608ea3a9bed486$export$9bb30bbe003b82e0(props, state, inputRef) {
         ...props,
         value: state.value,
         onChange: state.setValue,
-        onKeyDown: !isReadOnly ? (0, $2cf8bb4b9e45dc81$export$e08e3b67e392101e)(onKeyDown, props.onKeyDown) : props.onKeyDown,
+        onKeyDown: props.onKeyDown,
+        onKeyUp: props.onKeyUp,
         type: type
     }, inputRef);
     return {
         labelProps: labelProps,
-        inputProps: {
+        // An edge case, in Autocomplete, if the keyboard hanlders are not in this order, then
+        // Escape runs autocomplete/listbox first, then the search-field shortcut returns false and
+        // continues propagation, leaking Escape to a parent Dialog.
+        inputProps: (0, $64c36edd757dfa16$export$9d1611c77c2fe928)(keyboardProps, {
             ...inputProps,
             // already handled by useSearchFieldState
             defaultValue: undefined
-        },
+        }),
         clearButtonProps: {
             'aria-label': stringFormatter.format('Clear search'),
             excludeFromTabOrder: true,

package/dist/private/searchfield/useSearchField.js.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;AA+CM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,QAA4C;IAE5C,IAAI,kBAAkB,CAAA,GAAA,yCAA0B,EAAE,CAAA,GAAA,8CAAW,GAAG;IAChE,IAAI,cAAC,UAAU,cAAE,UAAU,YAAE,QAAQ,WAAE,OAAO,QAAE,OAAO,UAAS,GAAG;IAEnE,IAAI,YAAY,CAAA;QACd,MAAM,MAAM,EAAE,GAAG;QAEjB,IAAI,QAAQ,WAAY,CAAA,cAAc,UAAS,GAC7C,EAAE,cAAc;QAGlB,IAAI,cAAc,YAChB;QAGF,8BAA8B;QAC9B,2FAA2F;QAC3F,IAAI,QAAQ,WAAW,UAAU;YAC/B,EAAE,cAAc;YAChB,SAAS,MAAM,KAAK;QACtB;QAEA,IAAI,QAAQ;YACV,4HAA4H;YAC5H,WAAW;YACX,IAAI,MAAM,KAAK,KAAK,MAAO,CAAA,CAAC,SAAS,OAAO,IAAI,SAAS,OAAO,CAAC,KAAK,KAAK,EAAC,GAC1E,EAAE,mBAAmB;iBAChB;gBACL,EAAE,cAAc;gBAChB,MAAM,QAAQ,CAAC;gBACf,IAAI,SACF;YAEJ;;IAEJ;IAEA,IAAI,qBAAqB;QACvB,MAAM,QAAQ,CAAC;QAEf,IAAI,SACF;IAEJ;IAEA,IAAI,eAAe;YACjB,+FAA+F;QAC/F,mCAAmC;QACnC;SAAA,oBAAA,SAAS,OAAO,cAAhB,wCAAA,kBAAkB,KAAK;IACzB;IAEA,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAE,GAAG,YAAW,GAAG,CAAA,GAAA,wCAAW,EAC5F;QACE,GAAG,KAAK;QACR,OAAO,MAAM,KAAK;QAClB,UAAU,MAAM,QAAQ;QACxB,WAAW,CAAC,aAAa,CAAA,GAAA,yCAAI,EAAE,WAAW,MAAM,SAAS,IAAI,MAAM,SAAS;cAC5E;IACF,GACA;IAGF,OAAO;oBACL;QACA,YAAY;YACV,GAAG,UAAU;YACb,yCAAyC;YACzC,cAAc;QAChB;QACA,kBAAkB;YAChB,cAAc,gBAAgB,MAAM,CAAC;YACrC,qBAAqB;YACrB,qBAAqB;YACrB,YAAY,cAAc;YAC1B,SAAS;0BACT;QACF;0BACA;2BACA;QACA,GAAG,UAAU;IACf;AACF","sources":["packages/react-aria/src/searchfield/useSearchField.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '../button/useButton';\nimport {AriaTextFieldProps, useTextField} from '../textfield/useTextField';\nimport {chain} from '../utils/chain';\nimport {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';\nimport {InputHTMLAttributes, LabelHTMLAttributes} from 'react';\nimport intlMessages from '../../intl/searchfield/*.json';\nimport {SearchFieldProps, SearchFieldState} from 'react-stately/useSearchFieldState';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\n\nexport interface AriaSearchFieldProps extends SearchFieldProps, Omit<AriaTextFieldProps, 'type'> {\n  /**\n   * An enumerated attribute that defines what action label or icon to preset for the enter key on\n   * virtual keyboards. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint).\n   */\n  enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';\n  /**\n   * The type of input to render. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype).\n   *\n   * @default 'search'\n   */\n  type?: 'text' | 'search' | 'url' | 'tel' | 'email' | 'password' | (string & {});\n}\n\nexport interface SearchFieldAria extends ValidationResult {\n  /** Props for the text field's visible label element (if any). */\n  labelProps: LabelHTMLAttributes<HTMLLabelElement>;\n  /** Props for the input element. */\n  inputProps: InputHTMLAttributes<HTMLInputElement>;\n  /** Props for the clear button. */\n  clearButtonProps: AriaButtonProps;\n  /** Props for the searchfield's description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the searchfield's error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a search field.\n *\n * @param props - Props for the search field.\n * @param state - State for the search field, as returned by `useSearchFieldState`.\n * @param inputRef - A ref to the input element.\n */\nexport function useSearchField(\n  props: AriaSearchFieldProps,\n  state: SearchFieldState,\n  inputRef: RefObject<HTMLInputElement | null>\n): SearchFieldAria {\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');\n  let {isDisabled, isReadOnly, onSubmit, onClear, type = 'search'} = props;\n\n  let onKeyDown = e => {\n    const key = e.key;\n\n    if (key === 'Enter' && (isDisabled || isReadOnly)) {\n      e.preventDefault();\n    }\n\n    if (isDisabled || isReadOnly) {\n      return;\n    }\n\n    // for backward compatibility;\n    // otherwise, \"Enter\" on an input would trigger a form submit, the default browser behavior\n    if (key === 'Enter' && onSubmit) {\n      e.preventDefault();\n      onSubmit(state.value);\n    }\n\n    if (key === 'Escape') {\n      // Also check the inputRef value for the case where the value was set directly on the input element instead of going through\n      // the hook\n      if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) {\n        e.continuePropagation();\n      } else {\n        e.preventDefault();\n        state.setValue('');\n        if (onClear) {\n          onClear();\n        }\n      }\n    }\n  };\n\n  let onClearButtonClick = () => {\n    state.setValue('');\n\n    if (onClear) {\n      onClear();\n    }\n  };\n\n  let onPressStart = () => {\n    // this is in PressStart for mobile so that touching the clear button doesn't remove focus from\n    // the input and close the keyboard\n    inputRef.current?.focus();\n  };\n\n  let {labelProps, inputProps, descriptionProps, errorMessageProps, ...validation} = useTextField(\n    {\n      ...props,\n      value: state.value,\n      onChange: state.setValue,\n      onKeyDown: !isReadOnly ? chain(onKeyDown, props.onKeyDown) : props.onKeyDown,\n      type\n    },\n    inputRef\n  );\n\n  return {\n    labelProps,\n    inputProps: {\n      ...inputProps,\n      // already handled by useSearchFieldState\n      defaultValue: undefined\n    },\n    clearButtonProps: {\n      'aria-label': stringFormatter.format('Clear search'),\n      excludeFromTabOrder: true,\n      preventFocusOnPress: true,\n      isDisabled: isDisabled || isReadOnly,\n      onPress: onClearButtonClick,\n      onPressStart\n    },\n    descriptionProps,\n    errorMessageProps,\n    ...validation\n  };\n}\n"],"names":[],"version":3,"file":"useSearchField.js.map"}
+{"mappings":";;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;AAiDM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,QAA4C;IAE5C,IAAI,kBAAkB,CAAA,GAAA,yCAA0B,EAAE,CAAA,GAAA,8CAAW,GAAG;IAChE,IAAI,cAAC,UAAU,cAAE,UAAU,YAAE,QAAQ,WAAE,OAAO,QAAE,OAAO,UAAS,GAAG;IAEnE,IAAI,iBAAC,aAAa,EAAC,GAAG,CAAA,GAAA,yCAAU,EAAE;QAChC,YAAY,cAAc;QAC1B,WAAW;YACT,OAAO;gBACL,IAAI,UAAU;oBACZ,8BAA8B;oBAC9B,2FAA2F;oBAC3F,SAAS,MAAM,KAAK;oBACpB;gBACF;gBACA,OAAO;YACT;YACA,QAAQ;gBACN,4HAA4H;gBAC5H,WAAW;gBACX,IAAI,MAAM,KAAK,KAAK,MAAO,CAAA,CAAC,SAAS,OAAO,IAAI,SAAS,OAAO,CAAC,KAAK,KAAK,EAAC,GAC1E,OAAO;gBAET,MAAM,QAAQ,CAAC;gBACf,oBAAA,8BAAA;YACF;QACF;IACF;IAEA,IAAI,qBAAqB;QACvB,MAAM,QAAQ,CAAC;QAEf,IAAI,SACF;IAEJ;IAEA,IAAI,eAAe;YACjB,+FAA+F;QAC/F,mCAAmC;QACnC;SAAA,oBAAA,SAAS,OAAO,cAAhB,wCAAA,kBAAkB,KAAK;IACzB;IAEA,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAE,GAAG,YAAW,GAAG,CAAA,GAAA,wCAAW,EAC5F;QACE,GAAG,KAAK;QACR,OAAO,MAAM,KAAK;QAClB,UAAU,MAAM,QAAQ;QACxB,WAAW,MAAM,SAAS;QAC1B,SAAS,MAAM,OAAO;cACtB;IACF,GACA;IAGF,OAAO;oBACL;QACA,sFAAsF;QACtF,2FAA2F;QAC3F,4DAA4D;QAC5D,YAAY,CAAA,GAAA,yCAAS,EAAE,eAAe;YACpC,GAAG,UAAU;YACb,yCAAyC;YACzC,cAAc;QAChB;QACA,kBAAkB;YAChB,cAAc,gBAAgB,MAAM,CAAC;YACrC,qBAAqB;YACrB,qBAAqB;YACrB,YAAY,cAAc;YAC1B,SAAS;0BACT;QACF;0BACA;2BACA;QACA,GAAG,UAAU;IACf;AACF","sources":["packages/react-aria/src/searchfield/useSearchField.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '../button/useButton';\nimport {AriaTextFieldProps, useTextField} from '../textfield/useTextField';\nimport {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';\nimport {InputHTMLAttributes, LabelHTMLAttributes} from 'react';\nimport intlMessages from '../../intl/searchfield/*.json';\n// @ts-ignore\nimport {mergeProps} from '../utils/mergeProps';\nimport {SearchFieldProps, SearchFieldState} from 'react-stately/useSearchFieldState';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\n\nexport interface AriaSearchFieldProps extends SearchFieldProps, Omit<AriaTextFieldProps, 'type'> {\n  /**\n   * An enumerated attribute that defines what action label or icon to preset for the enter key on\n   * virtual keyboards. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint).\n   */\n  enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';\n  /**\n   * The type of input to render. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype).\n   *\n   * @default 'search'\n   */\n  type?: 'text' | 'search' | 'url' | 'tel' | 'email' | 'password' | (string & {});\n}\n\nexport interface SearchFieldAria extends ValidationResult {\n  /** Props for the text field's visible label element (if any). */\n  labelProps: LabelHTMLAttributes<HTMLLabelElement>;\n  /** Props for the input element. */\n  inputProps: InputHTMLAttributes<HTMLInputElement>;\n  /** Props for the clear button. */\n  clearButtonProps: AriaButtonProps;\n  /** Props for the searchfield's description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the searchfield's error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a search field.\n *\n * @param props - Props for the search field.\n * @param state - State for the search field, as returned by `useSearchFieldState`.\n * @param inputRef - A ref to the input element.\n */\nexport function useSearchField(\n  props: AriaSearchFieldProps,\n  state: SearchFieldState,\n  inputRef: RefObject<HTMLInputElement | null>\n): SearchFieldAria {\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');\n  let {isDisabled, isReadOnly, onSubmit, onClear, type = 'search'} = props;\n\n  let {keyboardProps} = useKeyboard({\n    isDisabled: isDisabled || isReadOnly,\n    shortcuts: {\n      Enter: () => {\n        if (onSubmit) {\n          // for backward compatibility;\n          // otherwise, \"Enter\" on an input would trigger a form submit, the default browser behavior\n          onSubmit(state.value);\n          return;\n        }\n        return false;\n      },\n      Escape: () => {\n        // Also check the inputRef value for the case where the value was set directly on the input element instead of going through\n        // the hook\n        if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) {\n          return false;\n        }\n        state.setValue('');\n        onClear?.();\n      }\n    }\n  });\n\n  let onClearButtonClick = () => {\n    state.setValue('');\n\n    if (onClear) {\n      onClear();\n    }\n  };\n\n  let onPressStart = () => {\n    // this is in PressStart for mobile so that touching the clear button doesn't remove focus from\n    // the input and close the keyboard\n    inputRef.current?.focus();\n  };\n\n  let {labelProps, inputProps, descriptionProps, errorMessageProps, ...validation} = useTextField(\n    {\n      ...props,\n      value: state.value,\n      onChange: state.setValue,\n      onKeyDown: props.onKeyDown,\n      onKeyUp: props.onKeyUp,\n      type\n    },\n    inputRef\n  );\n\n  return {\n    labelProps,\n    // An edge case, in Autocomplete, if the keyboard hanlders are not in this order, then\n    // Escape runs autocomplete/listbox first, then the search-field shortcut returns false and\n    // continues propagation, leaking Escape to a parent Dialog.\n    inputProps: mergeProps(keyboardProps, {\n      ...inputProps,\n      // already handled by useSearchFieldState\n      defaultValue: undefined\n    }),\n    clearButtonProps: {\n      'aria-label': stringFormatter.format('Clear search'),\n      excludeFromTabOrder: true,\n      preventFocusOnPress: true,\n      isDisabled: isDisabled || isReadOnly,\n      onPress: onClearButtonClick,\n      onPressStart\n    },\n    descriptionProps,\n    errorMessageProps,\n    ...validation\n  };\n}\n"],"names":[],"version":3,"file":"useSearchField.js.map"}

package/dist/private/searchfield/useSearchField.mjs

@@ -1,6 +1,7 @@
 import {useTextField as $054f71d2330da2e3$export$712718f7aec83d5} from "../textfield/useTextField.mjs";
-import {chain as $a4e76a5424781910$export$e08e3b67e392101e} from "../utils/chain.mjs";
 import $kb1Sb$intlStringsmjs from "./intlStrings.mjs";
+import {mergeProps as $bbaa08b3cd72f041$export$9d1611c77c2fe928} from "../utils/mergeProps.mjs";
+import {useKeyboard as $8296dad1a4c5e0dc$export$8f71654801c2f7cd} from "../interactions/useKeyboard.mjs";
 import {useLocalizedStringFormatter as $cf2482eff2eeeec2$export$f12b703ca79dfbb1} from "../i18n/useLocalizedStringFormatter.mjs";
 
 
@@ -21,30 +22,31 @@ function $parcel$interopDefault(a) {
 
 
 
+
 function $44614525ec969a63$export$9bb30bbe003b82e0(props, state, inputRef) {
     let stringFormatter = (0, $cf2482eff2eeeec2$export$f12b703ca79dfbb1)((0, ($parcel$interopDefault($kb1Sb$intlStringsmjs))), '@react-aria/searchfield');
     let { isDisabled: isDisabled, isReadOnly: isReadOnly, onSubmit: onSubmit, onClear: onClear, type: type = 'search' } = props;
-    let onKeyDown = (e)=>{
-        const key = e.key;
-        if (key === 'Enter' && (isDisabled || isReadOnly)) e.preventDefault();
-        if (isDisabled || isReadOnly) return;
-        // for backward compatibility;
-        // otherwise, "Enter" on an input would trigger a form submit, the default browser behavior
-        if (key === 'Enter' && onSubmit) {
-            e.preventDefault();
-            onSubmit(state.value);
-        }
-        if (key === 'Escape') {
-            // Also check the inputRef value for the case where the value was set directly on the input element instead of going through
-            // the hook
-            if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) e.continuePropagation();
-            else {
-                e.preventDefault();
+    let { keyboardProps: keyboardProps } = (0, $8296dad1a4c5e0dc$export$8f71654801c2f7cd)({
+        isDisabled: isDisabled || isReadOnly,
+        shortcuts: {
+            Enter: ()=>{
+                if (onSubmit) {
+                    // for backward compatibility;
+                    // otherwise, "Enter" on an input would trigger a form submit, the default browser behavior
+                    onSubmit(state.value);
+                    return;
+                }
+                return false;
+            },
+            Escape: ()=>{
+                // Also check the inputRef value for the case where the value was set directly on the input element instead of going through
+                // the hook
+                if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) return false;
                 state.setValue('');
-                if (onClear) onClear();
+                onClear?.();
             }
         }
-    };
+    });
     let onClearButtonClick = ()=>{
         state.setValue('');
         if (onClear) onClear();
@@ -58,16 +60,20 @@ function $44614525ec969a63$export$9bb30bbe003b82e0(props, state, inputRef) {
         ...props,
         value: state.value,
         onChange: state.setValue,
-        onKeyDown: !isReadOnly ? (0, $a4e76a5424781910$export$e08e3b67e392101e)(onKeyDown, props.onKeyDown) : props.onKeyDown,
+        onKeyDown: props.onKeyDown,
+        onKeyUp: props.onKeyUp,
         type: type
     }, inputRef);
     return {
         labelProps: labelProps,
-        inputProps: {
+        // An edge case, in Autocomplete, if the keyboard hanlders are not in this order, then
+        // Escape runs autocomplete/listbox first, then the search-field shortcut returns false and
+        // continues propagation, leaking Escape to a parent Dialog.
+        inputProps: (0, $bbaa08b3cd72f041$export$9d1611c77c2fe928)(keyboardProps, {
             ...inputProps,
             // already handled by useSearchFieldState
             defaultValue: undefined
-        },
+        }),
         clearButtonProps: {
             'aria-label': stringFormatter.format('Clear search'),
             excludeFromTabOrder: true,

package/dist/private/searchfield/useSearchField.mjs.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;AA+CM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,QAA4C;IAE5C,IAAI,kBAAkB,CAAA,GAAA,yCAA0B,EAAE,CAAA,GAAA,+CAAW,GAAG;IAChE,IAAI,cAAC,UAAU,cAAE,UAAU,YAAE,QAAQ,WAAE,OAAO,QAAE,OAAO,UAAS,GAAG;IAEnE,IAAI,YAAY,CAAA;QACd,MAAM,MAAM,EAAE,GAAG;QAEjB,IAAI,QAAQ,WAAY,CAAA,cAAc,UAAS,GAC7C,EAAE,cAAc;QAGlB,IAAI,cAAc,YAChB;QAGF,8BAA8B;QAC9B,2FAA2F;QAC3F,IAAI,QAAQ,WAAW,UAAU;YAC/B,EAAE,cAAc;YAChB,SAAS,MAAM,KAAK;QACtB;QAEA,IAAI,QAAQ;YACV,4HAA4H;YAC5H,WAAW;YACX,IAAI,MAAM,KAAK,KAAK,MAAO,CAAA,CAAC,SAAS,OAAO,IAAI,SAAS,OAAO,CAAC,KAAK,KAAK,EAAC,GAC1E,EAAE,mBAAmB;iBAChB;gBACL,EAAE,cAAc;gBAChB,MAAM,QAAQ,CAAC;gBACf,IAAI,SACF;YAEJ;;IAEJ;IAEA,IAAI,qBAAqB;QACvB,MAAM,QAAQ,CAAC;QAEf,IAAI,SACF;IAEJ;IAEA,IAAI,eAAe;QACjB,+FAA+F;QAC/F,mCAAmC;QACnC,SAAS,OAAO,EAAE;IACpB;IAEA,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAE,GAAG,YAAW,GAAG,CAAA,GAAA,wCAAW,EAC5F;QACE,GAAG,KAAK;QACR,OAAO,MAAM,KAAK;QAClB,UAAU,MAAM,QAAQ;QACxB,WAAW,CAAC,aAAa,CAAA,GAAA,yCAAI,EAAE,WAAW,MAAM,SAAS,IAAI,MAAM,SAAS;cAC5E;IACF,GACA;IAGF,OAAO;oBACL;QACA,YAAY;YACV,GAAG,UAAU;YACb,yCAAyC;YACzC,cAAc;QAChB;QACA,kBAAkB;YAChB,cAAc,gBAAgB,MAAM,CAAC;YACrC,qBAAqB;YACrB,qBAAqB;YACrB,YAAY,cAAc;YAC1B,SAAS;0BACT;QACF;0BACA;2BACA;QACA,GAAG,UAAU;IACf;AACF","sources":["packages/react-aria/src/searchfield/useSearchField.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '../button/useButton';\nimport {AriaTextFieldProps, useTextField} from '../textfield/useTextField';\nimport {chain} from '../utils/chain';\nimport {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';\nimport {InputHTMLAttributes, LabelHTMLAttributes} from 'react';\nimport intlMessages from '../../intl/searchfield/*.json';\nimport {SearchFieldProps, SearchFieldState} from 'react-stately/useSearchFieldState';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\n\nexport interface AriaSearchFieldProps extends SearchFieldProps, Omit<AriaTextFieldProps, 'type'> {\n  /**\n   * An enumerated attribute that defines what action label or icon to preset for the enter key on\n   * virtual keyboards. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint).\n   */\n  enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';\n  /**\n   * The type of input to render. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype).\n   *\n   * @default 'search'\n   */\n  type?: 'text' | 'search' | 'url' | 'tel' | 'email' | 'password' | (string & {});\n}\n\nexport interface SearchFieldAria extends ValidationResult {\n  /** Props for the text field's visible label element (if any). */\n  labelProps: LabelHTMLAttributes<HTMLLabelElement>;\n  /** Props for the input element. */\n  inputProps: InputHTMLAttributes<HTMLInputElement>;\n  /** Props for the clear button. */\n  clearButtonProps: AriaButtonProps;\n  /** Props for the searchfield's description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the searchfield's error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a search field.\n *\n * @param props - Props for the search field.\n * @param state - State for the search field, as returned by `useSearchFieldState`.\n * @param inputRef - A ref to the input element.\n */\nexport function useSearchField(\n  props: AriaSearchFieldProps,\n  state: SearchFieldState,\n  inputRef: RefObject<HTMLInputElement | null>\n): SearchFieldAria {\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');\n  let {isDisabled, isReadOnly, onSubmit, onClear, type = 'search'} = props;\n\n  let onKeyDown = e => {\n    const key = e.key;\n\n    if (key === 'Enter' && (isDisabled || isReadOnly)) {\n      e.preventDefault();\n    }\n\n    if (isDisabled || isReadOnly) {\n      return;\n    }\n\n    // for backward compatibility;\n    // otherwise, \"Enter\" on an input would trigger a form submit, the default browser behavior\n    if (key === 'Enter' && onSubmit) {\n      e.preventDefault();\n      onSubmit(state.value);\n    }\n\n    if (key === 'Escape') {\n      // Also check the inputRef value for the case where the value was set directly on the input element instead of going through\n      // the hook\n      if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) {\n        e.continuePropagation();\n      } else {\n        e.preventDefault();\n        state.setValue('');\n        if (onClear) {\n          onClear();\n        }\n      }\n    }\n  };\n\n  let onClearButtonClick = () => {\n    state.setValue('');\n\n    if (onClear) {\n      onClear();\n    }\n  };\n\n  let onPressStart = () => {\n    // this is in PressStart for mobile so that touching the clear button doesn't remove focus from\n    // the input and close the keyboard\n    inputRef.current?.focus();\n  };\n\n  let {labelProps, inputProps, descriptionProps, errorMessageProps, ...validation} = useTextField(\n    {\n      ...props,\n      value: state.value,\n      onChange: state.setValue,\n      onKeyDown: !isReadOnly ? chain(onKeyDown, props.onKeyDown) : props.onKeyDown,\n      type\n    },\n    inputRef\n  );\n\n  return {\n    labelProps,\n    inputProps: {\n      ...inputProps,\n      // already handled by useSearchFieldState\n      defaultValue: undefined\n    },\n    clearButtonProps: {\n      'aria-label': stringFormatter.format('Clear search'),\n      excludeFromTabOrder: true,\n      preventFocusOnPress: true,\n      isDisabled: isDisabled || isReadOnly,\n      onPress: onClearButtonClick,\n      onPressStart\n    },\n    descriptionProps,\n    errorMessageProps,\n    ...validation\n  };\n}\n"],"names":[],"version":3,"file":"useSearchField.mjs.map"}
+{"mappings":";;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;AAiDM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,QAA4C;IAE5C,IAAI,kBAAkB,CAAA,GAAA,yCAA0B,EAAE,CAAA,GAAA,+CAAW,GAAG;IAChE,IAAI,cAAC,UAAU,cAAE,UAAU,YAAE,QAAQ,WAAE,OAAO,QAAE,OAAO,UAAS,GAAG;IAEnE,IAAI,iBAAC,aAAa,EAAC,GAAG,CAAA,GAAA,yCAAU,EAAE;QAChC,YAAY,cAAc;QAC1B,WAAW;YACT,OAAO;gBACL,IAAI,UAAU;oBACZ,8BAA8B;oBAC9B,2FAA2F;oBAC3F,SAAS,MAAM,KAAK;oBACpB;gBACF;gBACA,OAAO;YACT;YACA,QAAQ;gBACN,4HAA4H;gBAC5H,WAAW;gBACX,IAAI,MAAM,KAAK,KAAK,MAAO,CAAA,CAAC,SAAS,OAAO,IAAI,SAAS,OAAO,CAAC,KAAK,KAAK,EAAC,GAC1E,OAAO;gBAET,MAAM,QAAQ,CAAC;gBACf;YACF;QACF;IACF;IAEA,IAAI,qBAAqB;QACvB,MAAM,QAAQ,CAAC;QAEf,IAAI,SACF;IAEJ;IAEA,IAAI,eAAe;QACjB,+FAA+F;QAC/F,mCAAmC;QACnC,SAAS,OAAO,EAAE;IACpB;IAEA,IAAI,cAAC,UAAU,cAAE,UAAU,oBAAE,gBAAgB,qBAAE,iBAAiB,EAAE,GAAG,YAAW,GAAG,CAAA,GAAA,wCAAW,EAC5F;QACE,GAAG,KAAK;QACR,OAAO,MAAM,KAAK;QAClB,UAAU,MAAM,QAAQ;QACxB,WAAW,MAAM,SAAS;QAC1B,SAAS,MAAM,OAAO;cACtB;IACF,GACA;IAGF,OAAO;oBACL;QACA,sFAAsF;QACtF,2FAA2F;QAC3F,4DAA4D;QAC5D,YAAY,CAAA,GAAA,yCAAS,EAAE,eAAe;YACpC,GAAG,UAAU;YACb,yCAAyC;YACzC,cAAc;QAChB;QACA,kBAAkB;YAChB,cAAc,gBAAgB,MAAM,CAAC;YACrC,qBAAqB;YACrB,qBAAqB;YACrB,YAAY,cAAc;YAC1B,SAAS;0BACT;QACF;0BACA;2BACA;QACA,GAAG,UAAU;IACf;AACF","sources":["packages/react-aria/src/searchfield/useSearchField.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '../button/useButton';\nimport {AriaTextFieldProps, useTextField} from '../textfield/useTextField';\nimport {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';\nimport {InputHTMLAttributes, LabelHTMLAttributes} from 'react';\nimport intlMessages from '../../intl/searchfield/*.json';\n// @ts-ignore\nimport {mergeProps} from '../utils/mergeProps';\nimport {SearchFieldProps, SearchFieldState} from 'react-stately/useSearchFieldState';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\n\nexport interface AriaSearchFieldProps extends SearchFieldProps, Omit<AriaTextFieldProps, 'type'> {\n  /**\n   * An enumerated attribute that defines what action label or icon to preset for the enter key on\n   * virtual keyboards. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint).\n   */\n  enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';\n  /**\n   * The type of input to render. See\n   * [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype).\n   *\n   * @default 'search'\n   */\n  type?: 'text' | 'search' | 'url' | 'tel' | 'email' | 'password' | (string & {});\n}\n\nexport interface SearchFieldAria extends ValidationResult {\n  /** Props for the text field's visible label element (if any). */\n  labelProps: LabelHTMLAttributes<HTMLLabelElement>;\n  /** Props for the input element. */\n  inputProps: InputHTMLAttributes<HTMLInputElement>;\n  /** Props for the clear button. */\n  clearButtonProps: AriaButtonProps;\n  /** Props for the searchfield's description element, if any. */\n  descriptionProps: DOMAttributes;\n  /** Props for the searchfield's error message element, if any. */\n  errorMessageProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a search field.\n *\n * @param props - Props for the search field.\n * @param state - State for the search field, as returned by `useSearchFieldState`.\n * @param inputRef - A ref to the input element.\n */\nexport function useSearchField(\n  props: AriaSearchFieldProps,\n  state: SearchFieldState,\n  inputRef: RefObject<HTMLInputElement | null>\n): SearchFieldAria {\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');\n  let {isDisabled, isReadOnly, onSubmit, onClear, type = 'search'} = props;\n\n  let {keyboardProps} = useKeyboard({\n    isDisabled: isDisabled || isReadOnly,\n    shortcuts: {\n      Enter: () => {\n        if (onSubmit) {\n          // for backward compatibility;\n          // otherwise, \"Enter\" on an input would trigger a form submit, the default browser behavior\n          onSubmit(state.value);\n          return;\n        }\n        return false;\n      },\n      Escape: () => {\n        // Also check the inputRef value for the case where the value was set directly on the input element instead of going through\n        // the hook\n        if (state.value === '' && (!inputRef.current || inputRef.current.value === '')) {\n          return false;\n        }\n        state.setValue('');\n        onClear?.();\n      }\n    }\n  });\n\n  let onClearButtonClick = () => {\n    state.setValue('');\n\n    if (onClear) {\n      onClear();\n    }\n  };\n\n  let onPressStart = () => {\n    // this is in PressStart for mobile so that touching the clear button doesn't remove focus from\n    // the input and close the keyboard\n    inputRef.current?.focus();\n  };\n\n  let {labelProps, inputProps, descriptionProps, errorMessageProps, ...validation} = useTextField(\n    {\n      ...props,\n      value: state.value,\n      onChange: state.setValue,\n      onKeyDown: props.onKeyDown,\n      onKeyUp: props.onKeyUp,\n      type\n    },\n    inputRef\n  );\n\n  return {\n    labelProps,\n    // An edge case, in Autocomplete, if the keyboard hanlders are not in this order, then\n    // Escape runs autocomplete/listbox first, then the search-field shortcut returns false and\n    // continues propagation, leaking Escape to a parent Dialog.\n    inputProps: mergeProps(keyboardProps, {\n      ...inputProps,\n      // already handled by useSearchFieldState\n      defaultValue: undefined\n    }),\n    clearButtonProps: {\n      'aria-label': stringFormatter.format('Clear search'),\n      excludeFromTabOrder: true,\n      preventFocusOnPress: true,\n      isDisabled: isDisabled || isReadOnly,\n      onPress: onClearButtonClick,\n      onPressStart\n    },\n    descriptionProps,\n    errorMessageProps,\n    ...validation\n  };\n}\n"],"names":[],"version":3,"file":"useSearchField.mjs.map"}

package/dist/private/select/useSelect.cjs

@@ -7,6 +7,7 @@ var $d0df89f3abe2c2ca$exports = require("../interactions/useFocusVisible.cjs");
 var $74751389dd0da9fc$exports = require("../i18n/useCollator.cjs");
 var $e3486d9c44549186$exports = require("../label/useField.cjs");
 var $7ac82d1fee77eb8a$exports = require("../utils/useId.cjs");
+var $6d2f10bb8b359da5$exports = require("../interactions/useKeyboard.cjs");
 var $5b639fe010c6782f$exports = require("../menu/useMenuTrigger.cjs");
 var $a6299e8d95fc8908$exports = require("../selection/useTypeSelect.cjs");
 var $iVReG$react = require("react");
@@ -40,6 +41,7 @@ $parcel$export(module.exports, "useSelect", function () { return $60b1d3323c1be9
 
 
 
+
 const $60b1d3323c1be9a0$export$703601b7e90536f8 = new WeakMap();
 function $60b1d3323c1be9a0$export$e64b2f635402ca43(props, state, ref) {
     let { keyboardDelegate: keyboardDelegate, isDisabled: isDisabled, isRequired: isRequired, name: name, form: form, validationBehavior: validationBehavior = 'aria' } = props;
@@ -60,27 +62,23 @@ function $60b1d3323c1be9a0$export$e64b2f635402ca43(props, state, ref) {
         isDisabled: isDisabled,
         type: 'listbox'
     }, state, ref);
-    let onKeyDown = (e)=>{
-        if (state.selectionManager.selectionMode === 'multiple') return;
-        switch(e.key){
-            case 'ArrowLeft':
-                {
-                    // prevent scrolling containers
-                    e.preventDefault();
-                    let key = state.selectedKey != null ? delegate.getKeyAbove?.(state.selectedKey) : delegate.getFirstKey?.();
-                    if (key != null) state.setSelectedKey(key);
-                    break;
-                }
-            case 'ArrowRight':
-                {
-                    // prevent scrolling containers
-                    e.preventDefault();
-                    let key = state.selectedKey != null ? delegate.getKeyBelow?.(state.selectedKey) : delegate.getFirstKey?.();
-                    if (key != null) state.setSelectedKey(key);
-                    break;
-                }
-        }
-    };
+    let { keyboardProps: keyboardProps } = (0, $6d2f10bb8b359da5$exports.useKeyboard)({
+        shortcuts: {
+            ArrowLeft: ()=>{
+                if (state.selectionManager.selectionMode === 'multiple') return false;
+                let key = state.selectedKey != null ? delegate.getKeyAbove?.(state.selectedKey) : delegate.getFirstKey?.();
+                if (key != null) state.setSelectedKey(key);
+            },
+            ArrowRight: ()=>{
+                if (state.selectionManager.selectionMode === 'multiple') return false;
+                let key = state.selectedKey != null ? delegate.getKeyBelow?.(state.selectedKey) : delegate.getFirstKey?.();
+                if (key != null) state.setSelectedKey(key);
+            }
+        },
+        allowRepeats: true,
+        onKeyDown: props.onKeyDown,
+        onKeyUp: props.onKeyUp
+    });
     let { typeSelectProps: typeSelectProps } = (0, $a6299e8d95fc8908$exports.useTypeSelect)({
         keyboardDelegate: delegate,
         selectionManager: state.selectionManager,
@@ -122,8 +120,8 @@ function $60b1d3323c1be9a0$export$e64b2f635402ca43(props, state, ref) {
         triggerProps: (0, $89b39774f3b79dbb$exports.mergeProps)(domProps, {
             ...triggerProps,
             isDisabled: isDisabled,
-            onKeyDown: (0, $2f95486cfdaa743c$exports.chain)(triggerProps.onKeyDown, onKeyDown, props.onKeyDown),
-            onKeyUp: props.onKeyUp,
+            onKeyDown: (0, $2f95486cfdaa743c$exports.chain)(triggerProps.onKeyDown, keyboardProps.onKeyDown),
+            onKeyUp: keyboardProps.onKeyUp,
             'aria-labelledby': [
                 valueId,
                 triggerProps['aria-labelledby'],