Skip to content

Add color schema #119

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
Feb 11, 2025
Merged

Add color schema #119

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/polite-points-exercise.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 color schema
2 changes: 1 addition & 1 deletion bindings/devup-ui-wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ mod tests {

assert_eq!(
get_css().unwrap(),
":root{--primary:#FFF;}\n:root[data-theme=dark]{--primary:#000;}\n"
":root{color-scheme:light;--primary:#FFF;}\n:root[data-theme=dark]{color-scheme:dark;--primary:#000;}\n"
);
}

Expand Down
2 changes: 1 addition & 1 deletion bindings/devup-ui-wasm/src/snapshots/devup_ui_wasm__tests__deserialize_theme.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
source: bindings/devup-ui-wasm/src/lib.rs
expression: theme.to_css()
---
":root{--primary:#000;}\n:root[data-theme=dark]{--primary:#fff;}\n.typo-default{font-family:Arial;font-size:16px;font-weight:400;line-height:1.5;letter-spacing:0.5em}\n@media (min-width:480px){.typo-default{font-family:Arial;font-size:24px;font-weight:400;line-height:1.5;letter-spacing:0.5em}}\n@media (min-width:768px){.typo-default{font-family:Arial;font-size:24px;line-height:1.5;letter-spacing:0.5em}}"
":root{color-scheme:light;--primary:#000;}\n:root[data-theme=dark]{color-scheme:dark;--primary:#fff;}\n.typo-default{font-family:Arial;font-size:16px;font-weight:400;line-height:1.5;letter-spacing:0.5em}\n@media (min-width:480px){.typo-default{font-family:Arial;font-size:24px;font-weight:400;line-height:1.5;letter-spacing:0.5em}}\n@media (min-width:768px){.typo-default{font-family:Arial;font-size:24px;line-height:1.5;letter-spacing:0.5em}}"
2 changes: 1 addition & 1 deletion libs/sheet/src/snapshots/sheet__theme__tests__to_css_from_theme-2.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/theme.rs
expression: theme.to_css()
---
":root{--primary:#000;}\n:root[data-theme=dark]{--primary:#000;}\n"
":root{color-scheme:light;--primary:#000;}\n:root[data-theme=dark]{color-scheme:dark;--primary:#000;}\n"
2 changes: 1 addition & 1 deletion libs/sheet/src/snapshots/sheet__theme__tests__to_css_from_theme-3.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/theme.rs
expression: theme.to_css()
---
":root{--primary:#000;}\n:root[data-theme=b]{--primary:#000;}\n"
":root{color-scheme:light;--primary:#000;}\n:root[data-theme=b]{color-scheme:dark;--primary:#000;}\n"
2 changes: 1 addition & 1 deletion libs/sheet/src/snapshots/sheet__theme__tests__to_css_from_theme-4.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/theme.rs
expression: theme.to_css()
---
":root{--primary:#000;}\n:root[data-theme=a]{--primary:#000;}\n:root[data-theme=b]{--primary:#000;}\n:root[data-theme=c]{--primary:#000;}\n"
":root{color-scheme:light;--primary:#000;}\n:root[data-theme=a]{color-scheme:dark;--primary:#000;}\n:root[data-theme=b]{color-scheme:dark;--primary:#000;}\n:root[data-theme=c]{color-scheme:dark;--primary:#000;}\n"
5 changes: 5 additions & 0 deletions libs/sheet/src/snapshots/sheet__theme__tests__to_css_from_theme-5.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: libs/sheet/src/theme.rs
expression: theme.to_css()
---
":root{--primary:#000;}\n"
2 changes: 1 addition & 1 deletion libs/sheet/src/snapshots/sheet__theme__tests__to_css_from_theme.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/theme.rs
expression: theme.to_css()
---
":root{--primary:#000;}\n:root[data-theme=dark]{--primary:#000;}\n"
":root{color-scheme:light;--primary:#000;}\n:root[data-theme=dark]{color-scheme:dark;--primary:#000;}\n"
32 changes: 28 additions & 4 deletions libs/sheet/src/theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,29 @@ impl Theme {
});
col
};
let single_theme = entries.len() <= 1;
for (theme_name, theme_properties) in entries {
if let Some(theme_key) = if *theme_name == *default_theme_key {
None
} else {
Some(theme_name)
} {
theme_declaration
.push_str(format!(":root[data-theme={}]{{", theme_key).as_str());
theme_declaration.push_str(
format!(":root[data-theme={}]{{{}", theme_key, "color-scheme:dark;")
.as_str(),
);
} else {
theme_declaration.push_str(":root{");
theme_declaration.push_str(
format!(
":root{{{}",
if single_theme {
""
} else {
"color-scheme:light;"
}
)
.as_str(),
);
}
for (prop, value) in theme_properties.0.iter() {
theme_declaration.push_str(format!("--{}:{};", prop, value).as_str());
Expand Down Expand Up @@ -278,7 +291,7 @@ mod tests {
let css = theme.to_css();
assert_eq!(
css,
":root{--primary:#000;}\n:root[data-theme=dark]{--primary:#fff;}\n.typo-default{font-family:Arial;font-size:16px;font-weight:400;line-height:1.5;letter-spacing:0.5}\n@media (min-width:480px){.typo-default{font-family:Arial;font-size:24px;font-weight:400;line-height:1.5;letter-spacing:0.5}.typo-default1{font-family:Arial;font-size:24px;font-weight:400;line-height:1.5;letter-spacing:0.5}}"
":root{color-scheme:light;--primary:#000;}\n:root[data-theme=dark]{color-scheme:dark;--primary:#fff;}\n.typo-default{font-family:Arial;font-size:16px;font-weight:400;line-height:1.5;letter-spacing:0.5}\n@media (min-width:480px){.typo-default{font-family:Arial;font-size:24px;font-weight:400;line-height:1.5;letter-spacing:0.5}.typo-default1{font-family:Arial;font-size:24px;font-weight:400;line-height:1.5;letter-spacing:0.5}}"
);

assert_eq!(Theme::default().to_css(), "");
Expand Down Expand Up @@ -386,6 +399,17 @@ mod tests {
}),
);
assert_debug_snapshot!(theme.to_css());

let mut theme = Theme::default();
theme.add_color_theme(
"light",
ColorTheme({
let mut map = HashMap::new();
map.insert("primary".to_string(), "#000".to_string());
map
}),
);
assert_debug_snapshot!(theme.to_css());
}

#[test]
Expand Down