diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx index 27c8cb292ac..6498e155add 100644 --- a/packages/@react-spectrum/s2/src/TableView.tsx +++ b/packages/@react-spectrum/s2/src/TableView.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {baseColor, colorMix, focusRing, fontRelative, lightDark, space, style} from '../style' with {type: 'macro'}; +import {baseColor, colorMix, focusRing, fontRelative, lightDark, space, style, StyleString} from '../style' with {type: 'macro'}; import { Button, CellRenderProps, @@ -1008,7 +1008,8 @@ export interface CellProps extends RACCellProps, Pick cell({ + className={renderProps => mergeStyles(cell({ ...renderProps, ...tableVisualOptions, isDivider: showDivider - })} + }), props.styles)} textValue={textValue} {...otherProps}> {({isFocusVisible}) => ( diff --git a/packages/@react-spectrum/s2/stories/TableView.stories.tsx b/packages/@react-spectrum/s2/stories/TableView.stories.tsx index c08479b0263..4a896bd7fb3 100644 --- a/packages/@react-spectrum/s2/stories/TableView.stories.tsx +++ b/packages/@react-spectrum/s2/stories/TableView.stories.tsx @@ -129,6 +129,52 @@ export const DisabledRows: StoryObj = { } }; +export const WrappingCells: StoryObj = { + render: (args: any) => ( + + + Name + Type + Date Modified + Size + B + + + + Games + File folder + 6/7/2020 + 74 GB + Long long long long long long long cell + + + Program Files + File folder + 4/7/2021 + 1.2 GB + Long long long long long long long cell + + + bootmgr + System file + 11/20/2010 + 0.2 GB + Long long long long long long long cell + + + + ), + args: { + ...Example.args, + overflowMode: 'wrap' + }, + parameters: { + docs: { + disable: true + } + } +}; + let columns = [ {name: 'Foo', id: 'foo', isRowHeader: true}, {name: 'Bar', id: 'bar'},