From 9a5618ef4b612db76b2d5d5d85679fb9cf7b28bc Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Sun, 3 Mar 2024 21:14:56 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Simplify=20?=
 =?UTF-8?q?component=20class=20access=20functions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/pagetop-bootsier/src/lib.rs     | 63 +++++++++++++++---------
 packages/pagetop-bulmix/src/lib.rs       | 46 ++++++++++-------
 src/base/component/block.rs              |  2 +-
 src/base/component/button.rs             |  3 +-
 src/base/component/flex/container.rs     |  3 +-
 src/base/component/flex/item.rs          |  3 +-
 src/base/component/form/action_button.rs |  3 +-
 src/base/component/form/input.rs         |  4 +-
 src/base/component/heading.rs            |  2 +-
 src/base/component/icon.rs               |  2 +-
 src/base/component/paragraph.rs          |  2 +-
 src/core/component/classes.rs            | 43 ----------------
 12 files changed, 82 insertions(+), 94 deletions(-)

diff --git a/packages/pagetop-bootsier/src/lib.rs b/packages/pagetop-bootsier/src/lib.rs
index ceb1abd0..a3e645ff 100644
--- a/packages/pagetop-bootsier/src/lib.rs
+++ b/packages/pagetop-bootsier/src/lib.rs
@@ -92,40 +92,55 @@ impl ThemeTrait for Bootsier {
         match component.type_id() {
             t if t == TypeId::of::<Icon>() => {
                 if let Some(i) = component_as_mut::<Icon>(component) {
-                    i.replace_classes(i.font_size().to_string(), with_font(i.font_size()));
+                    i.alter_classes(
+                        ClassesOp::Replace(i.font_size().to_string()),
+                        with_font(i.font_size()),
+                    );
                 }
             }
             t if t == TypeId::of::<Button>() => {
                 if let Some(b) = component_as_mut::<Button>(component) {
-                    b.replace_classes("button__tap", "btn");
-                    b.replace_classes(b.style().to_string(), match b.style() {
-                        StyleBase::Default => "btn-primary",
-                        StyleBase::Success => "btn-success",
-                        StyleBase::Danger  => "btn-danger",
-                        StyleBase::Warning => "btn-warning",
-                        StyleBase::Info    => "btn-info",
-                        StyleBase::Light   => "btn-light",
-                        StyleBase::Dark    => "btn-dark",
-                        StyleBase::Link    => "btn-link",
-                    });
-                    b.replace_classes(b.font_size().to_string(), with_font(b.font_size()));
+                    b.alter_classes(ClassesOp::Replace("button__tap".to_owned()), "btn");
+                    b.alter_classes(
+                        ClassesOp::Replace(b.style().to_string()),
+                        match b.style() {
+                            StyleBase::Default => "btn-primary",
+                            StyleBase::Success => "btn-success",
+                            StyleBase::Danger  => "btn-danger",
+                            StyleBase::Warning => "btn-warning",
+                            StyleBase::Info    => "btn-info",
+                            StyleBase::Light   => "btn-light",
+                            StyleBase::Dark    => "btn-dark",
+                            StyleBase::Link    => "btn-link",
+                        },
+                    );
+                    b.alter_classes(
+                        ClassesOp::Replace(b.font_size().to_string()),
+                        with_font(b.font_size()),
+                    );
                 }
-            },
+            }
             t if t == TypeId::of::<Heading>() => {
                 if let Some(h) = component_as_mut::<Heading>(component) {
-                    h.replace_classes(h.size().to_string(), match h.size() {
-                        HeadingSize::ExtraLarge => "display-1",
-                        HeadingSize::XxLarge    => "display-2",
-                        HeadingSize::XLarge     => "display-3",
-                        HeadingSize::Large      => "display-4",
-                        HeadingSize::Medium     => "display-5",
-                        _ => "",
-                    });
+                    h.alter_classes(
+                        ClassesOp::Replace(h.size().to_string()),
+                        match h.size() {
+                            HeadingSize::ExtraLarge => "display-1",
+                            HeadingSize::XxLarge    => "display-2",
+                            HeadingSize::XLarge     => "display-3",
+                            HeadingSize::Large      => "display-4",
+                            HeadingSize::Medium     => "display-5",
+                            _ => "",
+                        },
+                    );
                 }
-            },
+            }
             t if t == TypeId::of::<Paragraph>() => {
                 if let Some(p) = component_as_mut::<Paragraph>(component) {
-                    p.replace_classes(p.font_size().to_string(), with_font(p.font_size()));
+                    p.alter_classes(
+                        ClassesOp::Replace(p.font_size().to_string()),
+                        with_font(p.font_size()),
+                    );
                 }
             }
             _ => {}
