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(react): fix field wrong mounted state #3181

Merged
merged 1 commit into from
Jun 12, 2022
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions packages/react/src/__tests__/field.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { act } from 'react-dom/test-utils'
import { render, fireEvent, waitFor } from '@testing-library/react'
import { createForm, onFieldUnmount } from '@formily/core'
import { createForm, onFieldUnmount, isArrayField } from '@formily/core'
import {
isField,
Field as FieldType,
Expand Down Expand Up @@ -33,7 +33,7 @@ type CustomProps = {
list?: string[]
}

const Decorator: React.FC = (props) => <div>{props.children}</div>
const Decorator = (props) => <div>{props.children}</div>
const Input: React.FC<React.PropsWithChildren<InputProps>> = (props) => (
<input
{...props}
Expand Down Expand Up @@ -147,6 +147,47 @@ test('useAttach', () => {
expect(form.query('bb').take().mounted).toBeTruthy()
})

test('useAttach with array field', async () => {
const form = createForm()
const MyComponent = () => {
return (
<FormProvider form={form}>
<ArrayField
name="array"
initialValue={[{ input: '11' }, { input: '22' }]}
>
{(field) => {
return field.value.map((val, index) => {
return (
<Field
key={index}
name={index + '.input'}
decorator={[Decorator]}
component={[Input]}
/>
)
})
}}
</ArrayField>
</FormProvider>
)
}
render(<MyComponent />)
await waitFor(() => {
expect(form.query('array.0.input').take().mounted).toBeTruthy()
expect(form.query('array.1.input').take().mounted).toBeTruthy()
})
form.query('array').take((field) => {
if (isArrayField(field)) {
field.moveDown(0)
}
})
await waitFor(() => {
expect(form.query('array.0.input').take().mounted).toBeTruthy()
expect(form.query('array.1.input').take().mounted).toBeTruthy()
})
})

test('useFormEffects', async () => {
const form = createForm()
const CustomField = observer(() => {
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/__tests__/schema.markup.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('markup schema field', () => {
})
test('void', () => {
const form = createForm()
const VoidComponent: React.FC = (props) => {
const VoidComponent = (props) => {
return <div data-testid="void-component">{props.children}</div>
}
const SchemaField = createSchemaField({
Expand Down Expand Up @@ -178,7 +178,7 @@ describe('markup schema field', () => {
})
test('props children', () => {
const form = createForm()
const Text: React.FC = (props) => {
const Text = (props) => {
return <div data-testid="children-test">{props.children}</div>
}
const SchemaField = createSchemaField({
Expand All @@ -201,7 +201,7 @@ describe('markup schema field', () => {
})
test('x-content', () => {
const form = createForm()
const Text: React.FC = (props) => {
const Text = (props) => {
return <div data-testid="content-test">{props.children}</div>
}
const SchemaField = createSchemaField({
Expand Down
11 changes: 2 additions & 9 deletions packages/react/src/hooks/useAttach.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
import { useRef, useEffect } from 'react'
import { useEffect } from 'react'

interface IRecycleTarget {
onMount: () => void
onUnmount: () => void
}

export const useAttach = <T extends IRecycleTarget>(target: T): T => {
const oldTargetRef = useRef<IRecycleTarget>(null)
useEffect(() => {
if (oldTargetRef.current && target !== oldTargetRef.current) {
oldTargetRef.current.onUnmount()
}
oldTargetRef.current = target
target.onMount()
return () => {
target.onUnmount()
}
return () => target.onUnmount()
}, [target])
return target
}
2 changes: 1 addition & 1 deletion packages/react/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface IFormSpyProps {
}

export type RenderPropsChildren<Payload> =
| ((field: Payload, form: Form) => ReactChild)
| ((field: Payload, form: Form) => React.ReactNode)
| React.ReactNode

export interface IFieldProps<
Expand Down