Skip to content
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

[test-utils] Remove leftover React.ReactElement<any> from describeConformance.tsx #44639

Merged
merged 2 commits into from
Dec 3, 2024
Merged

[test-utils] Remove leftover React.ReactElement<any> from describeConformance.tsx #44639

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52ff9a6
[test-utils] remove leftover React.ReactElement<any> from describeCon…
sai6855 Dec 3, 2024
5378b88
fix render type
sai6855 Dec 3, 2024
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
37 changes: 28 additions & 9 deletions packages-internal/test-utils/src/describeConformance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export interface ConformanceOptions {
refInstanceof: any;
after?: () => void;
inheritComponent?: React.ElementType;
render: (node: React.ReactElement<any>) => MuiRenderResult | Promise<MuiRenderResult>;
render: (node: React.ReactElement<DataProps>) => MuiRenderResult | Promise<MuiRenderResult>;
only?: Array<keyof typeof fullSuite>;
skip?: Array<keyof typeof fullSuite | 'classesRoot'>;
testComponentsRootPropWith?: string;
Expand Down Expand Up @@ -495,7 +495,13 @@ function testSlotsProp(
});
}

function testSlotPropsProp(element: React.ReactElement<any>, getOptions: () => ConformanceOptions) {
function testSlotPropsProp(
element: React.ReactElement<{
componentsProps?: Record<string, DataProps>;
slotProps: Record<string, DataProps>;
}>,
getOptions: () => ConformanceOptions,
) {
const { render, slots, testLegacyComponentsProp } = getOptions();

if (!render) {
Expand Down Expand Up @@ -579,7 +585,10 @@ function testSlotPropsProp(element: React.ReactElement<any>, getOptions: () => C
}

function testSlotPropsCallback(
element: React.ReactElement<any>,
element: React.ReactElement<{
slotProps: Record<string, () => DataProps>;
className: string;
}>,
getOptions: () => ConformanceOptions,
) {
const { render, slots } = getOptions();
Expand All @@ -606,7 +615,10 @@ function testSlotPropsCallback(
}

function testSlotPropsCallbackWithPropsAsOwnerState(
element: React.ReactElement<any>,
element: React.ReactElement<{
slotProps: Record<string, (ownerState: Record<string, any>) => DataProps>;
className: string;
}>,
getOptions: () => ConformanceOptions,
) {
const { render, slots } = getOptions();
Expand Down Expand Up @@ -637,7 +649,11 @@ function testSlotPropsCallbackWithPropsAsOwnerState(
* Components from @inheritComponent
*/
function testComponentsProp(
element: React.ReactElement<any>,
element: React.ReactElement<
{
components?: Record<string, string>;
} & DataProps
>,
getOptions: () => ConformanceOptions,
) {
describe('prop components:', () => {
Expand All @@ -663,7 +679,7 @@ function testComponentsProp(
* Components from @inheritComponent
*/
function testThemeDefaultProps(
element: React.ReactElement<any>,
element: React.ReactElement<unknown>,
getOptions: () => ConformanceOptions,
) {
describe('theme default components:', () => {
Expand Down Expand Up @@ -747,7 +763,7 @@ function testThemeDefaultProps(
* Components from @inheritComponent
*/
function testThemeStyleOverrides(
element: React.ReactElement<any>,
element: React.ReactElement<unknown>,
getOptions: () => ConformanceOptions,
) {
describe('theme style overrides:', () => {
Expand Down Expand Up @@ -999,7 +1015,10 @@ function testThemeStyleOverrides(
* MUI theme has a components section that allows specifying custom variants.
* Components from @inheritComponent
*/
function testThemeVariants(element: React.ReactElement<any>, getOptions: () => ConformanceOptions) {
function testThemeVariants(
element: React.ReactElement<DataProps & { variant: string }>,
getOptions: () => ConformanceOptions,
) {
describe('theme variants:', () => {
it("respect theme's variants", async function test(t = {}) {
if (/jsdom/.test(window.navigator.userAgent)) {
Expand Down Expand Up @@ -1109,7 +1128,7 @@ function testThemeVariants(element: React.ReactElement<any>, getOptions: () => C
* The components that iterate over the palette via `variants` should be able to render with or without applying the custom palette styles.
*/
function testThemeCustomPalette(
element: React.ReactElement<any>,
element: React.ReactElement<unknown>,
getOptions: () => ConformanceOptions,
) {
describe('theme extended palette:', () => {
Expand Down
Loading