inquirer-textual 0.4.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

inquirer_textual/InquirerApp.py

@@ -10,19 +10,22 @@ from textual.binding import Binding, BindingsMap
 from textual.widgets import Footer
 
 from inquirer_textual.common.InquirerHeader import InquirerHeader
-from inquirer_textual.common.InquirerResult import InquirerResult
+from inquirer_textual.common.Result import Result
 from inquirer_textual.common.Shortcut import Shortcut
-from inquirer_textual.common.defaults import DEFAULT_THEME
 from inquirer_textual.widgets.InquirerWidget import InquirerWidget
 
 T = TypeVar('T')
 
 
-class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: ignore[call-arg]
+class InquirerApp(App[Result[T]], inherit_bindings=False):  # type: ignore[call-arg]
     CSS = """
+        App {
+            background: black;
+        }
         Screen {
             border-top: none;
             border-bottom: none;
+            background: transparent;
             height: auto;
         }
         """
@@ -32,21 +35,18 @@ class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: igno
         Binding("ctrl+d", "quit", "Quit", show=False, priority=True)
     ]
 
-    def __init__(self, theme: str = 'inquirer-textual-default') -> None:
-        self._theme = theme
+    def __init__(self) -> None:
         self.widget: InquirerWidget | None = None
         self.shortcuts: list[Shortcut] | None = None
         self.header: str | list[str] | None = None
         self.show_footer: bool = False
-        self.result: InquirerResult[T] | None = None
+        self.result: Result[T] | None = None
         self.result_ready: Event | None = None
         self.inquiry_func: Callable[[InquirerApp[T]], None] | None = None
         self.inquiry_func_stop: bool = False
         super().__init__()
 
     def on_mount(self) -> None:
-        self.register_theme(DEFAULT_THEME)
-        self.theme = self._theme
         self._update_bindings()
         if self.inquiry_func:
             self.run_worker(self.inquiry_func_worker, thread=True)
@@ -63,24 +63,21 @@ class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: igno
         if self.inquiry_func:
             self.inquiry_func(self)
 
-    async def action_shortcut(self, command: str):
+    def action_shortcut(self, command: str):
         value = self.widget.current_value() if self.widget else None
-        await self._handle_result(command, value)
+        self._handle_result(command, value)
 
     async def action_quit(self):
-        await self._handle_result('quit', None)
+        self._handle_result('quit', None)
 
-    async def on_inquirer_widget_submit(self, event: InquirerWidget.Submit) -> None:
-        await self._handle_result(event.command, event.value)
+    def on_inquirer_widget_submit(self, event: InquirerWidget.Submit) -> None:
+        self._handle_result(event.command, event.value)
 
-    async def _handle_result(self, command: str | None, value: Any | None):
+    def _handle_result(self, command: str | None, value: Any | None):
         if self.result_ready is not None:
-            self.result = InquirerResult(self.widget.name if self.widget else None, value,  # type: ignore[arg-type]
-                                         command)
+            self.result = Result(command, value) # type: ignore[arg-type]
             self.result_ready.set()
         else:
-            if self.widget:
-                await self.widget.set_selected_value(value)
             self.call_after_refresh(lambda: self._terminate(command, value))
 
     def _terminate(self, command: str | None = None, value: Any | None = None):
@@ -88,9 +85,9 @@ class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: igno
         if self.result_ready:
             self.result_ready.set()
         if command is not None:
-            self.app.exit(InquirerResult(self.widget.name if self.widget else None, value, command))
+            self.app.exit(Result(command, value))
         else:
-            self.exit(InquirerResult(None, value, None))
+            self.exit(value)
 
     def compose(self) -> ComposeResult:
         if self.header is not None:
@@ -105,7 +102,7 @@ class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: igno
         if self.widget:
             self.call_after_refresh(self.widget.focus)
 
-    def prompt(self, widget: InquirerWidget, shortcuts: list[Shortcut] | None = None) -> InquirerResult[T]:
+    def prompt(self, widget: InquirerWidget, shortcuts: list[Shortcut] | None = None) -> Result[T]:
         if shortcuts:
             self.shortcuts = shortcuts
             self.show_footer = True
@@ -138,7 +135,7 @@ class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: igno
             auto_pilot: AutopilotCallbackType | None = None,
             loop: AbstractEventLoop | None = None,
             inquiry_func: Callable[[InquirerApp[T]], None] | None = None,
