Skip to content

Commit 3d99f30

Browse files
authored
Merge pull request #121 from dev-five-git/selector-issue
Selector issue
2 parents cf4b3fc + 27c414d commit 3d99f30

File tree

148 files changed

+1581
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1581
-822
lines changed

.changeset/gentle-peas-double.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@devup-ui/wasm": patch
3+
---
4+
5+
Fix selector issue

.changeset/tidy-parents-buy.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@devup-ui/wasm": patch
3+
"@devup-ui/react": patch
4+
---
5+
6+
Implement style order

Cargo.lock

Lines changed: 43 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/devup-ui-wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ css = { path = "../../libs/css" }
2121
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
2222
# code size when deploying.
2323
console_error_panic_hook = { version = "0.1.7", optional = true }
24-
once_cell = "1.20.2"
24+
once_cell = "1.20.3"
2525
js-sys = "0.3.76"
2626
serde_json = "1.0.138"
2727
serde-wasm-bindgen = "0.6.5"

bindings/devup-ui-wasm/src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Output {
5353
st.level(),
5454
st.value(),
5555
st.selector(),
56-
st.basic(),
56+
st.style_order(),
5757
) {
5858
collected = true;
5959
}
@@ -65,7 +65,7 @@ impl Output {
6565
dy.level(),
6666
&format!("var({})", variable.unwrap()),
6767
dy.selector(),
68-
false,
68+
dy.style_order(),
6969
) {
7070
collected = true;
7171
}
@@ -81,6 +81,9 @@ impl Output {
8181
if !collected {
8282
return None;
8383
}
84+
85+
log_str(&format!("css: {:?}", sheet.properties));
86+
log_str(&sheet.create_css());
8487
Some(sheet.create_css())
8588
}
8689
}

libs/css/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
once_cell = "1.20.2"
7+
once_cell = "1.20.3"
88
serial_test = "3.2.0"
99
serde = { version = "1.0.217", features = ["derive"] }
1010
regex = "1.11.1"

0 commit comments

Comments
 (0)