Remove phantom markers and just default to Rc<dyn Fn(props) -> Element> where it makes sense

packages/desktop/src/app.rs

@@ -10,7 +10,7 @@ use crate::{
     webview::WebviewInstance,
 };
 use crossbeam_channel::Receiver;
-use dioxus_core::{ComponentFunction, CrossPlatformConfig, ElementId};
+use dioxus_core::{CrossPlatformConfig, ElementId};
 use dioxus_html::{
     native_bind::NativeFileEngine, FileEngine, HasFileData, HasFormData, HtmlEvent,
     PlatformEventData,
@@ -29,14 +29,10 @@ use tao::{
 };
 
 /// The single top-level object that manages all the running windows, assets, shortcuts, etc
-pub(crate) struct App<
-    Component: ComponentFunction<Phantom, Props = Props>,
-    Props: Clone + 'static,
-    Phantom: 'static,
-> {
+pub(crate) struct App<Props: Clone + 'static> {
     // move the props into a cell so we can pop it out later to create the first window
     // iOS panics if we create a window before the event loop is started, so we toss them into a cell
-    pub(crate) dioxus_config: Cell<Option<CrossPlatformConfig<Component, Props, Phantom>>>,
+    pub(crate) dioxus_config: Cell<Option<CrossPlatformConfig<Props>>>,
     pub(crate) cfg: Cell<Option<Config>>,
 
     // Stuff we need mutable access to
@@ -49,8 +45,6 @@ pub(crate) struct App<
     ///
     /// This includes stuff like the event handlers, shortcuts, etc as well as ways to modify *other* windows
     pub(crate) shared: Rc<SharedContext>,
-
-    phantom: PhantomData<Phantom>,
 }
 
 /// A bundle of state shared between all the windows, providing a way for us to communicate with running webview.
@@ -65,15 +59,10 @@ pub struct SharedContext {
     pub(crate) target: EventLoopWindowTarget<UserWindowEvent>,
 }
 
-impl<
-        Component: ComponentFunction<Phantom, Props = Props>,
-        Props: Clone + 'static,
-        Phantom: 'static,
-    > App<Component, Props, Phantom>
-{
+impl<Props: Clone + 'static> App<Props> {
     pub fn new(
         cfg: Config,
-        dioxus_config: CrossPlatformConfig<Component, Props, Phantom>,
+        dioxus_config: CrossPlatformConfig<Props>,
     ) -> (EventLoop<UserWindowEvent>, Self) {
         let event_loop = EventLoopBuilder::<UserWindowEvent>::with_user_event().build();
 
@@ -92,7 +81,6 @@ impl<
                 proxy: event_loop.create_proxy(),
                 target: event_loop.clone(),
             }),
-            phantom: PhantomData,
         };
 
         // Set the event converter

packages/desktop/src/launch.rs

@@ -10,12 +10,8 @@ use tao::event::{Event, StartCause, WindowEvent};
 ///
 /// This will block the main thread, and *must* be spawned on the main thread. This function does not assume any runtime
 /// and is equivalent to calling launch_with_props with the tokio feature disabled.
-pub fn launch_with_props_blocking<
-    Component: ComponentFunction<Phantom, Props = Props>,
-    Props: Clone + 'static,
-    Phantom: 'static,
->(
-    dioxus_cfg: CrossPlatformConfig<Component, Props, Phantom>,
+pub fn launch_with_props_blocking<Props: Clone + 'static>(
+    dioxus_cfg: CrossPlatformConfig<Props>,
     desktop_config: Config,
 ) {
     let (event_loop, mut app) = App::new(desktop_config, dioxus_cfg);
@@ -60,10 +56,7 @@ pub struct DesktopPlatform;
 impl<Props: Clone + 'static> PlatformBuilder<Props> for DesktopPlatform {
     type Config = Config;
 
-    fn launch<Component: ComponentFunction<Phantom, Props = Props>, Phantom: 'static>(
-        config: dioxus_core::CrossPlatformConfig<Component, Props, Phantom>,
-        platform_config: Self::Config,
-    ) {
+    fn launch(config: dioxus_core::CrossPlatformConfig<Props>, platform_config: Self::Config) {
         #[cfg(feature = "tokio")]
         tokio::runtime::Builder::new_multi_thread()
             .enable_all()