Skip to content

Commit

Permalink
Split class names on whitespace when using tuple or Vec (#1084)
Browse files Browse the repository at this point in the history
* Add tests for current behavior of `Classes`

* Change `Classes::push` to split incoming class on whitespace

* Split each item in `Vec` on whitespace in `From<Vec<T>> for Classes`

When creating a `VTag` with `class` assigned from a `Vec` the items in
`Vec` were not split on whitespace and so were not enforced as unique in
the same way a `VTag` with `class` assigned from `tuple`.
  • Loading branch information
bryanjswift committed Apr 14, 2020
1 parent 9651d07 commit 4167c51
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 5 deletions.
55 changes: 50 additions & 5 deletions src/virtual_dom/mod.rs
Expand Up @@ -76,10 +76,8 @@ impl Classes {
///
/// Prevents duplication of class names.
pub fn push(&mut self, class: &str) {
let class = class.trim();
if !class.is_empty() {
self.set.insert(class.into());
}
let classes_to_add: Classes = class.into();
self.set.extend(classes_to_add.set);
}

/// Check the set contains a class.
Expand Down Expand Up @@ -148,7 +146,9 @@ impl<T: AsRef<str>> From<Vec<T>> for Classes {
fn from(t: Vec<T>) -> Self {
let set = t
.iter()
.map(|x| x.as_ref().to_string())
.map(|x| x.as_ref())
.flat_map(|s| s.split_whitespace())
.map(String::from)
.filter(|c| !c.is_empty())
.collect();
Self { set }
Expand Down Expand Up @@ -228,3 +228,48 @@ pub trait Transformer<FROM, TO> {
/// Transforms one type to another.
fn transform(from: FROM) -> TO;
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn it_is_initially_empty() {
let subject = Classes::new();
assert!(subject.is_empty());
}

#[test]
fn it_pushes_value() {
let mut subject = Classes::new();
subject.push("foo");
assert!(!subject.is_empty());
assert!(subject.contains("foo"));
}

#[test]
fn it_adds_values_via_extend() {
let mut other = Classes::new();
other.push("bar");
let subject = Classes::new().extend(other);
assert!(subject.contains("bar"));
}

#[test]
fn it_contains_both_values() {
let mut other = Classes::new();
other.push("bar");
let mut subject = Classes::new().extend(other);
subject.push("foo");
assert!(subject.contains("foo"));
assert!(subject.contains("bar"));
}

#[test]
fn it_splits_class_with_spaces() {
let mut subject = Classes::new();
subject.push("foo bar");
assert!(subject.contains("foo"));
assert!(subject.contains("bar"));
}
}
33 changes: 33 additions & 0 deletions src/virtual_dom/vtag.rs
Expand Up @@ -755,6 +755,22 @@ mod tests {
assert_eq!(a, c);
}

#[test]
fn supports_multiple_non_unique_classes_tuple() {
let a = html! {
<div class=("class-1", "class-1 class-2")></div>
};

if let VNode::VTag(vtag) = a {
println!("{:?}", vtag.classes);
assert!(vtag.classes.contains("class-1"));
assert!(vtag.classes.contains("class-2"));
assert!(!vtag.classes.contains("class-3"));
} else {
panic!("vtag expected");
}
}

#[test]
fn supports_multiple_classes_string() {
let a = html! {
Expand Down Expand Up @@ -795,6 +811,23 @@ mod tests {
}
}

#[test]
fn supports_multiple_classes_one_value_vec() {
let classes = vec!["class-1 class-2", "class-1"];
let a = html! {
<div class=classes></div>
};

if let VNode::VTag(vtag) = a {
println!("{:?}", vtag.classes);
assert!(vtag.classes.contains("class-1"));
assert!(vtag.classes.contains("class-2"));
assert!(!vtag.classes.contains("class-3"));
} else {
panic!("vtag expected");
}
}

#[test]
fn filter_empty_string_classes_vec() {
let mut classes = vec![""];
Expand Down

0 comments on commit 4167c51

Please sign in to comment.