Skip to content

[pull] main from adobe:main #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Sep 5, 2025
Merged

[pull] main from adobe:main #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/s2-esbuild-starter-app/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@

import "@react-spectrum/s2/page.css";
import { style } from "@react-spectrum/s2/style" with { type: "macro" };
import { Button } from "@react-spectrum/s2";
import { Button, Provider } from "@react-spectrum/s2";

function App() {
return (
<main>
<Provider elementType="main">
<Button
styles={style({
marginStart: 16,
})}
>
Hello Spectrum 2!
</Button>
</main>
</Provider>
);
}

Expand Down
9 changes: 6 additions & 3 deletions examples/s2-next-macros/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
NotificationBadge,
Picker,
PickerItem,
Provider,
Row,
SubmenuTrigger,
TableBody,
Expand Down Expand Up @@ -72,7 +73,7 @@ function App() {
{id: 'waterfall', label: 'Waterfall'}
];
return (
<main>
<Provider elementType="main">
<Heading
styles={style({ font: "heading-xl", textAlign: "center" })}
level={1}
Expand All @@ -98,10 +99,11 @@ function App() {
<Section title="Buttons">
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
<Button variant="primary">Primary</Button>
<Button variant="secondary"><Text>Secondary</Text><NotificationBadge value={2} /></Button>
<Button variant="secondary"><Text>Secondary</Text></Button>
<ActionButton>
<Edit />
<Text>Action Button</Text>
<NotificationBadge value={2} />
</ActionButton>
<ToggleButton>Toggle Button</ToggleButton>
<LinkButton
Expand Down Expand Up @@ -185,6 +187,7 @@ function App() {
<TableView
aria-label="Files"
styles={style({width: 320, height: 320})}
selectionMode="multiple"
renderActionBar={selectedKeys => (
<ActionBar>
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
Expand Down Expand Up @@ -268,7 +271,7 @@ function App() {
<Lazy />
</React.Suspense>}
</div>
</main>
</Provider>
);
}

Expand Down
9 changes: 6 additions & 3 deletions examples/s2-parcel-example/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
NotificationBadge,
Picker,
PickerItem,
Provider,
Row,
SubmenuTrigger,
TableBody,
Expand Down Expand Up @@ -70,7 +71,7 @@ function App() {
{id: 'waterfall', label: 'Waterfall'}
];
return (
<main>
<Provider elementType="main">
<Heading
styles={style({ font: "heading-xl", textAlign: "center" })}
level={1}
Expand All @@ -96,10 +97,11 @@ function App() {
<Section title="Buttons">
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
<Button variant="primary">Primary</Button>
<Button variant="secondary"><Text>Secondary</Text><NotificationBadge value={2} /></Button>
<Button variant="secondary"><Text>Secondary</Text></Button>
<ActionButton>
<Edit />
<Text>Action Button</Text>
<NotificationBadge value={2} />
</ActionButton>
<ToggleButton>Toggle Button</ToggleButton>
<LinkButton
Expand Down Expand Up @@ -183,6 +185,7 @@ function App() {
<TableView
aria-label="Files"
styles={style({width: 320, height: 320})}
selectionMode="multiple"
renderActionBar={selectedKeys => (
<ActionBar>
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
Expand Down Expand Up @@ -266,7 +269,7 @@ function App() {
<Lazy />
</React.Suspense>}
</div>
</main>
</Provider>
);
}

Expand Down
9 changes: 6 additions & 3 deletions examples/s2-vite-project/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
NotificationBadge,
Picker,
PickerItem,
Provider,
Row,
SubmenuTrigger,
TableBody,
Expand Down Expand Up @@ -70,7 +71,7 @@ function App() {
{id: 'waterfall', label: 'Waterfall'}
];
return (
<main>
<Provider elementType="main">
<Heading
styles={style({ font: "heading-xl", textAlign: "center" })}
level={1}
Expand All @@ -96,10 +97,11 @@ function App() {
<Section title="Buttons">
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
<Button variant="primary">Primary</Button>
<Button variant="secondary"><Text>Secondary</Text><NotificationBadge value={2} /></Button>
<Button variant="secondary"><Text>Secondary</Text></Button>
<ActionButton>
<Edit />
<Text>Action Button</Text>
<NotificationBadge value={2} />
</ActionButton>
<ToggleButton>Toggle Button</ToggleButton>
<LinkButton
Expand Down Expand Up @@ -183,6 +185,7 @@ function App() {
<TableView
aria-label="Files"
styles={style({width: 320, height: 320})}
selectionMode="multiple"
renderActionBar={selectedKeys => (
<ActionBar>
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
Expand Down Expand Up @@ -266,7 +269,7 @@ function App() {
<Lazy />
</React.Suspense>}
</div>
</main>
</Provider>
);
}

Expand Down
9 changes: 6 additions & 3 deletions examples/s2-webpack-5-example/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
NotificationBadge,
Picker,
PickerItem,
Provider,
Row,
SubmenuTrigger,
TableBody,
Expand Down Expand Up @@ -70,7 +71,7 @@ function App() {
{id: 'waterfall', label: 'Waterfall'}
];
return (
<main>
<Provider elementType="main">
<Heading
styles={style({ font: "heading-xl", textAlign: "center" })}
level={1}
Expand All @@ -96,10 +97,11 @@ function App() {
<Section title="Buttons">
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
<Button variant="primary">Primary</Button>
<Button variant="secondary"><Text>Secondary</Text><NotificationBadge value={2} /></Button>
<Button variant="secondary"><Text>Secondary</Text></Button>
<ActionButton>
<Edit />
<Text>Action Button</Text>
<NotificationBadge value={2} />
</ActionButton>
<ToggleButton>Toggle Button</ToggleButton>
<LinkButton
Expand Down Expand Up @@ -183,6 +185,7 @@ function App() {
<TableView
aria-label="Files"
styles={style({width: 320, height: 320})}
selectionMode="multiple"
renderActionBar={selectedKeys => (
<ActionBar>
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
Expand Down Expand Up @@ -266,7 +269,7 @@ function App() {
<Lazy />
</React.Suspense>}
</div>
</main>
</Provider>
);
}

Expand Down
22 changes: 18 additions & 4 deletions examples/s2-webpack-5-typescript-example/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import "@react-spectrum/s2/page.css";
import {
ActionBar,
ActionButton,
ActionButtonGroup,
ActionMenu,
Expand All @@ -25,8 +26,10 @@ import {
Menu,
MenuItem,
MenuTrigger,
NotificationBadge,
Picker,
PickerItem,
Provider,
Row,
SubmenuTrigger,
TableBody,
Expand Down Expand Up @@ -69,7 +72,7 @@ function App() {
{id: 'waterfall', label: 'Waterfall'}
];
return (
<main>
<Provider elementType="main">
<Heading
styles={style({ font: "heading-xl", textAlign: "center" })}
level={1}
Expand All @@ -95,10 +98,11 @@ function App() {
<Section title="Buttons">
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
<Button variant="primary">Primary</Button>
<Button variant="secondary">Secondary</Button>
<Button variant="secondary"><Text>Secondary</Text></Button>
<ActionButton>
<Edit />
<Text>Action Button</Text>
<NotificationBadge value={2} />
</ActionButton>
<ToggleButton>Toggle Button</ToggleButton>
<LinkButton
Expand Down Expand Up @@ -179,7 +183,17 @@ function App() {
<MenuItem>Paste</MenuItem>
</Menu>
</MenuTrigger>
<TableView aria-label="Files" styles={style({width: 320, height: 320})}>
<TableView
aria-label="Files"
styles={style({width: 320, height: 320})}
selectionMode="multiple"
renderActionBar={selectedKeys => (
<ActionBar>
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
<ActionButton onPress={() => console.log('copy', selectedKeys)}>Copy</ActionButton>
<ActionButton onPress={() => console.log('delete', selectedKeys)}>Delete</ActionButton>
</ActionBar>
)}>
<TableHeader>
<Column isRowHeader>Name</Column>
<Column>Type</Column>
Expand Down Expand Up @@ -256,7 +270,7 @@ function App() {
<Lazy />
</React.Suspense>}
</div>
</main>
</Provider>
);
}

Expand Down
Loading