Merge branch 'main' into firebase-custom-token-auth

Author: Umair-Manzoor-47

modules/ensemble/lib/layout/form.dart

@@ -68,6 +68,7 @@ class EnsembleForm extends StatefulWidget
           _controller.labelStyle = Utils.getTextStyle(value),
       'enabled': (value) => _controller.enabled = Utils.optionalBool(value),
       'readOnly': (value) => _controller.readOnly = Utils.optionalBool(value),
+      'dismissibleKeyboard': (value) => _controller.dismissibleKeyboard = Utils.getBool(value, fallback: _controller.dismissibleKeyboard),
       'width': (value) => _controller.width = Utils.optionalInt(value),
       'height': (value) => _controller.height = Utils.optionalInt(value),
       'gap': (value) => _controller.gap =
@@ -110,6 +111,7 @@ class FormController extends WidgetController {
   String? labelOverflow;
   bool? enabled;
   bool? readOnly;
+  bool dismissibleKeyboard = true;
 
   // labelMaxWidth applicable only to labelPosition=start
   int? labelMaxWidth;

modules/ensemble/lib/widget/button.dart

@@ -280,7 +280,9 @@ class ButtonState extends EWidgetState<Button> {
     // if focus in on a formfield (e.g. TextField), clicking on button will
     // not remove focus, so its value is never updated. Unfocus here before
     // executing button click ensure we get all the latest value of the form fields
-    FocusManager.instance.primaryFocus?.unfocus();
+    if (widget._controller.submitForm == false) {
+      FocusManager.instance.primaryFocus?.unfocus();
+    }
 
     // submit the form if specified
     if (widget._controller.submitForm == true) {

modules/ensemble/lib/widget/helpers/form_helper.dart

@@ -118,6 +118,10 @@ class FormHelper {
             event: EnsembleEvent(formState.widget));
       }
     }
+    // only dismiss keyboard if dismissKeyboardOnSubmit is true (By default it is true)
+    if(formState?.widget.controller.dismissibleKeyboard == true) {
+    FocusManager.instance.primaryFocus?.unfocus();
+    }
   }
 }
 

modules/ensemble/lib/widget/input/form_textfield.dart

@@ -145,6 +145,8 @@ abstract class BaseTextInput extends StatefulWidget
       'validator': (value) => _controller.validator = Utils.getValidator(value),
       'enableClearText': (value) =>
           _controller.enableClearText = Utils.optionalBool(value),
+      'dismissibleKeyboard': (value) =>
+          _controller.dismissibleKeyboard = Utils.getBool(value, fallback: _controller.dismissibleKeyboard),
       'obscureToggle': (value) =>
           _controller.obscureToggle = Utils.optionalBool(value),
       'obscured': (widget) => _controller.obscureText == true,
@@ -224,6 +226,7 @@ class TextInputController extends FormFieldController with HasTextPlaceholder {
   EnsembleAction? onFocusReceived;
   EnsembleAction? onFocusLost;
   bool? enableClearText;
+  bool dismissibleKeyboard = true;
 
   // applicable only for TextInput
   bool? obscureText;
@@ -305,7 +308,10 @@ class TextInputState extends FormFieldWidgetState<BaseTextInput>
       overlayEntry!.remove();
       overlayEntry = null;
     }
+    // only dismiss if dismissibleKeyboard is true (By Default dismissibleKeyboard is true)
+    if(widget._controller.dismissibleKeyboard == true){
     FocusManager.instance.primaryFocus?.unfocus();
+    }
   }
 
   @override