slint-ui 1.6.0-nightly.2024050819 → 1.6.0-nightly.2024050917
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.toml +4 -4
- package/package.json +6 -6
- package/src/interpreter/value.rs +8 -10
package/Cargo.toml
CHANGED
|
@@ -40,10 +40,10 @@ accessibility = ["slint-interpreter/accessibility"]
|
|
|
40
40
|
[dependencies]
|
|
41
41
|
napi = { version = "2.14.0", default-features = false, features = ["napi8"] }
|
|
42
42
|
napi-derive = "2.14.0"
|
|
43
|
-
i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "
|
|
44
|
-
i-slint-core = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "
|
|
45
|
-
i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "
|
|
46
|
-
slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "
|
|
43
|
+
i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "65160638a1c36cf8ee19047554f7bb4384c69ddf", version = "=1.6.0", default-features = false }
|
|
44
|
+
i-slint-core = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "65160638a1c36cf8ee19047554f7bb4384c69ddf", version = "=1.6.0", default-features = false }
|
|
45
|
+
i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "65160638a1c36cf8ee19047554f7bb4384c69ddf", version = "=1.6.0", default-features = false }
|
|
46
|
+
slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "65160638a1c36cf8ee19047554f7bb4384c69ddf", version = "=1.6.0"}
|
|
47
47
|
spin_on = "0.1"
|
|
48
48
|
css-color-parser2 = { version = "1.0.1" }
|
|
49
49
|
itertools = { version = "0.12" }
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slint-ui",
|
|
3
|
-
"version": "1.6.0-nightly.
|
|
3
|
+
"version": "1.6.0-nightly.2024050917",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"types": "index.d.ts",
|
|
6
6
|
"homepage": "https://github.com/slint-ui/slint",
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
"@napi-rs/cli": "^2.16.5"
|
|
60
60
|
},
|
|
61
61
|
"optionalDependencies": {
|
|
62
|
-
"@slint-ui/slint-ui-binary-linux-x64-gnu": "1.6.0-nightly.
|
|
63
|
-
"@slint-ui/slint-ui-binary-darwin-x64": "1.6.0-nightly.
|
|
64
|
-
"@slint-ui/slint-ui-binary-darwin-arm64": "1.6.0-nightly.
|
|
65
|
-
"@slint-ui/slint-ui-binary-win32-x64-msvc": "1.6.0-nightly.
|
|
66
|
-
"@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.6.0-nightly.
|
|
62
|
+
"@slint-ui/slint-ui-binary-linux-x64-gnu": "1.6.0-nightly.2024050917",
|
|
63
|
+
"@slint-ui/slint-ui-binary-darwin-x64": "1.6.0-nightly.2024050917",
|
|
64
|
+
"@slint-ui/slint-ui-binary-darwin-arm64": "1.6.0-nightly.2024050917",
|
|
65
|
+
"@slint-ui/slint-ui-binary-win32-x64-msvc": "1.6.0-nightly.2024050917",
|
|
66
|
+
"@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.6.0-nightly.2024050917"
|
|
67
67
|
}
|
|
68
68
|
}
|
package/src/interpreter/value.rs
CHANGED
|
@@ -221,16 +221,14 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
|
|
|
221
221
|
fields
|
|
222
222
|
.iter()
|
|
223
223
|
.map(|(pro_name, pro_ty)| {
|
|
224
|
-
|
|
225
|
-
pro_name.
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
)?,
|
|
233
|
-
))
|
|
224
|
+
let prop: JsUnknown = js_object
|
|
225
|
+
.get_property(env.create_string(&pro_name.replace('-', "_"))?)?;
|
|
226
|
+
let prop_value = if prop.get_type()? == napi::ValueType::Undefined {
|
|
227
|
+
slint_interpreter::default_value_for_type(pro_ty)
|
|
228
|
+
} else {
|
|
229
|
+
to_value(env, prop, pro_ty)?
|
|
230
|
+
};
|
|
231
|
+
Ok((pro_name.clone(), prop_value))
|
|
234
232
|
})
|
|
235
233
|
.collect::<Result<_, _>>()?,
|
|
236
234
|
))
|