From cc579add5fecee236702fc9cab63b5ae5b9fb84c Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Thu, 31 Mar 2022 21:05:54 +0200
Subject: [PATCH] Corrige API del grid

---
 pagetop/src/base/component/grid/column.rs | 12 +++++-------
 pagetop/src/base/component/grid/row.rs    | 12 +++++-------
 pagetop/src/base/theme/bulmix/mod.rs      |  4 ++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pagetop/src/base/component/grid/column.rs b/pagetop/src/base/component/grid/column.rs
index f5bc4669..da1a76a9 100644
--- a/pagetop/src/base/component/grid/column.rs
+++ b/pagetop/src/base/component/grid/column.rs
@@ -37,7 +37,7 @@ impl PageComponent for Column {
     fn default_render(&self, assets: &mut PageAssets) -> Markup {
         html! {
             div id=[self.id()] class=[self.classes("col")] {
-                (self.render_components(assets))
+                (self.components().render(assets))
             }
         }
     }
@@ -84,6 +84,10 @@ impl Column {
 
     // Column GETTERS.
 
+    pub fn components(&self) -> &PageContainer {
+        &self.components
+    }
+
     pub fn id(&self) -> &Option<String> {
         self.id.option()
     }
@@ -95,12 +99,6 @@ impl Column {
     pub fn template(&self) -> &str {
         self.template.as_str()
     }
-
-    // Column EXTRAS.
-
-    pub fn render_components(&self, assets: &mut PageAssets) -> Markup {
-        html! { (self.components.render(assets)) }
-    }
 }
 
 fn always() -> bool {
diff --git a/pagetop/src/base/component/grid/row.rs b/pagetop/src/base/component/grid/row.rs
index 8437c1fe..f4a5b6a5 100644
--- a/pagetop/src/base/component/grid/row.rs
+++ b/pagetop/src/base/component/grid/row.rs
@@ -37,7 +37,7 @@ impl PageComponent for Row {
     fn default_render(&self, assets: &mut PageAssets) -> Markup {
         html! {
             div id=[self.id()] class=[self.classes("row")] {
-                (self.render_columns(assets))
+                (self.columns().render(assets))
             }
         }
     }
@@ -84,6 +84,10 @@ impl Row {
 
     // Row GETTERS.
 
+    pub fn columns(&self) -> &PageContainer {
+        &self.columns
+    }
+
     pub fn id(&self) -> &Option<String> {
         self.id.option()
     }
@@ -95,12 +99,6 @@ impl Row {
     pub fn template(&self) -> &str {
         self.template.as_str()
     }
-
-    // Row EXTRAS.
-
-    pub fn render_columns(&self, assets: &mut PageAssets) -> Markup {
-        html! { (self.columns.render(assets)) }
-    }
 }
 
 fn always() -> bool {
diff --git a/pagetop/src/base/theme/bulmix/mod.rs b/pagetop/src/base/theme/bulmix/mod.rs
index 0e8a4d9b..284353c1 100644
--- a/pagetop/src/base/theme/bulmix/mod.rs
+++ b/pagetop/src/base/theme/bulmix/mod.rs
@@ -42,7 +42,7 @@ impl ThemeTrait for BulmixTheme {
                 let row = component.downcast_ref::<grid::Row>().unwrap();
                 Some(html! {
                     div id=[row.id()] class=[row.classes("columns")] {
-                        (row.render_columns(assets))
+                        (row.columns().render(assets))
                     }
                 })
             },
@@ -50,7 +50,7 @@ impl ThemeTrait for BulmixTheme {
                 let col = component.downcast_ref::<grid::Column>().unwrap();
                 Some(html! {
                     div id=[col.id()] class=[col.classes("column")] {
-                        (col.render_components(assets))
+                        (col.components().render(assets))
                     }
                 })
             },