Skip to content

Commit 26a6026

Browse files
committed
Merge remote-tracking branch 'origin/main' into s2-docs-newest-testing-fixes
2 parents 7bd90fd + 692e782 commit 26a6026

File tree

21 files changed

+46
-21
lines changed

21 files changed

+46
-21
lines changed

packages/@react-spectrum/s2/src/Calendar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,14 +353,14 @@ export const CalendarGrid = (props: Omit<AriaCalendarGridProps, 'children'> & Pr
353353
isolation: 'isolate'
354354
})}
355355
offset={{months: props.months}}>
356-
<CalendarGridHeader>
356+
<CalendarGridHeader className="">
357357
{(day) => (
358358
<CalendarHeaderCell>
359359
{day}
360360
</CalendarHeaderCell>
361361
)}
362362
</CalendarGridHeader>
363-
<CalendarGridBody>
363+
<CalendarGridBody className="">
364364
{(date) => (
365365
<CalendarCell date={date} firstDayOfWeek={props.firstDayOfWeek} />
366366
)}

packages/@react-spectrum/s2/src/DateField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export function DateInputContainer(props: PropsWithChildren): ReactElement {
171171

172172
export function DateInput(props: Omit<DateInputProps, 'children'>): ReactElement {
173173
return (
174-
<AriaDateInput {...props}>
174+
<AriaDateInput className="" {...props}>
175175
{(segment) => (
176176
<AriaDateSegment
177177
segment={segment}

packages/@react-spectrum/s2/src/Popover.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export const PopoverBase = forwardRef(function PopoverBase(props: PopoverProps,
225225
{composeRenderProps(props.children, (children, renderProps) => (
226226
<>
227227
{!hideArrow && (
228-
<OverlayArrow>
228+
<OverlayArrow className="">
229229
<svg viewBox="0 0 18 10" className={arrow(renderProps)}>
230230
<path transform="translate(0 -1)" d="M1 1L7.93799 8.52588C8.07224 8.67448 8.23607 8.79362 8.41895 8.87524C8.60182 8.95687 8.79973 8.9993 9 9C9.19984 8.99882 9.39724 8.95606 9.57959 8.87427C9.76193 8.79248 9.9253 8.67336 10.0591 8.5249L17 1" />
231231
</svg>

packages/@react-spectrum/s2/src/Tabs.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ let CollapsingTabs = ({collection, containerRef, ...props}: {collection: Collect
681681
contents = (
682682
<RACTabs
683683
{...props}
684+
className=""
684685
style={{display: 'contents'}}>
685686
{props.children}
686687
</RACTabs>

packages/@react-spectrum/s2/src/TabsPicker.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ function Picker<T extends object>(props: PickerProps<T>, ref: FocusableRef<HTMLB
185185
<div>
186186
<AriaSelect
187187
{...pickerProps}
188+
className=""
188189
aria-labelledby={`${labelBehavior === 'hide' ? valueId : ''} ${ariaLabelledby}`}>
189190
{({isOpen}) => (
190191
<>

packages/@react-spectrum/s2/src/Tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export const Tooltip = forwardRef(function Tooltip(props: TooltipProps, ref: DOM
174174
className={renderProps => UNSAFE_className + tooltip({...renderProps, colorScheme})}>
175175
{renderProps => (
176176
<>
177-
<OverlayArrow>
177+
<OverlayArrow className="">
178178
<svg className={arrowStyles(renderProps)} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 5">
179179
<path d="M4.29289 4.29289L0 0H10L5.70711 4.29289C5.31658 4.68342 4.68342 4.68342 4.29289 4.29289Z" />
180180
</svg>

packages/dev/s2-docs/pages/react-aria/DatePicker.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const description = 'Combines a DateField and a Calendar popover to allow
3232
props={['label', 'granularity', 'isDisabled']}
3333
initialProps={{label: 'Date'}}
3434
type="tailwind"
35-
files={["starters/tailwind/src/DatePicker.tsx", "starters/tailwind/src/DateField.tsx", "starters/tailwind/src/index.css"]} />
35+
files={["starters/tailwind/src/DatePicker.tsx"]} />
3636
</ExampleSwitcher>
3737

3838
## Value

packages/dev/s2-docs/pages/react-aria/DateRangePicker.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const description = 'Combines two DateFields and a RangeCalendar popover
3232
props={['label', 'granularity', 'isDisabled']}
3333
initialProps={{label: 'Date range'}}
3434
type="tailwind"
35-
files={["starters/tailwind/src/DateRangePicker.tsx", "starters/tailwind/src/DateField.tsx", "starters/tailwind/src/index.css"]} />
35+
files={["starters/tailwind/src/DateRangePicker.tsx"]} />
3636
</ExampleSwitcher>
3737

3838
## Value

packages/dev/s2-docs/pages/react-aria/Modal.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const description = 'An overlay element which blocks interaction with ele
4848
}
4949
```
5050

51-
```tsx render docs={vanillaDocs.exports.Modal} links={vanillaDocs.links} props={['isDismissable', 'isKeyboardDismissDisabled']} type="tailwind" files={["starters/docs/src/Modal.tsx"]}
51+
```tsx render docs={vanillaDocs.exports.Modal} links={vanillaDocs.links} props={['isDismissable', 'isKeyboardDismissDisabled']} type="tailwind" files={["starters/tailwind/src/Modal.tsx"]}
5252
"use client";
5353
import {DialogTrigger, Heading} from 'react-aria-components';
5454
import {Modal} from 'tailwind-starter/Modal';

packages/dev/s2-docs/pages/react-aria/Popover.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const description = 'An overlay element positioned relative to a trigger.
4444
}
4545
```
4646

47-
```tsx render docs={vanillaDocs.exports.Popover} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']} type="tailwind" files={["starters/docs/src/Popover.tsx"]}
47+
```tsx render docs={vanillaDocs.exports.Popover} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']} type="tailwind" files={["starters/tailwind/src/Popover.tsx"]}
4848
"use client";
4949
import {DialogTrigger} from 'react-aria-components';
5050
import {Popover} from 'tailwind-starter/Popover';

0 commit comments

Comments
 (0)