From 9c465c3f32598be053a9d25d292d595191e1c346 Mon Sep 17 00:00:00 2001
From: Jovansonlee Cesar <ivanceras@gmail.com>
Date: Tue, 8 Sep 2020 11:45:36 +0800
Subject: update to latest sauron version

---
 Cargo.toml                                         |  4 ----
 svgbob/Cargo.toml                                  |  2 +-
 svgbob/src/buffer/fragment_buffer/fragment_tree.rs | 25 +++++++++++++++++++++-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d430286..59e188d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,3 @@ members = [
     "svgbob",
     "svgbob_cli",
 ]
-
-[patch.crates-io]
-sauron = { path = "../sauron" }
-
diff --git a/svgbob/Cargo.toml b/svgbob/Cargo.toml
index 3e2675e..6fe3e82 100644
--- a/svgbob/Cargo.toml
+++ b/svgbob/Cargo.toml
@@ -13,7 +13,7 @@ license = "Apache-2.0"
 nalgebra = "0.18.0"
 ncollide2d = "0.19.1"
 lazy_static = "1.3.0"
-sauron = { version = "0.27.0", default-features = false}
+sauron = { version = "0.31", default-features = false }
 unicode-width = "0.1.5"
 itertools = "0.8.0"
 pom = { version = "3.1.0" }
diff --git a/svgbob/src/buffer/fragment_buffer/fragment_tree.rs b/svgbob/src/buffer/fragment_buffer/fragment_tree.rs
index 7006f2a..4615e75 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment_tree.rs
+++ b/svgbob/src/buffer/fragment_buffer/fragment_tree.rs
@@ -102,7 +102,30 @@ impl FragmentTree {
     fn into_nodes<MSG>(self) -> Vec<Node<MSG>> {
         let mut nodes = vec![];
         let mut fragment_node: Node<MSG> = self.fragment.into();
-        fragment_node = fragment_node.add_attributes(vec![classes(self.css_tag)]);
+        let css_tag_len = self.css_tag.len();
+        if css_tag_len > 0 {
+            if let Some(ex_classes) = fragment_node
+                .get_attributes()
+                .unwrap()
+                .iter()
+                .find(|att| att.name() == &"class")
+            {
+                println!("existing classes: {:#?}", ex_classes);
+                println!("css tags: {:#?}", self.css_tag);
+            }
+        }
+        fragment_node = fragment_node.merge_attributes(vec![classes(self.css_tag)]);
+
+        if css_tag_len > 0 {
+            if let Some(ex_classes) = fragment_node
+                .get_attributes()
+                .unwrap()
+                .iter()
+                .find(|att| att.name() == &"class")
+            {
+                println!("AFTER merged: {:#?}", ex_classes);
+            }
+        }
         nodes.push(fragment_node);
         for child in self.enclosing {
             nodes.extend(child.into_nodes())
-- 
cgit v1.2.3