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.

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

fix(render): Default to HTMLElement in returned container #868

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 17 additions & 7 deletions types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ import {
BoundFunction,
prettyFormat,
} from '@testing-library/dom'
import {Renderer} from 'react-dom'
import {act as reactAct} from 'react-dom/test-utils'

export * from '@testing-library/dom'

export type RenderResult<Q extends Queries = typeof queries> = {
container: Element
export type RenderResult<
Q extends Queries = typeof queries,
Container extends Element | DocumentFragment = HTMLElement
> = {
container: Container
baseElement: Element
debug: (
baseElement?:
Expand All @@ -26,8 +30,11 @@ export type RenderResult<Q extends Queries = typeof queries> = {
asFragment: () => DocumentFragment
} & {[P in keyof Q]: BoundFunction<Q[P]>}

export interface RenderOptions<Q extends Queries = typeof queries> {
container?: Element
export interface RenderOptions<
Q extends Queries = typeof queries,
Container extends Element | DocumentFragment = HTMLElement
> {
container?: Container
baseElement?: Element
hydrate?: boolean
queries?: Q
Expand All @@ -43,10 +50,13 @@ export function render(
ui: React.ReactElement,
options?: Omit<RenderOptions, 'queries'>,
): RenderResult
export function render<Q extends Queries>(
export function render<
Q extends Queries,
Container extends Element | DocumentFragment = HTMLElement
>(
ui: React.ReactElement,
options: RenderOptions<Q>,
): RenderResult<Q>
options: RenderOptions<Q, Container>,
): RenderResult<Q, Container>

/**
* Unmounts React trees that were mounted with render.
Expand Down
40 changes: 36 additions & 4 deletions types/test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {render, fireEvent, screen, waitFor} from '.'
import * as pure from './pure'

export async function testRender() {
const page = render(<div />)
const page = render(<button />)

// single queries
page.getByText('foo')
Expand All @@ -17,11 +17,12 @@ export async function testRender() {

// helpers
const {container, rerender, debug} = page
expectType<HTMLElement, typeof container>(container)
return {container, rerender, debug}
}

export async function testPureRender() {
const page = pure.render(<div />)
const page = pure.render(<button />)

// single queries
page.getByText('foo')
Expand All @@ -35,13 +36,19 @@ export async function testPureRender() {

// helpers
const {container, rerender, debug} = page
expectType<HTMLElement, typeof container>(container)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was Element before this change which caused #834 (comment)

return {container, rerender, debug}
}

export function testRenderOptions() {
const container = document.createElement('div')
const options = {container}
render(<div />, options)
const {container: returnedContainer} = render(<button />, options)
// Unclear why TypeScript infers `HTMLElement` here when the the input `container` is `HTMLDivElement`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we'd swap the render methods in the declaration file, this would infer correctly (it uses the first one).
I'm unfamiliar with the types for RTL, so I'm not sure if this would break something, or if we could maybe entirely remove the other render type.

Suggested change
// Unclear why TypeScript infers `HTMLElement` here when the the input `container` is `HTMLDivElement`.
// Unclear why TypeScript infers `HTMLElement` here when the input `container` is `HTMLDivElement`.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@timdeschryver Awesome, thanks! Fixed in a61a0d5 (#868)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm glad I could help 🙂

// It's working for `testSVGRenderOptions`.
// Hopefully this breaks someday and we can switch to
// expectType<HTMLDivElement, typeof returnedContainer>(returnedContainer)
expectType<HTMLElement, typeof returnedContainer>(returnedContainer)
}

export function testSVGRenderOptions() {
Expand All @@ -50,7 +57,8 @@ export function testSVGRenderOptions() {
'svg',
)
const options = {container}
render(<svg />, options)
const {container: returnedContainer} = render(<path />, options)
expectType<SVGSVGElement, typeof returnedContainer>(returnedContainer)
}

export function testFireEvent() {
Expand Down Expand Up @@ -87,3 +95,27 @@ eslint
testing-library/no-debug: "off",
testing-library/prefer-screen-queries: "off"
*/

// https://stackoverflow.com/questions/53807517/how-to-test-if-two-types-are-exactly-the-same
type IfEquals<T, U, Yes = unknown, No = never> = (<G>() => G extends T
? 1
: 2) extends <G>() => G extends U ? 1 : 2
? Yes
: No

/**
* Issues a type error if `Expected` is not identical to `Actual`.
*
* `Expected` should be declared when invoking `expectType`.
* `Actual` should almost always we be a `typeof value` statement.
*
* Source: https://github.com/mui-org/material-ui/blob/6221876a4b468a3330ffaafa8472de7613933b87/packages/material-ui-types/index.d.ts#L73-L84
*
* @example `expectType<number | string, typeof value>(value)`
* TypeScript issues a type error since `value is not assignable to never`.
* This means `typeof value` is not identical to `number | string`
* @param actual
*/
declare function expectType<Expected, Actual>(
actual: IfEquals<Actual, Expected, Actual>,
): void