Skip to content

Commit 0f2bd04

Browse files
snowystingersnowystinger
committed
Merge branch 'main' into dedupe-packages-and-fix-types
# Conflicts: # yarn.lock
2 parents bd15da6 + bf87614 commit 0f2bd04

File tree

456 files changed

+15932
-4076
lines changed

Some content is hidden

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

456 files changed

+15932
-4076
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ export function Migrating() {
259259
<li className={style({font: 'body', marginY: 8})}>If within <Code>Picker</Code>: Update <Code>Item</Code> to be a <Code>PickerItem</Code></li>
260260
<li className={style({font: 'body', marginY: 8})}>If within <Code>ComboBox</Code>: Update <Code>Item</Code> to be a <Code>ComboBoxItem</Code></li>
261261
<li className={style({font: 'body', marginY: 8})}>If within <Code>ListBox</Code>: Update <Code>Item</Code> to be a <Code>ListBoxItem</Code></li>
262+
<li className={style({font: 'body', marginY: 8})}>If within <Code>ListView</Code>: Update <Code>Item</Code> to be a <Code>ListViewItem</Code></li>
262263
<li className={style({font: 'body', marginY: 8})}>If within <Code>TabList</Code>: Update <Code>Item</Code> to be a <Code>Tab</Code></li>
263264
<li className={style({font: 'body', marginY: 8})}>If within <Code>TabPanels</Code>: Update <Code>Item</Code> to be a <Code>TabPanel</Code> and remove surrounding <Code>TabPanels</Code></li>
264265
<li className={style({font: 'body', marginY: 8})}>Update <Code>key</Code> to be <Code>id</Code> (and keep <Code>key</Code> if rendered inside <Code>array.map</Code>)</li>
@@ -275,6 +276,12 @@ export function Migrating() {
275276
<li className={style({font: 'body', marginY: 8})}>Update <Code>Item</Code> to be a <Code>ListBoxItem</Code></li>
276277
</ul>
277278

279+
<H3>ListView</H3>
280+
<ul className="sb-unstyled">
281+
<li className={style({font: 'body', marginY: 8})}>[PENDING] Comment out <Code>density</Code> (it has not been implemented yet)</li>
282+
<li className={style({font: 'body', marginY: 8})}>[PENDING] Comment out <Code>dragAndDropHooks</Code> (it has not been implemented yet)</li>
283+
</ul>
284+
278285
<H3>Menu</H3>
279286
<ul className="sb-unstyled">
280287
<li className={style({font: 'body', marginY: 8})}>Update <Code>Item</Code> to be a <Code>MenuItem</Code></li>

‎eslint.config.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ export default [{
457457
FileSystemDirectoryEntry: "readonly",
458458
FileSystemEntry: "readonly",
459459
IS_REACT_ACT_ENVIRONMENT: "readonly",
460+
globalThis: "readonly",
460461
},
461462

462463
parser: tseslint.parser,

‎examples/s2-next-macros/src/app/page.tsx‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ import {
2323
ButtonGroup,
2424
Cell,
2525
Column,
26+
Content,
27+
ContextualHelpPopover,
2628
Divider,
2729
Heading,
2830
LinkButton,
31+
ListView,
32+
ListViewItem,
2933
Menu,
3034
MenuItem,
3135
MenuTrigger,
@@ -43,7 +47,8 @@ import {
4347
ToggleButtonGroup,
4448
TreeView,
4549
TreeViewItem,
46-
TreeViewItemContent
50+
TreeViewItemContent,
51+
UnavailableMenuItemTrigger
4752
} from "@react-spectrum/s2";
4853
import Edit from "@react-spectrum/s2/icons/Edit";
4954
import FileTxt from "@react-spectrum/s2/icons/FileText";
@@ -170,7 +175,13 @@ function App() {
170175
<MenuItem id="sms">SMS</MenuItem>
171176
</Menu>
172177
</SubmenuTrigger>
173-
<MenuItem id="delete">Delete</MenuItem>
178+
<UnavailableMenuItemTrigger isUnavailable>
179+
<MenuItem id="delete">Delete</MenuItem>
180+
<ContextualHelpPopover>
181+
<Heading slot="title">Permission required</Heading>
182+
<Content>Contact your administrator for permissions to delete.</Content>
183+
</ContextualHelpPopover>
184+
</UnavailableMenuItemTrigger>
174185
</Menu>
175186
</MenuTrigger>
176187
<MenuTrigger>
@@ -184,6 +195,23 @@ function App() {
184195
<MenuItem>Paste</MenuItem>
185196
</Menu>
186197
</MenuTrigger>
198+
<ListView
199+
aria-label="Files"
200+
selectionMode="multiple"
201+
styles={style({width: 320, height: 320})}>
202+
<ListViewItem id="adobe-photoshop" textValue="Adobe Photoshop">
203+
<Text>Adobe Photoshop</Text>
204+
<Text slot="description">Image editing software</Text>
205+
</ListViewItem>
206+
<ListViewItem id="adobe-xd" textValue="Adobe XD">
207+
<Text>Adobe XD</Text>
208+
<Text slot="description">UI/UX design tool</Text>
209+
</ListViewItem>
210+
<ListViewItem id="adobe-indesign" textValue="Adobe InDesign">
211+
<Text>Adobe InDesign</Text>
212+
<Text slot="description">Desktop publishing</Text>
213+
</ListViewItem>
214+
</ListView>
187215
<TableView
188216
aria-label="Files"
189217
styles={style({width: 320, height: 320})}

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

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ import {
2121
ButtonGroup,
2222
Cell,
2323
Column,
24+
Content,
25+
ContextualHelpPopover,
2426
Divider,
2527
Heading,
2628
LinkButton,
29+
ListView,
30+
ListViewItem,
2731
Menu,
2832
MenuItem,
2933
MenuTrigger,
@@ -41,7 +45,8 @@ import {
4145
ToggleButtonGroup,
4246
TreeView,
4347
TreeViewItem,
44-
TreeViewItemContent
48+
TreeViewItemContent,
49+
UnavailableMenuItemTrigger
4550
} from "@react-spectrum/s2";
4651
import Edit from "@react-spectrum/s2/icons/Edit";
4752
import FileTxt from "@react-spectrum/s2/icons/FileText";
@@ -168,7 +173,13 @@ function App() {
168173
<MenuItem id="sms">SMS</MenuItem>
169174
</Menu>
170175
</SubmenuTrigger>
171-
<MenuItem id="delete">Delete</MenuItem>
176+
<UnavailableMenuItemTrigger isUnavailable>
177+
<MenuItem id="delete">Delete</MenuItem>
178+
<ContextualHelpPopover>
179+
<Heading slot="title">Permission required</Heading>
180+
<Content>Contact your administrator for permissions to delete.</Content>
181+
</ContextualHelpPopover>
182+
</UnavailableMenuItemTrigger>
172183
</Menu>
173184
</MenuTrigger>
174185
<MenuTrigger>
@@ -182,6 +193,23 @@ function App() {
182193
<MenuItem>Paste</MenuItem>
183194
</Menu>
184195
</MenuTrigger>
196+
<ListView
197+
aria-label="Files"
198+
selectionMode="multiple"
199+
styles={style({width: 320, height: 320})}>
200+
<ListViewItem id="adobe-photoshop" textValue="Adobe Photoshop">
201+
<Text>Adobe Photoshop</Text>
202+
<Text slot="description">Image editing software</Text>
203+
</ListViewItem>
204+
<ListViewItem id="adobe-xd" textValue="Adobe XD">
205+
<Text>Adobe XD</Text>
206+
<Text slot="description">UI/UX design tool</Text>
207+
</ListViewItem>
208+
<ListViewItem id="adobe-indesign" textValue="Adobe InDesign">
209+
<Text>Adobe InDesign</Text>
210+
<Text slot="description">Desktop publishing</Text>
211+
</ListViewItem>
212+
</ListView>
185213
<TableView
186214
aria-label="Files"
187215
styles={style({width: 320, height: 320})}

‎examples/s2-vite-project/.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ dist
1212
dist-ssr
1313
*.local
1414

15-
yarn.lock
16-
1715
# Editor directories and files
1816
.vscode/*
1917
!.vscode/extensions.json

‎examples/s2-vite-project/.yarn/install-state.gz‎

-63.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)