From ced7ad23fb663388637400ad86b496f6aed1abd2 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Wed, 28 Jan 2026 12:15:59 -0600
Subject: [PATCH 1/2] export all utilities

---
 packages/@react-spectrum/s2/src/index.ts | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/@react-spectrum/s2/src/index.ts b/packages/@react-spectrum/s2/src/index.ts
index 0865c16c0cb..7f48c6e0f25 100644
--- a/packages/@react-spectrum/s2/src/index.ts
+++ b/packages/@react-spectrum/s2/src/index.ts
@@ -91,6 +91,24 @@ 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} from '../style';
+
 export {Autocomplete, Collection, FileTrigger, parseColor, useLocale} from 'react-aria-components';
 export {useListData, useTreeData, useAsyncList} from 'react-stately';
 
@@ -168,3 +186,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';

From 418056f528701169d373b18e1d8db8e803602056 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Wed, 28 Jan 2026 13:54:11 -0600
Subject: [PATCH 2/2] export remaining utils

---
 packages/@react-spectrum/s2/src/index.ts   | 3 ++-
 packages/@react-spectrum/s2/style/index.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/index.ts b/packages/@react-spectrum/s2/src/index.ts
index 7f48c6e0f25..5469aef78de 100644
--- a/packages/@react-spectrum/s2/src/index.ts
+++ b/packages/@react-spectrum/s2/src/index.ts
@@ -107,7 +107,8 @@ export {
   heightProperties
 } from './style-utils';
 
-export {focusRing, iconStyle} from '../style';
+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';
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.