Skip to content

[pull] main from adobe:main #252

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 3 commits into from
Jan 6, 2026
Merged

[pull] main from adobe:main #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f61fbc
fix: filter DOM props on TabPanels (#9432)
yihuiliao Jan 6, 2026
d7dca0c
fix: ColorWheel inner border width (#9440)
reidbarber Jan 6, 2026
31861ad
chore: replace tsc with tsgo (#9409)
reidbarber Jan 6, 2026
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
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
},
"packageManager": "yarn@4.2.2",
"scripts": {
"check-types": "tsc",
"tsgo": "tsgo",
"check-types": "tsgo --noEmit",
"check-types:tsc": "tsc",
"clean": "make clean",
"clean:all": "make clean_all",
"install-16": "node scripts/react-16-install-prep.mjs && yarn add react@^16.8.0 react-dom@^16.8.0 @testing-library/react@^12 @testing-library/react-hooks@^8 @testing-library/dom@^8 react-test-renderer@^16.9.0 && node scripts/oldReactSupport.mjs",
Expand Down Expand Up @@ -134,6 +136,7 @@
"@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",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@typescript/native-preview": "^7.0.0-dev.20251223.1",
"@yarnpkg/types": "^4.0.0",
"autoprefixer": "^9.6.0",
"axe-playwright": "^1.1.11",
Expand Down
11 changes: 11 additions & 0 deletions packages/@react-spectrum/s2/chromatic/ColorWheel.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,14 @@ export const Example: StoryObj<typeof ColorWheel> = {
defaultValue: 'hsl(30, 100%, 50%)'
}
};

export const InContainer: StoryObj<typeof ColorWheel> = {
render: (args) => (
<div style={{width: 600, border: '1px solid gray', padding: 16}}>
<ColorWheel {...args} onChange={undefined} />
</div>
),
args: {
defaultValue: 'hsl(30, 100%, 50%)'
}
};
2 changes: 1 addition & 1 deletion packages/@react-spectrum/s2/src/ColorWheel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const ColorWheel = forwardRef(function ColorWheel(props: ColorWheelProps,
outerRadius={outerRadius}
innerRadius={innerRadius}
ref={containerRef}
style={UNSAFE_style}
style={{...UNSAFE_style, width: outerRadius * 2, height: outerRadius * 2}}
className={UNSAFE_className + styles}>
{({isDisabled, state}) => (<>
<ColorWheelTrack
Expand Down
11 changes: 11 additions & 0 deletions packages/@react-spectrum/s2/stories/ColorWheel.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,14 @@ export const Example: Story = {
defaultValue: 'hsl(30, 100%, 50%)'
}
};

export const InContainer: Story = {
render: (args) => (
<div style={{width: 600, border: '1px solid gray', padding: 16}}>
<ColorWheel {...args} onChange={undefined} />
</div>
),
args: {
defaultValue: 'hsl(30, 100%, 50%)'
}
};
2 changes: 1 addition & 1 deletion packages/@react-spectrum/utils/src/Slots.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function useSlotProps<T>(props: T & {id?: string}, defaultSlot?: string):
// @ts-ignore TODO why is slot an object and not just string or undefined?
let {[slot]: slotProps = {}} = useContext(SlotContext) || {};

return mergeProps(props, mergeProps(slotProps, {id: props.id}));
return mergeProps(props, mergeProps(slotProps, {id: props.id})) as T;
}

export function cssModuleToSlots(cssModule: {[cssmodule: string]: string}): {[slot: string]: {UNSAFE_className: string}} {
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/s2-docs/src/zip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ export function zip(files: {[name: string]: string}): Blob {
putUint32s(eocd, 12, cdSz, offset);
records.push(eocd);

return new Blob(records, {type: 'application/zip'});
return new Blob(records as BlobPart[], {type: 'application/zip'});
}
5 changes: 4 additions & 1 deletion packages/react-aria-components/src/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,12 @@ export const TabPanels = /*#__PURE__*/ createHideableComponent(function TabPanel
prevSize.current = ref.current.getBoundingClientRect();
}

let DOMProps = filterDOMProps(props, {global: true});
delete DOMProps.id;

return (
<div
{...props}
{...DOMProps}
ref={ref}
className={props.className || 'react-aria-TabPanels'}>
<Collection {...props} />
Expand Down
14 changes: 14 additions & 0 deletions patches/@types+jsdom+20.0.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/@types/jsdom/base.d.ts b/node_modules/@types/jsdom/base.d.ts
index 67d7514..144a595 100755
--- a/node_modules/@types/jsdom/base.d.ts
+++ b/node_modules/@types/jsdom/base.d.ts
@@ -191,7 +191,9 @@ declare module "jsdom" {

/* ECMAScript Globals */
globalThis: DOMWindow;
+ // @ts-ignore - conflicts with Window's numeric index signature
readonly ["Infinity"]: number;
+ // @ts-ignore - conflicts with Window's numeric index signature
readonly ["NaN"]: number;
readonly undefined: undefined;

82 changes: 82 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10882,6 +10882,87 @@ __metadata:
languageName: node
linkType: hard

"@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20251223.1"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20251223.1"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20251223.1"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"@typescript/native-preview-linux-arm@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20251223.1"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@typescript/native-preview-linux-x64@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20251223.1"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20251223.1"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@typescript/native-preview-win32-x64@npm:7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20251223.1"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@typescript/native-preview@npm:^7.0.0-dev.20251223.1":
version: 7.0.0-dev.20251223.1
resolution: "@typescript/native-preview@npm:7.0.0-dev.20251223.1"
dependencies:
"@typescript/native-preview-darwin-arm64": "npm:7.0.0-dev.20251223.1"
"@typescript/native-preview-darwin-x64": "npm:7.0.0-dev.20251223.1"
"@typescript/native-preview-linux-arm": "npm:7.0.0-dev.20251223.1"
"@typescript/native-preview-linux-arm64": "npm:7.0.0-dev.20251223.1"
"@typescript/native-preview-linux-x64": "npm:7.0.0-dev.20251223.1"
"@typescript/native-preview-win32-arm64": "npm:7.0.0-dev.20251223.1"
"@typescript/native-preview-win32-x64": "npm:7.0.0-dev.20251223.1"
dependenciesMeta:
"@typescript/native-preview-darwin-arm64":
optional: true
"@typescript/native-preview-darwin-x64":
optional: true
"@typescript/native-preview-linux-arm":
optional: true
"@typescript/native-preview-linux-arm64":
optional: true
"@typescript/native-preview-linux-x64":
optional: true
"@typescript/native-preview-win32-arm64":
optional: true
"@typescript/native-preview-win32-x64":
optional: true
bin:
tsgo: bin/tsgo.js
checksum: 10c0/e7ce674c99fb045d72318e5a9d6d16a0f60e11e7315105197a5115f433ac86ee6a583899f0e54c8022fd799f58dc546fa1d0cd730dd6fe3de1f22751fe281bb1
languageName: node
linkType: hard

"@verdaccio/auth@npm:8.0.0-next-8.7":
version: 8.0.0-next-8.7
resolution: "@verdaccio/auth@npm:8.0.0-next-8.7"
Expand Down Expand Up @@ -24759,6 +24840,7 @@ __metadata:
"@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"
"@types/react": "npm:^19.0.0"
"@types/react-dom": "npm:^19.0.0"
"@typescript/native-preview": "npm:^7.0.0-dev.20251223.1"
"@yarnpkg/types": "npm:^4.0.0"
autoprefixer: "npm:^9.6.0"
axe-playwright: "npm:^1.1.11"
Expand Down
Loading