Skip to content

Commit 692e782

Browse files
authored
docs: Fixes from testing (#9236)
* Fix alignment of contextual help * Fix border-radius of first/last items * Fix press outline on toast close button * Fix toast contrast * Fix tailwind code examples
1 parent 531b32d commit 692e782

File tree

12 files changed

+34
-12
lines changed

12 files changed

+34
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const relatedPages = [{'title': 'useDatePicker', 'url': 'https://react-sp
3131
props={['label', 'granularity', 'isDisabled']}
3232
initialProps={{label: 'Date'}}
3333
type="tailwind"
34-
files={["starters/tailwind/src/DatePicker.tsx", "starters/tailwind/src/DateField.tsx", "starters/tailwind/src/index.css"]} />
34+
files={["starters/tailwind/src/DatePicker.tsx"]} />
3535
</ExampleSwitcher>
3636

3737
## Value

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const relatedPages = [{'title': 'useDateRangePicker', 'url': 'https://rea
3131
props={['label', 'granularity', 'isDisabled']}
3232
initialProps={{label: 'Date range'}}
3333
type="tailwind"
34-
files={["starters/tailwind/src/DateRangePicker.tsx", "starters/tailwind/src/DateField.tsx", "starters/tailwind/src/index.css"]} />
34+
files={["starters/tailwind/src/DateRangePicker.tsx"]} />
3535
</ExampleSwitcher>
3636

3737
## Value

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const relatedPages = [{'title': 'useModalOverlay', 'url': 'https://react-
4747
}
4848
```
4949

50-
```tsx render docs={vanillaDocs.exports.Modal} links={vanillaDocs.links} props={['isDismissable', 'isKeyboardDismissDisabled']} type="tailwind" files={["starters/docs/src/Modal.tsx"]}
50+
```tsx render docs={vanillaDocs.exports.Modal} links={vanillaDocs.links} props={['isDismissable', 'isKeyboardDismissDisabled']} type="tailwind" files={["starters/tailwind/src/Modal.tsx"]}
5151
"use client";
5252
import {DialogTrigger, Heading} from 'react-aria-components';
5353
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
@@ -43,7 +43,7 @@ export const relatedPages = [{'title': 'usePopover', 'url': 'https://react-spect
4343
}
4444
```
4545

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const relatedPages = [{'title': 'useToolbar', 'url': 'https://react-spect
5656
</Toolbar>
5757
```
5858

59-
```tsx render docs={docs.exports.Toolbar} links={docs.links} props={['orientation']} initialProps={{'aria-label': 'Text formatting'}} type="tailwind" files={["starters/docs/src/Toolbar.tsx"]}
59+
```tsx render docs={docs.exports.Toolbar} links={docs.links} props={['orientation']} initialProps={{'aria-label': 'Text formatting'}} type="tailwind" files={["starters/tailwind/src/Toolbar.tsx"]}
6060
"use client";
6161
import {Toolbar} from 'tailwind-starter/Toolbar';
6262
import {ToggleButtonGroup} from 'tailwind-starter/ToggleButtonGroup';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const relatedPages = [{'title': 'useTooltipTrigger', 'url': 'https://reac
3838
}
3939
```
4040

41-
```tsx render docs={vanillaDocs.exports.Tooltip} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']} type="tailwind" files={["starters/docs/src/Tooltip.tsx"]}
41+
```tsx render docs={vanillaDocs.exports.Tooltip} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']} type="tailwind" files={["starters/tailwind/src/Tooltip.tsx"]}
4242
"use client";
4343
import {TooltipTrigger} from 'react-aria-components';
4444
import {Tooltip} from 'tailwind-starter/Tooltip';

packages/dev/s2-docs/src/VisualExampleClient.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import {ActionButton, Avatar, Collection, ComboBox, ComboBoxItem, Content, ContextualHelp, Footer, Header, Heading, NotificationBadge, NumberField, Picker, PickerItem, PickerSection, RangeSlider, Slider, Switch, Text, TextField, ToggleButton, ToggleButtonGroup} from '@react-spectrum/s2';
44
import AddCircle from '@react-spectrum/s2/icons/AddCircle';
55
import {baseColor, focusRing, style, StyleString} from '@react-spectrum/s2/style' with { type: 'macro' };
6+
import {CenterBaseline} from '../../../@react-spectrum/s2/src/CenterBaseline';
67
import {CodePlatter, Pre, ShareUrlProvider} from './CodePlatter';
78
import {ExampleOutput} from './ExampleOutput';
89
import {ExampleSwitcherContext} from './ExampleSwitcher';
@@ -549,7 +550,15 @@ function Wrapper({control, children, styles, ref}: {control: PropControl, childr
549550
{control.name}
550551
<span className={style({whiteSpace: 'nowrap'})}>
551552
&nbsp;
552-
{control.description ? <div style={{display: 'inline-flex'}}><PropContextualHelp control={control} /></div> : null}
553+
{control.description ? (
554+
<CenterBaseline
555+
styles={style({
556+
display: 'inline-flex',
557+
height: 0
558+
})}>
559+
<PropContextualHelp control={control} />
560+
</CenterBaseline>
561+
) : null}
553562
</span>
554563
</span>
555564
{children}

starters/docs/src/Table.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
transition-duration: 200ms;
5656
-webkit-tap-highlight-color: transparent;
5757

58+
&tr:last-child {
59+
border-radius: 0 0 var(--radius) var(--radius);
60+
}
61+
5862
&[data-focus-visible] {
5963
outline: 2px solid var(--focus-ring-color);
6064
outline-offset: -2px;
@@ -144,6 +148,14 @@
144148
height: 100%;
145149
}
146150

151+
&:is(.react-aria-Row > :first-child) {
152+
border-end-start-radius: var(--radius);
153+
}
154+
155+
&:is(.react-aria-Row > :last-child) {
156+
border-end-end-radius: var(--radius);
157+
}
158+
147159
&[data-focus-visible] {
148160
outline: 2px solid var(--focus-ring-color);
149161
outline-offset: -2px;

starters/docs/src/Toast.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
display: flex;
2121
align-items: center;
2222
gap: var(--spacing-4);
23-
background: var(--tint-1000);
23+
background: var(--highlight-background);
2424
padding: var(--spacing-3) var(--spacing-4);
2525
border-radius: var(--radius-lg);
2626
outline: none;
@@ -75,6 +75,7 @@
7575

7676
&[data-pressed] {
7777
background: var(--highlight-pressed);
78+
box-shadow: none;
7879
}
7980
}
8081
}

starters/tailwind/src/GridList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function GridList<T extends object>(
2424

2525
const itemStyles = tv({
2626
extend: focusRing,
27-
base: 'relative flex gap-3 cursor-default select-none py-2 px-3 text-sm text-neutral-900 dark:text-neutral-200 border-y dark:border-y-neutral-700 border-transparent first:border-t-0 last:border-b-0 first:rounded-t-lg last:rounded-b-lg -mb-px last:mb-0 -outline-offset-2',
27+
base: 'relative flex gap-3 cursor-default select-none py-2 px-3 text-sm text-neutral-900 dark:text-neutral-200 border-t dark:border-t-neutral-700 border-transparent first:border-t-0 first:rounded-t-lg last:rounded-b-lg last:mb-0 -outline-offset-2',
2828
variants: {
2929
isSelected: {
3030
false: 'hover:bg-neutral-100 dark:hover:bg-neutral-700/60',

0 commit comments

Comments
 (0)