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: Type for options in autodetected renderer was incorrectly inferring any passed type #527

Merged
merged 1 commit into from
Jan 8, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/pure.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReactHooksRenderer } from './types'
import { ReactHooksRenderer } from './types/react'

const renderers = [
{ required: 'react-test-renderer', renderer: './native/pure' },
Expand Down
11 changes: 0 additions & 11 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,6 @@ export type RenderHook<
Omit<TRenderer, keyof Renderer<TProps>> &
AsyncUtils

export interface ReactHooksRenderer {
renderHook: <TProps, TResult, TOptions>(
callback: (props: TProps) => TResult,
options?: RenderHookOptions<TProps, TOptions>
) => RenderHook<TProps, TResult>
act: Act
cleanup: () => void
addCleanup: (callback: () => Promise<void> | void) => () => void
removeCleanup: (callback: () => Promise<void> | void) => void
}

export type RenderHookOptions<TProps, TOptions extends {}> = TOptions & {
initialProps?: TProps
}
Expand Down
13 changes: 13 additions & 0 deletions src/types/react.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
import { ComponentType } from 'react'

import { RenderHook, RenderHookOptions, Act } from '.'

export type WrapperComponent<TProps> = ComponentType<TProps>

export type RendererOptions<TProps> = {
wrapper?: WrapperComponent<TProps>
}

export interface ReactHooksRenderer {
renderHook: <TProps, TResult>(
callback: (props: TProps) => TResult,
options?: RenderHookOptions<TProps, RendererOptions<TProps>>
) => RenderHook<TProps, TResult>
act: Act
cleanup: () => void
addCleanup: (callback: () => Promise<void> | void) => () => void
removeCleanup: (callback: () => Promise<void> | void) => void
}
2 changes: 1 addition & 1 deletion test/dom/autoCleanup.disabled.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect } from 'react'

import { ReactHooksRenderer } from 'types'
import { ReactHooksRenderer } from 'types/react'

// This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
// then we DON'T auto-wire up the afterEach for folks
Expand Down
2 changes: 1 addition & 1 deletion test/dom/autoCleanup.noAfterEach.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect } from 'react'

import { ReactHooksRenderer } from 'types'
import { ReactHooksRenderer } from 'types/react'

// This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
// then we DON'T auto-wire up the afterEach for folks
Expand Down