manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

💥 Introduce ComponentRef to add comp's to packs

Browse source
This commit is contained in:
Manuel Cillero 2023-07-19 19:18:20 +02:00
parent df2d15a839
commit 0a95f3d51c
12 changed files with 106 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pagetop-minimal/src/component/block.rs
View file

@ -12,7 +12,7 @@ pub struct Block {
id : IdentifierValue,
classes : Classes,
title : AttributeValue,
components: PackComponents,
content : PackComponents,
template : String,
}
@ -94,12 +94,12 @@ impl Block {
}
pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.components.alter_pack(PackOp::Add, component);
self.content.alter(PackOp::Add, ComponentRef::to(component));
self
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.components.alter_pack(op, component);
self.content.alter(op, ComponentRef::to(component));
self
}
@ -120,7 +120,7 @@ impl Block {
}
pub fn components(&self) -> &PackComponents {
&self.components
&self.content
}
pub fn template(&self) -> &str {

8
pagetop-minimal/src/component/container.rs
View file

@ -23,7 +23,7 @@ pub struct Container {
classes : Classes,
inner_classes : Classes,
container_type: ContainerType,
components : PackComponents,
content : PackComponents,
template : String,
}
@ -155,12 +155,12 @@ impl Container {
}
pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.components.alter_pack(PackOp::Add, component);
self.content.alter(PackOp::Add, ComponentRef::to(component));
self
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.components.alter_pack(op, component);
self.content.alter(op, ComponentRef::to(component));
self
}
@ -185,7 +185,7 @@ impl Container {
}
pub fn components(&self) -> &PackComponents {
&self.components
&self.content
}
pub fn template(&self) -> &str {

4
pagetop-minimal/src/component/form_element/form.rs
View file

@ -121,12 +121,12 @@ impl Form {
}
pub fn with_element(mut self, element: impl ComponentTrait) -> Self {
self.elements.alter_pack(PackOp::Add, element);
self.elements.alter(PackOp::Add, ComponentRef::to(element));
self
}
pub fn alter_elements(&mut self, op: PackOp, element: impl ComponentTrait) -> &mut Self {
self.elements.alter_pack(op, element);
self.elements.alter(op, ComponentRef::to(element));
self
}

50
pagetop-minimal/src/component/grid/column.rs
View file

@ -4,16 +4,16 @@ create_handle!(COMPONENT_COLUMN);
actions_for_component!(Column);
const SIZE__DEFAULT: &str = "col-md";
const SIZE__1_OF_12: &str = "col-md-1";
const SIZE__2_OF_12: &str = "col-md-2";
const SIZE__3_OF_12: &str = "col-md-3";
const SIZE__4_OF_12: &str = "col-md-4";
const SIZE__5_OF_12: &str = "col-md-5";
const SIZE__6_OF_12: &str = "col-md-6";
const SIZE__7_OF_12: &str = "col-md-7";
const SIZE__8_OF_12: &str = "col-md-8";
const SIZE__9_OF_12: &str = "col-md-9";
const SIZE_DEFAULT: &str = "col-md";
const SIZE_1_OF_12: &str = "col-md-1";
const SIZE_2_OF_12: &str = "col-md-2";
const SIZE_3_OF_12: &str = "col-md-3";
const SIZE_4_OF_12: &str = "col-md-4";
const SIZE_5_OF_12: &str = "col-md-5";
const SIZE_6_OF_12: &str = "col-md-6";
const SIZE_7_OF_12: &str = "col-md-7";
const SIZE_8_OF_12: &str = "col-md-8";
const SIZE_9_OF_12: &str = "col-md-9";
const SIZE_10_OF_12: &str = "col-md-10";
const SIZE_11_OF_12: &str = "col-md-11";
const SIZE_12_OF_12: &str = "col-md-12";
@ -44,13 +44,13 @@ pub struct Column {
id : IdentifierValue,
classes : Classes,
size : ColumnSize,
components: PackComponents,
content : PackComponents,
template : String,
}
impl ComponentTrait for Column {
fn new() -> Self {
Column::default().with_classes(ClassesOp::SetDefault, SIZE__DEFAULT)
Column::default().with_classes(ClassesOp::SetDefault, SIZE_DEFAULT)
}
fn handle(&self) -> Handle {
@ -117,16 +117,16 @@ impl Column {
#[fn_builder]
pub fn alter_size(&mut self, size: ColumnSize) -> &mut Self {
match size {
ColumnSize::Default => self.alter_classes(ClassesOp::SetDefault, SIZE__DEFAULT),
ColumnSize::Is1of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__1_OF_12),
ColumnSize::Is2of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__2_OF_12),
ColumnSize::Is3of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__3_OF_12),
ColumnSize::Is4of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__4_OF_12),
ColumnSize::Is5of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__5_OF_12),
ColumnSize::Is6of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__6_OF_12),
ColumnSize::Is7of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__7_OF_12),
ColumnSize::Is8of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__8_OF_12),
ColumnSize::Is9of12 => self.alter_classes(ClassesOp::SetDefault, SIZE__9_OF_12),
ColumnSize::Default => self.alter_classes(ClassesOp::SetDefault, SIZE_DEFAULT),
ColumnSize::Is1of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_1_OF_12),
ColumnSize::Is2of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_2_OF_12),
ColumnSize::Is3of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_3_OF_12),
ColumnSize::Is4of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_4_OF_12),
ColumnSize::Is5of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_5_OF_12),
ColumnSize::Is6of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_6_OF_12),
ColumnSize::Is7of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_7_OF_12),
ColumnSize::Is8of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_8_OF_12),
ColumnSize::Is9of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_9_OF_12),
ColumnSize::Is10of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_10_OF_12),
ColumnSize::Is11of12 => self.alter_classes(ClassesOp::SetDefault, SIZE_11_OF_12),
ColumnSize::IsFull => self.alter_classes(ClassesOp::SetDefault, SIZE_12_OF_12),
@ -136,12 +136,12 @@ impl Column {
}
pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.components.alter_pack(PackOp::Add, component);
self.content.alter(PackOp::Add, ComponentRef::to(component));
self
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.components.alter_pack(op, component);
self.content.alter(op, ComponentRef::to(component));
self
}
@ -162,7 +162,7 @@ impl Column {
}
pub fn components(&self) -> &PackComponents {
&self.components
&self.content
}
pub fn template(&self) -> &str {

4
pagetop-minimal/src/component/grid/row.rs
View file

@ -83,12 +83,12 @@ impl Row {
}
pub fn with_column(mut self, column: grid::Column) -> Self {
self.columns.alter_pack(PackOp::Add, column);
self.columns.alter(PackOp::Add, ComponentRef::to(column));
self
}
pub fn alter_columns(&mut self, op: PackOp, column: grid::Column) -> &mut Self {
self.columns.alter_pack(op, column);
self.columns.alter(op, ComponentRef::to(column));
self
}

8
pagetop-minimal/src/component/paragraph.rs
View file

@ -20,7 +20,7 @@ pub struct Paragraph {
renderable: Renderable,
id : IdentifierValue,
classes : Classes,
components: PackComponents,
content : PackComponents,
display : ParagraphDisplay,
template : String,
}
@ -90,12 +90,12 @@ impl Paragraph {
}
pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.components.alter_pack(PackOp::Add, component);
self.content.alter(PackOp::Add, ComponentRef::to(component));
self
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.components.alter_pack(op, component);
self.content.alter(op, ComponentRef::to(component));
self
}
@ -130,7 +130,7 @@ impl Paragraph {
}
pub fn components(&self) -> &PackComponents {
&self.components
&self.content
}
pub fn display(&self) -> &ParagraphDisplay {