packages/wyatt_form_bloc/example/lib/sign_up/widgets/sign_up_form.dart

@@ -39,7 +39,7 @@ class _NameInput extends StatelessWidget {
     return InputBuilderTextController<SimpleCustomFormCubit, String?, Metadata>(
       field: formFieldName,
       builder:
-          (context, cubit, state, field, input, controller, metadata) {
+          (context, cubit, state, field, inputValid, controller, metadata) {
         final meta = state.form.metadataOf<Metadata>(field).extra;
         final color = computeColor(meta);
         return Row(
@@ -65,7 +65,7 @@ class _NameInput extends StatelessWidget {
                 decoration: InputDecoration(
                   labelText: 'name',
                   helperText: '',
-                  errorText: input.validator.invalid ? 'invalid name' : null,
+                  errorText: !inputValid ? 'invalid name' : null,
                 ),
               ),
             )
@@ -81,7 +81,7 @@ class _PhoneInput extends StatelessWidget {
   Widget build(BuildContext context) {
     return InputBuilderMetadata<SimpleCustomFormCubit, Metadata>(
       field: formFieldPhone,
-      builder: (context, cubit, state, field, input, metadata) {
+      builder: (context, cubit, state, field, inputValid, metadata) {
         final meta = state.form.metadataOf<Metadata>(field).extra;
         final color = computeColor(meta);
         return Row(
@@ -106,7 +106,7 @@ class _PhoneInput extends StatelessWidget {
                 decoration: InputDecoration(
                   labelText: 'phone',
                   helperText: '',
-                  errorText: input.validator.invalid ? 'invalid phone' : null,
+                  errorText: !inputValid ? 'invalid phone' : null,
                 ),
               ),
             )
@@ -122,13 +122,13 @@ class _EmailInput extends StatelessWidget {
   Widget build(BuildContext context) {
     return InputBuilder<SimpleCustomFormCubit>(
       field: formFieldEmail,
-      builder: (context, cubit, state, field, input) => TextField(
+      builder: (context, cubit, state, field, inputValid) => TextField(
         onChanged: (value) => cubit.dataChanged(field, Email.dirty(value)),
         keyboardType: TextInputType.emailAddress,
         decoration: InputDecoration(
           labelText: 'email',
           helperText: '',
-          errorText: input.validator.invalid ? 'invalid email' : null,
+          errorText: !inputValid ? 'invalid email' : null,
         ),
       ),
     );

packages/wyatt_form_bloc/example/lib/sign_up/widgets/simple_sign_up_form.dart

@@ -25,7 +25,8 @@ class _NameInput extends StatelessWidget {
   Widget build(BuildContext context) {
     return InputBuilderTextController<SimpleCustomFormCubit, String?, Metadata>(
       field: formFieldName,
-      builder: (context, cubit, state, field, input, controller, metadata) {
+      builder:
+          (context, cubit, state, field, inputValid, controller, metadata) {
         return TextField(
           controller: controller,
           onChanged: (value) => cubit.dataChanged(field, Name.dirty(value)),
@@ -33,7 +34,7 @@ class _NameInput extends StatelessWidget {
           decoration: InputDecoration(
             labelText: 'name',
             helperText: '',
-            errorText: input.validator.invalid ? 'invalid name' : null,
+            errorText: !inputValid ? 'invalid name' : null,
           ),
         );
       },

packages/wyatt_form_bloc/lib/src/presentation/features/widgets/input_builder.dart

@@ -28,16 +28,16 @@ class InputBuilder<Cubit extends FormDataCubit> extends StatelessWidget {
     Cubit cubit,
     FormDataState state,
     String field,
-    FormInput<dynamic, FormInputValidator<dynamic, ValidationError>, dynamic>
+    bool inputValid,
-        input,
   ) builder;
 
   @override
-  Widget build(BuildContext context) => BlocBuilder<Cubit, FormDataState>(
+  Widget build(BuildContext context) =>
+      BlocBuilder<Cubit, FormDataState>(
         builder: (context, state) {
           final cubit = context.watch<Cubit>();
-          final input = state.form.inputOf(field);
+          final inputValid = state.form.validatorOf(field).valid;
-          return builder.call(context, cubit, state, field, input);
+          return builder.call(context, cubit, state, field, inputValid);
         },
       );
 }

packages/wyatt_form_bloc/lib/src/presentation/features/widgets/input_builder_metadata.dart

@@ -16,10 +16,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wyatt_form_bloc/src/core/enums/validation_error.dart';
-import 'package:wyatt_form_bloc/src/domain/entities/form_input.dart';
 import 'package:wyatt_form_bloc/src/domain/entities/form_input_metadata.dart';
-import 'package:wyatt_form_bloc/src/domain/input_validators/form_input_validator.dart';
 import 'package:wyatt_form_bloc/src/presentation/presentation.dart';
 
 class InputBuilderMetadata<Cubit extends FormDataCubit, Extra>
@@ -37,23 +34,22 @@ class InputBuilderMetadata<Cubit extends FormDataCubit, Extra>
     Cubit cubit,
     FormDataState state,
     String field,
-    FormInput<dynamic, FormInputValidator<dynamic, ValidationError>, dynamic>
+    bool inputValid,
-        input,
     FormInputMetadata<Extra>? metadata,
   ) builder;
 
   @override
   Widget build(BuildContext context) => BlocBuilder<Cubit, FormDataState>(
         builder: (context, state) {
-          final cubit = context.watch<Cubit>();
+          final cubit = context.read<Cubit>();
-          final input = state.form.inputOf(field);
+          final inputValid = state.form.validatorOf(field).valid;
-          final metadata = input.metadata as FormInputMetadata<Extra>?;
+          final metadata = state.form.metadataOf<Extra>(field);
           return builder.call(
             context,
             cubit,
             state,
             field,
-            input,
+            inputValid,
             metadata,
           );
         },

packages/wyatt_form_bloc/lib/src/presentation/features/widgets/input_builder_text_controller.dart

@@ -16,10 +16,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wyatt_form_bloc/src/core/enums/validation_error.dart';
-import 'package:wyatt_form_bloc/src/domain/entities/form_input.dart';
 import 'package:wyatt_form_bloc/src/domain/entities/form_input_metadata.dart';
-import 'package:wyatt_form_bloc/src/domain/input_validators/form_input_validator.dart';
 import 'package:wyatt_form_bloc/src/domain/repositories/form_repository.dart';
 import 'package:wyatt_form_bloc/src/presentation/features/form_data/form_data_cubit.dart';
 
@@ -38,8 +35,7 @@ class InputBuilderTextController<Cubit extends FormDataCubit, S extends String?,
     Cubit cubit,
     FormDataState state,
     String field,
-    FormInput<dynamic, FormInputValidator<dynamic, ValidationError>, dynamic>
+    bool inputValid,
-        input,
     TextEditingController textEditingController,
     FormInputMetadata<Extra>? metadata,
   ) builder;
@@ -61,15 +57,15 @@ class InputBuilderTextController<Cubit extends FormDataCubit, S extends String?,
 
     return BlocBuilder<Cubit, FormDataState>(
       builder: (context, state) {
-        final cubit = context.watch<Cubit>();
+        final cubit = context.read<Cubit>();
-        final input = state.form.inputOf(field);
+        final inputValid = state.form.validatorOf(field).valid;
-        final metadata = input.metadata as FormInputMetadata<Extra>?;
+        final metadata = state.form.metadataOf<Extra>(field);
         return builder.call(
           context,
           cubit,
           state,
           field,
-          input,
+          inputValid,
           _controller,
           metadata,
         );

packages/wyatt_form_bloc/lib/src/presentation/features/widgets/submit_builder.dart

@@ -27,6 +27,7 @@ class SubmitBuilder<Cubit extends FormDataCubit> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => BlocBuilder<Cubit, FormDataState>(
+        buildWhen: (previous, current) => previous.status != current.status,
         builder: (context, state) => builder.call(
           context,
           context.read<Cubit>(),