Less clumsy configuration for desktop and mobile (#553)
* chore: dont use prebuilt builder pattern for configuring desktop * chore: use regular config pattern for web * Chore: update docs too * chore: clean up some warnings
This commit is contained in:
1 parent
41b450eedf
commit
540e785d8b
28 files changed
+172
-156
No files matched your search
+13
-18
@@ -56,7 +56,7 @@
|
||||
|
||||
use std::rc::Rc;
|
||||
|
||||
pub use crate::cfg::WebConfig;
|
||||
pub use crate::cfg::Config;
|
||||
pub use crate::util::use_eval;
|
||||
use dioxus_core::prelude::Component;
|
||||
use dioxus_core::SchedulerMsg;
|
||||
@@ -93,7 +93,7 @@ mod util;
|
||||
/// }
|
||||
/// ```
|
||||
pub fn launch(root_component: Component) {
|
||||
launch_with_props(root_component, (), |c| c);
|
||||
launch_with_props(root_component, (), Config::default());
|
||||
}
|
||||
|
||||
/// Launch your app and run the event loop, with configuration.
|
||||
@@ -106,7 +106,7 @@ pub fn launch(root_component: Component) {
|
||||
/// use dioxus::prelude::*;
|
||||
///
|
||||
/// fn main() {
|
||||
/// dioxus_web::launch_with_props(App, |config| config.pre_render(true));
|
||||
/// dioxus_web::launch_with_props(App, Config::new().pre_render(true));
|
||||
/// }
|
||||
///
|
||||
/// fn app(cx: Scope) -> Element {
|
||||
@@ -115,8 +115,8 @@ pub fn launch(root_component: Component) {
|
||||
/// })
|
||||
/// }
|
||||
/// ```
|
||||
pub fn launch_cfg(root: Component, config_builder: impl FnOnce(&mut WebConfig) -> &mut WebConfig) {
|
||||
launch_with_props(root, (), config_builder)
|
||||
pub fn launch_cfg(root: Component, config: Config) {
|
||||
launch_with_props(root, (), config)
|
||||
}
|
||||
|
||||
/// Launches the VirtualDOM from the specified component function and props.
|
||||
@@ -130,7 +130,7 @@ pub fn launch_cfg(root: Component, config_builder: impl FnOnce(&mut WebConfig) -
|
||||
/// dioxus_web::launch_with_props(
|
||||
/// App,
|
||||
/// RootProps { name: String::from("joe") },
|
||||
/// |config| config
|
||||
/// Config::new()
|
||||
/// );
|
||||
/// }
|
||||
///
|
||||
@@ -143,19 +143,10 @@ pub fn launch_cfg(root: Component, config_builder: impl FnOnce(&mut WebConfig) -
|
||||
/// rsx!(cx, div {"hello {cx.props.name}"})
|
||||
/// }
|
||||
/// ```
|
||||
pub fn launch_with_props<T>(
|
||||
root_component: Component<T>,
|
||||
root_properties: T,
|
||||
configuration_builder: impl FnOnce(&mut WebConfig) -> &mut WebConfig,
|
||||
) where
|
||||
pub fn launch_with_props<T>(root_component: Component<T>, root_properties: T, config: Config)
|
||||
where
|
||||
T: Send + 'static,
|
||||
{
|
||||
if cfg!(feature = "panic_hook") {
|
||||
console_error_panic_hook::set_once();
|
||||
}
|
||||
|
||||
let mut config = WebConfig::default();
|
||||
configuration_builder(&mut config);
|
||||
wasm_bindgen_futures::spawn_local(run_with_props(root_component, root_properties, config));
|
||||
}
|
||||
|
||||
@@ -171,9 +162,13 @@ pub fn launch_with_props<T>(
|
||||
/// wasm_bindgen_futures::spawn_local(app_fut);
|
||||
/// }
|
||||
/// ```
|
||||
pub async fn run_with_props<T: 'static + Send>(root: Component<T>, root_props: T, cfg: WebConfig) {
|
||||
pub async fn run_with_props<T: 'static + Send>(root: Component<T>, root_props: T, cfg: Config) {
|
||||
let mut dom = VirtualDom::new_with_props(root, root_props);
|
||||
|
||||
if cfg!(feature = "panic_hook") && cfg.default_panic_hook {
|
||||
console_error_panic_hook::set_once();
|
||||
}
|
||||
|
||||
#[cfg(feature = "hot-reload")]
|
||||
hot_reload::init(&dom);
|
||||
|
||||
|
||||
Reference in new issue
Block a user