Add 'validator' parameter to input_dialog.

Author: jonathanslenders

prompt_toolkit/shortcuts/dialogs.py

@@ -16,6 +16,7 @@
 from prompt_toolkit.layout.containers import AnyContainer, HSplit
 from prompt_toolkit.layout.dimension import Dimension as D
 from prompt_toolkit.styles import BaseStyle
+from prompt_toolkit.validation import Validator
 from prompt_toolkit.widgets import (
     Box,
     Button,
@@ -25,6 +26,7 @@
     ProgressBar,
     RadioList,
     TextArea,
+    ValidationToolbar,
 )
 
 __all__ = [
@@ -105,6 +107,7 @@ def input_dialog(
     ok_text: str = "OK",
     cancel_text: str = "Cancel",
     completer: Optional[Completer] = None,
+    validator: Optional[Validator] = None,
     password: FilterOrBool = False,
     style: Optional[BaseStyle] = None,
 ) -> Application[str]:
@@ -124,7 +127,11 @@ def ok_handler() -> None:
     cancel_button = Button(text=cancel_text, handler=_return_none)
 
     textfield = TextArea(
-        multiline=False, password=password, completer=completer, accept_handler=accept
+        multiline=False,
+        password=password,
+        completer=completer,
+        validator=validator,
+        accept_handler=accept,
     )
 
     dialog = Dialog(
@@ -133,6 +140,7 @@ def ok_handler() -> None:
             [
                 Label(text=text, dont_extend_height=True),
                 textfield,
+                ValidationToolbar(),
             ],
             padding=D(preferred=1, max=1),
         ),

prompt_toolkit/widgets/base.py

@@ -74,6 +74,7 @@
 from prompt_toolkit.lexers import DynamicLexer, Lexer
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.utils import get_cwidth
+from prompt_toolkit.validation import DynamicValidator, Validator
 
 from .toolbars import SearchToolbar
 
@@ -139,6 +140,8 @@ class TextArea:
     :param focus_on_click: When `True`, focus after mouse click.
     :param input_processors: `None` or a list of
         :class:`~prompt_toolkit.layout.Processor` objects.
+    :param validator: `None` or a :class:`~prompt_toolkit.validation.Validator`
+        object.
 
     Window attributes:
 
@@ -173,6 +176,7 @@ def __init__(
         auto_suggest: Optional[AutoSuggest] = None,
         completer: Optional[Completer] = None,
         complete_while_typing: FilterOrBool = True,
+        validator: Optional[Validator] = None,
         accept_handler: Optional[BufferAcceptHandler] = None,
         history: Optional[History] = None,
         focusable: FilterOrBool = True,
@@ -208,6 +212,7 @@ def __init__(
         self.auto_suggest = auto_suggest
         self.read_only = read_only
         self.wrap_lines = wrap_lines
+        self.validator = validator
 
         self.buffer = Buffer(
             document=Document(text, 0),
@@ -217,6 +222,7 @@ def __init__(
             complete_while_typing=Condition(
                 lambda: is_true(self.complete_while_typing)
             ),
+            validator=DynamicValidator(lambda: self.validator),
             auto_suggest=DynamicAutoSuggest(lambda: self.auto_suggest),
             accept_handler=accept_handler,
             history=history,