Refactor service registry usage in Page control

Consolidated service registries in the Page control by removing separate _user_services and _page_services in favor of a single _services property. Updated related Dart and Python code, including tests and service registration logic, to reflect this change. Deprecated direct service properties on Page in favor of using service classes directly.

Author: FeodorFitsner

packages/flet/lib/src/controls/page.dart

@@ -56,9 +56,8 @@ class _PageControlState extends State<PageControl> with WidgetsBindingObserver {
   late final SimpleRouterDelegate _routerDelegate;
   late final RouteParser _routeParser;
   late final AppLifecycleListener _appLifecycleListener;
-  ServiceRegistry? _pageServices;
-  ServiceRegistry? _userServices;
-  String? _userServicesUid;
+  ServiceRegistry? _services;
+  String? _servicesUid;
   ServiceBinding? _windowService;
   Control? _windowControl;
   bool? _prevOnKeyboardEvent;
@@ -136,8 +135,7 @@ class _PageControlState extends State<PageControl> with WidgetsBindingObserver {
     }
     widget.control.removeInvokeMethodListener(_invokeMethod);
     widget.control.removeListener(_onPageControlChanged);
-    _pageServices?.dispose();
-    _userServices?.dispose();
+    _services?.dispose();
     _windowService?.dispose();
     super.dispose();
   }
@@ -152,24 +150,21 @@ class _PageControlState extends State<PageControl> with WidgetsBindingObserver {
     }
     var backend = FletBackend.of(context);
 
