Skip to content

Commit a98c247

Browse files
committed
feat(@uform/react): Optimize package size and fixing onFieldChange initialization trigger twice
1 parent 1cdd0c1 commit a98c247

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

packages/core/src/form.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import {
2222
} from './utils'
2323
import { Field } from './field'
2424
import { runValidation, format } from '@uform/validator'
25-
import { Subject } from 'rxjs'
26-
import { filter } from 'rxjs/operators'
25+
import { Subject } from 'rxjs/internal/Subject'
26+
import { filter } from 'rxjs/internal/operators/filter'
27+
import { debounceTime } from 'rxjs/internal/operators/debounceTime'
2728
import { FormPath } from './path'
2829

2930
const defaults = opts => ({
@@ -98,6 +99,9 @@ export class Form {
9899
if (!this.subscribes[eventName]) {
99100
this.subscribes[eventName] = new Subject()
100101
}
102+
this.subscribes[eventName] = this.subscribes[eventName].pipe(
103+
debounceTime(0)
104+
)
101105
if (isStr($filter) || isFn($filter)) {
102106
return this.subscribes[eventName].pipe(
103107
filter(isStr($filter) ? FormPath.match($filter) : $filter)

packages/react/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"@uform/utils": "0.1.3",
2525
"@uform/validator": "0.1.3",
2626
"pascal-case": "^2.0.1",
27-
"react-eva": "^1.0.0"
27+
"react-eva": "^1.0.0",
28+
"rxjs-compat": "^6.5.1"
2829
},
2930
"publishConfig": {
3031
"access": "public"

packages/react/src/__tests__/effects.spec.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,28 @@ test('onFormInit setFieldState', async () => {
7474
expect(queryByText('field is required')).toBeNull()
7575
})
7676

77+
test('init triggers', async () => {
78+
const callback = jest.fn()
79+
const TestComponent = () => {
80+
return (
81+
<SchemaForm
82+
effects={($, { setFieldState }) => {
83+
$('onFieldChange', 'aaa').subscribe(callback)
84+
}}
85+
>
86+
<Field name='aaa' type='string' />
87+
<button type='submit' data-testid='btn'>
88+
Submit
89+
</button>
90+
</SchemaForm>
91+
)
92+
}
93+
94+
render(<TestComponent />)
95+
await sleep(33)
96+
expect(callback).toHaveBeenCalledTimes(1)
97+
})
98+
7799
test('onFieldChange will trigger with initialValues', async () => {
78100
const callback = jest.fn()
79101
const TestComponent = () => {
@@ -104,8 +126,7 @@ test('onFieldChange will trigger with initialValues', async () => {
104126

105127
render(<TestComponent />)
106128
await sleep(33)
107-
expect(callback).toHaveBeenCalledTimes(3)
129+
expect(callback).toHaveBeenCalledTimes(2)
108130
expect(callback.mock.calls[0][0].value).toBe(undefined)
109-
expect(callback.mock.calls[1][0].value).toBe(undefined)
110-
expect(callback.mock.calls[2][0].value).toBe(123)
131+
expect(callback.mock.calls[1][0].value).toBe(123)
111132
})

0 commit comments

Comments
 (0)