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

# Conflicts:
#	packages/@react-spectrum/inlinealert/package.json
#	packages/@react-types/inlinealert/package.json

Author: devongovett

packages/@react-spectrum/inlinealert/chromatic/InlineAlert.chromatic.tsx

@@ -12,10 +12,9 @@
 
 import {Content} from '@react-spectrum/view';
 import {Heading} from '@react-spectrum/text';
-import {InlineAlert} from '../';
+import {InlineAlert, SpectrumInlineAlertProps} from '../';
 import {Meta} from '@storybook/react';
 import React from 'react';
-import {SpectrumInlineAlertProps} from '@react-types/inlinealert';
 
 const meta: Meta<SpectrumInlineAlertProps> = {
   title: 'InlineAlert',

packages/@react-spectrum/inlinealert/package.json

@@ -40,7 +40,6 @@
     "@react-aria/utils": "^3.19.0",
     "@react-spectrum/layout": "^3.5.4",
     "@react-spectrum/utils": "^3.10.1",
-    "@react-types/inlinealert": "3.0.0-rc.1",
     "@react-types/shared": "^3.19.0",
     "@spectrum-icons/ui": "^3.5.4",
     "@swc/helpers": "^0.5.0"

packages/@react-spectrum/inlinealert/src/InlineAlert.tsx

@@ -12,19 +12,30 @@
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
 import {classNames, SlotProvider, useDOMRef, useStyleProps} from '@react-spectrum/utils';
-import {DOMRef} from '@react-types/shared';
+import {DOMProps, DOMRef, StyleProps} from '@react-types/shared';
 import {filterDOMProps} from '@react-aria/utils';
 import {Grid} from '@react-spectrum/layout';
 import InfoMedium from '@spectrum-icons/ui/InfoMedium';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
-import React from 'react';
-import {SpectrumInlineAlertProps} from '@react-types/inlinealert';
+import React, {ReactNode} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/inlinealert/vars.css';
 import SuccessMedium from '@spectrum-icons/ui/SuccessMedium';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useProviderProps} from '@react-spectrum/provider';
 
+export interface SpectrumInlineAlertProps extends DOMProps, StyleProps {
+  /**
+   * The [visual style](https://spectrum.adobe.com/page/in-line-alert/#Options) of the Inline Alert.
+   * @default 'neutral'
+   */
+  variant?: 'neutral' | 'info' | 'positive' | 'notice' | 'negative',
+  /**
+   * The contents of the Inline Alert.
+   */
+  children: ReactNode
+}
+
 let ICONS = {
   info: InfoMedium,
   positive: SuccessMedium,

packages/@react-spectrum/inlinealert/src/index.ts

@@ -13,3 +13,4 @@
 /// <reference types="css-module-types" />
 
 export {InlineAlert} from './InlineAlert';
+export type {SpectrumInlineAlertProps} from './InlineAlert';

packages/@react-spectrum/inlinealert/stories/InlineAlert.stories.tsx

@@ -13,10 +13,9 @@
 import {Button} from '@react-spectrum/button';
 import {Content} from '@react-spectrum/view';
 import {Heading} from '@react-spectrum/text';
-import {InlineAlert} from '../';
+import {InlineAlert, SpectrumInlineAlertProps} from '../';
 import {Meta} from '@storybook/react';
 import React, {useState} from 'react';
-import {SpectrumInlineAlertProps} from '@react-types/inlinealert';
 
 type StoryArgs = SpectrumInlineAlertProps & {title: string, content: string};