fix: dynamic changing readonly state on fields not working (#83)

dhaalves · danvick · commit cdbec531a4b0 · 2019-06-25T07:46:48.000+03:00
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -39,7 +39,6 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -74,6 +73,7 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       key: _fieldKey,
       enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_checkbox_list.dart b/lib/src/fields/form_builder_checkbox_list.dart
@@ -40,7 +40,6 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -80,6 +79,7 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
         key: _fieldKey,
         enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -50,7 +50,6 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -62,6 +61,7 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return SizedBox(
       // height: 200.0,
       child: FormField(
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -171,7 +171,6 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -183,6 +182,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return DateTimePickerFormField(
       key: _fieldKey,
       inputType: widget.inputType,
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -53,7 +53,6 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -65,6 +64,7 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       key: _fieldKey,
       enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_radio.dart b/lib/src/fields/form_builder_radio.dart
@@ -39,7 +39,6 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -75,9 +74,10 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       key: _fieldKey,
-      enabled: !_readonly && !_readonly,
+      enabled: !_readonly,
       initialValue: widget.initialValue,
       validator: (val) {
         for (int i = 0; i < widget.validators.length; i++) {
diff --git a/lib/src/fields/form_builder_rate.dart b/lib/src/fields/form_builder_rate.dart
@@ -42,7 +42,6 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -54,6 +53,7 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       key: _fieldKey,
       enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -40,7 +40,6 @@ class _FormBuilderSegmentedControlState
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -52,6 +51,7 @@ class _FormBuilderSegmentedControlState
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       key: _fieldKey,
       initialValue: widget.initialValue,
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -57,7 +57,6 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     _points = widget.points;
     super.initState();
   }
@@ -70,6 +69,7 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField<Uint8List>(
       key: _fieldKey,
       enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -53,7 +53,6 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -65,6 +64,7 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       key: _fieldKey,
       enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_stepper.dart b/lib/src/fields/form_builder_stepper.dart
@@ -44,7 +44,6 @@ class _FormBuilderStepperState extends State<FormBuilderStepper> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -56,6 +55,7 @@ class _FormBuilderStepperState extends State<FormBuilderStepper> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
       enabled: !_readonly,
       key: _fieldKey,
diff --git a/lib/src/fields/form_builder_switch.dart b/lib/src/fields/form_builder_switch.dart
@@ -37,7 +37,6 @@ class _FormBuilderSwitchState extends State<FormBuilderSwitch> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     super.initState();
   }
 
@@ -49,6 +48,7 @@ class _FormBuilderSwitchState extends State<FormBuilderSwitch> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return FormField(
         key: _fieldKey,
         enabled: !_readonly,
diff --git a/lib/src/fields/form_builder_text_field.dart b/lib/src/fields/form_builder_text_field.dart
@@ -91,7 +91,6 @@ class FormBuilderTextFieldState extends State<FormBuilderTextField> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     if (widget.controller != null)
       _textEditingController = widget.controller;
     else
@@ -107,6 +106,7 @@ class FormBuilderTextFieldState extends State<FormBuilderTextField> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return TextFormField(
       key: _fieldKey,
       validator: (val) {
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
@@ -86,7 +86,6 @@ class _FormBuilderTypeAheadState extends State<FormBuilderTypeAhead> {
   void initState() {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
-    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     _typeAheadController = TextEditingController(text: widget.initialValue);
     _typeAheadController.addListener(() {
       if (widget.onChanged != null) widget.onChanged(_typeAheadController.text);
@@ -96,6 +95,7 @@ class _FormBuilderTypeAheadState extends State<FormBuilderTypeAhead> {
 
   @override
   Widget build(BuildContext context) {
+    _readonly = (_formState?.readonly == true) ? true : widget.readonly;
     return TypeAheadFormField(
       key: _fieldKey,
       validator: (val) {
