textual upgrade

Author: e3rd

mininterface/config.py

@@ -21,7 +21,7 @@ class MininterfaceConfig:
     gui: Gui
     tui: Tui
     interface: Literal["gui"] | Literal["tui"] | None = None
-    """ Choose the interface """
+    """ Enforce an interface. By default, we choose automatically. """
 
 
 Config = MininterfaceConfig(Gui(), Tui())

mininterface/showcase.py

@@ -26,15 +26,18 @@ class Subcommand1(SharedArgs):
     my_local: int = 1
 
     def run(self):
+        print("Subcommand 1 clicked")
         print("Common:", self.common)  # user input
         print("Number:", self.my_local)  # 1 or user input
         print("Internal:", self.internal)
+        print("The submit button blocked!")
         raise ValidationFail("The submit button blocked!")
 
 
 @dataclass
 class Subcommand2(SharedArgs):
     def run(self):
+        print("Subcommand 2 clicked")
         self._facet.set_title("Button clicked")  # you can access internal self._facet: Facet
         print("Common files", self.files)
 

mininterface/textual_interface/textual_adaptor.py

@@ -82,18 +82,11 @@ def run_dialog(self, form: TagDict, title: str = "", submit: bool | str = True)
         if title:
             app.title = title
 
-        widgets: WidgetList = [f for f in flatten(formdict_to_widgetdict(
-            form, self.widgetize), include_keys=self.header)]
-        if len(widgets) and isinstance(widgets[0], Rule):
-            # there are multiple sections in the list, <hr>ed by Rule elements. However, the first takes much space.
-            widgets.pop(0)
-        app.widgets = widgets
-
         if not app.run():
             raise Cancelled
 
         # validate and store the UI value → Tag value → original value
-        vals = ((field._link, field.get_ui_value()) for field in widgets if hasattr(field, "_link"))
+        vals = ((field._link, field.get_ui_value()) for field in app.widgets if hasattr(field, "_link"))
         if not Tag._submit_values(vals) or not self.submit_done():
             return self.run_dialog(form, title, submit)
 

mininterface/textual_interface/textual_app.py

@@ -5,12 +5,15 @@
 from textual.containers import VerticalScroll
 from textual.widget import Widget
 from textual.widgets import (Checkbox, Footer, Header, Input, Label,
-                             RadioButton, Static)
+                             RadioButton, Static, Rule)
 
 
 from .widgets import (Changeable, MyButton, MyCheckbox, MyInput, MyRadioSet,
                       MySubmitButton)
 
+from ..form_dict import formdict_to_widgetdict
+
+from ..auxiliary import flatten
 from ..facet import BackendAdaptor
 
 if TYPE_CHECKING:
@@ -52,6 +55,16 @@ def __init__(self, adaptor: "TextualAdaptor", submit: str | bool = True):
         self.bind("escape", "exit", description="Cancel")
 
     def compose(self) -> ComposeResult:
+        # prepare widgets
+        # since textual 1.0.0 we have to build widgets not earlier than the context app is ready
+        self.widgets = list(flatten(formdict_to_widgetdict(
+            self.adaptor.facet._form, self.adaptor.widgetize), include_keys=self.adaptor.header))
+
+        # there are multiple sections in the list, <hr>ed by Rule elements. However, the first takes much space.
+        if len(self.widgets) and isinstance(self.widgets[0], Rule):
+            self.widgets.pop(0)
+
+        # start yielding widgets
         if self.title:
             yield Header()
         yield self.output  # NOTE not used

pyproject.toml

@@ -20,7 +20,7 @@ pyyaml = "*"
 # Standard requirements
 autocombobox = "1.4.2"
 humanize = "*"          # used only in the TkInterface, hence it is not a minimal requirement
-textual = "~0.84"
+textual = "<2.0.0"
 tkinter-tooltip = "*"
 tkinter_form = "0.2.1"
 tkscrollableframe = "*"