Skip to content

Add maintain properies #24

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 1 commit into from
Jan 17, 2025
Merged

Add maintain properies #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/long-beds-suffer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Add maintain properies
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions bindings/devup-ui-wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use extractor::{extract, ExtractOption, ExtractStyleValue, StyleProperty};
use extractor::extract_style::ExtractStyleValue;
use extractor::{extract, ExtractOption, StyleProperty};
use js_sys::{Object, Reflect};
use once_cell::sync::Lazy;
use sheet::theme::{ColorTheme, Theme, Typography};
Expand Down Expand Up @@ -45,22 +46,22 @@ impl Output {
match style {
ExtractStyleValue::Static(st) => {
if sheet.add_property(
cls,
st.property.clone(),
st.level,
st.value.clone(),
st.selector.clone(),
&cls,
st.property(),
st.level(),
st.value(),
st.selector(),
) {
collected = true;
}
}
ExtractStyleValue::Dynamic(dy) => {
if sheet.add_property(
cls,
dy.property.clone(),
dy.level,
format!("var({})", variable.unwrap()),
dy.selector.clone(),
&cls,
dy.property(),
dy.level(),
&format!("var({})", variable.unwrap()),
dy.selector(),
) {
collected = true;
}
Expand Down
1 change: 1 addition & 0 deletions libs/extractor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ oxc_allocator = "0.46.0"
oxc_ast = "0.46.0"
oxc_codegen = "0.46.0"
css = { path = "../css" }
once_cell = "1.20.2"

[dev-dependencies]
insta = "1.42.0"
Expand Down
173 changes: 87 additions & 86 deletions libs/extractor/src/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::ExtractStyleValue::Static;
use crate::{ExtractStaticStyle, ExtractStyleValue};
use crate::extract_style::ExtractStaticStyle;
use crate::extract_style::ExtractStyleValue::Static;
use crate::ExtractStyleValue;

/// devup-ui export variable kind
#[derive(Debug, PartialEq, Clone)]
Expand Down Expand Up @@ -40,56 +41,56 @@ impl ExportVariableKind {
| ExportVariableKind::Text
| ExportVariableKind::Image
| ExportVariableKind::Box => vec![],
ExportVariableKind::Flex => vec![Static(ExtractStaticStyle {
value: "flex".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
})],
ExportVariableKind::Flex => vec![Static(ExtractStaticStyle::new(
"display".to_string(),
"flex".to_string(),
0,
None,
))],
ExportVariableKind::VStack => {
vec![
Static(ExtractStaticStyle {
value: "flex".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle {
value: "column".to_string(),
property: "flexDirection".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle::new(
"display".to_string(),
"flex".to_string(),
0,
None,
)),
Static(ExtractStaticStyle::new(
"flexDirection".to_string(),
"column".to_string(),
0,
None,
)),
]
}
ExportVariableKind::Center => {
vec![
Static(ExtractStaticStyle {
value: "flex".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle {
value: "center".to_string(),
property: "justifyContent".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle {
value: "center".to_string(),
property: "alignItems".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle::new(
"display".to_string(),
"flex".to_string(),
0,
None,
)),
Static(ExtractStaticStyle::new(
"justifyContent".to_string(),
"center".to_string(),
0,
None,
)),
Static(ExtractStaticStyle::new(
"alignItems".to_string(),
"center".to_string(),
0,
None,
)),
]
}
ExportVariableKind::Grid => vec![Static(ExtractStaticStyle {
value: "grid".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
})],
ExportVariableKind::Grid => vec![Static(ExtractStaticStyle::new(
"display".to_string(),
"grid".to_string(),
0,
None,
))],
}
}
}
Expand Down Expand Up @@ -181,61 +182,61 @@ mod tests {
assert_eq!(ExportVariableKind::Input.extract(), vec![]);
assert_eq!(
ExportVariableKind::Flex.extract(),
vec![Static(ExtractStaticStyle {
value: "flex".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
})]
vec![Static(ExtractStaticStyle::new(
"display".to_string(),
"flex".to_string(),
0,
None,
))]
);
assert_eq!(
ExportVariableKind::VStack.extract(),
vec![
Static(ExtractStaticStyle {
value: "flex".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle {
value: "column".to_string(),
property: "flexDirection".to_string(),
level: 0,
selector: None,
})
Static(ExtractStaticStyle::new(
"display".to_string(),
"flex".to_string(),
0,
None,
)),
Static(ExtractStaticStyle::new(
"flexDirection".to_string(),
"column".to_string(),
0,
None,
))
]
);
assert_eq!(
ExportVariableKind::Center.extract(),
vec![
Static(ExtractStaticStyle {
value: "flex".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle {
value: "center".to_string(),
property: "justifyContent".to_string(),
level: 0,
selector: None,
}),
Static(ExtractStaticStyle {
value: "center".to_string(),
property: "alignItems".to_string(),
level: 0,
selector: None,
})
Static(ExtractStaticStyle::new(
"display".to_string(),
"flex".to_string(),
0,
None,
)),
Static(ExtractStaticStyle::new(
"justifyContent".to_string(),
"center".to_string(),
0,
None,
)),
Static(ExtractStaticStyle::new(
"alignItems".to_string(),
"center".to_string(),
0,
None,
))
]
);
assert_eq!(
ExportVariableKind::Grid.extract(),
vec![Static(ExtractStaticStyle {
value: "grid".to_string(),
property: "display".to_string(),
level: 0,
selector: None,
})]
vec![Static(ExtractStaticStyle::new(
"display".to_string(),
"grid".to_string(),
0,
None,
))]
);
}
}
Loading
Loading