diff --git a/packages/pagetop-bulmix/src/lib.rs b/packages/pagetop-bulmix/src/lib.rs
index 1ad0ab7c..dc9bddc4 100644
--- a/packages/pagetop-bulmix/src/lib.rs
+++ b/packages/pagetop-bulmix/src/lib.rs
@@ -44,39 +44,51 @@ impl ThemeTrait for Bulmix {
         match component.type_id() {
             t if t == TypeId::of::<Icon>() => {
                 if let Some(i) = component_as_mut::<Icon>(component) {
-                    i.replace_classes(i.font_size().to_string(), with_font(i.font_size()));
+                    i.alter_classes(
+                        ClassesOp::Replace(i.font_size().to_string()),
+                        with_font(i.font_size()),
+                    );
                 }
             }
             t if t == TypeId::of::<Button>() => {
                 if let Some(b) = component_as_mut::<Button>(component) {
-                    b.replace_classes("button__tap", "button");
-                    b.replace_classes(b.style().to_string(), match b.style() {
-                        StyleBase::Default => "is-primary",
-                        StyleBase::Success => "is-success",
-                        StyleBase::Danger  => "is-danger",
-                        StyleBase::Warning => "is-warning",
-                        StyleBase::Info    => "is-info",
-                        StyleBase::Light   => "is-light",
-                        StyleBase::Dark    => "is-dark",
-                        StyleBase::Link    => "is-text",
-                    });
-                    b.replace_classes(b.font_size().to_string(), with_font(b.font_size()));
+                    b.alter_classes(ClassesOp::Replace("button__tap".to_owned()), "button");
+                    b.alter_classes(
+                        ClassesOp::Replace(b.style().to_string()),
+                        match b.style() {
+                            StyleBase::Default => "is-primary",
+                            StyleBase::Success => "is-success",
+                            StyleBase::Danger  => "is-danger",
+                            StyleBase::Warning => "is-warning",
+                            StyleBase::Info    => "is-info",
+                            StyleBase::Light   => "is-light",
+                            StyleBase::Dark    => "is-dark",
+                            StyleBase::Link    => "is-text",
+                        },
+                    );
+                    b.alter_classes(
+                        ClassesOp::Replace(b.font_size().to_string()),
+                        with_font(b.font_size()),
+                    );
                 }
             }
             t if t == TypeId::of::<Heading>() => {
                 if let Some(h) = component_as_mut::<Heading>(component) {
                     match h.size() {
                         HeadingSize::Subtitle => {
-                            h.replace_classes(h.size().to_string(), "subtitle")
+                            h.alter_classes(ClassesOp::Replace(h.size().to_string()), "subtitle")
                         }
-                        _ => h.add_classes("title"),
+                        _ => h.alter_classes(ClassesOp::Add, "title"),
                     };
                 }
             }
             t if t == TypeId::of::<Paragraph>() => {
                 if let Some(p) = component_as_mut::<Paragraph>(component) {
-                    p.add_classes("block");
-                    p.replace_classes(p.font_size().to_string(), with_font(p.font_size()));
+                    p.alter_classes(ClassesOp::Add, "block");
+                    p.alter_classes(
+                        ClassesOp::Replace(p.font_size().to_string()),
+                        with_font(p.font_size()),
+                    );
                 }
             }
             _ => {}
diff --git a/src/base/component/block.rs b/src/base/component/block.rs
index 7dadbd52..0e147698 100644
--- a/src/base/component/block.rs
+++ b/src/base/component/block.rs
@@ -29,7 +29,7 @@ impl ComponentTrait for Block {
     }
 
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.prepend_classes("block__container");
+        self.alter_classes(ClassesOp::Prepend, "block__container");
     }
 
     fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
diff --git a/src/base/component/button.rs b/src/base/component/button.rs
index a6b37dff..a04b3734 100644
--- a/src/base/component/button.rs
+++ b/src/base/component/button.rs
@@ -44,7 +44,8 @@ impl ComponentTrait for Button {
     }
 
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.prepend_classes(
+        self.alter_classes(
+            ClassesOp::Prepend,
             [
                 "button__tap".to_string(),
                 self.style().to_string(),
diff --git a/src/base/component/flex/container.rs b/src/base/component/flex/container.rs
index bacf06a0..6ada35c0 100644
--- a/src/base/component/flex/container.rs
+++ b/src/base/component/flex/container.rs
@@ -33,7 +33,8 @@ impl ComponentTrait for Container {
     }
 
     fn setup_before_prepare(&mut self, cx: &mut Context) {
-        self.prepend_classes(
+        self.alter_classes(
+            ClassesOp::Prepend,
             [
                 self.direction().to_string(),
                 self.wrap_align().to_string(),
diff --git a/src/base/component/flex/item.rs b/src/base/component/flex/item.rs
index 54a26e29..335f1e11 100644
--- a/src/base/component/flex/item.rs
+++ b/src/base/component/flex/item.rs
@@ -33,7 +33,8 @@ impl ComponentTrait for Item {
     }
 
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.prepend_classes(
+        self.alter_classes(
+            ClassesOp::Prepend,
             [
                 "flex-item__container".to_owned(),
                 self.grow().to_string(),
diff --git a/src/base/component/form/action_button.rs b/src/base/component/form/action_button.rs
index 768ee0d5..0c5ba3a7 100644
--- a/src/base/component/form/action_button.rs
+++ b/src/base/component/form/action_button.rs
@@ -48,7 +48,8 @@ impl ComponentTrait for ActionButton {
     }
 
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.prepend_classes(
+        self.alter_classes(
+            ClassesOp::Prepend,
             [
                 "button__tap".to_string(),
                 self.style().to_string(),
diff --git a/src/base/component/form/input.rs b/src/base/component/form/input.rs
index e5df0295..51a114b4 100644
--- a/src/base/component/form/input.rs
+++ b/src/base/component/form/input.rs
@@ -162,9 +162,9 @@ impl Input {
     #[fn_builder]
     pub fn alter_name(&mut self, name: &str) -> &mut Self {
         if let Some(previous) = self.name.get() {
-            self.remove_classes(concat_string!("form-item-", previous));
+            self.alter_classes(ClassesOp::Remove, concat_string!("form-item-", previous));
         }
-        self.add_classes(concat_string!("form-item-", name));
+        self.alter_classes(ClassesOp::Add, concat_string!("form-item-", name));
         self.name.alter_value(name);
         self
     }
diff --git a/src/base/component/heading.rs b/src/base/component/heading.rs
index bb62ee57..f3b8290f 100644
--- a/src/base/component/heading.rs
+++ b/src/base/component/heading.rs
@@ -68,7 +68,7 @@ impl ComponentTrait for Heading {
     }
 
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.add_classes(self.size().to_string());
+        self.alter_classes(ClassesOp::Add, self.size().to_string());
     }
 
     fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
diff --git a/src/base/component/icon.rs b/src/base/component/icon.rs
index f747b0a8..a3e51905 100644
--- a/src/base/component/icon.rs
+++ b/src/base/component/icon.rs
@@ -26,7 +26,7 @@ impl ComponentTrait for Icon {
     #[rustfmt::skip]
     fn setup_before_prepare(&mut self, cx: &mut Context) {
         if let Some(icon_name) = self.icon_name().get() {
-            self.prepend_classes(
+            self.alter_classes(ClassesOp::Prepend,
                 concat_string!("bi-", icon_name, " ", self.font_size().to_string()),
             );
             cx.set_param::<bool>(PARAM_BASE_INCLUDE_ICONS, true);
diff --git a/src/base/component/paragraph.rs b/src/base/component/paragraph.rs
index d6fba0bd..ab47fe7d 100644
--- a/src/base/component/paragraph.rs
+++ b/src/base/component/paragraph.rs
@@ -29,7 +29,7 @@ impl ComponentTrait for Paragraph {
     }
 
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.prepend_classes(self.font_size().to_string());
+        self.alter_classes(ClassesOp::Prepend, self.font_size().to_string());
     }
 
     fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
diff --git a/src/core/component/classes.rs b/src/core/component/classes.rs
index b5b3be21..ab094be7 100644
--- a/src/core/component/classes.rs
+++ b/src/core/component/classes.rs
@@ -3,18 +3,6 @@ use crate::html::{ClassesOp, OptionClasses};
 
 pub trait ComponentClassesOp {
     fn with_classes(self, op: ClassesOp, classes: impl Into<String>) -> Self;
-
-    fn add_classes(&mut self, classes: impl Into<String>) -> &mut Self;
-
-    fn prepend_classes(&mut self, classes: impl Into<String>) -> &mut Self;
-
-    fn remove_classes(&mut self, classes: impl Into<String>) -> &mut Self;
-
-    fn replace_classes(&mut self, rep: impl Into<String>, classes: impl Into<String>) -> &mut Self;
-
-    fn toggle_classes(&mut self, classes: impl Into<String>) -> &mut Self;
-
-    fn set_classes(&mut self, classes: impl Into<String>) -> &mut Self;
 }
 
 pub trait ComponentClasses: ComponentBase + ComponentClassesOp {
@@ -24,39 +12,8 @@ pub trait ComponentClasses: ComponentBase + ComponentClassesOp {
 }
 
 impl<C: ComponentBase + ComponentClasses> ComponentClassesOp for C {
-    #[doc(hidden)]
     fn with_classes(mut self, op: ClassesOp, classes: impl Into<String>) -> Self {
         self.alter_classes(op, classes);
         self
     }
-
-    fn add_classes(&mut self, classes: impl Into<String>) -> &mut Self {
-        self.alter_classes(ClassesOp::Add, classes);
-        self
-    }
-
-    fn prepend_classes(&mut self, classes: impl Into<String>) -> &mut Self {
-        self.alter_classes(ClassesOp::Prepend, classes);
-        self
-    }
-
-    fn remove_classes(&mut self, classes: impl Into<String>) -> &mut Self {
-        self.alter_classes(ClassesOp::Remove, classes);
-        self
-    }
-
-    fn replace_classes(&mut self, rep: impl Into<String>, classes: impl Into<String>) -> &mut Self {
-        self.alter_classes(ClassesOp::Replace(rep.into()), classes);
-        self
-    }
-
-    fn toggle_classes(&mut self, classes: impl Into<String>) -> &mut Self {
-        self.alter_classes(ClassesOp::Toggle, classes);
-        self
-    }
-
-    fn set_classes(&mut self, classes: impl Into<String>) -> &mut Self {
-        self.alter_classes(ClassesOp::Set, classes);
-        self
-    }
 }