@@ -1948,10 +1948,11 @@ def _is_ui_blocked(self):
19481948 return _getscopeattr (self , Gui .__UI_BLOCK_NAME , False )
19491949
19501950 def __get_on_cancel_block_ui (self , callback : t .Optional [str ]):
1951- def _taipy_on_cancel_block_ui (guiApp , id : t .Optional [str ], payload : t .Any ):
1952- if _hasscopeattr (guiApp , Gui .__UI_BLOCK_NAME ):
1953- _setscopeattr (guiApp , Gui .__UI_BLOCK_NAME , False )
1954- guiApp .__on_action (id , {"action" : callback })
1951+ def _taipy_on_cancel_block_ui (a_state : State , id : t .Optional [str ], payload : t .Any ):
1952+ gui_app = a_state .get_gui ()
1953+ if _hasscopeattr (gui_app , Gui .__UI_BLOCK_NAME ):
1954+ _setscopeattr (gui_app , Gui .__UI_BLOCK_NAME , False )
1955+ gui_app .__on_action (id , {"action" : callback })
19551956
19561957 return _taipy_on_cancel_block_ui
19571958
@@ -2391,15 +2392,13 @@ def _hold_actions(
23912392 callback : t .Optional [t .Union [str , t .Callable ]] = None ,
23922393 message : t .Optional [str ] = "Work in Progress..." ,
23932394 ): # pragma: no cover
2394- action_name = (
2395- callback
2396- if isinstance (callback , str )
2397- else _get_lambda_id (t .cast (LambdaType , callback ))
2398- if _is_unnamed_function (callback )
2399- else callback .__name__
2400- if callback is not None
2401- else None
2402- )
2395+ if _is_unnamed_function (callback ):
2396+ action_name = _get_lambda_id (t .cast (LambdaType , callback ))
2397+ self ._bind_var_val (action_name , callback )
2398+ else :
2399+ action_name = (
2400+ callback if isinstance (callback , str ) else (callback .__name__ if callback is not None else None )
2401+ )
24032402 func = self .__get_on_cancel_block_ui (action_name )
24042403 def_action_name = func .__name__
24052404 _setscopeattr (self , def_action_name , func )
@@ -2579,7 +2578,11 @@ def __render_page(self, page_name: str) -> t.Any:
25792578 with self ._set_locals_context (context ):
25802579 self ._call_on_page_load (nav_page )
25812580 return self ._server ._render (
2582- page ._rendered_jsx , page ._script_paths if page ._script_paths is not None else [], page ._style if page ._style is not None else "" , page ._head , context # noqa: E501
2581+ page ._rendered_jsx ,
2582+ page ._script_paths if page ._script_paths is not None else [],
2583+ page ._style if page ._style is not None else "" ,
2584+ page ._head ,
2585+ context , # noqa: E501
25832586 )
25842587 else :
25852588 return ("No page template" , 404 )
0 commit comments