diff --git a/examples/calculator.rs b/examples/calculator.rs
index bc7f13459..648ccfbc3 100644
--- a/examples/calculator.rs
+++ b/examples/calculator.rs
@@ -62,6 +62,7 @@ fn app(cx: Scope) -> Element {
div { id: "wrapper",
div { class: "app",
div { class: "calculator",
+ tabindex: "0",
onkeydown: handle_key_down_event,
div { class: "calculator-display", val.to_string() }
div { class: "calculator-keypad",
diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs
index a2ee2c73f..40bc31d55 100644
--- a/packages/cli/src/builder.rs
+++ b/packages/cli/src/builder.rs
@@ -460,8 +460,14 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
&style.to_str().unwrap(),
))
}
- if config.application.tools.clone().contains_key("tailwindcss") {
- style_str.push_str("\n");
+ if config
+ .application
+ .tools
+ .clone()
+ .unwrap_or_default()
+ .contains_key("tailwindcss")
+ {
+ style_str.push_str("\n");
}
replace_or_insert_before("{style_include}", &style_str, ") -> Result> {
- const ERR_MESSAGE: &str = "The `--bin` flag has to be ran in a Cargo workspace.";
+fn get_bin(bin: Option) -> Result {
+ let metadata = cargo_metadata::MetadataCommand::new()
+ .exec()
+ .map_err(Error::CargoMetadata)?;
+ let package = if let Some(bin) = bin {
+ metadata
+ .workspace_packages()
+ .into_iter()
+ .find(|p| p.name == bin)
+ .ok_or(format!("no such package: {}", bin))
+ .map_err(Error::CargoError)?
+ } else {
+ metadata
+ .root_package()
+ .ok_or("no root package?".into())
+ .map_err(Error::CargoError)?
+ };
- if let Some(ref bin) = bin {
- let manifest = cargo_toml::Manifest::from_path("./Cargo.toml")
- .map_err(|_| Error::CargoError(ERR_MESSAGE.to_string()))?;
+ let crate_dir = package
+ .manifest_path
+ .parent()
+ .ok_or("couldn't take parent dir".into())
+ .map_err(Error::CargoError)?;
- if let Some(workspace) = manifest.workspace {
- for item in workspace.members.iter() {
- let path = PathBuf::from(item);
-
- if !path.exists() {
- continue;
- }
-
- if !path.is_dir() {
- continue;
- }
-
- if path.ends_with(bin.clone()) {
- return Ok(Some(path));
- }
- }
- } else {
- return Err(Error::CargoError(ERR_MESSAGE.to_string()));
- }
- }
-
- // If the bin exists but we couldn't find it
- if bin.is_some() {
- return Err(Error::CargoError(
- "The specified bin does not exist.".to_string(),
- ));
- }
-
- Ok(None)
+ Ok(crate_dir.into())
}
#[tokio::main]
@@ -56,7 +45,7 @@ async fn main() -> anyhow::Result<()> {
let bin = get_bin(args.bin)?;
- let _dioxus_config = DioxusConfig::load(bin.clone())
+ let _dioxus_config = DioxusConfig::load(Some(bin.clone()))
.map_err(|e| anyhow!("Failed to load Dioxus config because: {e}"))?
.unwrap_or_else(|| {
log::warn!("You appear to be creating a Dioxus project from scratch; we will use the default config");
@@ -73,15 +62,15 @@ async fn main() -> anyhow::Result<()> {
.map_err(|e| anyhow!("🚫 Translation of HTML into RSX failed: {}", e)),
Build(opts) => opts
- .build(bin.clone())
+ .build(Some(bin.clone()))
.map_err(|e| anyhow!("🚫 Building project failed: {}", e)),
Clean(opts) => opts
- .clean(bin.clone())
+ .clean(Some(bin.clone()))
.map_err(|e| anyhow!("🚫 Cleaning project failed: {}", e)),
Serve(opts) => opts
- .serve(bin.clone())
+ .serve(Some(bin.clone()))
.await
.map_err(|e| anyhow!("🚫 Serving project failed: {}", e)),
@@ -94,7 +83,7 @@ async fn main() -> anyhow::Result<()> {
.map_err(|e| anyhow!("🚫 Configuring new project failed: {}", e)),
Bundle(opts) => opts
- .bundle(bin.clone())
+ .bundle(Some(bin.clone()))
.map_err(|e| anyhow!("🚫 Bundling project failed: {}", e)),
#[cfg(feature = "plugin")]
diff --git a/packages/core/src/lazynodes.rs b/packages/core/src/lazynodes.rs
index 811dbb734..3189086b4 100644
--- a/packages/core/src/lazynodes.rs
+++ b/packages/core/src/lazynodes.rs
@@ -23,8 +23,37 @@ use crate::{innerlude::VNode, ScopeState};
///
///
/// ```rust, ignore
-/// LazyNodes::new(|f| f.element("div", [], [], [] None))
+/// LazyNodes::new(|f| {
+/// static TEMPLATE: dioxus::core::Template = dioxus::core::Template {
+/// name: "main.rs:5:5:20", // Source location of the template for hot reloading
+/// roots: &[
+/// dioxus::core::TemplateNode::Element {
+/// tag: dioxus_elements::div::TAG_NAME,
+/// namespace: dioxus_elements::div::NAME_SPACE,
+/// attrs: &[],
+/// children: &[],
+/// },
+/// ],
+/// node_paths: &[],
+/// attr_paths: &[],
+/// };
+/// dioxus::core::VNode {
+/// parent: None,
+/// key: None,
+/// template: std::cell::Cell::new(TEMPLATE),
+/// root_ids: dioxus::core::exports::bumpalo::collections::Vec::with_capacity_in(
+/// 1usize,
+/// f.bump(),
+/// )
+/// .into(),
+/// dynamic_nodes: f.bump().alloc([]),
+/// dynamic_attrs: f.bump().alloc([]),
+/// })
+/// }
/// ```
+///
+/// Find more information about how to construct [`VNode`] at
+
pub struct LazyNodes<'a, 'b> {
#[cfg(not(miri))]
inner: SmallBox VNode<'a> + 'b, S16>,
@@ -61,7 +90,7 @@ impl<'a, 'b> LazyNodes<'a, 'b> {
/// Call the closure with the given factory to produce real [`VNode`].
///
/// ```rust, ignore
- /// let f = LazyNodes::new(move |f| f.element("div", [], [], [] None));
+ /// let f = LazyNodes::new(/* Closure for creating VNodes */);
///
/// let node = f.call(cac);
/// ```
diff --git a/packages/fullstack/src/router.rs b/packages/fullstack/src/router.rs
index b556aa000..b8d93f0e0 100644
--- a/packages/fullstack/src/router.rs
+++ b/packages/fullstack/src/router.rs
@@ -53,7 +53,7 @@ fn default_external_navigation_handler() -> fn(Scope) -> Element {
dioxus_router::prelude::FailureExternalNavigation
}
-/// The configeration for the router
+/// The configuration for the router
#[derive(Props, serde::Serialize, serde::Deserialize)]
pub struct FullstackRouterConfig
where