Commit 9c3d9b1

committed

Merge branch 'beta' into refactor/tests-proposal

2 parents 62f05ba + 3813b88 commit 9c3d9b1Copy full SHA for 9c3d9b1

File tree

+23

-12

lines changed

+23

-12

lines changed

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,18 @@ function resultContainer<TValue>(): ResultContainer<TValue> {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-function createRenderHook<TProps, TResult, TOptions extends {}, TRenderer extends Renderer<TProps>>(`
	`43`	`+function createRenderHook<`
	`44`	`+ TProps,`
	`45`	`+ TResult,`
	`46`	`+ TOptions extends object,`
	`47`	`+ TRenderer extends Renderer<TProps>`
	`48`	`+>(`
`44`	`49`	`createRenderer: CreateRenderer<TProps, TResult, TOptions, TRenderer>`
`45`		`-) {`
`46`		`- const renderHook = (`
`47`		`- callback: (props: TProps)=>TResult,`
`48`		`- options: RenderHookOptions<TProps,TOptions> = {} as RenderHookOptions<TProps, TOptions>`
`49`		`- ): RenderHook<TProps,TResult,TRenderer> => {`
	`50`	`+): RenderHook<TProps,TResult,TOptions> {`
	`51`	`+ const renderHook: RenderHook<TProps,TResult,TOptions> = (`
	`52`	`+ callback,`
	`53`	`+ options = {} as RenderHookOptions<TProps, TOptions>`
	`54`	`+ ) => {`
`50`	`55`	`const { result, setValue, setError, addResolver } = resultContainer<TResult>()`
`51`	`56`	`const renderProps = { callback, setValue, setError }`
`52`	`57`	`let hookProps = options.initialProps`
`@@ -81,7 +86,6 @@ function createRenderHook<TProps, TResult, TOptions extends {}, TRenderer extend`
`81`	`86`	`// This dummy usage works around that.`
`82`	`87`	`renderHook.name // eslint-disable-line @typescript-eslint/no-unused-expressions`
`83`	`88`
`84`		`-`
`85`	`89`	`return renderHook`
`86`	`90`	`}`
`87`	`91`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export type AsyncUtils = {`
`38`	`38`	`waitForValueToChange: (selector: () => unknown, options?: WaitOptions) => Promise<void>`
`39`	`39`	`}`
`40`	`40`
`41`		`-export type RenderHook<`
	`41`	`+export type RenderHookResult<`
`42`	`42`	`TProps,`
`43`	`43`	`TValue,`
`44`	`44`	`TRenderer extends Renderer<TProps> = Renderer<TProps>`
`@@ -47,10 +47,17 @@ export type RenderHook<`
`47`	`47`	`Omit<TRenderer, keyof Renderer<TProps>> &`
`48`	`48`	`AsyncUtils`
`49`	`49`
`50`		`-export type RenderHookOptions<TProps, TOptions extends {}> = TOptions & {`
	`50`	`+export type RenderHookOptions<TProps, TOptions extends object> = TOptions & {`
`51`	`51`	`initialProps?: TProps`
`52`	`52`	`}`
`53`	`53`
	`54`	`+export interface RenderHook<TProps, TResult, TOptions extends object> {`
	`55`	`+ (`
	`56`	`+ callback: (props: TProps) => TResult,`
	`57`	`+ options?: RenderHookOptions<TProps, TOptions>`
	`58`	`+ ): RenderHookResult<TProps, TResult>`
	`59`	`+}`
	`60`	`+`
`54`	`61`	`export interface Act {`
`55`	`62`	`(callback: () => void \| undefined): void`
`56`	`63`	`(callback: () => Promise<void \| undefined>): Promise<undefined>`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`import { ComponentType } from 'react'`
`2`	`2`
`3`		`-import { RenderHook,RenderHookOptions, Act } from '.'`
	`3`	`+import { RenderHookOptions,RenderHookResult, Act } from '.'`
`4`	`4`
`5`	`5`	`export type WrapperComponent<TProps> = ComponentType<TProps>`
`6`	`6`
`7`	`7`	`export type RendererOptions<TProps> = {`
`8`	`8`	`wrapper?: WrapperComponent<TProps>`
`9`	`9`	`}`
`10`	`10`
`11`		`-export interface ReactHooksRenderer {`
	`11`	`+export type ReactHooksRenderer= {`
`12`	`12`	`renderHook: <TProps, TResult>(`
`13`	`13`	`callback: (props: TProps) => TResult,`
`14`	`14`	`options?: RenderHookOptions<TProps, RendererOptions<TProps>>`
`15`		`- ) => RenderHook<TProps, TResult>`
	`15`	`+ ) => RenderHookResult<TProps, TResult>`
`16`	`16`	`act: Act`
`17`	`17`	`cleanup: () => void`
`18`	`18`	`addCleanup: (callback: () => Promise<void> \| void) => () => void`

Comments

(0)