Merge branch 'main' of https://github.com/EnsembleUI/ensemble into 97…

…1-actions-in-js
EnsembleUI · Dec 6, 2023 · f7070f7 · f7070f7
2 parents 9503dd0 + d72e67e
commit f7070f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/assets/schema/ensemble_schema.json b/assets/schema/ensemble_schema.json
@@ -1558,6 +1558,10 @@
               "type": "boolean",
               "description": "enable the toggling between plain and obscure text."
             },
+            "toolbarDone": {
+              "type": "boolean",
+              "description": "enable the toolbar with done button in the TextInput. (defaults to False)"
+            },
             "enableClearText": {
               "type": "boolean",
               "description": "It enables the default suffix clear icon button for the text input field to clear the values. Default (false)"

diff --git a/lib/widget/input/form_textfield.dart b/lib/widget/input/form_textfield.dart
@@ -131,6 +131,8 @@ abstract class BaseTextInput extends StatefulWidget
           _controller.enableClearText = Utils.optionalBool(value),
       'obscureToggle': (value) =>
           _controller.obscureToggle = Utils.optionalBool(value),
+      'toolbarDone': (value) =>
+          _controller.toolbarDoneButton = Utils.optionalBool(value),
       'keyboardAction': (value) =>
           _controller.keyboardAction = _getKeyboardAction(value),
       'maxLines': (value) => _controller.maxLines =
@@ -200,6 +202,8 @@ class TextInputController extends FormFieldController {
   // applicable only for Password or obscure TextInput, to toggle between plain and secure text
   bool? obscureToggle;
 
+  bool? toolbarDoneButton;
+
   model.InputValidator? validator;
   String? inputType;
   String? mask;
@@ -223,9 +227,7 @@ class TextInputState extends FormFieldWidgetState<BaseTextInput>
   late List<TextInputFormatter> _inputFormatter;
   OverlayEntry? overlayEntry;
   bool get toolbarDoneStatus {
-    final status = widget.keyboardType == TextInputType.phone ||
-        widget.keyboardType == TextInputType.number;
-    return status;
+    return widget.controller.toolbarDoneButton ?? false;
   }
 
   void evaluateChanges() {