Skip to content

Commit 7ff84d5

Browse files
snowystingersnowystinger
authored
Merge branch 'main' into tree-data-move-before-and-after
2 parents 2383104 + 104d441 commit 7ff84d5

File tree

520 files changed

+14827
-9889
lines changed

Some content is hidden

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

520 files changed

+14827
-9889
lines changed

‎.storybook-s2/docs/Release Notes.mdx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ export default MDXLayout;
44

55
# Release Notes
66

7+
## v0.8.0
8+
9+
### New Components
10+
11+
* [NotificationBadge](?path=/docs/actionbutton--docs#notification-badges)
12+
* [Toast](?path=/docs/toast--docs) (alpha)
13+
14+
### Updates
15+
16+
* Pass DOM Props to ButtonGroup
17+
* Prevent Dividers from growing or shrinking in a flex container by default
18+
* Export Autocomplete
19+
* Export SortDescriptor type
20+
21+
### Disclosure Design updates
22+
Spectrum has updated the S disclosure design. As a result, all other sizes (M, L, XL) now map to one size smaller than before. See [PR](https://github.com/adobe/react-spectrum/pull/8006) for details.
23+
724
## v0.7.0
825

926
### New Components

‎.storybook-s2/preview.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { addons } from '@storybook/preview-api';
66
import { DocsContainer } from '@storybook/addon-docs';
77
import React, { useEffect, useState } from 'react';
88
import {withProviderSwitcher} from './custom-addons/provider';
9+
import {Controls, Description, Primary, Stories, Subtitle, Title} from '@storybook/blocks';
910
import './global.css';
1011

1112
const channel = addons.getChannel();
@@ -42,7 +43,17 @@ const preview = {
4243
}
4344
return code;
4445
}
45-
}
46+
},
47+
page: () => (
48+
<>
49+
<Title />
50+
<Subtitle />
51+
<Description />
52+
<Primary />
53+
<Controls />
54+
<Stories includePrimary={false} />
55+
</>
56+
)
4657
},
4758
darkMode: {
4859
light: {

‎examples/remix/app/root.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function App() {
2828
<Links />
2929
</head>
3030
<body>
31-
<Provider
31+
<Provider
3232
theme={defaultTheme}
3333
locale="en"
3434
router={{
@@ -38,6 +38,12 @@ export default function App() {
3838
<Outlet />
3939
</Provider>
4040
<ScrollRestoration />
41+
{/* https://remix.run/docs/en/main/guides/envvars */}
42+
<script
43+
dangerouslySetInnerHTML={{
44+
__html: `window.process = {}; window.process.env = {};`,
45+
}}
46+
/>
4147
<Scripts />
4248
<LiveReload />
4349
</body>

‎examples/remix/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"react-dom": "^18.2.0"
2020
},
2121
"devDependencies": {
22+
"@react-aria/optimize-locales-plugin": "^1.1.4",
2223
"@remix-run/dev": "^2.3.1",
2324
"@remix-run/eslint-config": "^2.3.1",
2425
"@types/react": "^18",

‎examples/remix/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { unstable_vitePlugin as remix } from "@remix-run/dev";
1+
import { vitePlugin as remix } from "@remix-run/dev";
22
import { defineConfig } from "vite";
33
import tsconfigPaths from "vite-tsconfig-paths";
44
import optimizeLocales from '@react-aria/optimize-locales-plugin';

‎examples/rsp-cra-18/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"react-aria-components": "latest",
2525
"react-dom": "^18.1.0",
2626
"react-scripts": "5.0.1",
27-
"typescript": "5.0.4",
27+
"typescript": "5.8.2",
2828
"web-vitals": "^2.1.4"
2929
},
3030
"scripts": {

‎lib/jestResolver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = (request, options) => {
3232
let files = glob.sync(request, {cwd: options.basedir});
3333
let source = '';
3434
for (let file of files) {
35-
source += `exports['${path.basename(file, '.json')}'] = require('${path.join(options.basedir, file)}');\n`;
35+
source += `exports['${path.basename(file, '.json')}'] = require('${path.join(options.basedir, file).replace(/\\/g, '\\\\')}');\n`;
3636
}
3737
let hash = crypto.createHash('md5');
3838
hash.update(source);
@@ -51,7 +51,7 @@ module.exports = (request, options) => {
5151
return pkg;
5252
}
5353
});
54-
if (/packages\/.*\/.*\/intl\/.*\.json$/.test(resolved)) {
54+
if (/packages[\/\\].*[\/\\].*[\/\\]intl[\/\\].*\.json$/.test(resolved)) {
5555
let sourceText = fs.readFileSync(resolved, 'utf8');
5656
let json = JSON.parse(sourceText);
5757
let res = compileStrings(json);

‎lib/viewTransitions.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
*/
1212

1313
interface Document {
14-
startViewTransition(fn: () => void): ViewTransition;
14+
startViewTransition(update: (() => void) | {update: () => void, types: string[]}): ViewTransition;
1515
}
1616

1717
interface ViewTransition {
1818
ready: Promise<void>;
19+
finished: Promise<void>;
1920
}

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"test:ssr": "cross-env STRICT_MODE=1 yarn jest --config jest.ssr.config.js",
3737
"ci-test": "cross-env STRICT_MODE=1 yarn jest --maxWorkers=2 && cross-env STRICT_MODE=1 yarn test:ssr --runInBand",
3838
"lint": "concurrently \"yarn check-types\" \"eslint packages\" \"node scripts/lint-packages.js\" \"yarn constraints\"",
39-
"jest": "node scripts/jest.js",
39+
"jest": "jest",
4040
"copyrights": "babel-node --presets @babel/env ./scripts/addHeaders.js",
4141
"build:icons": "babel-node --presets @babel/env ./scripts/buildIcons.js",
4242
"clean:icons": "babel-node --presets @babel/env ./scripts/cleanIcons.js",
@@ -87,19 +87,19 @@
8787
"@faker-js/faker": "^8.4.1",
8888
"@jdb8/eslint-plugin-monorepo": "^1.0.1",
8989
"@octokit/rest": "*",
90-
"@parcel/bundler-library": "^2.12.1",
91-
"@parcel/config-default": "^2.13.1",
92-
"@parcel/config-storybook": "^0.0.2",
93-
"@parcel/core": "^2.13.1",
94-
"@parcel/optimizer-data-url": "^2.13.1",
95-
"@parcel/optimizer-terser": "^2.13.1",
96-
"@parcel/packager-ts": "^2.13.1",
97-
"@parcel/reporter-cli": "^2.13.1",
98-
"@parcel/resolver-glob": "^2.13.1",
99-
"@parcel/transformer-inline": "^2.13.1",
100-
"@parcel/transformer-inline-string": "^2.13.1",
101-
"@parcel/transformer-svg-react": "^2.13.1",
102-
"@parcel/transformer-typescript-types": "^2.13.1",
90+
"@parcel/bundler-library": "^2.14.0",
91+
"@parcel/config-default": "^2.14.0",
92+
"@parcel/config-storybook": "0.0.2",
93+
"@parcel/core": "^2.14.0",
94+
"@parcel/optimizer-data-url": "^2.14.0",
95+
"@parcel/optimizer-terser": "^2.14.0",
96+
"@parcel/packager-ts": "^2.14.0",
97+
"@parcel/reporter-cli": "^2.14.0",
98+
"@parcel/resolver-glob": "^2.14.0",
99+
"@parcel/transformer-inline": "^2.14.0",
100+
"@parcel/transformer-inline-string": "^2.14.0",
101+
"@parcel/transformer-svg-react": "^2.14.0",
102+
"@parcel/transformer-typescript-types": "^2.14.0",
103103
"@react-spectrum/s2-icon-builder": "^0.2.0",
104104
"@spectrum-css/component-builder": "1.0.1",
105105
"@spectrum-css/vars": "^2.3.0",
@@ -125,7 +125,7 @@
125125
"@tailwindcss/postcss": "^4.0.0",
126126
"@testing-library/dom": "^10.1.0",
127127
"@testing-library/jest-dom": "^5.16.5",
128-
"@testing-library/react": "^15.0.7",
128+
"@testing-library/react": "^16.0.0",
129129
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.1#~/.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch",
130130
"@types/react": "npm:[email protected]",
131131
"@types/react-dom": "npm:[email protected]",
@@ -161,7 +161,6 @@
161161
"fast-glob": "^3.1.0",
162162
"framer-motion": "^11.3.0-alpha.0",
163163
"fs-extra": "^10.0.0",
164-
"full-icu": "^1.3.0",
165164
"glob": "^8.0.3",
166165
"glob-promise": "^6.0.5",
167166
"globals": "^15.11.0",
@@ -179,7 +178,7 @@
179178
"npm-cli-login": "^1.0.0",
180179
"nyc": "^10.2.0",
181180
"p-queue": "^6.2.1",
182-
"parcel": "^2.13.1",
181+
"parcel": "^2.14.0",
183182
"parcel-optimizer-strict-mode": "workspace:^",
184183
"patch-package": "^6.2.0",
185184
"playwright": "^1.45.3",
@@ -247,7 +246,8 @@
247246
"packages/@react-spectrum/style-macro-s1/**",
248247
"packages/@react-spectrum/tree/**",
249248
"packages/@react-spectrum/color/src/*.tsx",
250-
"packages/@react-spectrum/s2/**",
249+
"packages/@react-spectrum/s2/**/*.{js,ts,tsx}",
250+
"packages/@react-spectrum/s2/stories/**",
251251
".storybook-s2/**"
252252
]
253253
},

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

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adobe/react-spectrum",
3-
"version": "3.40.1",
3+
"version": "3.41.0",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -37,69 +37,69 @@
3737
"url": "https://github.com/adobe/react-spectrum"
3838
},
3939
"dependencies": {
40-
"@internationalized/string": "^3.2.5",
41-
"@react-aria/collections": "3.0.0-beta.1",
42-
"@react-aria/i18n": "^3.12.7",
43-
"@react-aria/ssr": "^3.9.7",
44-
"@react-aria/utils": "^3.28.1",
45-
"@react-aria/visually-hidden": "^3.8.21",
46-
"@react-spectrum/accordion": "^3.0.4",
47-
"@react-spectrum/actionbar": "^3.6.5",
48-
"@react-spectrum/actiongroup": "^3.10.13",
49-
"@react-spectrum/avatar": "^3.0.20",
50-
"@react-spectrum/badge": "^3.1.21",
51-
"@react-spectrum/breadcrumbs": "^3.9.15",
52-
"@react-spectrum/button": "^3.16.12",
53-
"@react-spectrum/buttongroup": "^3.6.20",
54-
"@react-spectrum/calendar": "^3.6.2",
55-
"@react-spectrum/checkbox": "^3.9.14",
56-
"@react-spectrum/color": "^3.0.5",
57-
"@react-spectrum/combobox": "^3.15.1",
58-
"@react-spectrum/contextualhelp": "^3.6.19",
59-
"@react-spectrum/datepicker": "^3.13.1",
60-
"@react-spectrum/dialog": "^3.8.19",
61-
"@react-spectrum/divider": "^3.5.21",
62-
"@react-spectrum/dnd": "^3.5.3",
63-
"@react-spectrum/dropzone": "^3.0.9",
64-
"@react-spectrum/filetrigger": "^3.0.9",
65-
"@react-spectrum/form": "^3.7.13",
66-
"@react-spectrum/icon": "^3.8.3",
67-
"@react-spectrum/illustratedmessage": "^3.5.8",
68-
"@react-spectrum/image": "^3.5.9",
69-
"@react-spectrum/inlinealert": "^3.2.13",
70-
"@react-spectrum/labeledvalue": "^3.2.1",
71-
"@react-spectrum/layout": "^3.6.13",
72-
"@react-spectrum/link": "^3.6.15",
73-
"@react-spectrum/list": "^3.9.3",
74-
"@react-spectrum/listbox": "^3.14.3",
75-
"@react-spectrum/menu": "^3.21.3",
76-
"@react-spectrum/meter": "^3.5.8",
77-
"@react-spectrum/numberfield": "^3.9.11",
78-
"@react-spectrum/overlays": "^5.7.3",
79-
"@react-spectrum/picker": "^3.15.7",
80-
"@react-spectrum/progress": "^3.7.14",
81-
"@react-spectrum/provider": "^3.10.3",
82-
"@react-spectrum/radio": "^3.7.14",
83-
"@react-spectrum/searchfield": "^3.8.14",
84-
"@react-spectrum/slider": "^3.7.3",
85-
"@react-spectrum/statuslight": "^3.5.20",
86-
"@react-spectrum/switch": "^3.5.13",
87-
"@react-spectrum/table": "^3.16.1",
88-
"@react-spectrum/tabs": "^3.8.18",
89-
"@react-spectrum/tag": "^3.2.14",
90-
"@react-spectrum/text": "^3.5.13",
91-
"@react-spectrum/textfield": "^3.13.1",
92-
"@react-spectrum/theme-dark": "^3.5.16",
93-
"@react-spectrum/theme-default": "^3.5.16",
94-
"@react-spectrum/theme-light": "^3.4.16",
95-
"@react-spectrum/toast": "^3.0.1",
96-
"@react-spectrum/tooltip": "^3.7.3",
97-
"@react-spectrum/tree": "^3.0.1",
98-
"@react-spectrum/view": "^3.6.17",
99-
"@react-spectrum/well": "^3.4.21",
100-
"@react-stately/collections": "^3.12.2",
101-
"@react-stately/data": "^3.12.2",
102-
"@react-types/shared": "^3.28.0",
40+
"@internationalized/string": "^3.2.6",
41+
"@react-aria/collections": "3.0.0-rc.0",
42+
"@react-aria/i18n": "^3.12.8",
43+
"@react-aria/ssr": "^3.9.8",
44+
"@react-aria/utils": "^3.28.2",
45+
"@react-aria/visually-hidden": "^3.8.22",
46+
"@react-spectrum/accordion": "^3.0.5",
47+
"@react-spectrum/actionbar": "^3.6.6",
48+
"@react-spectrum/actiongroup": "^3.10.14",
49+
"@react-spectrum/avatar": "^3.0.21",
50+
"@react-spectrum/badge": "^3.1.22",
51+
"@react-spectrum/breadcrumbs": "^3.9.16",
52+
"@react-spectrum/button": "^3.16.13",
53+
"@react-spectrum/buttongroup": "^3.6.21",
54+
"@react-spectrum/calendar": "^3.7.0",
55+
"@react-spectrum/checkbox": "^3.9.15",
56+
"@react-spectrum/color": "^3.0.6",
57+
"@react-spectrum/combobox": "^3.15.2",
58+
"@react-spectrum/contextualhelp": "^3.6.20",
59+
"@react-spectrum/datepicker": "^3.14.0",
60+
"@react-spectrum/dialog": "^3.8.20",
61+
"@react-spectrum/divider": "^3.5.22",
62+
"@react-spectrum/dnd": "^3.5.4",
63+
"@react-spectrum/dropzone": "^3.0.10",
64+
"@react-spectrum/filetrigger": "^3.0.10",
65+
"@react-spectrum/form": "^3.7.14",
66+
"@react-spectrum/icon": "^3.8.4",
67+
"@react-spectrum/illustratedmessage": "^3.5.9",
68+
"@react-spectrum/image": "^3.5.10",
69+
"@react-spectrum/inlinealert": "^3.2.14",
70+
"@react-spectrum/labeledvalue": "^3.2.2",
71+
"@react-spectrum/layout": "^3.6.14",
72+
"@react-spectrum/link": "^3.6.16",
73+
"@react-spectrum/list": "^3.10.0",
74+
"@react-spectrum/listbox": "^3.15.0",
75+
"@react-spectrum/menu": "^3.22.0",
76+
"@react-spectrum/meter": "^3.5.9",
77+
"@react-spectrum/numberfield": "^3.9.12",
78+
"@react-spectrum/overlays": "^5.7.4",
79+
"@react-spectrum/picker": "^3.15.8",
80+
"@react-spectrum/progress": "^3.7.15",
81+
"@react-spectrum/provider": "^3.10.4",
82+
"@react-spectrum/radio": "^3.7.15",
83+
"@react-spectrum/searchfield": "^3.8.15",
84+
"@react-spectrum/slider": "^3.7.4",
85+
"@react-spectrum/statuslight": "^3.5.21",
86+
"@react-spectrum/switch": "^3.6.0",
87+
"@react-spectrum/table": "^3.17.0",
88+
"@react-spectrum/tabs": "^3.8.19",
89+
"@react-spectrum/tag": "^3.2.15",
90+
"@react-spectrum/text": "^3.5.14",
91+
"@react-spectrum/textfield": "^3.13.2",
92+
"@react-spectrum/theme-dark": "^3.5.17",
93+
"@react-spectrum/theme-default": "^3.5.17",
94+
"@react-spectrum/theme-light": "^3.4.17",
95+
"@react-spectrum/toast": "^3.0.2",
96+
"@react-spectrum/tooltip": "^3.7.4",
97+
"@react-spectrum/tree": "^3.1.0",
98+
"@react-spectrum/view": "^3.6.18",
99+
"@react-spectrum/well": "^3.4.22",
100+
"@react-stately/collections": "^3.12.3",
101+
"@react-stately/data": "^3.12.3",
102+
"@react-types/shared": "^3.29.0",
103103
"client-only": "^0.0.1"
104104
},
105105
"publishConfig": {

0 commit comments

Comments
 (0)