Skip to content

Simplify the way form units are created #26

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.

Sign up for GitHub

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

Open
iposokhin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify the way form units are created #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 0 additions & 37 deletions src/create-form-unit.ts
View file
Open in desktop

This file was deleted.

72 changes: 31 additions & 41 deletions src/factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
EventCallable,
Store,
combine,
createEvent,
sample,
} from "effector"
import {
Expand All @@ -18,7 +19,6 @@ import {
bindValidation,
bindChangeEvent,
} from "./field"
import { createFormUnit } from "./create-form-unit"

function createFormValuesStore(
fields: AnyFields
Expand Down Expand Up @@ -111,55 +111,45 @@ export function createForm<Values extends AnyFormValues>(
touched: $touched,
})

const validate = createFormUnit.event<void>({
domain,
existing: units?.validate,
})
const validate = units?.validate
? units.validate
: createEvent({ domain })

const submitForm = createFormUnit.event<void>({
domain,
existing: units?.submit,
})
const submitForm = units?.submit
? units.submit
: createEvent({ domain })

const formValidated = createFormUnit.event({
domain,
existing: units?.formValidated,
})
const formValidated = units?.formValidated
? units.formValidated
: createEvent<Values>({ domain })

const setInitialForm = createFormUnit.event<Partial<AnyFormValues>>({
domain,
existing: units?.setInitialForm as EventCallable<Partial<AnyFormValues>>
})
const setInitialForm = units?.setInitialForm
? units.setInitialForm
: createEvent<Partial<AnyFormValues>>({ domain })

const setForm = createFormUnit.event<Partial<AnyFormValues>>({
domain,
existing: units?.setForm as EventCallable<Partial<AnyFormValues>>,
})
const setForm = units?.setForm
? units.setForm
: createEvent<Partial<AnyFormValues>>({ domain })

const addErrors = createFormUnit.event<AddErrorPayload[]>({
domain,
existing: units?.addErrors,
})
const addErrors = units?.addErrors
? units.addErrors
: createEvent<AddErrorPayload[]>({ domain })

const resetForm = createFormUnit.event({
domain,
existing: units?.reset,
})
const resetForm = units?.reset
? units.reset
: createEvent({ domain })

const resetValues = createFormUnit.event({
domain,
existing: units?.resetValues,
})
const resetValues = units?.resetValues
? units.resetValues
: createEvent({ domain })

const resetErrors = createFormUnit.event({
domain,
existing: units?.resetErrors,
})
const resetErrors = units?.resetErrors
? units.resetErrors
: createEvent({ domain })

const resetTouched = createFormUnit.event({
domain,
existing: units?.resetTouched,
})
const resetTouched = units?.resetTouched
? units.resetTouched
: createEvent({ domain })

const submitWithFormData = sample({
source: $form,
Expand Down
113 changes: 45 additions & 68 deletions src/field.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
sample,
merge,
Event,
createEvent,
} from "effector"
import {
ValidationError,
Expand All @@ -19,7 +20,6 @@ import {
FieldUnitShape,
} from "./types"
import { createCombineValidator } from "./validation"
import { createFormUnit } from "./create-form-unit"

/**
* @group Factories
Expand All @@ -33,82 +33,59 @@ export function createField(
? fieldConfig.init()
: fieldConfig.init

const $value = createFormUnit.store({
domain,
existing: fieldConfig.units?.$value,
init: initValue,
}, {
sid: `${fieldName}-$value`
})

const $errors = createFormUnit.store<ValidationError[]>({
domain,
existing: fieldConfig.units?.$errors,
init: [],
}, {
sid: `${fieldName}-$errors`
})
const $value = fieldConfig.units?.$value
? fieldConfig.units.$value
: createStore(initValue, { sid: `${fieldName}-$value`, domain })

const $errors = fieldConfig.units?.$errors
? fieldConfig.units.$errors
: createStore<ValidationError[]>([], { sid: `${fieldName}-$errors`, domain })

const $firstError = $errors.map(
(errors) => errors[0] ? errors[0] : null
)
const $firstError = $errors.map((errors) => errors[0] ? errors[0] : null)

const $initValue = createFormUnit.store({
domain,
existing: fieldConfig.units?.$initValue,
init: initValue,
}, {
sid: `${fieldName}-$initValue`
})
const $initValue = fieldConfig.units?.$initValue
? fieldConfig.units.$initValue
: createStore(initValue, { sid: `${fieldName}-$initValue`, domain })

const $touched = createFormUnit.store({
domain,
existing: fieldConfig.units?.$isTouched,
init: false,
}, {
sid: `${fieldName}-$touched`
})
const $touched = fieldConfig.units?.$isTouched
? fieldConfig.units.$isTouched
: createStore(false, { sid: `${fieldName}-$touched`, domain })

const $isDirty = combine($value, $initValue,
(value, initValue) => value !== initValue,
)

const onChange = createFormUnit.event({
domain,
existing: fieldConfig.units?.onChange,
})
const onBlur = createFormUnit.event({
domain,
existing: fieldConfig.units?.onBlur,
})
const changed = createFormUnit.event({
domain,
existing: fieldConfig.units?.changed,
})
const addError = createFormUnit.event<{
rule: string
errorText?: string
}>({
domain,
existing: fieldConfig.units?.addError,
})
const validate = createFormUnit.event({
domain,
existing: fieldConfig.units?.validate,
})
const resetErrors = createFormUnit.event({
domain,
existing: fieldConfig.units?.resetErrors,
})
const resetValue = createFormUnit.event({
domain,
existing: fieldConfig.units?.resetValue,
})
const reset = createFormUnit.event({
domain,
existing: fieldConfig.units?.reset,
})
const onChange = fieldConfig.units?.onChange
? fieldConfig.units.onChange
: createEvent({ domain })

const onBlur = fieldConfig.units?.onBlur
? fieldConfig.units.onBlur
: createEvent({ domain })

const changed = fieldConfig.units?.changed
? fieldConfig.units.changed
: createEvent({ domain })

const addError = fieldConfig.units?.addError
? fieldConfig.units.addError
: createEvent<{ rule: string; errorText?: string }>({ domain })

const validate = fieldConfig.units?.validate
? fieldConfig.units.validate
: createEvent({ domain })

const resetErrors = fieldConfig.units?.resetErrors
? fieldConfig.units.resetErrors
: createEvent({ domain })

const resetValue = fieldConfig.units?.resetValue
? fieldConfig.units.resetValue
: createEvent({ domain })

const reset = fieldConfig.units?.reset
? fieldConfig.units.reset
: createEvent({ domain });

const $isValid = $firstError.map((firstError) => firstError === null)
const $errorText = $firstError.map(
Expand Down