-    _pageServices ??= ServiceRegistry(
-        control: widget.control, propertyName: "_services", backend: backend);
-
-    var userServicesControl = widget.control.child("_user_services");
-    if (userServicesControl != null) {
-      var uid = userServicesControl.internals?["uid"];
-      if (_userServices == null || _userServicesUid != uid) {
-        _userServices?.dispose();
-        _userServices = ServiceRegistry(
-            control: userServicesControl,
+    var servicesControl = widget.control.child("_services");
+    if (servicesControl != null) {
+      var uid = servicesControl.internals?["uid"];
+      if (_services == null || _servicesUid != uid) {
+        _services?.dispose();
+        _services = ServiceRegistry(
+            control: servicesControl,
             propertyName: "_services",
             backend: backend);
-        _userServicesUid = uid;
+        _servicesUid = uid;
       }
-    } else if (_userServices != null) {
-      _userServices?.dispose();
-      _userServices = null;
-      _userServicesUid = null;
+    } else if (_services != null) {
+      _services?.dispose();
+      _services = null;
+      _servicesUid = null;
     }
 
     var windowControl = widget.control.child("window", visibleOnly: false);

packages/flet/lib/src/transport/flet_backend_channel_mock.dart

@@ -50,8 +50,7 @@ class FletMockBackendChannel implements FletBackendChannel {
             {"_c": "Text", "_i": 20, "text": "OFF1"}
           ]
         },
-        "_user_services": {"_c": "ServiceRegistry", "_i": 10, "services": []},
-        "_page_services": {"_c": "ServiceRegistry", "_i": 11, "services": []},
+        "_services": {"_c": "ServiceRegistry", "_i": 10, "services": []},
         "views": [
           {
             "_c": "View",

sdk/python/packages/flet/src/flet/controls/page.py

@@ -193,45 +193,6 @@ class Page(BasePage):
     The list of multi-views associated with this page.
     """
 
-    browser_context_menu: BrowserContextMenu = field(
-        default_factory=lambda: BrowserContextMenu(), metadata={"skip": True}
-    )
-    """
-    Used to enable or disable the context menu that appears when the user
-    right-clicks on the web page.
-
-    Limitation:
-        Web only.
-    """
-
-    shared_preferences: SharedPreferences = field(
-        default_factory=lambda: SharedPreferences(), metadata={"skip": True}
-    )
-    """
-    Provides a persistent key-value storage for simple data types.
-    """
-
-    clipboard: Clipboard = field(
-        default_factory=lambda: Clipboard(), metadata={"skip": True}
-    )
-    """
-    Provides access to the system clipboard.
-    """
-
-    storage_paths: StoragePaths = field(
-        default_factory=lambda: StoragePaths(), metadata={"skip": True}
-    )
-    """
-    Provides the information about common storage paths.
-    """
-
-    url_launcher: UrlLauncher = field(
-        default_factory=lambda: UrlLauncher(), metadata={"skip": True}
-    )
-    """
-    Provides methods for launching URLs.
-    """
-
     window: Window = field(default_factory=lambda: Window())
     """
     Provides properties/methods/events to monitor and control the
@@ -424,8 +385,7 @@ class Page(BasePage):
     """
     TBD
     """
-    _services: list[Service] = field(default_factory=list)
-    _user_services: ServiceRegistry = field(default_factory=lambda: ServiceRegistry())
+    _services: ServiceRegistry = field(default_factory=lambda: ServiceRegistry())
 
     def __post_init__(
         self,
@@ -437,13 +397,6 @@ def __post_init__(
         self.__session = weakref.ref(sess)
 
         # page services
-        self._services = [
-            self.browser_context_menu,
-            self.shared_preferences,
-            self.clipboard,
-            self.url_launcher,
-            self.storage_paths,
-        ]
         self.__last_route = None
         self.__query: QueryString = QueryString(self)
         self.__authorization: Optional[Authorization] = None
@@ -583,7 +536,12 @@ def run_thread(
                 partial(handler_with_context, *args, **kwargs),
             )
 
-    @deprecated("Use push_route() instead.", version="0.70.0", show_parentheses=True)
+    @deprecated(
+        "Use push_route() instead.",
+        version="0.70.0",
+        delete_version="0.90.0",
+        show_parentheses=True,
+    )
     def go(
         self, route: str, skip_route_change_event: bool = False, **kwargs: Any
     ) -> None:
@@ -731,9 +689,12 @@ async def login(
             if on_open_authorization_url:
                 await on_open_authorization_url(authorization_url)
             else:
-                await self.launch_url(
-                    authorization_url, "flet_oauth_signin", web_popup_window=self.web
-                )
+                if self.web:
+                    await UrlLauncher().open_window(
+                        authorization_url, title="flet_oauth_signin"
+                    )
+                else:
+                    await UrlLauncher().launch_url(authorization_url)
         else:
             await self.__authorization.dehydrate_token(saved_token)
 
@@ -793,6 +754,11 @@ def logout(self) -> None:
             elif callable(self.on_logout):
                 self.on_logout(e)
 
+    @deprecated(
+        "Use UrlLauncher().launch_url() instead.",
+        version="0.90.0",
+        show_parentheses=True,
+    )
     async def launch_url(
         self,
         url: Union[str, Url],
@@ -816,14 +782,21 @@ async def launch_url(
             web_popup_window_width: Popup window width.
             web_popup_window_height: Popup window height.
         """
-        await self.url_launcher.launch_url(
-            url,
-            web_popup_window_name=web_popup_window_name,
-            web_popup_window=web_popup_window,
-            web_popup_window_width=web_popup_window_width,
-            web_popup_window_height=web_popup_window_height,
-        )
+        if web_popup_window:
+            await UrlLauncher().open_window(
+                url,
+                title=web_popup_window_name,
+                width=web_popup_window_width,
+                height=web_popup_window_height,
+            )
+        else:
+            await UrlLauncher().launch_url(url)
 
+    @deprecated(
+        "Use UrlLauncher().can_launch_url() instead.",
+        version="0.90.0",
+        show_parentheses=True,
+    )
     async def can_launch_url(self, url: str) -> bool:
         """
         Checks whether the specified URL can be handled by some app
@@ -844,15 +817,20 @@ async def can_launch_url(self, url: str) -> bool:
                     schemes that are always assumed to be supported (such as http(s)),
                     as web pages are never allowed to query installed applications.
         """
-        return await self.url_launcher.can_launch_url(url)
+        return await UrlLauncher().can_launch_url(url)
 
+    @deprecated(
+        "Use UrlLauncher().close_in_app_web_view() instead.",
+        version="0.90.0",
+        show_parentheses=True,
+    )
     async def close_in_app_web_view(self) -> None:
         """
         Closes in-app web view opened with `launch_url()`.
 
         📱 Mobile only.
         """
-        await self.url_launcher.close_in_app_web_view()
+        await UrlLauncher().close_in_app_web_view()
 
     @property
     def session(self) -> "Session":
@@ -912,6 +890,56 @@ def pubsub(self) -> "PubSubClient":
         """
         return self.session.pubsub_client
 
+    @property
+    @deprecated("Use UrlLauncher() instead.", version="0.70.0", delete_version="0.90.0")
+    def url_launcher(self) -> UrlLauncher:
+        """
+        DEPRECATED: The UrlLauncher service for the current page.
+        """
+        return UrlLauncher()
+
+    @property
+    @deprecated(
+        "Use BrowserContextMenu() instead.", version="0.70.0", delete_version="0.90.0"
+    )
+    def browser_context_menu(self):
+        """
+        DEPRECATED: The BrowserContextMenu service for the current page.
+        """
+
+        return BrowserContextMenu()
+
+    @property
+    @deprecated(
+        "Use SharedPreferences() instead.", version="0.70.0", delete_version="0.90.0"
+    )
+    def shared_preferences(self):
+        """
+        DEPRECATED: The SharedPreferences service for the current page.
+        """
+
+        return SharedPreferences()
+
+    @property
+    @deprecated("Use Clipboard() instead.", version="0.70.0", delete_version="0.90.0")
+    def clipboard(self):
+        """
+        DEPRECATED: The Clipboard service for the current page.
+        """
+
+        return Clipboard()
+
+    @property
+    @deprecated(
+        "Use StoragePaths() instead.", version="0.70.0", delete_version="0.90.0"
+    )
+    def storage_paths(self):
+        """
+        DEPRECATED: The StoragePaths service for the current page.
+        """
+
+        return StoragePaths()
+
     async def get_device_info(self) -> Optional[DeviceInfo]:
         """
         Returns device information.

sdk/python/packages/flet/src/flet/controls/services/service.py

@@ -16,4 +16,4 @@ class Service(BaseControl):
     def init(self):
         super().init()
         with contextlib.suppress(RuntimeError):
-            context.page._user_services.register_service(self)
+            context.page._services.register_service(self)

sdk/python/packages/flet/src/flet/messaging/session.py

@@ -258,7 +258,7 @@ async def after_event(self, control: BaseControl | None):
             await self.__auto_update(control)
 
         # unregister unreferenced services
-        self.page._user_services.unregister_services()
+        self.page._services.unregister_services()
 
     async def __auto_update(self, control: BaseControl | None):
         while control:

sdk/python/packages/flet/tests/test_object_diff_in_place.py

@@ -113,22 +113,19 @@ def test_simple_page():
     page.bgcolor = Colors.GREEN
     page.fonts = {"font1": "font_url_1", "font2": "font_url_2"}
     page.on_login = lambda e: print("on login")
-    page._user_services._services.append(MyService(prop_1="Hello", prop_2=[1, 2, 3]))
+    page._services._services.append(MyService(prop_1="Hello", prop_2=[1, 2, 3]))
 
     # page and window have hard-coded IDs
     assert page._i == 1
     assert page.window and page.window._i == 2
 
     msg, _, _, added_controls, removed_controls = make_msg(page, {}, show_details=True)
     u_msg = b_unpack(msg)
-    assert len(added_controls) == 13
+    assert len(added_controls) == 8
     assert len(removed_controls) == 0
 
     assert page.parent is None
     assert page.controls[0].parent == page.views[0]
-    assert page.clipboard
-    assert page.clipboard.parent
-    assert page.clipboard.page
 
     print(u_msg)
 
@@ -184,17 +181,6 @@ def test_simple_page():
     #                     }
     #                 ],
     #             },
-    #             "_page_services": {
-    #                 "_i": 27,
-    #                 "_c": "ServiceRegistry",
-    #                 "services": [
-    #                     {"_i": 21, "_c": "BrowserContextMenu"},
-    #                     {"_i": 22, "_c": "SharedPreferences"},
-    #                     {"_i": 23, "_c": "Clipboard"},
-    #                     {"_i": 25, "_c": "UrlLauncher"},
-    #                     {"_i": 24, "_c": "StoragePaths"},
-    #                 ],
-    #             },
     #             "fonts": {"font1": "font_url_1", "font2": "font_url_2"},
     #             "on_login": True,
     #         },
@@ -218,7 +204,7 @@ def test_simple_page():
     with raises(RuntimeError):
         assert page.controls[0].controls[0].page is None
 
-    page._user_services._services[0].prop_2 = [2, 6]
+    page._services._services[0].prop_2 = [2, 6]
 
     # add 2 new buttons to a list
     _, patch, _, added_controls, removed_controls = make_msg(page, show_details=True)
@@ -243,17 +229,17 @@ def test_simple_page():
             {"op": "remove", "path": ["fonts", "font2"], "value": "font_url_2"},
             {
                 "op": "remove",
-                "path": ["_user_services", "_services", 0, "prop_2", 0],
+                "path": ["_services", "_services", 0, "prop_2", 0],
                 "value": 1,
             },
             {
                 "op": "add",
-                "path": ["_user_services", "_services", 0, "prop_2", 1],
+                "path": ["_services", "_services", 0, "prop_2", 1],
                 "value": 6,
             },
             {
                 "op": "remove",
-                "path": ["_user_services", "_services", 0, "prop_2", 2],
+                "path": ["_services", "_services", 0, "prop_2", 2],
                 "value": 3,
             },
         ],