Skip to content

[pull] main from adobe:main #226

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 5, 2025
Merged

[pull] main from adobe:main #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0434057
fix: Numberfield keyboard on touch increment (#9281)
snowystinger Dec 5, 2025
5c8217a
chore: update dialog to match designs (#9277)
snowystinger Dec 5, 2025
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
6 changes: 3 additions & 3 deletions packages/@react-spectrum/s2/src/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ const image = style({
const heading = style({
flexGrow: 1,
marginY: 0,
font: 'heading'
font: 'title-2xl'
});

const header = style({
font: 'body-lg'
font: 'body'
});

const content = style({
Expand Down Expand Up @@ -181,7 +181,7 @@ export const Dialog = forwardRef(function Dialog(props: DialogProps, ref: DOMRef
{children}
</Provider>
</div>
{props.isDismissible &&
{props.isDismissible &&
<CloseButton styles={style({marginBottom: 12})} />
}
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/s2/src/Field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,13 @@ export const FieldGroup = forwardRef(function FieldGroup(props: FieldGroupProps,
{...otherProps}
onPointerDown={(e) => {
// Forward focus to input element when clicking on a non-interactive child (e.g. icon or padding)
if (e.pointerType === 'mouse' && !(e.target as Element).closest('button,input,textarea')) {
if (e.pointerType === 'mouse' && !(e.target as Element).closest('button,input,textarea,[role="button"]')) {
e.preventDefault();
(e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus();
}
}}
onTouchEnd={e => {
if (!(e.target as Element).closest('button,input,textarea')) {
if (!(e.target as Element).closest('button,input,textarea,[role="button"]')) {
e.preventDefault();
(e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus();
}
Expand Down
5 changes: 3 additions & 2 deletions packages/@react-spectrum/s2/src/FullscreenDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ const heading = style({
gridArea: 'heading',
flexGrow: 1,
marginY: 0,
font: 'heading'
font: 'title-2xl',
color: 'heading'
});

const header = style({
gridArea: 'header',
marginX: {
sm: 'auto'
},
font: 'body-lg'
font: 'body'
});

const content = style({
Expand Down
Loading