@react-aria/datepicker 3.2.0 → 3.3.0

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@react-aria/datepicker",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
   "module": "dist/module.js",
+  "exports": {
+    "types": "./dist/types.d.ts",
+    "import": "./dist/import.mjs",
+    "require": "./dist/main.js"
+  },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
   "files": [
@@ -17,22 +22,22 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@babel/runtime": "^7.6.2",
-    "@internationalized/date": "^3.0.1",
-    "@internationalized/number": "^3.1.1",
-    "@internationalized/string": "^3.0.0",
-    "@react-aria/focus": "^3.10.0",
-    "@react-aria/i18n": "^3.6.2",
-    "@react-aria/interactions": "^3.13.0",
-    "@react-aria/label": "^3.4.3",
-    "@react-aria/spinbutton": "^3.2.0",
-    "@react-aria/utils": "^3.14.1",
-    "@react-stately/datepicker": "^3.2.0",
-    "@react-types/button": "^3.7.0",
-    "@react-types/calendar": "^3.0.4",
-    "@react-types/datepicker": "^3.1.3",
-    "@react-types/dialog": "^3.4.5",
-    "@react-types/shared": "^3.16.0"
+    "@internationalized/date": "^3.1.0",
+    "@internationalized/number": "^3.2.0",
+    "@internationalized/string": "^3.1.0",
+    "@react-aria/focus": "^3.11.0",
+    "@react-aria/i18n": "^3.7.0",
+    "@react-aria/interactions": "^3.14.0",
+    "@react-aria/label": "^3.5.0",
+    "@react-aria/spinbutton": "^3.3.0",
+    "@react-aria/utils": "^3.15.0",
+    "@react-stately/datepicker": "^3.3.0",
+    "@react-types/button": "^3.7.1",
+    "@react-types/calendar": "^3.1.0",
+    "@react-types/datepicker": "^3.2.0",
+    "@react-types/dialog": "^3.5.0",
+    "@react-types/shared": "^3.17.0",
+    "@swc/helpers": "^0.4.14"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0",
@@ -41,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2954307ddbefe149241685440c81f80ece6b2c83"
+  "gitHead": "a0efee84aa178cb1a202951dfd6d8de02b292307"
 }

package/src/useDatePicker.ts

@@ -53,6 +53,7 @@ export interface DatePickerAria {
 export function useDatePicker<T extends DateValue>(props: AriaDatePickerProps<T>, state: DatePickerState, ref: RefObject<Element>): DatePickerAria {
   let buttonId = useId();
   let dialogId = useId();
+  let fieldId = useId();
   let stringFormatter = useLocalizedStringFormatter(intlMessages);
 
   let {labelProps, fieldProps, descriptionProps, errorMessageProps} = useField({
@@ -113,6 +114,7 @@ export function useDatePicker<T extends DateValue>(props: AriaDatePickerProps<T>
     },
     fieldProps: {
       ...fieldProps,
+      id: fieldId,
       [roleSymbol]: 'presentation',
       'aria-describedby': ariaDescribedBy,
       value: state.value,

package/src/useDateSegment.ts

@@ -13,7 +13,7 @@
 import {CalendarDate, toCalendar} from '@internationalized/date';
 import {DateFieldState, DateSegment} from '@react-stately/datepicker';
 import {DOMAttributes} from '@react-types/shared';
-import {getScrollParent, isIOS, isMac, mergeProps, scrollIntoView, useEvent, useId, useLabels, useLayoutEffect} from '@react-aria/utils';
+import {getScrollParent, isIOS, isMac, mergeProps, scrollIntoViewport, useEvent, useId, useLabels, useLayoutEffect} from '@react-aria/utils';
 import {hookData} from './useDateField';
 import {NumberParser} from '@internationalized/number';
 import React, {RefObject, useMemo, useRef} from 'react';
@@ -258,7 +258,7 @@ export function useDateSegment(segment: DateSegment, state: DateFieldState, ref:
 
   let onFocus = () => {
     enteredKeys.current = '';
-    scrollIntoView(getScrollParent(ref.current) as HTMLElement, ref.current);
+    scrollIntoViewport(ref.current, {containingElement: getScrollParent(ref.current)});
 
     // Collapse selection to start or Chrome won't fire input events.
     let selection = window.getSelection();