Jelajahi Sumber

match the render macro as well

Evan Almloff 2 tahun lalu
induk
melakukan
fb7c55f9bd
2 mengubah file dengan 29 tambahan dan 4 penghapusan
  1. 20 1
      Cargo.lock
  2. 9 3
      src/hot_reload.rs

+ 20 - 1
Cargo.lock

@@ -712,7 +712,6 @@ dependencies = [
 name = "dioxus-core"
 version = "0.2.1"
 dependencies = [
- "anyhow",
  "bumpalo",
  "futures-channel",
  "futures-util",
@@ -736,6 +735,7 @@ dependencies = [
  "euclid",
  "keyboard-types",
  "serde",
+ "serde-value",
  "serde_repr",
 ]
 
@@ -1849,6 +1849,15 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "ordered-float"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "os_str_bytes"
 version = "6.4.1"
@@ -2350,6 +2359,16 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float",
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.149"

+ 9 - 3
src/hot_reload.rs

@@ -424,8 +424,14 @@ fn find_rsx_expr(
             let new_mac = &new_expr.mac;
             let old_mac = &old_expr.mac;
             if new_mac.path.get_ident().map(|ident| ident.to_string()) == Some("rsx".to_string())
-                && old_mac.path.get_ident().map(|ident| ident.to_string())
-                    == Some("rsx".to_string())
+                && matches!(
+                    old_mac
+                        .path
+                        .get_ident()
+                        .map(|ident| ident.to_string())
+                        .as_deref(),
+                    Some("rsx" | "render")
+                )
             {
                 rsx_calls.push((old_mac.clone(), new_mac.tokens.clone()));
                 false
@@ -611,4 +617,4 @@ fn find_rsx_expr(
         (syn::Expr::Verbatim(_), syn::Expr::Verbatim(_)) => false,
         _ => true,
     }
-}
+}