@react-aria/searchfield 3.6.0 → 3.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/searchfield",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -22,9 +22,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.9.0",
-    "@react-aria/textfield": "^3.13.0",
-    "@react-aria/utils": "^3.22.0",
+    "@react-aria/i18n": "^3.10.0",
+    "@react-aria/textfield": "^3.14.0",
+    "@react-aria/utils": "^3.23.0",
     "@react-stately/searchfield": "^3.5.0",
     "@react-types/button": "^3.9.1",
     "@react-types/searchfield": "^3.5.2",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9ce2f674eab2cc8912800d3162dcf00a1ce94274"
+  "gitHead": "86b38c87868ce7f262e0df905e5ac4eb2653791d"
 }

package/src/useSearchField.ts

@@ -45,7 +45,7 @@ export function useSearchField(
   state: SearchFieldState,
   inputRef: RefObject<HTMLInputElement>
 ): SearchFieldAria {
-  let stringFormatter = useLocalizedStringFormatter(intlMessages);
+  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/searchfield');
   let {
     isDisabled,
     isReadOnly,
@@ -57,7 +57,7 @@ export function useSearchField(
   let onKeyDown = (e) => {
     const key = e.key;
 
-    if (key === 'Enter' || key === 'Escape') {
+    if (key === 'Enter') {
       e.preventDefault();
     }
 
@@ -70,9 +70,13 @@ export function useSearchField(
     }
 
     if (key === 'Escape') {
-      state.setValue('');
-      if (onClear) {
-        onClear();
+      if (state.value === '') {
+        e.continuePropagation();
+      } else {
+        state.setValue('');
+        if (onClear) {
+          onClear();
+        }
       }
     }
   };
@@ -95,7 +99,7 @@ export function useSearchField(
     ...props,
     value: state.value,
     onChange: state.setValue,
-    onKeyDown: chain(onKeyDown, props.onKeyDown),
+    onKeyDown: !isReadOnly ? chain(onKeyDown, props.onKeyDown) : props.onKeyDown,
     type
   }, inputRef);