@react-aria/datepicker 3.0.0-nightly.1847 → 3.0.0-nightly.1853

package/dist/main.js

@@ -2,8 +2,8 @@ var $IwcIq$reactariafocus = require("@react-aria/focus");
 var $IwcIq$reactariautils = require("@react-aria/utils");
 var $IwcIq$react = require("react");
 var $IwcIq$reactarialabel = require("@react-aria/label");
-var $IwcIq$reactariai18n = require("@react-aria/i18n");
 var $IwcIq$reactariainteractions = require("@react-aria/interactions");
+var $IwcIq$reactariai18n = require("@react-aria/i18n");
 var $IwcIq$internationalizeddate = require("@internationalized/date");
 var $IwcIq$internationalizednumber = require("@internationalized/number");
 var $IwcIq$reactariaspinbutton = require("@react-aria/spinbutton");
@@ -973,9 +973,13 @@ function $4acc2f407c169e55$export$5591b0b878c1a989(props, state, ref) {
         labelElementType: 'span'
     });
     let { focusWithinProps: focusWithinProps  } = $IwcIq$reactariainteractions.useFocusWithin({
-        onBlurWithin () {
+        ...props,
+        onBlurWithin: (e)=>{
             state.confirmPlaceholder();
-        }
+            if (props.onBlur) props.onBlur(e);
+        },
+        onFocusWithin: props.onFocus,
+        onFocusWithinChange: props.onFocusChange
     });
     let stringFormatter = $IwcIq$reactariai18n.useLocalizedStringFormatter((/*@__PURE__*/$parcel$interopDefault($c7d0e80b992ca68a$exports)));
     let message = state.maxGranularity === 'hour' ? 'selectedTimeDescription' : 'selectedDateDescription';
@@ -1043,18 +1047,6 @@ function $4acc2f407c169e55$export$5591b0b878c1a989(props, state, ref) {
             },
             onKeyUp (e) {
                 if (props.onKeyUp) props.onKeyUp(e);
-            },
-            onFocus (e) {
-                if (state.isFocused) return;
-                if (props.onFocus) props.onFocus(e);
-                if (props.onFocusChange) props.onFocusChange(true);
-                state.setFocused(true);
-            },
-            onBlur (e) {
-                if (e.currentTarget.contains(e.relatedTarget)) return;
-                if (props.onBlur) props.onBlur(e);
-                if (props.onFocusChange) props.onFocusChange(false);
-                state.setFocused(false);
             }
         }),
         descriptionProps: descriptionProps,
@@ -1069,6 +1061,7 @@ function $4acc2f407c169e55$export$4c842f6a241dc825(props, state, ref) {
 
 
 
+
 function $e90ae7c26a69c6b1$export$42df105a73306d51(props, state, ref) {
     let buttonId = $IwcIq$reactariautils.useId();
     let dialogId = $IwcIq$reactariautils.useId();
@@ -1096,8 +1089,15 @@ function $e90ae7c26a69c6b1$export$42df105a73306d51(props, state, ref) {
     , [
         ref
     ]);
+    let { focusWithinProps: focusWithinProps  } = $IwcIq$reactariainteractions.useFocusWithin({
+        ...props,
+        isDisabled: state.isOpen,
+        onBlurWithin: props.onBlur,
+        onFocusWithin: props.onFocus,
+        onFocusWithinChange: props.onFocusChange
+    });
     return {
-        groupProps: $IwcIq$reactariautils.mergeProps(domProps, groupProps, fieldProps, descProps, {
+        groupProps: $IwcIq$reactariautils.mergeProps(domProps, groupProps, fieldProps, descProps, focusWithinProps, {
             role: 'group',
             'aria-disabled': props.isDisabled || null,
             'aria-labelledby': labelledBy,
@@ -1109,20 +1109,6 @@ function $e90ae7c26a69c6b1$export$42df105a73306d51(props, state, ref) {
             onKeyUp (e) {
                 if (state.isOpen) return;
                 if (props.onKeyUp) props.onKeyUp(e);
-            },
-            onFocus (e) {
-                if (state.isFocused) return;
-                if (state.isOpen) return;
-                if (props.onFocus) props.onFocus(e);
-                if (props.onFocusChange) props.onFocusChange(true);
-                state.setFocused(true);
-            },
-            onBlur (e) {
-                if (state.isOpen) return;
-                if (e.currentTarget.contains(e.relatedTarget)) return;
-                if (props.onBlur) props.onBlur(e);
-                if (props.onFocusChange) props.onFocusChange(false);
-                state.setFocused(false);
             }
         }),
         labelProps: {
@@ -1563,6 +1549,7 @@ function $5c015c6316d1904d$var$commonPrefixLength(strings) {
 
 
 
+
 function $20f695b1b69e6b9e$export$12fd5f0e9f4bb192(props, state, ref) {
     var ref1, ref2;
     let stringFormatter = $IwcIq$reactariai18n.useLocalizedStringFormatter((/*@__PURE__*/$parcel$interopDefault($c7d0e80b992ca68a$exports)));
@@ -1619,8 +1606,15 @@ function $20f695b1b69e6b9e$export$12fd5f0e9f4bb192(props, state, ref) {
         validationState: state.validationState
     };
     let domProps = $IwcIq$reactariautils.filterDOMProps(props);
+    let { focusWithinProps: focusWithinProps  } = $IwcIq$reactariainteractions.useFocusWithin({
+        ...props,
+        isDisabled: state.isOpen,
+        onBlurWithin: props.onBlur,
+        onFocusWithin: props.onFocus,
+        onFocusWithinChange: props.onFocusChange
+    });
     return {
-        groupProps: $IwcIq$reactariautils.mergeProps(domProps, groupProps, fieldProps, descProps, {
+        groupProps: $IwcIq$reactariautils.mergeProps(domProps, groupProps, fieldProps, descProps, focusWithinProps, {
             role: 'group',
             'aria-disabled': props.isDisabled || null,
             'aria-describedby': ariaDescribedBy,
@@ -1631,20 +1625,6 @@ function $20f695b1b69e6b9e$export$12fd5f0e9f4bb192(props, state, ref) {
             onKeyUp (e) {
                 if (state.isOpen) return;
                 if (props.onKeyUp) props.onKeyUp(e);
-            },
-            onFocus (e) {
-                if (state.isFocused) return;
-                if (state.isOpen) return;
-                if (props.onFocus) props.onFocus(e);
-                if (props.onFocusChange) props.onFocusChange(true);
-                state.setFocused(true);
-            },
-            onBlur (e) {
-                if (state.isOpen) return;
-                if (e.currentTarget.contains(e.relatedTarget)) return;
-                if (props.onBlur) props.onBlur(e);
-                if (props.onFocusChange) props.onFocusChange(false);
-                state.setFocused(false);
             }
         }),
         labelProps: {