💥 Oculta as_ref_any() y as_mut_any() en la API

pagetop-megamenu/src/component.rs

@@ -76,14 +76,6 @@ impl ComponentTrait for MegaMenuItem {
             }),
         }
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl MegaMenuItem {
@@ -222,14 +214,6 @@ impl ComponentTrait for MegaMenu {
     fn after_prepare_component(&mut self, cx: &mut Context) {
         run_actions_after_prepare_megamenu(self, cx);
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl MegaMenu {

pagetop-minimal/src/component/anchor.rs

@@ -84,14 +84,6 @@ impl ComponentTrait for Anchor {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Anchor {

pagetop-minimal/src/component/block.rs

@@ -58,14 +58,6 @@ impl ComponentTrait for Block {
     fn after_prepare_component(&mut self, cx: &mut Context) {
         run_actions_after_prepare_block(self, cx);
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Block {

pagetop-minimal/src/component/container.rs

@@ -95,14 +95,6 @@ impl ComponentTrait for Container {
     fn after_prepare_component(&mut self, cx: &mut Context) {
         run_actions_after_prepare_container(self, cx);
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Container {

pagetop-minimal/src/component/form_element/button.rs

@@ -67,14 +67,6 @@ impl ComponentTrait for Button {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Button {

pagetop-minimal/src/component/form_element/date.rs

@@ -72,14 +72,6 @@ impl ComponentTrait for Date {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Date {

pagetop-minimal/src/component/form_element/form.rs

@@ -73,14 +73,6 @@ impl ComponentTrait for Form {
     fn after_prepare_component(&mut self, cx: &mut Context) {
         run_actions_after_prepare_form(self, cx);
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Form {

pagetop-minimal/src/component/form_element/hidden.rs

@@ -29,14 +29,6 @@ impl ComponentTrait for Hidden {
             input type="hidden" id=[id] name=[self.name().get()] value=[self.value().get()];
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Hidden {

pagetop-minimal/src/component/form_element/input.rs

@@ -106,14 +106,6 @@ impl ComponentTrait for Input {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Input {

pagetop-minimal/src/component/grid/column.rs

@@ -84,14 +84,6 @@ impl ComponentTrait for Column {
     fn after_prepare_component(&mut self, cx: &mut Context) {
         run_actions_after_prepare_column(self, cx);
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Column {

pagetop-minimal/src/component/grid/row.rs

@@ -53,14 +53,6 @@ impl ComponentTrait for Row {
     fn after_prepare_component(&mut self, cx: &mut Context) {
         run_actions_after_prepare_row(self, cx);
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Row {

pagetop-minimal/src/component/heading.rs

@@ -73,14 +73,6 @@ impl ComponentTrait for Heading {
             HeadingType::H6 => h6 id=[id] class=[classes] { (self.text().prepare(cx)) },
         }})
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Heading {

pagetop-minimal/src/component/icon.rs

@@ -37,14 +37,6 @@ impl ComponentTrait for Icon {
     fn prepare_component(&self, _: &mut Context) -> PrepareMarkup {
         PrepareMarkup::With(html! { i class=[self.classes().get()] {}; })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Icon {

pagetop-minimal/src/component/image.rs

@@ -42,14 +42,6 @@ impl ComponentTrait for Image {
                 class=[self.classes().get()];
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Image {

pagetop-minimal/src/component/paragraph.rs

@@ -56,14 +56,6 @@ impl ComponentTrait for Paragraph {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Paragraph {

pagetop/src/core/action.rs

@@ -1,5 +1,5 @@
 mod definition;
-pub use definition::{action_ref, ActionTrait, AnyAction};
+pub use definition::{action_ref, ActionTrait, BaseAction};
 
 mod list;
 pub use list::Action;

pagetop/src/core/action/definition.rs

@@ -1,8 +1,12 @@
 use crate::Handle;
 
-pub use std::any::Any as AnyAction;
+use std::any::Any;
 
-pub trait ActionTrait: AnyAction + Send + Sync {
+pub trait BaseAction: Any {
+    fn as_ref_any(&self) -> &dyn Any;
+}
+
+pub trait ActionTrait: BaseAction + Send + Sync {
     fn new() -> Self
     where
         Self: Sized;
@@ -12,8 +16,12 @@ pub trait ActionTrait: AnyAction + Send + Sync {
     fn weight(&self) -> isize {
         0
     }
+}
 
-    fn as_ref_any(&self) -> &dyn AnyAction;
+impl<C: ActionTrait> BaseAction for C {
+    fn as_ref_any(&self) -> &dyn Any {
+        self
+    }
 }
 
 pub fn action_ref<A: 'static>(action: &dyn ActionTrait) -> &A {

pagetop/src/core/component.rs

@@ -2,7 +2,7 @@ mod context;
 pub use context::{Context, ContextOp};
 
 mod definition;
-pub use definition::{component_mut, component_ref, AnyComponent, BaseComponent, ComponentTrait};
+pub use definition::{component_mut, component_ref, BaseComponent, ComponentTrait};
 
 mod one;
 pub use one::OneComponent;
@@ -50,10 +50,6 @@ macro_rules! actions_for_component {
                 fn weight(&self) -> isize {
                     self.weight
                 }
-
-                fn as_ref_any(&self) -> &dyn AnyAction {
-                    self
-                }
             }
 
             impl [<BeforePrepare $Component>] {
@@ -113,10 +109,6 @@ macro_rules! actions_for_component {
                 fn weight(&self) -> isize {
                     self.weight
                 }
-
-                fn as_ref_any(&self) -> &dyn AnyAction {
-                    self
-                }
             }
 
             impl [<AfterPrepare $Component>] {

pagetop/src/core/component/definition.rs

@@ -2,13 +2,17 @@ use crate::core::component::Context;
 use crate::html::{html, Markup, PrepareMarkup};
 use crate::{util, Handle};
 
-pub use std::any::Any as AnyComponent;
+use std::any::Any;
 
-pub trait BaseComponent {
+pub trait BaseComponent: Any {
     fn prepare(&mut self, cx: &mut Context) -> Markup;
+
+    fn as_ref_any(&self) -> &dyn Any;
+
+    fn as_mut_any(&mut self) -> &mut dyn Any;
 }
 
-pub trait ComponentTrait: AnyComponent + BaseComponent + Send + Sync {
+pub trait ComponentTrait: BaseComponent + Send + Sync {
     fn new() -> Self
     where
         Self: Sized;
@@ -46,10 +50,6 @@ pub trait ComponentTrait: AnyComponent + BaseComponent + Send + Sync {
 
     #[allow(unused_variables)]
     fn after_prepare_component(&mut self, cx: &mut Context) {}
-
-    fn as_ref_any(&self) -> &dyn AnyComponent;
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent;
 }
 
 impl<C: ComponentTrait> BaseComponent for C {
@@ -77,12 +77,20 @@ impl<C: ComponentTrait> BaseComponent for C {
             html! {}
         }
     }
+
+    fn as_ref_any(&self) -> &dyn Any {
+        self
     }
 
-pub fn component_ref<C: 'static>(component: &dyn ComponentTrait) -> &C {
+    fn as_mut_any(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+pub fn component_ref<C: ComponentTrait>(component: &dyn ComponentTrait) -> &C {
     component.as_ref_any().downcast_ref::<C>().unwrap()
 }
 
-pub fn component_mut<C: 'static>(component: &mut dyn ComponentTrait) -> &mut C {
+pub fn component_mut<C: ComponentTrait>(component: &mut dyn ComponentTrait) -> &mut C {
     component.as_mut_any().downcast_mut::<C>().unwrap()
 }

pagetop/src/core/component/html.rs

@@ -1,4 +1,6 @@
-use crate::prelude::*;
+use crate::core::component::{ComponentTrait, Context};
+use crate::html::{html, Markup, PrepareMarkup};
+use crate::{fn_builder, use_handle, Handle};
 
 use_handle!(COMPONENT_HTML);
 
@@ -17,14 +19,6 @@ impl ComponentTrait for Html {
     fn prepare_component(&self, _: &mut Context) -> PrepareMarkup {
         PrepareMarkup::With(html! { (self.html()) })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl Html {

pagetop/src/core/component/l10n.rs

@@ -1,4 +1,7 @@
-use crate::prelude::*;
+use crate::core::component::{ComponentTrait, Context};
+use crate::html::{html, PreEscaped, PrepareMarkup};
+use crate::locale::{Loader, Locales};
+use crate::{fn_builder, use_handle, Handle};
 
 use std::collections::HashMap;
 
@@ -60,14 +63,6 @@ impl ComponentTrait for L10n {
             }),
         }
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }
 
 impl L10n {

pagetop/src/response/fatal_error/error403.rs

@@ -1,4 +1,4 @@
-use crate::core::component::{AnyComponent, ComponentTrait, Context};
+use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, PrepareMarkup};
 use crate::{use_handle, Handle};
 
@@ -22,12 +22,4 @@ impl ComponentTrait for Error403 {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }

pagetop/src/response/fatal_error/error404.rs

@@ -1,4 +1,4 @@
-use crate::core::component::{AnyComponent, ComponentTrait, Context};
+use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, PrepareMarkup};
 use crate::{use_handle, Handle};
 
@@ -22,12 +22,4 @@ impl ComponentTrait for Error404 {
             }
         })
     }
-
-    fn as_ref_any(&self) -> &dyn AnyComponent {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn AnyComponent {
-        self
-    }
 }

pagetop/src/response/page/action/after_prepare_body.rs

@@ -1,4 +1,4 @@
-use crate::core::action::{action_ref, run_actions, ActionTrait, AnyAction};
+use crate::core::action::{action_ref, run_actions, ActionTrait};
 use crate::response::page::action::ActionPage;
 use crate::response::page::Page;
 use crate::{use_handle, Handle};
@@ -25,10 +25,6 @@ impl ActionTrait for ActionAfterPrepareBody {
     fn weight(&self) -> isize {
         self.weight
     }
-
-    fn as_ref_any(&self) -> &dyn AnyAction {
-        self
-    }
 }
 
 impl ActionAfterPrepareBody {

pagetop/src/response/page/action/before_prepare_body.rs

@@ -1,4 +1,4 @@
-use crate::core::action::{action_ref, run_actions, ActionTrait, AnyAction};
+use crate::core::action::{action_ref, run_actions, ActionTrait};
 use crate::response::page::action::ActionPage;
 use crate::response::page::Page;
 use crate::{use_handle, Handle};
@@ -25,10 +25,6 @@ impl ActionTrait for ActionBeforePrepareBody {
     fn weight(&self) -> isize {
         self.weight
     }
-
-    fn as_ref_any(&self) -> &dyn AnyAction {
-        self
-    }
 }
 
 impl ActionBeforePrepareBody {