Skip to content
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.

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

feat: support arrays for Classes/classes!() #3393

Merged
merged 2 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion packages/yew-macro/tests/classes_macro/classes-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ fn compile_pass() {
// single expression
::yew::classes!(::std::vec!["one", "two"]);

// single array
::yew::classes!(["one", "two"]);
// multiple arrays
::yew::classes!(["one"], ["two"]);

// optional classes
::yew::classes!(
::std::option::Option::Some("one"),
Expand All @@ -58,7 +63,7 @@ fn compile_pass() {
// mixed types
{
use ::std::borrow::ToOwned;
::yew::classes!("one".to_owned(), "two", ::std::vec!["three"]);
::yew::classes!("one".to_owned(), "two", ::std::vec!["three"], ["four", "five"]);
}
}

Expand Down
6 changes: 6 additions & 0 deletions packages/yew/src/html/classes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,12 @@ impl<T: Into<Classes> + Clone> From<&[T]> for Classes {
}
}

impl<T: Into<Classes>, const SIZE: usize> From<[T; SIZE]> for Classes {
fn from(t: [T; SIZE]) -> Self {
t.into_iter().collect()
}
}

impl PartialEq for Classes {
fn eq(&self, other: &Self) -> bool {
self.set.len() == other.set.len() && self.set.iter().eq(other.set.iter())
Expand Down
4 changes: 1 addition & 3 deletions website/docs/concepts/html/classes.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ html! {
```rust
use yew::{classes, html};

let my_classes = ["class-1", "class-2"];

html! {
<div class={classes!(my_classes.as_ref())}></div>
<div class={classes!(["class-1", "class-2"])}></div>
};
```

Expand Down
Loading