Skip to content

Fix ordering logic in style comparison and update class name serializ… #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owjs3901 merged 2 commits into from
Feb 3, 2025
Merged

Fix ordering logic in style comparison and update class name serializ… #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b434cd
Fix ordering logic in style comparison and update class name serializ…
owjs3901 Feb 3, 2025
522c690
Fix snapshot
owjs3901 Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dry-readers-doubt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Fix order issue
39 changes: 18 additions & 21 deletions libs/sheet/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ use crate::theme::Theme;
use css::{convert_property, merge_selector, PropertyType, StyleSelector};
use serde::de::Error;
use serde::{Deserialize, Deserializer, Serialize};
use std::cmp::Ordering::{Greater, Less};
use std::cmp::Ordering::{Equal, Greater, Less};
use std::collections::{BTreeMap, HashSet};

trait ExtractStyle {
fn extract(&self) -> String;
}

#[derive(Debug, Hash, Eq, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct StyleSheetProperty {
pub class_name: String,
pub property: String,
Expand Down Expand Up @@ -132,24 +133,20 @@ impl StyleSheet {
match (a.selector.is_some(), b.selector.is_some()) {
(true, false) => Greater,
(false, true) => Less,
(true, true) => {
if a.selector == b.selector {
if a.property == b.property {
a.value.cmp(&b.value)
} else {
a.property.cmp(&b.property)
}
} else {
a.selector.cmp(&b.selector)
}
}
(false, false) => {
if a.property == b.property {
a.value.cmp(&b.value)
} else {
a.property.cmp(&b.property)
}
}
(true, true) => match a.selector.cmp(&b.selector) {
Equal => match a.value.cmp(&b.value) {
Equal => a.class_name.cmp(&b.class_name),
val => val,
},
val => val,
},
(false, false) => match a.property.cmp(&b.property) {
Equal => match a.value.cmp(&b.value) {
Equal => a.class_name.cmp(&b.class_name),
val => val,
},
prop => prop,
},
}
} else {
b.basic.cmp(&a.basic)
Expand Down Expand Up @@ -348,7 +345,7 @@ mod tests {
"properties": {
"0": [
{
"class_name": "test",
"className": "test",
"property": "mx",
"value": "40px",
"selector": null,
Expand Down Expand Up @@ -382,7 +379,7 @@ mod tests {
"properties": {
"wrong": [
{
"class_name": "test",
"className": "test",
"property": "mx",
"value": "40px",
"selector": null,
Expand Down
2 changes: 1 addition & 1 deletion libs/sheet/src/snapshots/sheet__tests__theme_selector.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
source: libs/sheet/src/lib.rs
expression: sheet.create_css()
---
":root[data-theme=dark] .test{margin-left:40px;margin-right:40px;}:root[data-theme=dark] .test{margin-top:40px;margin-bottom:40px;}:root[data-theme=light] .test{margin-left:50px;margin-right:50px;}"
":root[data-theme=dark] .test{margin-top:40px;margin-bottom:40px;}:root[data-theme=dark] .test{margin-left:40px;margin-right:40px;}:root[data-theme=light] .test{margin-left:50px;margin-right:50px;}"