-    ) -> InquirerResult[T]:
+    ) -> Result[T]:
         if not self.inquiry_func:
             self.inquiry_func = inquiry_func
         return super().run(
@@ -153,6 +150,7 @@ class InquirerApp(App[InquirerResult[T]], inherit_bindings=False):  # type: igno
 
     def get_theme_variable_defaults(self) -> dict[str, str]:
         return {
-            'inquirer-textual-question-mark': self.current_theme.foreground or 'initial',
-            'inquirer-textual-input-color': self.current_theme.foreground or 'initial',
+            'select-question-mark': '#e5c07b',
+            'select-list-item-highlight-foreground': '#61afef',
+            'input-color': '#98c379'
         }

inquirer_textual/common/Choice.py

@@ -7,6 +7,3 @@ class Choice:
     name: str
     data: Any = None
     command: str = 'select'
-
-    def __str__(self) -> str:
-        return self.name

inquirer_textual/common/ChoiceLabel.py

@@ -1,27 +1,18 @@
 from __future__ import annotations
 
-from rich.text import Text
 from textual.widgets import Label
 
 from inquirer_textual.common.Choice import Choice
-from inquirer_textual.common.defaults import DEFAULT_THEME, POINTER_CHARACTER
 
 
 class ChoiceLabel(Label):
-    def __init__(self, item: str | Choice, pattern: str | None = None):
-        self._text = self._get_text(item, pattern)
-        super().__init__(Text('  ').append_text(self._text))
+    def __init__(self, item: str | Choice):
+        super().__init__(f'  {item if isinstance(item, str) else item.name}')
+        self._text = item if isinstance(item, str) else item.name
         self.item = item
 
-    def _get_text(self, item: str | Choice, pattern: str | None = None) -> Text:
-        result = Text(item if isinstance(item, str) else item.name)
-        if pattern:
-            result.highlight_words([pattern], style=self.app.current_theme.accent or DEFAULT_THEME.accent,
-                                   case_sensitive=False)
-        return result
-
     def add_pointer(self):
-        self.update(Text(f'{POINTER_CHARACTER} ').append_text(self._text))
+        self.update(f'\u276f {self._text}')
 
     def remove_pointer(self):
-        self.update(Text('  ').append_text(self._text))
+        self.update(f'  {self._text}')

inquirer_textual/common/{Prompt.py → PromptMessage.py}

@@ -4,9 +4,9 @@ from textual.widget import Widget
 from textual.widgets import Static, Label
 
 
-class Prompt(Widget):
+class PromptMessage(Widget):
     DEFAULT_CSS = """
-        Prompt {
+        PromptMessage {
             width: auto;
             height: auto;
         }
@@ -16,7 +16,7 @@ class Prompt(Widget):
         }
         #prompt-message-question-mark {
             width: auto;
-            color: $inquirer-textual-question-mark;
+            color: $select-question-mark;
         }
         """
 

inquirer_textual/common/Result.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import TypeVar, Generic
+
+T = TypeVar('T')
+
+
+@dataclass
+class Result(Generic[T]):
+    command: str | None
+    value: T
+
+    def __str__(self):
+        return str(self.value)

inquirer_textual/prompts.py

@@ -4,85 +4,73 @@ from textual.validation import Validator
 
 from inquirer_textual.InquirerApp import InquirerApp
 from inquirer_textual.common.Choice import Choice
+from inquirer_textual.common.Result import Result
+from inquirer_textual.common.Shortcut import Shortcut
 from inquirer_textual.widgets.InquirerCheckbox import InquirerCheckbox
 from inquirer_textual.widgets.InquirerConfirm import InquirerConfirm
-from inquirer_textual.widgets.InquirerEditor import InquirerEditor
 from inquirer_textual.widgets.InquirerMulti import InquirerMulti
 from inquirer_textual.widgets.InquirerNumber import InquirerNumber
-from inquirer_textual.widgets.InquirerPath import InquirerPath, PathType
-from inquirer_textual.widgets.InquirerPattern import InquirerPattern
 from inquirer_textual.widgets.InquirerSecret import InquirerSecret
 from inquirer_textual.widgets.InquirerSelect import InquirerSelect
 from inquirer_textual.widgets.InquirerText import InquirerText
 from inquirer_textual.widgets.InquirerWidget import InquirerWidget
 
 
-def checkbox(message: str, choices: list[str | Choice], enabled: list[str | Choice] | None = None,
-             mandatory: bool = False, clear: bool = False) -> list[str | Choice]:
-    app: InquirerApp[list[str | Choice]] = InquirerApp()
-    app.widget = InquirerCheckbox(message, choices, enabled=enabled, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
-
-
-def confirm(message: str, default: bool = False, mandatory: bool = False, clear: bool = False) -> bool:
-    app: InquirerApp[bool] = InquirerApp()
-    app.widget = InquirerConfirm(message, default=default, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
-
-
-def editor(message: str, clear: bool = False) -> str:
+def text(message: str, shortcuts: list[Shortcut] | None = None,
+         validators: Validator | Iterable[Validator] | None = None) -> Result[str]:
     app: InquirerApp[str] = InquirerApp()
-    app.widget = InquirerEditor(message)
-    return app.run(inline=True, inline_no_clear=not clear).value
-
-
-def external(widget: InquirerWidget, clear: bool = False) -> Any:
-    app: InquirerApp[Any] = InquirerApp()
-    app.widget = widget
-    return app.run(inline=True, inline_no_clear=not clear).value
+    app.widget = InquirerText(message, validators=validators)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)
 
 
-def multi(widgets: dict[str, InquirerWidget], clear: bool = False) -> dict[str, Any]:
-    app: InquirerApp[dict[str, Any]] = InquirerApp()
-    app.widget = InquirerMulti(widgets)
-    return app.run(inline=True, inline_no_clear=not clear).value
+def secret(message: str, shortcuts: list[Shortcut] | None = None) -> Result[str]:
+    app: InquirerApp[str] = InquirerApp()
+    app.widget = InquirerSecret(message)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)
 
 
-def number(message: str, mandatory: bool = False, clear: bool = False) -> int:
+def number(message: str, shortcuts: list[Shortcut] | None = None) -> Result[int]:
     app: InquirerApp[int] = InquirerApp()
-    app.widget = InquirerNumber(message, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
+    app.widget = InquirerNumber(message)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)
 
 
-def path(message: str, exists: bool = False, path_type: PathType = PathType.ANY, mandatory: bool = False,
-         clear: bool = False) -> str:
-    app: InquirerApp[str] = InquirerApp()
-    app.widget = InquirerPath(message, exists=exists, path_type=path_type, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
+def confirm(message: str, shortcuts: list[Shortcut] | None = None, default: bool = False, mandatory: bool = True) -> \
+        Result[bool]:
+    app: InquirerApp[bool] = InquirerApp()
+    app.widget = InquirerConfirm(message, default=default, mandatory=mandatory)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)
 
 
-def pattern(message: str, choices: list[str | Choice], default: str | Choice | None = None,
-            mandatory: bool = False, clear: bool = False) -> str | Choice:
+def select(message: str, choices: list[str | Choice], shortcuts: list[Shortcut] | None = None,
+           default: str | Choice | None = None, mandatory: bool = True) -> Result[str | Choice]:
     app: InquirerApp[str | Choice] = InquirerApp()
-    app.widget = InquirerPattern(message, choices, default=default, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
-
-
-def secret(message: str, mandatory: bool = False, clear: bool = False) -> str:
-    app: InquirerApp[str] = InquirerApp()
-    app.widget = InquirerSecret(message, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
+    app.widget = InquirerSelect(message, choices, default, mandatory)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)
 
 
-def select(message: str, choices: list[str | Choice], default: str | Choice | None = None,
-           mandatory: bool = False, clear: bool = False) -> str | Choice:
-    app: InquirerApp[str | Choice] = InquirerApp()
-    app.widget = InquirerSelect(message, choices, default=default, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
+def checkbox(message: str, choices: list[str | Choice], shortcuts: list[Shortcut] | None = None,
+             enabled: list[str | Choice] | None = None) -> Result[list[str | Choice]]:
+    app: InquirerApp[list[str | Choice]] = InquirerApp()
+    app.widget = InquirerCheckbox(message, choices, enabled)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)
 
 
-def text(message: str, default: str = '', validators: Validator | Iterable[Validator] | None = None,
-         mandatory: bool = False, clear: bool = False) -> str:
-    app: InquirerApp[str] = InquirerApp()
-    app.widget = InquirerText(message, default=default, validators=validators, mandatory=mandatory)
-    return app.run(inline=True, inline_no_clear=not clear).value
+def multi(widgets: list[InquirerWidget], shortcuts: list[Shortcut] | None = None) -> Result[list[Any]]:
+    app: InquirerApp[list[Any]] = InquirerApp()
+    app.widget = InquirerMulti(widgets)
+    app.shortcuts = shortcuts
+    app.show_footer = bool(shortcuts)
+    return app.run(inline=True)

inquirer_textual/version.py

@@ -1 +1 @@
-version = "0.4.0"
+version = "1.0.0"

inquirer_textual/widgets/InquirerCheckbox.py

@@ -1,43 +1,46 @@
 from __future__ import annotations
 
 from textual.app import ComposeResult
-from textual.containers import VerticalGroup, HorizontalGroup
+from textual.containers import VerticalGroup
 from textual.widgets import ListItem, ListView
 from typing_extensions import Self
 
-from inquirer_textual.common.Answer import Answer
 from inquirer_textual.common.Choice import Choice
 from inquirer_textual.common.ChoiceCheckboxLabel import ChoiceCheckboxLabel
-from inquirer_textual.common.Prompt import Prompt
+from inquirer_textual.common.PromptMessage import PromptMessage
 from inquirer_textual.widgets.InquirerWidget import InquirerWidget
 
 
 class InquirerCheckbox(InquirerWidget):
     """A checkbox widget that allows multiple selections from a list of choices."""
 
+    DEFAULT_CSS = """
+            #inquirer-checkbox-list-view {
+                background: transparent;
+            }
+            #inquirer-checkbox-list-view ListItem.-highlight {
+                color: $select-list-item-highlight-foreground;
+                background: transparent;
+            }
+            """
     BINDINGS = [
         ("space", "toggle_selected", "Toggle selection"),
     ]
 
-    def __init__(self, message: str, choices: list[str | Choice], name: str | None = None,
-                 enabled: list[str | Choice] | None = None, mandatory: bool = False):
+    def __init__(self, message: str, choices: list[str | Choice], enabled: list[str | Choice] | None = None):
         """
             Args:
                 message (str): The prompt message to display.
                 choices (list[str | Choice]): A list of choices to present to the user.
-                name (str | None): The name of the input field.
                 enabled (list[str | Choice] | None): A list of choices that should be pre-selected.
-                mandatory (bool): Whether at least one selection is mandatory.
         """
-        super().__init__(name=name, mandatory=mandatory)
+        super().__init__()
         self.message = message
         self.choices = choices
         self.enabled = enabled
         self.list_view: ListView | None = None
         self.selected_label: ChoiceCheckboxLabel | None = None
         self.selected_item: str | Choice | None = None
-        self.selected_value: list[str | Choice] | None = None
-        self.show_selected_value: bool = False
 
     def on_mount(self):
         self.styles.height = min(10, len(self.choices) + 1)
@@ -52,7 +55,7 @@ class InquirerCheckbox(InquirerWidget):
         self.selected_item = label.item
 
     def on_list_view_selected(self, _: ListView.Selected) -> None:
-        self.submit_current_value()
+        self.post_message(InquirerWidget.Submit(self.current_value()))
 
     def focus(self, scroll_visible: bool = True) -> Self:
         if self.list_view:
@@ -64,23 +67,12 @@ class InquirerCheckbox(InquirerWidget):
         labels = self.query(ChoiceCheckboxLabel)
         return [label.item for label in labels if label.checked]
 
-    async def set_selected_value(self, value: list[str | Choice]) -> None:
-        self.selected_value = value
-        self.styles.height = 1
-        self.show_selected_value = True
-        await self.recompose()
-
     def compose(self) -> ComposeResult:
-        if self.show_selected_value:
-            with HorizontalGroup():
-                yield Prompt(self.message)
-                yield Answer(str(self.selected_value))
-        else:
-            with VerticalGroup():
-                items: list[ListItem] = []
-                for idx, choice in enumerate(self.choices):
-                    list_item = ListItem(ChoiceCheckboxLabel(choice))
-                    items.append(list_item)
-                self.list_view = ListView(*items, id='inquirer-checkbox-list-view')
-                yield Prompt(self.message)
-                yield self.list_view
+        with VerticalGroup():
+            items: list[ListItem] = []
+            for idx, choice in enumerate(self.choices):
+                list_item = ListItem(ChoiceCheckboxLabel(choice))
+                items.append(list_item)
+            self.list_view = ListView(*items, id='inquirer-checkbox-list-view')
+            yield PromptMessage(self.message)
+            yield self.list_view

inquirer_textual/widgets/InquirerConfirm.py

@@ -1,14 +1,10 @@
-from __future__ import annotations
-
+from inquirer_textual.widgets.InquirerWidget import InquirerWidget
+from inquirer_textual.common.PromptMessage import PromptMessage
 from textual import events
 from textual.app import ComposeResult
 from textual.containers import HorizontalGroup
 from textual.widgets import Label
 
-from inquirer_textual.common.Answer import Answer
-from inquirer_textual.common.Prompt import Prompt
-from inquirer_textual.widgets.InquirerWidget import InquirerWidget
-
 
 class InquirerConfirm(InquirerWidget):
     """A confirmation prompt that allows the user to confirm or reject."""
@@ -20,58 +16,42 @@ class InquirerConfirm(InquirerWidget):
     """
     can_focus = True
 
-    def __init__(self, message: str, confirm_character: str = 'y', reject_character: str = 'n', name: str | None = None,
-                 default=False, mandatory: bool = False):
+    def __init__(self, message: str, confirm_character: str = 'y', reject_character: str = 'n', default=False,
+                 mandatory: bool = True):
         """
         Args:
             message (str): The prompt message to display.
             confirm_character (str): The character to use for confirmation.
             reject_character (str): The character to use for rejection.
-            name (str | None): The name of the prompt.
             default (bool): The default value if the user presses Enter without input.
             mandatory (bool): Whether a response is mandatory.
         """
-        super().__init__(name=name, mandatory=mandatory)
+        super().__init__(mandatory)
         if len(confirm_character) != 1 or len(reject_character) != 1:
             raise ValueError("confirm_character and reject_character must be a single character")
         if confirm_character.lower() == reject_character.lower():
             raise ValueError("confirm_character and reject_character must be different")
         self.message = message
-        self.confirm_character = confirm_character
-        self.reject_character = reject_character
         c = confirm_character if not default else confirm_character.upper()
         r = reject_character if default else reject_character.upper()
         self.label = Label(f'({c}/{r})')
         self.value: bool = default
-        self.selected_value: bool | None = None
-        self.show_selected_value: bool = False
 
     def on_key(self, event: events.Key):
         if event.key.lower() == 'y':
             self.value = True
-            self.submit_current_value()
+            self.post_message(InquirerWidget.Submit(self.value))
         elif event.key.lower() == 'n':
             self.value = False
-            self.submit_current_value()
+            self.post_message(InquirerWidget.Submit(self.value))
         elif event.key == 'enter':
             event.stop()
-            self.submit_current_value()
+            self.post_message(InquirerWidget.Submit(self.value))
 
     def current_value(self):
         return self.value
 
-    async def set_selected_value(self, value: bool) -> None:
-        self.selected_value = value
-        self.styles.height = 1
-        self.show_selected_value = True
-        await self.recompose()
-
     def compose(self) -> ComposeResult:
-        if self.show_selected_value:
-            with HorizontalGroup():
-                yield Prompt(self.message)
-                yield Answer(self.confirm_character if self.selected_value else self.reject_character)
-        else:
-            with HorizontalGroup():
-                yield Prompt(self.message)
-                yield self.label
+        with HorizontalGroup():
+            yield PromptMessage(self.message)
+            yield self.label

inquirer_textual/widgets/InquirerMulti.py

@@ -1,6 +1,7 @@
 from typing import Any
 
 from textual.app import ComposeResult
+from textual.widgets import ContentSwitcher
 
 from inquirer_textual.widgets.InquirerWidget import InquirerWidget
 
@@ -14,32 +15,32 @@ class InquirerMulti(InquirerWidget):
         }
     """
 
-    def __init__(self, widgets: dict[str, InquirerWidget]) -> None:
+    def __init__(self, widgets: list[InquirerWidget]) -> None:
         """
         Args:
-            widgets (dict[str, InquirerWidget]): A dictionary of InquirerWidget instances to present in sequence of definition.
+            widgets (list[InquirerWidget]): A list of InquirerWidget instances to present in sequence.
         """
         super().__init__()
         self.widgets = widgets
         self._current_widget_index = 0
-        self._return_values_dict: dict[str, Any] = {}
+        self._return_values: list[Any] = []
 
-    async def on_inquirer_widget_submit(self, message: InquirerWidget.Submit) -> None:
-        current_item = list(self.widgets.items())[self._current_widget_index]
-        self._return_values_dict[current_item[0]] = message.value
-        await current_item[1].set_selected_value(message.value)
+    def on_mount(self):
+        self.query_one(ContentSwitcher).current = f'widget-{self._current_widget_index}'
+        self.query_one(ContentSwitcher).visible_content.focus()
+
+    def on_inquirer_widget_submit(self, message: InquirerWidget.Submit) -> None:
+        self._return_values.append(message.value)
         self._current_widget_index += 1
         if self._current_widget_index < len(self.widgets):
             message.stop()
-            next_widget = self.query_one(f'#widget-{self._current_widget_index}')
-            next_widget.styles.display = 'block'
-            next_widget.focus()
+            self.query_one(ContentSwitcher).current = f'widget-{self._current_widget_index}'
+            self.query_one(ContentSwitcher).visible_content.focus()
         else:
-            message.value = self._return_values_dict
+            message.value = self._return_values
 
     def compose(self) -> ComposeResult:
-        for idx, item in enumerate(self.widgets.items()):
-            item[1].id = f'widget-{idx}'
-            if idx > 0:
-                item[1].styles.display = 'none'
-            yield item[1]
+        with ContentSwitcher(initial=f'widget-{self._current_widget_index}'):
+            for idx, widget in enumerate(self.widgets):
+                widget.id = f'widget-{idx}'
+                yield widget

inquirer_textual/widgets/InquirerNumber.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
+from typing_extensions import Self
+
 from textual.app import ComposeResult
 from textual.containers import HorizontalGroup
 from textual.widgets import Input
-from typing_extensions import Self, Literal
 
-from inquirer_textual.common.Prompt import Prompt
 from inquirer_textual.widgets.InquirerWidget import InquirerWidget
+from inquirer_textual.common.PromptMessage import PromptMessage
 
 
 class InquirerNumber(InquirerWidget):
@@ -18,28 +19,24 @@ class InquirerNumber(InquirerWidget):
     }
     #inquirer-number-input {
         border: none;
-        color: $inquirer-textual-input-color;
+        background: transparent;
+        color: $input-color;
         padding: 0;
         height: 1;
     }
     """
 
-    def __init__(self, message: str, name: str | None = None, input_type: Literal['integer', 'number'] = 'integer',
-                 mandatory: bool = False):
+    def __init__(self, message: str):
         """
         Args:
             message (str): The prompt message to display.
