Skip to content

[pull] main from adobe:main #343

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
Apr 2, 2026
Merged

[pull] main from adobe:main #343

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
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ describe('ActionGroup', function () {
<ActionGroup>
<DialogTrigger>
<Item>Hi</Item>
<Dialog>
<Dialog aria-label="Test dialog">
I'm a dialog
</Dialog>
</DialogTrigger>
Expand Down
18 changes: 9 additions & 9 deletions packages/@adobe/react-spectrum/test/contextualhelp/ContextualHelp.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {act, pointerMap, render, simulateDesktop} from '@react-spectrum/test-uti
import {Content} from '../../src/view/Content';
import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
import {Footer} from '../../src/view/Footer';
import {Header} from '../../src/view/Header';
import {Heading} from '../../src/text/Heading';
import {Link} from '../../src/link/Link';
import {Provider} from '../../src/provider/Provider';
import React from 'react';
Expand All @@ -39,7 +39,7 @@ describe('ContextualHelp', function () {
let {getByRole, queryByRole} = render(
<Provider theme={theme}>
<ContextualHelp>
<Header>Test title</Header>
<Heading>Test title</Heading>
</ContextualHelp>
</Provider>
);
Expand All @@ -56,7 +56,7 @@ describe('ContextualHelp', function () {
let {getByRole, queryByRole, getByTestId, getByText} = render(
<Provider theme={theme}>
<ContextualHelp>
<Header>Test title</Header>
<Heading>Test title</Heading>
</ContextualHelp>
</Provider>
);
Expand Down Expand Up @@ -84,7 +84,7 @@ describe('ContextualHelp', function () {
let {getByRole, getByText} = render(
<Provider theme={theme}>
<ContextualHelp>
<Header>Test title</Header>
<Heading>Test title</Heading>
<Content>Help content</Content>
</ContextualHelp>
</Provider>
Expand All @@ -109,7 +109,7 @@ describe('ContextualHelp', function () {
let {getByRole, getByText} = render(
<Provider theme={theme}>
<ContextualHelp>
<Header>Test title</Header>
<Heading>Test title</Heading>
<Content>Help content</Content>
<Footer>
<Link>Test link</Link>
Expand Down Expand Up @@ -137,7 +137,7 @@ describe('ContextualHelp', function () {
let {getByRole} = render(
<Provider theme={theme}>
<ContextualHelp>
<Header>Test title</Header>
<Heading>Test title</Heading>
<Content>Help content</Content>
</ContextualHelp>
</Provider>
Expand All @@ -151,7 +151,7 @@ describe('ContextualHelp', function () {
let {getByRole} = render(
<Provider theme={theme}>
<ContextualHelp variant="info">
<Header>Test title</Header>
<Heading>Test title</Heading>
<Content>Help content</Content>
</ContextualHelp>
</Provider>
Expand All @@ -165,7 +165,7 @@ describe('ContextualHelp', function () {
let {getByRole} = render(
<Provider theme={theme}>
<ContextualHelp aria-label="test">
<Header>Test title</Header>
<Heading>Test title</Heading>
<Content>Help content</Content>
</ContextualHelp>
</Provider>
Expand All @@ -179,7 +179,7 @@ describe('ContextualHelp', function () {
let {getByRole} = render(
<Provider theme={theme}>
<ContextualHelp aria-labelledby="test">
<Header>Test title</Header>
<Heading>Test title</Heading>
<Content>Help content</Content>
</ContextualHelp>
</Provider>
Expand Down
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('Dialog SSR', function () {
await testSSR(__filename, `
import {Dialog} from '../../exports/index.ts';
<Dialog>
<Dialog aria-label="The label">
contents
</Dialog>
`);
Expand Down
6 changes: 3 additions & 3 deletions packages/@adobe/react-spectrum/test/dialog/Dialog.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {render} from '@react-spectrum/test-utils-internal';
describe('Dialog', function () {
it('does not auto focus anything inside', function () {
let {getByRole} = render(
<Dialog>
<Dialog aria-label="Test dialog">
<input data-testid="input1" />
<input data-testid="input2" />
</Dialog>
Expand All @@ -35,7 +35,7 @@ describe('Dialog', function () {

it('auto focuses the dialog itself if there is no focusable child', function () {
let {getByRole} = render(
<Dialog>
<Dialog aria-label="Test dialog">
contents
</Dialog>
);
Expand All @@ -46,7 +46,7 @@ describe('Dialog', function () {

it('autofocuses any element that has autofocus inside', function () {
let {getByTestId} = render(
<Dialog>
<Dialog aria-label="Test dialog">
<input data-testid="input1" />
<input data-testid="input2" autoFocus />
</Dialog>
Expand Down
52 changes: 26 additions & 26 deletions packages/@adobe/react-spectrum/test/dialog/DialogTrigger.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand All @@ -90,7 +90,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="tray">
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand All @@ -116,7 +116,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="popover">
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand All @@ -140,7 +140,7 @@ describe('DialogTrigger', function () {
<DialogTrigger type="popover">
<ActionButton>Trigger</ActionButton>
{(close) => (
<Dialog>
<Dialog aria-label="Test dialog">
contents
<ButtonGroup>
<Button variant="secondary" onPress={close}>
Expand Down Expand Up @@ -180,7 +180,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="popover">
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand All @@ -207,7 +207,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="popover" mobileType="tray">
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand All @@ -233,7 +233,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type={type}>
<ActionButton>Trigger</ActionButton>
<Dialog>
<Dialog aria-label="Test dialog">
<input data-testid="input1" />
<input data-testid="input2" />
</Dialog>
Expand Down Expand Up @@ -268,7 +268,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand All @@ -291,7 +291,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="popover">
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -336,7 +336,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger onOpenChange={onOpenChange} type="popover">
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -382,7 +382,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme} ref={rootProviderRef}>
<DialogTrigger>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -422,7 +422,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger isOpen={isOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -480,7 +480,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -518,7 +518,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
{(close) => <Dialog>contents<Button variant="primary" data-testid="closebtn" onPress={close}>Close</Button></Dialog>}
{(close) => <Dialog aria-label="Test dialog">contents<Button variant="primary" data-testid="closebtn" onPress={close}>Close</Button></Dialog>}
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -557,7 +557,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger isDismissable defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -596,7 +596,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="modal" isDismissable defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -634,7 +634,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="modal" defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -667,7 +667,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="popover" mobileType="modal" defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -705,7 +705,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger type="popover" defaultOpen={defaultOpen} onOpenChange={onOpenChange} isDismissable={false}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -742,7 +742,7 @@ describe('DialogTrigger', function () {
<Provider theme={theme}>
<DialogTrigger isKeyboardDismissDisabled>
<ActionButton>Trigger</ActionButton>
{close => <Dialog><ActionButton onPress={close}>Close</ActionButton></Dialog>}
{close => <Dialog aria-label="Test dialog"><ActionButton onPress={close}>Close</ActionButton></Dialog>}
</DialogTrigger>
</Provider>
);
Expand Down Expand Up @@ -794,7 +794,7 @@ describe('DialogTrigger', function () {
<Menu>
<DialogTrigger isKeyboardDismissDisabled>
<Item>Open menu</Item>
<Dialog>Content body</Dialog>
<Dialog aria-label="Test dialog">Content body</Dialog>
</DialogTrigger>
</Menu>
</MenuTrigger>
Expand Down Expand Up @@ -830,12 +830,12 @@ describe('DialogTrigger', function () {
<TextField id="document-input" aria-label="document input" />
<DialogTrigger>
<ActionButton id="outer-trigger">Trigger</ActionButton>
<Dialog id="outer-dialog">
<Dialog aria-label="Test dialog" id="outer-dialog">
<Content>
<TextField id="outer-input" aria-label="outer input" autoFocus />
<DialogTrigger>
<ActionButton id="inner-trigger">Trigger</ActionButton>
<Dialog id="inner-dialog">
<Dialog aria-label="Test dialog" id="inner-dialog">
<Content>
<TextField id="inner-input" aria-label="outer input" autoFocus />
</Content>
Expand Down Expand Up @@ -900,12 +900,12 @@ describe('DialogTrigger', function () {
<TextField id="document-input" aria-label="document input" />
<DialogTrigger type="popover">
<ActionButton id="outer-trigger">Trigger1</ActionButton>
<Dialog id="outer-dialog">
<Dialog aria-label="Test dialog" id="outer-dialog">
<Content>
<TextField id="outer-input" aria-label="outer input" />
<DialogTrigger type="popover">
<ActionButton id="inner-trigger">Trigger2</ActionButton>
<Dialog id="inner-dialog">
<Dialog aria-label="Test dialog" id="inner-dialog">
<Content>
<TextField id="inner-input" label="inner input" />
</Content>
Expand Down Expand Up @@ -958,7 +958,7 @@ describe('DialogTrigger', function () {
<UNSAFE_PortalProvider getContainer={() => container.current}>
<DialogTrigger type={props.type}>
<ActionButton>Trigger</ActionButton>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</DialogTrigger>
</UNSAFE_PortalProvider>
</Provider>
Expand Down
4 changes: 2 additions & 2 deletions packages/@adobe/react-spectrum/test/form/Form.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {Button} from '../../src/button/Button';
import {Content} from '../../src/view/Content';
import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
import {Form} from '../../src/form/Form';
import {Header} from '../../src/view/Header';
import {Heading} from '../../src/text/Heading';
import {Item} from 'react-stately/Item';
import {Picker} from '../../src/picker/Picker';
import {pointerMap, render, simulateMobile} from '@react-spectrum/test-utils-internal';
Expand Down Expand Up @@ -212,7 +212,7 @@ describe('Form', function () {
label="Test Picker"
contextualHelp={(
<ContextualHelp>
<Header>What is it good for?</Header>
<Heading>What is it good for?</Heading>
<Content>Absolutely nothing.</Content>
</ContextualHelp>
)}>
Expand Down
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/test/menu/Menu.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ describe('Menu', function () {
<Section title="Test">
<DialogTrigger>
<Item>Hi</Item>
<Dialog>
<Dialog aria-label="Test dialog">
I'm a dialog
</Dialog>
</DialogTrigger>
Expand Down
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/test/overlays/Popover.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function PopoverWithDialog({children}) {
let state = useOverlayTriggerState({isOpen: true});
return (
<Popover triggerRef={ref} state={state}>
<Dialog>{children}</Dialog>
<Dialog aria-label="Test dialog">{children}</Dialog>
</Popover>
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/test/overlays/Tray.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('Tray', function () {
let {getByRole} = render(
<Provider theme={theme}>
<TestTray isOpen onOpenChange={onOpenChange} shouldCloseOnBlur>
<Dialog>contents</Dialog>
<Dialog aria-label="Test dialog">contents</Dialog>
</TestTray>
</Provider>
);
Expand Down
Loading
Loading