Merge pull request #354 from lubaskinc0de/develop

provide support for ShowMode in SwitchTo and Cancel widgets #350
Tishka17 · Feb 2, 2024 · 9c855ad · 9c855ad
2 parents 3f3444b + 779c27f
commit 9c855ad
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/aiogram_dialog/widgets/kbd/state.py b/src/aiogram_dialog/widgets/kbd/state.py
@@ -3,12 +3,12 @@
 from aiogram.fsm.state import State
 from aiogram.types import CallbackQuery
 
-from aiogram_dialog.api.entities import ChatEvent, Data, StartMode
+from aiogram_dialog.api.entities import ChatEvent, Data, ShowMode, StartMode
 from aiogram_dialog.api.protocols import DialogManager
 from aiogram_dialog.widgets.common import WhenCondition
+from aiogram_dialog.widgets.kbd.button import Button, OnClick
 from aiogram_dialog.widgets.text import Const, Text
 from aiogram_dialog.widgets.widget_event import WidgetEventProcessor
-from .button import Button, OnClick
 
 BACK_TEXT = Const("Back")
 NEXT_TEXT = Const("Next")
@@ -41,6 +41,7 @@ def __init__(
             state: State,
             on_click: Optional[OnClick] = None,
             when: WhenCondition = None,
+            show_mode: Optional[ShowMode] = None,
     ):
         super().__init__(
             text=text, on_click=self._on_click,
@@ -49,14 +50,15 @@ def __init__(
         self.text = text
         self.user_on_click = on_click
         self.state = state
+        self.show_mode = show_mode
 
     async def _on_click(
             self, callback: CallbackQuery, button: Button,
             manager: DialogManager,
     ):
         if self.user_on_click:
             await self.user_on_click(callback, self, manager)
-        await manager.switch_to(self.state)
+        await manager.switch_to(self.state, show_mode=self.show_mode)
 
 
 class Next(EventProcessorButton):
@@ -117,6 +119,7 @@ def __init__(
             result: Any = None,
             on_click: Optional[OnClick] = None,
             when: WhenCondition = None,
+            show_mode: Optional[ShowMode] = None,
     ):
         super().__init__(
             text=text, on_click=self._on_click,
@@ -125,14 +128,15 @@ def __init__(
         self.text = text
         self.result = result
         self.user_on_click = on_click
+        self.show_mode = show_mode
 
     async def _on_click(
             self, callback: CallbackQuery, button: Button,
             manager: DialogManager,
     ):
         if self.user_on_click:
             await self.user_on_click(callback, self, manager)
-        await manager.done(self.result)
+        await manager.done(self.result, show_mode=self.show_mode)
 
 
 class Start(EventProcessorButton):