Skip to content
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
49 changes: 47 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions packages/flower-react/src/__tests__/FlowerField.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -790,4 +790,79 @@ describe('Test FlowerField component', () => {
'{"name":["error-name"]}'
)
})

it('Test hidden field', async () => {
const user = userEvent.setup()

render(
<FlowerProvider>
<Flower name="app-test">
<FlowerNode id="start" to={{ form: null }}>
<InitState state={{ amount: 1 }} />
</FlowerNode>
<FlowerNode
id="form"
to={{
success: {
rules: { $and: [{ '$form.isValid': { $eq: true } }] }
},
error: { rules: { $and: [{ '$form.isValid': { $ne: true } }] } }
}}
>
<FlowerField
id="name"
alwaysDisplay
rules={{
name: { $eq: 'wrong' }
}}
asyncValidate={(val) => {
if (val?.indexOf('@') > -1) return
return [
{
message: 'is not email'
}
]
}}
validate={[
{
message: 'is equal',
rules: { $and: [{ name: { $eq: '@andrea' } }] }
}
]}
>
<Input />
</FlowerField>
<FlowerField
id="metadata.age"
validate={[
{
message: 'is gt 18',
rules: { $and: [{ $self: { $gt: 18 } }] }
}
]}
>
<Input name="age" />
</FlowerField>
<ButtonNext />
</FlowerNode>
<FlowerNode id="success">
<Text text="success" />
</FlowerNode>
<FlowerNode id="error">
<Form />
<Text text="error" />
</FlowerNode>
</Flower>
</FlowerProvider>
)

await user.type(screen.getByTestId('input'), 'an')

await user.type(screen.getByTestId('age'), '19')
expect(screen.getByTestId('age').getAttribute('value')).toBe('19')

fireEvent.click(screen.getByTestId('btn-next'))

expect(screen.getByTestId('h1')).toHaveTextContent('success')
})
})
7 changes: 4 additions & 3 deletions packages/flower-react/src/components/FlowerField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Wrapper({
const dispatch = useDispatch()

const [customAsyncErrors, setCustomAsyncErrors] = useState(
asyncValidate && [asyncInitialError]
!hidden && asyncValidate && [asyncInitialError]
)
const [isValidating, setIsValidating] = useState<boolean | undefined>(
undefined
Expand All @@ -65,7 +65,7 @@ function Wrapper({

const value = useSelector(getDataFromState(flowNameFromPath, path))
const errors = useSelector(
makeSelectFieldError(flowName, id, validate),
makeSelectFieldError(flowName, id, hidden ? [] :validate),
CoreUtils.allEqual
)
const dirty = useSelector(
Expand Down Expand Up @@ -167,6 +167,7 @@ function Wrapper({
)

useEffect(() => {
if(hidden) return
if (asyncValidate) {
if (refValue.current === value) return
refValue.current = value
Expand All @@ -182,7 +183,7 @@ function Wrapper({
setTouched(true)
debouncedValidation(value)
}
}, [asyncValidate, asyncInitialError, value, debouncedValidation, setTouched])
}, [asyncValidate, asyncInitialError, value, debouncedValidation, setTouched, hidden])

useEffect(() => {
if (onUpdate) {
Expand Down