Merge branch 'main' of github.com:adobe/react-spectrum

Author: devongovett

packages/@react-spectrum/datepicker/src/Input.tsx

@@ -105,6 +105,7 @@ function Input(props, ref) {
       'is-invalid': isInvalid,
       'is-focused': isFocused
     },
+    classNames(datepickerStyles, 'react-spectrum-DateField-Input'),
     reservePadding && classNames(datepickerStyles, 'react-spectrum-Datepicker-input'),
     inputClassName
   );

packages/@react-spectrum/datepicker/src/styles.css

@@ -37,6 +37,10 @@
   width: auto;
 }
 
+.react-spectrum-Datepicker-field .react-spectrum-DateField-Input {
+  line-height: var(--spectrum-body-4-text-line-height);
+}
+
 /* specificity war with .spectrum-Field--positionSide etc. */
 .react-spectrum-DateField.react-spectrum-DateField.react-spectrum-DateField.react-spectrum-DateField {
   min-width: var(--spectrum-global-dimension-size-2000);