diff --git a/packages/@react-spectrum/s2/src/index.ts b/packages/@react-spectrum/s2/src/index.ts index 0865c16c0cb..5469aef78de 100644 --- a/packages/@react-spectrum/s2/src/index.ts +++ b/packages/@react-spectrum/s2/src/index.ts @@ -91,6 +91,25 @@ export {TreeView, TreeViewItem, TreeViewItemContent, TreeViewLoadMoreItem} from export {pressScale} from './pressScale'; +export { + getAllowedOverrides, + field, + fieldLabel, + fieldInput, + control, + controlFont, + controlSize, + controlBorderRadius, + centerPadding, + colorScheme, + staticColor, + widthProperties, + heightProperties +} from './style-utils'; + +export {focusRing, iconStyle, linearGradient, edgeToText, raw, keyframes} from '../style'; +export {mergeStyles} from '../style/runtime'; + export {Autocomplete, Collection, FileTrigger, parseColor, useLocale} from 'react-aria-components'; export {useListData, useTreeData, useAsyncList} from 'react-stately'; @@ -168,3 +187,12 @@ export type {TooltipProps} from './Tooltip'; export type {TreeViewProps, TreeViewItemProps, TreeViewItemContentProps, TreeViewLoadMoreItemProps} from './TreeView'; export type {AutocompleteProps, FileTriggerProps, TooltipTriggerComponentProps as TooltipTriggerProps, SortDescriptor, Color, Key, Selection, RouterConfig} from 'react-aria-components'; export type {ListData, TreeData, AsyncListData} from 'react-stately'; + +export type { + StylesProp, + StylesPropWithHeight, + StylesPropWithoutWidth, + UnsafeClassName, + UnsafeStyles, + StyleProps +} from './style-utils'; diff --git a/packages/@react-spectrum/s2/style/index.ts b/packages/@react-spectrum/s2/style/index.ts index 7a847469bd7..2cefa419782 100644 --- a/packages/@react-spectrum/s2/style/index.ts +++ b/packages/@react-spectrum/s2/style/index.ts @@ -15,7 +15,8 @@ import {Inset, fontRelative as internalFontRelative, space as internalSpace, Spa import type {MacroContext} from '@parcel/macros'; import {StyleString} from './types'; -export {baseColor, color, lightDark, colorMix, size, style} from './spectrum-theme'; +export {baseColor, color, lightDark, colorMix, size, style, linearGradient, edgeToText} from './spectrum-theme'; +export {raw, keyframes} from './style-macro'; export type {StyleString} from './types'; // Wrap these functions in arbitrary value syntax when called from the outside.