@react-aria/numberfield 3.2.1 → 3.3.0

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"mappings":";;;;AAqCA;IACE,mCAAmC;IACnC,UAAU,EAAE,oBAAoB,gBAAgB,CAAC,CAAC;IAClD,wEAAwE;IACxE,UAAU,EAAE,eAAe,WAAW,CAAC,CAAC;IACxC,mCAAmC;IACnC,UAAU,EAAE,oBAAoB,gBAAgB,CAAC,CAAC;IAClD,mFAAmF;IACnF,oBAAoB,EAAE,eAAe,CAAC;IACtC,mFAAmF;IACnF,oBAAoB,EAAE,eAAe,CAAC;IACtC,gEAAgE;IAChE,gBAAgB,EAAE,eAAe,WAAW,CAAC,CAAC;IAC9C,kEAAkE;IAClE,iBAAiB,EAAE,eAAe,WAAW,CAAC,CAAA;CAC/C;AAED;;;GAGG;AACH,+BAA+B,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,gBAAgB,CAAC,GAAG,eAAe,CA8O3I","sources":["packages/@react-aria/numberfield/src/packages/@react-aria/numberfield/src/useNumberField.ts","packages/@react-aria/numberfield/src/packages/@react-aria/numberfield/src/index.ts","packages/@react-aria/numberfield/src/index.ts"],"sourcesContent":[null,null,"/*\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\nexport * from './useNumberField';\n"],"names":[],"version":3,"file":"types.d.ts.map"}
+{"mappings":";;;;;AAoCA;IACE,mCAAmC;IACnC,UAAU,EAAE,oBAAoB,gBAAgB,CAAC,CAAC;IAClD,wEAAwE;IACxE,UAAU,EAAE,aAAa,CAAC;IAC1B,mCAAmC;IACnC,UAAU,EAAE,oBAAoB,gBAAgB,CAAC,CAAC;IAClD,mFAAmF;IACnF,oBAAoB,EAAE,eAAe,CAAC;IACtC,mFAAmF;IACnF,oBAAoB,EAAE,eAAe,CAAC;IACtC,gEAAgE;IAChE,gBAAgB,EAAE,aAAa,CAAC;IAChC,kEAAkE;IAClE,iBAAiB,EAAE,aAAa,CAAA;CACjC;AAED;;;GAGG;AACH,+BAA+B,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,gBAAgB,CAAC,GAAG,eAAe,CA8O3I;AC3RD,YAAY,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC","sources":["packages/@react-aria/numberfield/src/packages/@react-aria/numberfield/src/useNumberField.ts","packages/@react-aria/numberfield/src/packages/@react-aria/numberfield/src/index.ts","packages/@react-aria/numberfield/src/index.ts"],"sourcesContent":[null,null,"/*\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 */\nexport {useNumberField} from './useNumberField';\nexport type {AriaNumberFieldProps} from '@react-types/numberfield';\nexport type {NumberFieldAria} from './useNumberField';\n"],"names":[],"version":3,"file":"types.d.ts.map"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/numberfield",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -18,17 +18,17 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.6.2",
-    "@react-aria/i18n": "^3.4.1",
-    "@react-aria/interactions": "^3.9.1",
-    "@react-aria/live-announcer": "^3.1.0",
-    "@react-aria/spinbutton": "^3.1.1",
-    "@react-aria/textfield": "^3.6.1",
-    "@react-aria/utils": "^3.13.1",
-    "@react-stately/numberfield": "^3.1.1",
-    "@react-types/button": "^3.5.1",
-    "@react-types/numberfield": "^3.3.1",
-    "@react-types/shared": "^3.13.1",
-    "@react-types/textfield": "^3.5.1"
+    "@react-aria/i18n": "^3.5.0",
+    "@react-aria/interactions": "^3.10.0",
+    "@react-aria/live-announcer": "^3.1.1",
+    "@react-aria/spinbutton": "^3.1.2",
+    "@react-aria/textfield": "^3.7.0",
+    "@react-aria/utils": "^3.13.2",
+    "@react-stately/numberfield": "^3.2.0",
+    "@react-types/button": "^3.6.0",
+    "@react-types/numberfield": "^3.3.2",
+    "@react-types/shared": "^3.14.0",
+    "@react-types/textfield": "^3.5.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "715c3f563ccf8c2e0102d3e18403d9db21a05a71"
+  "gitHead": "cd7c0ec917122c7612f653c22f8ed558f8b66ecd"
 }

package/src/index.ts

