Skip to content

Commit 912e8b6

Browse files
snowystingersnowystinger
authored
Merge branch 'main' into node-22
2 parents 0a7375a + 5334df7 commit 912e8b6

File tree

153 files changed

+5618
-1503
lines changed

Some content is hidden

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

153 files changed

+5618
-1503
lines changed

‎.storybook-s2/manager.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import {addons} from '@storybook/manager-api';
2+
3+
addons.setConfig({
4+
enableShortcuts: false
5+
});

‎.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/dist/cjs/document/prepareDocument.js b/dist/cjs/document/prepareDocument.js
2+
index 39a24b8f2ccdc52739d130480ab18975073616cb..0c3f5199401c15b90230c25a02de364eeef3e297 100644
3+
--- a/dist/cjs/document/prepareDocument.js
4+
+++ b/dist/cjs/document/prepareDocument.js
5+
@@ -30,7 +30,7 @@ function prepareDocument(document) {
6+
const initialValue = UI.getInitialValue(el);
7+
if (initialValue !== undefined) {
8+
if (el.value !== initialValue) {
9+
- dispatchEvent.dispatchDOMEvent(el, 'change');
10+
+ el.dispatchEvent(new Event('change'));
11+
}
12+
UI.clearInitialValue(el);
13+
}
14+
diff --git a/dist/cjs/utils/focus/getActiveElement.js b/dist/cjs/utils/focus/getActiveElement.js
15+
index d25f3a8ef67e856e43614559f73012899c0b53d7..4ed9ee45565ed438ee9284d8d3043c0bd50463eb 100644
16+
--- a/dist/cjs/utils/focus/getActiveElement.js
17+
+++ b/dist/cjs/utils/focus/getActiveElement.js
18+
@@ -6,6 +6,8 @@ function getActiveElement(document) {
19+
const activeElement = document.activeElement;
20+
if (activeElement === null || activeElement === undefined ? undefined : activeElement.shadowRoot) {
21+
return getActiveElement(activeElement.shadowRoot);
22+
+ } else if (activeElement && activeElement.tagName === 'IFRAME') {
23+
+ return getActiveElement(activeElement.contentWindow.document);
24+
} else {
25+
// Browser does not yield disabled elements as document.activeElement - jsdom does
26+
if (isDisabled.isDisabled(activeElement)) {

‎examples/rac-tailwind/src/App.js

Lines changed: 184 additions & 62 deletions
Large diffs are not rendered by default.

‎examples/rsp-cra-18/src/AutocompleteExample.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {UNSTABLE_Autocomplete as Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
1+
import {Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
22
import {classNames} from '@react-spectrum/utils';
33
import styles from './autocomplete.css';
44

‎examples/rsp-cra-18/src/sections/CollectionExamples.tsx

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
import {ActionMenu, Flex, Divider, Item, ListBox, ListView, MenuTrigger, Menu, SubmenuTrigger, ActionButton, TableBody, TableView, Row, Cell, TableHeader, Column, TagGroup} from '@adobe/react-spectrum';
1+
import {
2+
ActionMenu,
3+
Flex,
4+
Divider,
5+
Item,
6+
ListBox,
7+
ListView,
8+
MenuTrigger,
9+
Menu,
10+
SubmenuTrigger,
11+
ActionButton,
12+
TableBody,
13+
TableView,
14+
Row,
15+
Cell,
16+
TableHeader,
17+
Column,
18+
TagGroup,
19+
Text,
20+
TreeView,
21+
TreeViewItem,
22+
TreeViewItemContent
23+
} from '@adobe/react-spectrum';
24+
25+
import FileTxt from '@spectrum-icons/workflow/FileTxt';
26+
import Folder from '@spectrum-icons/workflow/Folder';
227

328
export default function CollectionExamples(){
429
return (
@@ -92,6 +117,46 @@ export default function CollectionExamples(){
92117
<Item>Gaming</Item>
93118
<Item>Shopping</Item>
94119
</TagGroup>
120+
<div style={{width: '300px', height: '150px', overflow: 'auto'}}>
121+
<TreeView disabledKeys={['projects-1']} aria-label="test static tree">
122+
<TreeViewItem id="Photos" textValue="Photos">
123+
<TreeViewItemContent>
124+
<Text>Photos</Text>
125+
<Folder />
126+
</TreeViewItemContent>
127+
</TreeViewItem>
128+
<TreeViewItem id="projects" textValue="Projects">
129+
<TreeViewItemContent>
130+
<Text>Projects</Text>
131+
<Folder />
132+
</TreeViewItemContent>
133+
<TreeViewItem id="projects-1" textValue="Projects-1">
134+
<TreeViewItemContent>
135+
<Text>Projects-1</Text>
136+
<Folder />
137+
</TreeViewItemContent>
138+
<TreeViewItem id="projects-1A" textValue="Projects-1A">
139+
<TreeViewItemContent>
140+
<Text>Projects-1A</Text>
141+
<FileTxt />
142+
</TreeViewItemContent>
143+
</TreeViewItem>
144+
</TreeViewItem>
145+
<TreeViewItem id="projects-2" textValue="Projects-2">
146+
<TreeViewItemContent>
147+
<Text>Projects-2</Text>
148+
<FileTxt />
149+
</TreeViewItemContent>
150+
</TreeViewItem>
151+
<TreeViewItem id="projects-3" textValue="Projects-3">
152+
<TreeViewItemContent>
153+
<Text>Projects-3</Text>
154+
<FileTxt />
155+
</TreeViewItemContent>
156+
</TreeViewItem>
157+
</TreeViewItem>
158+
</TreeView>
159+
</div>
95160
</Flex>
96161
</>
97162
)

‎examples/rsp-next-ts-17/pages/index.tsx

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ import {
8181
Accordion,
8282
Disclosure,
8383
DisclosureTitle,
84-
DisclosurePanel
84+
DisclosurePanel,
85+
TreeView,
86+
TreeViewItem,
87+
TreeViewItemContent
8588
} from "@adobe/react-spectrum";
8689
import Edit from "@spectrum-icons/workflow/Edit";
8790
import NotFound from "@spectrum-icons/illustrations/NotFound";
@@ -90,6 +93,9 @@ import ReorderableListView from "../components/ReorderableListView";
9093
import {ToastQueue} from '@react-spectrum/toast';
9194
import {SubmenuTrigger} from "@react-spectrum/menu";
9295

96+
import FileTxt from '@spectrum-icons/workflow/FileTxt';
97+
import Folder from '@spectrum-icons/workflow/Folder';
98+
9399
let nestedItems = [
94100
{foo: 'Lvl 1 Foo 1', bar: 'Lvl 1 Bar 1', baz: 'Lvl 1 Baz 1', childRows: [
95101
{foo: 'Lvl 2 Foo 1', bar: 'Lvl 2 Bar 1', baz: 'Lvl 2 Baz 1', childRows: [
@@ -238,6 +244,46 @@ export default function Home() {
238244
}
239245
</TableBody>
240246
</TableView>
247+
<div style={{width: '300px', height: '150px', overflow: 'auto'}}>
248+
<TreeView disabledKeys={['projects-1']} aria-label="test static tree">
249+
<TreeViewItem id="Photos" textValue="Photos">
250+
<TreeViewItemContent>
251+
<Text>Photos</Text>
252+
<Folder />
253+
</TreeViewItemContent>
254+
</TreeViewItem>
255+
<TreeViewItem id="projects" textValue="Projects">
256+
<TreeViewItemContent>
257+
<Text>Projects</Text>
258+
<Folder />
259+
</TreeViewItemContent>
260+
<TreeViewItem id="projects-1" textValue="Projects-1">
261+
<TreeViewItemContent>
262+
<Text>Projects-1</Text>
263+
<Folder />
264+
</TreeViewItemContent>
265+
<TreeViewItem id="projects-1A" textValue="Projects-1A">
266+
<TreeViewItemContent>
267+
<Text>Projects-1A</Text>
268+
<FileTxt />
269+
</TreeViewItemContent>
270+
</TreeViewItem>
271+
</TreeViewItem>
272+
<TreeViewItem id="projects-2" textValue="Projects-2">
273+
<TreeViewItemContent>
274+
<Text>Projects-2</Text>
275+
<FileTxt />
276+
</TreeViewItemContent>
277+
</TreeViewItem>
278+
<TreeViewItem id="projects-3" textValue="Projects-3">
279+
<TreeViewItemContent>
280+
<Text>Projects-3</Text>
281+
<FileTxt />
282+
</TreeViewItemContent>
283+
</TreeViewItem>
284+
</TreeViewItem>
285+
</TreeView>
286+
</div>
241287
</Section>
242288

243289
<Section title="Color">

‎examples/rsp-next-ts/components/AutocompleteExample.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {UNSTABLE_Autocomplete as Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
1+
import {Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
22
import {classNames} from '@react-spectrum/utils';
33
import React from 'react';
44
import styles from './autocomplete.module.css';

‎examples/rsp-next-ts/pages/index.tsx

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ import {
8181
Accordion,
8282
Disclosure,
8383
DisclosureTitle,
84-
DisclosurePanel
84+
DisclosurePanel,
85+
TreeView,
86+
TreeViewItem,
87+
TreeViewItemContent
8588
} from "@adobe/react-spectrum";
8689
import {AutocompleteExample} from "../components/AutocompleteExample";
8790
import Edit from "@spectrum-icons/workflow/Edit";
@@ -91,6 +94,9 @@ import ReorderableListView from "../components/ReorderableListView";
9194
import {ToastQueue} from '@react-spectrum/toast';
9295
import {SubmenuTrigger} from "@react-spectrum/menu";
9396

97+
import FileTxt from '@spectrum-icons/workflow/FileTxt';
98+
import Folder from '@spectrum-icons/workflow/Folder';
99+
94100
let nestedItems = [
95101
{foo: 'Lvl 1 Foo 1', bar: 'Lvl 1 Bar 1', baz: 'Lvl 1 Baz 1', childRows: [
96102
{foo: 'Lvl 2 Foo 1', bar: 'Lvl 2 Bar 1', baz: 'Lvl 2 Baz 1', childRows: [
@@ -242,6 +248,47 @@ export default function Home() {
242248
</TableBody>
243249
</TableView>
244250
<AutocompleteExample />
251+
252+
<div style={{width: '300px', height: '150px', overflow: 'auto'}}>
253+
<TreeView disabledKeys={['projects-1']} aria-label="test static tree">
254+
<TreeViewItem id="Photos" textValue="Photos">
255+
<TreeViewItemContent>
256+
<Text>Photos</Text>
257+
<Folder />
258+
</TreeViewItemContent>
259+
</TreeViewItem>
260+
<TreeViewItem id="projects" textValue="Projects">
261+
<TreeViewItemContent>
262+
<Text>Projects</Text>
263+
<Folder />
264+
</TreeViewItemContent>
265+
<TreeViewItem id="projects-1" textValue="Projects-1">
266+
<TreeViewItemContent>
267+
<Text>Projects-1</Text>
268+
<Folder />
269+
</TreeViewItemContent>
270+
<TreeViewItem id="projects-1A" textValue="Projects-1A">
271+
<TreeViewItemContent>
272+
<Text>Projects-1A</Text>
273+
<FileTxt />
274+
</TreeViewItemContent>
275+
</TreeViewItem>
276+
</TreeViewItem>
277+
<TreeViewItem id="projects-2" textValue="Projects-2">
278+
<TreeViewItemContent>
279+
<Text>Projects-2</Text>
280+
<FileTxt />
281+
</TreeViewItemContent>
282+
</TreeViewItem>
283+
<TreeViewItem id="projects-3" textValue="Projects-3">
284+
<TreeViewItemContent>
285+
<Text>Projects-3</Text>
286+
<FileTxt />
287+
</TreeViewItemContent>
288+
</TreeViewItem>
289+
</TreeViewItem>
290+
</TreeView>
291+
</div>
245292
</Section>
246293

247294
<Section title="Color">

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

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ import {
3535
TableView,
3636
Text,
3737
ToggleButton,
38-
ToggleButtonGroup
38+
ToggleButtonGroup,
39+
TreeView,
40+
TreeViewItem,
41+
TreeViewItemContent
3942
} from "@react-spectrum/s2";
4043
import Edit from "@react-spectrum/s2/icons/Edit";
44+
import FileTxt from "@react-spectrum/s2/icons/FileText";
45+
import Folder from "@react-spectrum/s2/icons/Folder";
4146
import Section from "./components/Section";
4247
import { style } from "@react-spectrum/s2/style" with { type: "macro" };
4348
import { CardViewExample } from "./components/CardViewExample";
@@ -205,6 +210,44 @@ function App() {
205210
</Row>
206211
</TableBody>
207212
</TableView>
213+
<TreeView disabledKeys={['projects-1']} aria-label="test static tree">
214+
<TreeViewItem id="Photos" textValue="Photos">
215+
<TreeViewItemContent>
216+
<Text>Photos</Text>
217+
<Folder />
218+
</TreeViewItemContent>
219+
</TreeViewItem>
220+
<TreeViewItem id="projects" textValue="Projects">
221+
<TreeViewItemContent>
222+
<Text>Projects</Text>
223+
<Folder />
224+
</TreeViewItemContent>
225+
<TreeViewItem id="projects-1" textValue="Projects-1">
226+
<TreeViewItemContent>
227+
<Text>Projects-1</Text>
228+
<Folder />
229+
</TreeViewItemContent>
230+
<TreeViewItem id="projects-1A" textValue="Projects-1A">
231+
<TreeViewItemContent>
232+
<Text>Projects-1A</Text>
233+
<FileTxt />
234+
</TreeViewItemContent>
235+
</TreeViewItem>
236+
</TreeViewItem>
237+
<TreeViewItem id="projects-2" textValue="Projects-2">
238+
<TreeViewItemContent>
239+
<Text>Projects-2</Text>
240+
<FileTxt />
241+
</TreeViewItemContent>
242+
</TreeViewItem>
243+
<TreeViewItem id="projects-3" textValue="Projects-3">
244+
<TreeViewItemContent>
245+
<Text>Projects-3</Text>
246+
<FileTxt />
247+
</TreeViewItemContent>
248+
</TreeViewItem>
249+
</TreeViewItem>
250+
</TreeView>
208251
</Section>
209252

210253
{!isLazyLoaded && <ActionButton onPress={() => setLazyLoaded(true)}>Load more</ActionButton>}

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

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ import {
3535
TableView,
3636
Text,
3737
ToggleButton,
38-
ToggleButtonGroup
38+
ToggleButtonGroup,
39+
TreeView,
40+
TreeViewItem,
41+
TreeViewItemContent
3942
} from "@react-spectrum/s2";
4043
import Edit from "@react-spectrum/s2/icons/Edit";
44+
import FileTxt from "@react-spectrum/s2/icons/FileText";
45+
import Folder from "@react-spectrum/s2/icons/Folder";
4146
import Section from "./components/Section";
4247
import { style } from "@react-spectrum/s2/style" with { type: "macro" };
4348
import { CardViewExample } from "./components/CardViewExample";
@@ -205,6 +210,44 @@ function App() {
205210
</Row>
206211
</TableBody>
207212
</TableView>
213+
<TreeView disabledKeys={['projects-1']} aria-label="test static tree">
214+
<TreeViewItem id="Photos" textValue="Photos">
215+
<TreeViewItemContent>
216+
<Text>Photos</Text>
217+
<Folder />
218+
</TreeViewItemContent>
219+
</TreeViewItem>
220+
<TreeViewItem id="projects" textValue="Projects">
221+
<TreeViewItemContent>
222+
<Text>Projects</Text>
223+
<Folder />
224+
</TreeViewItemContent>
225+
<TreeViewItem id="projects-1" textValue="Projects-1">
226+
<TreeViewItemContent>
227+
<Text>Projects-1</Text>
228+
<Folder />
229+
</TreeViewItemContent>
230+
<TreeViewItem id="projects-1A" textValue="Projects-1A">
231+
<TreeViewItemContent>
232+
<Text>Projects-1A</Text>
233+
<FileTxt />
234+
</TreeViewItemContent>
235+
</TreeViewItem>
236+
</TreeViewItem>
237+
<TreeViewItem id="projects-2" textValue="Projects-2">
238+
<TreeViewItemContent>
239+
<Text>Projects-2</Text>
240+
<FileTxt />
241+
</TreeViewItemContent>
242+
</TreeViewItem>
243+
<TreeViewItem id="projects-3" textValue="Projects-3">
244+
<TreeViewItemContent>
245+
<Text>Projects-3</Text>
246+
<FileTxt />
247+
</TreeViewItemContent>
248+
</TreeViewItem>
249+
</TreeViewItem>
250+
</TreeView>
208251
</Section>
209252

210253
{!isLazyLoaded && <ActionButton onPress={() => setLazyLoaded(true)}>Load more</ActionButton>}

0 commit comments

Comments
 (0)