From 37dbcaa84aa8fe40aabc899bdc96e6514eac3ada Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Sun, 3 Jul 2022 20:26:49 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1ade=20estilos=20en=20l=C3=ADnea=20para?=
 =?UTF-8?q?=20los=20componentes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagetop/src/base/component/anchor.rs |  6 ++--
 pagetop/src/base/component/icon.rs   | 47 +++++++++++++++++++++-------
 pagetop/src/html.rs                  |  3 ++
 pagetop/src/html/inline_styles.rs    | 46 +++++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 14 deletions(-)
 create mode 100644 pagetop/src/html/inline_styles.rs

diff --git a/pagetop/src/base/component/anchor.rs b/pagetop/src/base/component/anchor.rs
index 50d1b41e..82f863ed 100644
--- a/pagetop/src/base/component/anchor.rs
+++ b/pagetop/src/base/component/anchor.rs
@@ -77,7 +77,7 @@ impl ComponentTrait for Anchor {
                 target=[target]
             {
                 (self.left_icon().render(context))
-                (" ")(*self.html())(" ")
+                (*self.html())
                 (self.right_icon().render(context))
             }
         }
@@ -195,13 +195,13 @@ impl Anchor {
 
     pub fn alter_left_icon(&mut self, icon: Icon) -> &mut Self {
         self.left_icon.clear();
-        self.left_icon.add(icon);
+        self.left_icon.add(icon.with_inline_style("margin-right", Some("5px")));
         self
     }
 
     pub fn alter_right_icon(&mut self, icon: Icon) -> &mut Self {
         self.right_icon.clear();
-        self.right_icon.add(icon);
+        self.right_icon.add(icon.with_inline_style("margin-left", Some("5px")));
         self
     }
 
diff --git a/pagetop/src/base/component/icon.rs b/pagetop/src/base/component/icon.rs
index 1fb24120..6e10cbe5 100644
--- a/pagetop/src/base/component/icon.rs
+++ b/pagetop/src/base/component/icon.rs
@@ -3,17 +3,19 @@ use crate::prelude::*;
 pub const ICON_COMPONENT: &str = "pagetop::component::icon";
 
 pub struct Icon {
-    renderable: fn() -> bool,
-    weight    : isize,
-    icon_name : String,
+    renderable   : fn() -> bool,
+    weight       : isize,
+    classes      : Classes,
+    inline_styles: InlineStyles,
 }
 
 impl ComponentTrait for Icon {
     fn new() -> Self {
         Icon {
-            renderable: render_always,
-            weight    : 0,
-            icon_name : "question-circle-fill".to_owned(),
+            renderable   : render_always,
+            weight       : 0,
+            classes      : Classes::new_with_default("bi-question-circle-fill"),
+            inline_styles: InlineStyles::new(),
         }
     }
 
@@ -35,8 +37,7 @@ impl ComponentTrait for Icon {
                 "/theme/icons/bootstrap-icons.css?ver=1.8.2"
             ));
 
-        let name = concat_string!("bi-", self.icon_name);
-        html! { i class=(name) {}; }
+        html! { i class=[self.classes()] style=[self.inline_styles()] {}; }
     }
 
     fn as_ref_any(&self) -> &dyn AnyComponent {
@@ -70,6 +71,16 @@ impl Icon {
         self
     }
 
+    pub fn with_classes(mut self, classes: &str, op: ClassesOp) -> Self {
+        self.alter_classes(classes, op);
+        self
+    }
+
+    pub fn with_inline_style(mut self, style: &str, value: Option<&str>) -> Self {
+        self.alter_inline_style(style, value);
+        self
+    }
+
     // Icon ALTER.
 
     pub fn alter_renderable(&mut self, renderable: fn() -> bool) -> &mut Self {
@@ -83,13 +94,27 @@ impl Icon {
     }
 
     pub fn alter_icon_name(&mut self, name: &str) -> &mut Self {
-        self.icon_name = name.to_owned();
+        self.classes.alter(concat_string!("bi-", name).as_str(), ClassesOp::SetDefault);
+        self
+    }
+
+    pub fn alter_classes(&mut self, classes: &str, op: ClassesOp) -> &mut Self {
+        self.classes.alter(classes, op);
+        self
+    }
+
+    pub fn alter_inline_style(&mut self, style: &str, value: Option<&str>) -> &mut Self {
+        self.inline_styles.add_style(style, value);
         self
     }
 
     // Icon GETTERS.
 
-    pub fn icon_name(&self) -> &str {
-        &self.icon_name
+    pub fn classes(&self) -> &Option<String> {
+        self.classes.option()
+    }
+
+    pub fn inline_styles(&self) -> Option<String> {
+        self.inline_styles.option()
     }
 }
diff --git a/pagetop/src/html.rs b/pagetop/src/html.rs
index 0afcdadd..35db7b8c 100644
--- a/pagetop/src/html.rs
+++ b/pagetop/src/html.rs
@@ -16,3 +16,6 @@ pub use optattr::OptAttr;
 
 mod classes;
 pub use classes::{Classes, ClassesOp};
+
+mod inline_styles;
+pub use inline_styles::InlineStyles;
diff --git a/pagetop/src/html/inline_styles.rs b/pagetop/src/html/inline_styles.rs
new file mode 100644
index 00000000..c9e9faad
--- /dev/null
+++ b/pagetop/src/html/inline_styles.rs
@@ -0,0 +1,46 @@
+use crate::concat_string;
+
+struct Style {
+    property: String,
+    inline  : String,
+}
+
+pub struct InlineStyles(Vec<Style>);
+
+impl InlineStyles {
+    pub fn new() -> Self {
+        InlineStyles(Vec::new())
+    }
+
+    pub fn add_style(&mut self, property: &str, value: Option<&str>) -> &Self {
+        let property = property.trim();
+        match self.0.iter().position(|s| s.property.eq(property)) {
+            Some(pos) => {
+                self.0.remove(pos);
+                if let Some(value) = value {
+                    self.0.insert(pos, Style {
+                        property: property.to_owned(),
+                        inline  : concat_string!(property, ":", value.trim(), ";"),
+                    });
+                }
+            },
+            _ => if let Some(value) = value {
+                self.0.push(Style {
+                    property: property.to_owned(),
+                    inline  : concat_string!(property, ":", value.trim(), ";"),
+                });
+            }
+        }
+        self
+    }
+
+    pub fn option(&self) -> Option<String> {
+        if self.0.len() == 0 {
+            None
+        } else {
+            let mut inline = "".to_owned();
+            self.0.iter().for_each(|s| inline.push_str(s.inline.as_str()));
+            Some(inline)
+        }
+    }
+}