@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-
-export * from './useNumberField';
+export {useNumberField} from './useNumberField';
+export type {AriaNumberFieldProps} from '@react-types/numberfield';
+export type {NumberFieldAria} from './useNumberField';

package/src/useNumberField.ts

@@ -12,9 +12,9 @@
 
 import {AriaButtonProps} from '@react-types/button';
 import {AriaNumberFieldProps} from '@react-types/numberfield';
+import {DOMAttributes, TextInputDOMProps} from '@react-types/shared';
 import {filterDOMProps, isAndroid, isIOS, isIPhone, mergeProps, useId} from '@react-aria/utils';
 import {
-  HTMLAttributes,
   InputHTMLAttributes,
   LabelHTMLAttributes,
   RefObject,
@@ -25,21 +25,20 @@ import {
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {NumberFieldState} from '@react-stately/numberfield';
-import {TextInputDOMProps} from '@react-types/shared';
 import {useFocus, useFocusWithin} from '@react-aria/interactions';
 import {useFormattedTextField} from '@react-aria/textfield';
 import {
-  useMessageFormatter,
+  useLocalizedStringFormatter,
   useNumberFormatter
 } from '@react-aria/i18n';
 import {useScrollWheel} from '@react-aria/interactions';
 import {useSpinButton} from '@react-aria/spinbutton';
 
-interface NumberFieldAria {
+export interface NumberFieldAria {
   /** Props for the label element. */
   labelProps: LabelHTMLAttributes<HTMLLabelElement>,
   /** Props for the group wrapper around the input and stepper buttons. */
-  groupProps: HTMLAttributes<HTMLElement>,
+  groupProps: DOMAttributes,
   /** Props for the input element. */
   inputProps: InputHTMLAttributes<HTMLInputElement>,
   /** Props for the increment button, to be passed to [useButton](useButton.html). */
@@ -47,9 +46,9 @@ interface NumberFieldAria {
   /** Props for the decrement button, to be passed to [useButton](useButton.html). */
   decrementButtonProps: AriaButtonProps,
   /** Props for the number field's description element, if any. */
-  descriptionProps: HTMLAttributes<HTMLElement>,
+  descriptionProps: DOMAttributes,
   /** Props for the number field's error message element, if any. */
-  errorMessageProps: HTMLAttributes<HTMLElement>
+  errorMessageProps: DOMAttributes
 }
 
 /**
@@ -70,7 +69,7 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt
     validationState,
     label,
     formatOptions,
-    onBlur,
+    onBlur = () => {},
     onFocus,
     onFocusChange,
     onKeyDown,
@@ -89,7 +88,7 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt
     commit
   } = state;
 
-  const formatMessage = useMessageFormatter(intlMessages);
+  const stringFormatter = useLocalizedStringFormatter(intlMessages);
 
   let inputId = useId(id);
 
@@ -204,13 +203,13 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt
 
   let inputProps = mergeProps(
     spinButtonProps,
-    textFieldProps,
     focusProps,
+    textFieldProps,
     {
       // override the spinbutton role, we can't focus a spin button with VO
       role: null,
       // ignore aria-roledescription on iOS so that required state will announce when it is present
-      'aria-roledescription': (!isIOS() ? formatMessage('numberField') : null),
+      'aria-roledescription': (!isIOS() ? stringFormatter.format('numberField') : null),
       'aria-valuemax': null,
       'aria-valuemin': null,
       'aria-valuenow': null,
@@ -257,7 +256,7 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt
   let decrementId = useId();
 
   let incrementButtonProps: AriaButtonProps = mergeProps(incButtonProps, {
-    'aria-label': incrementAriaLabel || formatMessage('increase', {fieldLabel}).trim(),
+    'aria-label': incrementAriaLabel || stringFormatter.format('increase', {fieldLabel}).trim(),
     id: ariaLabelledby && !incrementAriaLabel ? incrementId : null,
     'aria-labelledby': ariaLabelledby && !incrementAriaLabel ? `${incrementId} ${ariaLabelledby}` : null,
     'aria-controls': inputId,
@@ -269,7 +268,7 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt
   });
 
   let decrementButtonProps: AriaButtonProps = mergeProps(decButtonProps, {
-    'aria-label': decrementAriaLabel || formatMessage('decrease', {fieldLabel}).trim(),
+    'aria-label': decrementAriaLabel || stringFormatter.format('decrease', {fieldLabel}).trim(),
     id: ariaLabelledby && !decrementAriaLabel ? decrementId : null,
     'aria-labelledby': ariaLabelledby && !decrementAriaLabel ? `${decrementId} ${ariaLabelledby}` : null,
     'aria-controls': inputId,