-            name (str | None): The name of the input field.
-            input_type (Literal['integer', 'number']): The type of number input ('integer' or 'number').
-            mandatory (bool): Whether the input is mandatory.
         """
-        super().__init__(name=name, mandatory=mandatory)
+        super().__init__()
         self.message = message
-        self.input_type = input_type
         self.input: Input | None = None
 
-    def on_input_submitted(self) -> None:
-        self.submit_current_value()
+    def on_input_submitted(self, submitted: Input.Submitted):
+        self.post_message(InquirerWidget.Submit(submitted.value))
 
     def focus(self, scroll_visible: bool = True) -> Self:
         if self.input:
@@ -48,15 +45,10 @@ class InquirerNumber(InquirerWidget):
             return super().focus(scroll_visible)
 
     def current_value(self):
-        if self.input and self.input.value:
-            if self.input_type == 'integer':
-                return int(self.input.value)
-            elif self.input_type == 'number':
-                return float(self.input.value)
-        return None
+        return self.input.value if self.input else None
 
     def compose(self) -> ComposeResult:
         with HorizontalGroup():
-            yield Prompt(self.message)
-            self.input = Input(id="inquirer-number-input", type=self.input_type)
+            yield PromptMessage(self.message)
+            self.input = Input(id="inquirer-number-input", type="integer")
             yield self.input