Skip to content

Commit 64348e4

Browse files
snowystingersnowystinger
committed
Merge branch 'main' into shadow-dom-enhancement-1-getRootNode
# Conflicts: # packages/dev/test-utils/src/index.ts
2 parents cf3f567 + 19bc0b8 commit 64348e4

File tree

123 files changed

+3461
-1046
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3461
-1046
lines changed

‎.storybook-s2/docs/Illustrations.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function Illustrations() {
3636
size="XS"
3737
isQuiet
3838
aria-label="Copy"
39-
onPress={() => navigator.clipboard.writeText(`import ${name} from '@react-spectrum/s2/illustrations/${gradientStyle}/${icon}';`)}>
39+
onPress={() => navigator.clipboard.writeText(`import ${name} from '@react-spectrum/s2/illustrations/gradient/${gradientStyle}/${icon}';`)}>
4040
<Paste />
4141
</ActionButton>
4242
</span>

‎examples/s2-parcel-example/src/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function App() {
8787
})}
8888
>
8989
<Section title="Buttons">
90-
<ButtonGroup>
90+
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
9191
<Button variant="primary">Primary</Button>
9292
<Button variant="secondary">Secondary</Button>
9393
<ActionButton>

‎examples/s2-parcel-example/src/Lazy.js‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
ButtonGroup,
1414
Checkbox,
1515
CheckboxGroup,
16+
CloseButton,
1617
ColorArea,
1718
ColorField,
1819
ColorSlider,
@@ -23,6 +24,7 @@ import {
2324
ComboBoxItem,
2425
Content,
2526
ContextualHelp,
27+
CustomDialog,
2628
Dialog,
2729
DialogContainer,
2830
DialogTrigger,
@@ -44,6 +46,7 @@ import {
4446
NumberField,
4547
Picker,
4648
PickerItem,
49+
Popover,
4750
ProgressBar,
4851
ProgressCircle,
4952
Radio,
@@ -67,6 +70,7 @@ import {
6770
Tooltip,
6871
TooltipTrigger,
6972
} from "@react-spectrum/s2";
73+
import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark';
7074
import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud";
7175
import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload";
7276
import Edit from "@react-spectrum/s2/icons/Edit";
@@ -247,15 +251,27 @@ export default function Lazy() {
247251
</Dialog>
248252
</DialogTrigger>
249253

250-
<DialogTrigger type="popover">
254+
<DialogTrigger>
255+
<ActionButton>Illustration</ActionButton>
256+
<CustomDialog size="M">
257+
<div className={style({display: 'flex', flexDirection: 'column', rowGap: 8, alignItems: 'center'})}>
258+
<Checkmark />
259+
<Heading slot="title" styles={style({font: 'heading-lg', textAlign: 'center', marginY: 0})}>Thank you!</Heading>
260+
<p className={style({font: 'body', textAlign: 'center', marginY: 0})}>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
261+
<CloseButton styles={style({position: 'absolute', top: 12, insetEnd: 12})} />
262+
</div>
263+
</CustomDialog>
264+
</DialogTrigger>
265+
266+
<DialogTrigger>
251267
<ActionButton>Disk Status</ActionButton>
252-
<Dialog>
253-
<Heading>C://</Heading>
268+
<Popover>
269+
<Heading styles={style({font: 'heading', marginTop: 0, marginBottom: 20})}>C://</Heading>
254270

255-
<Content>
271+
<Content styles={style({font: 'ui'})}>
256272
<Text>50% disk space remaining.</Text>
257273
</Content>
258-
</Dialog>
274+
</Popover>
259275
</DialogTrigger>
260276

261277
<TooltipTrigger>

‎examples/s2-parcel-example/src/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1" />
56
<title>Spectrum 2 + Parcel</title>
67
</head>
78
<body>

‎examples/s2-vite-project/src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function App() {
8787
})}
8888
>
8989
<Section title="Buttons">
90-
<ButtonGroup>
90+
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
9191
<Button variant="primary">Primary</Button>
9292
<Button variant="secondary">Secondary</Button>
9393
<ActionButton>

‎examples/s2-vite-project/src/Lazy.tsx‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
ButtonGroup,
1414
Checkbox,
1515
CheckboxGroup,
16+
CloseButton,
1617
ColorArea,
1718
ColorField,
1819
ColorSlider,
@@ -23,6 +24,7 @@ import {
2324
ComboBoxItem,
2425
Content,
2526
ContextualHelp,
27+
CustomDialog,
2628
Dialog,
2729
DialogContainer,
2830
DialogTrigger,
@@ -44,6 +46,7 @@ import {
4446
NumberField,
4547
Picker,
4648
PickerItem,
49+
Popover,
4750
ProgressBar,
4851
ProgressCircle,
4952
Radio,
@@ -67,6 +70,7 @@ import {
6770
Tooltip,
6871
TooltipTrigger,
6972
} from "@react-spectrum/s2";
73+
import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark';
7074
import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud";
7175
import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload";
7276
import Edit from "@react-spectrum/s2/icons/Edit";
@@ -247,15 +251,27 @@ export default function Lazy() {
247251
</Dialog>
248252
</DialogTrigger>
249253

250-
<DialogTrigger type="popover">
254+
<DialogTrigger>
255+
<ActionButton>Illustration</ActionButton>
256+
<CustomDialog size="M">
257+
<div className={style({display: 'flex', flexDirection: 'column', rowGap: 8, alignItems: 'center'})}>
258+
<Checkmark />
259+
<Heading slot="title" styles={style({font: 'heading-lg', textAlign: 'center', marginY: 0})}>Thank you!</Heading>
260+
<p className={style({font: 'body', textAlign: 'center', marginY: 0})}>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
261+
<CloseButton styles={style({position: 'absolute', top: 12, insetEnd: 12})} />
262+
</div>
263+
</CustomDialog>
264+
</DialogTrigger>
265+
266+
<DialogTrigger>
251267
<ActionButton>Disk Status</ActionButton>
252-
<Dialog>
253-
<Heading>C://</Heading>
268+
<Popover>
269+
<Heading styles={style({font: 'heading', marginTop: 0, marginBottom: 20})}>C://</Heading>
254270

255-
<Content>
271+
<Content styles={style({font: 'ui'})}>
256272
<Text>50% disk space remaining.</Text>
257273
</Content>
258-
</Dialog>
274+
</Popover>
259275
</DialogTrigger>
260276

261277
<TooltipTrigger>

‎examples/s2-webpack-5-example/src/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function App() {
8787
})}
8888
>
8989
<Section title="Buttons">
90-
<ButtonGroup>
90+
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
9191
<Button variant="primary">Primary</Button>
9292
<Button variant="secondary">Secondary</Button>
9393
<ActionButton>

‎examples/s2-webpack-5-example/src/Lazy.js‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
ButtonGroup,
1414
Checkbox,
1515
CheckboxGroup,
16+
CloseButton,
1617
ColorArea,
1718
ColorField,
1819
ColorSlider,
@@ -23,6 +24,7 @@ import {
2324
ComboBoxItem,
2425
Content,
2526
ContextualHelp,
27+
CustomDialog,
2628
Dialog,
2729
DialogContainer,
2830
DialogTrigger,
@@ -44,6 +46,7 @@ import {
4446
NumberField,
4547
Picker,
4648
PickerItem,
49+
Popover,
4750
ProgressBar,
4851
ProgressCircle,
4952
Radio,
@@ -67,6 +70,7 @@ import {
6770
Tooltip,
6871
TooltipTrigger,
6972
} from "@react-spectrum/s2";
73+
import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark';
7074
import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud";
7175
import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload";
7276
import Edit from "@react-spectrum/s2/icons/Edit";
@@ -247,15 +251,27 @@ export default function Lazy() {
247251
</Dialog>
248252
</DialogTrigger>
249253

250-
<DialogTrigger type="popover">
254+
<DialogTrigger>
255+
<ActionButton>Illustration</ActionButton>
256+
<CustomDialog size="M">
257+
<div className={style({display: 'flex', flexDirection: 'column', rowGap: 8, alignItems: 'center'})}>
258+
<Checkmark />
259+
<Heading slot="title" styles={style({font: 'heading-lg', textAlign: 'center', marginY: 0})}>Thank you!</Heading>
260+
<p className={style({font: 'body', textAlign: 'center', marginY: 0})}>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
261+
<CloseButton styles={style({position: 'absolute', top: 12, insetEnd: 12})} />
262+
</div>
263+
</CustomDialog>
264+
</DialogTrigger>
265+
266+
<DialogTrigger>
251267
<ActionButton>Disk Status</ActionButton>
252-
<Dialog>
253-
<Heading>C://</Heading>
268+
<Popover>
269+
<Heading styles={style({font: 'heading', marginTop: 0, marginBottom: 20})}>C://</Heading>
254270

255-
<Content>
271+
<Content styles={style({font: 'ui'})}>
256272
<Text>50% disk space remaining.</Text>
257273
</Content>
258-
</Dialog>
274+
</Popover>
259275
</DialogTrigger>
260276

261277
<TooltipTrigger>

‎packages/@adobe/react-spectrum/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adobe/react-spectrum",
3-
"version": "3.38.0",
3+
"version": "3.38.1",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -42,7 +42,7 @@
4242
"@react-aria/ssr": "^3.9.7",
4343
"@react-aria/utils": "^3.26.0",
4444
"@react-aria/visually-hidden": "^3.8.18",
45-
"@react-spectrum/accordion": "^3.0.0",
45+
"@react-spectrum/accordion": "^3.0.1",
4646
"@react-spectrum/actionbar": "^3.6.2",
4747
"@react-spectrum/actiongroup": "^3.10.10",
4848
"@react-spectrum/avatar": "^3.0.17",

‎packages/@react-aria/autocomplete/intl/ar-AE.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"collectionLabel": "مقترحات"
3+
}

0 commit comments

Comments
 (0)