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

🚧 Pack and Veck for arrays of components

Browse source
This commit is contained in:
Manuel Cillero 2023-08-15 00:53:14 +02:00
parent 3d86115f97
commit 6197052ae7
22 changed files with 229 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pagetop-megamenu/src/component/item.rs
View file

@ -4,8 +4,8 @@ use crate::component::MegaMenu;
new_handle!(COMPONENT_MEGAITEM); new_handle!(COMPONENT_MEGAITEM);
type Label = OneComponent<L10n>; type Label = ComponentOne<L10n>;
type Content = OneComponent<Html>; type Content = ComponentOne<Html>;
#[derive(Default)] #[derive(Default)]
pub enum MegaItemType { pub enum MegaItemType {

11
pagetop-megamenu/src/component/menu.rs
View file

@ -26,7 +26,7 @@ pub struct MegaMenu {
weight : Weight, weight : Weight,
renderable: Renderable, renderable: Renderable,
id : IdentifierValue, id : IdentifierValue,
items : PackComponents, items : VeckComponents<MegaItem>,
theme : MegaMenuTheme, theme : MegaMenuTheme,
} }
@ -153,12 +153,13 @@ impl MegaMenu {
} }
pub fn with_item(mut self, item: MegaItem) -> Self { pub fn with_item(mut self, item: MegaItem) -> Self {
self.items.alter(PackOp::Add, ComponentArc::new(item)); self.items.alter(VeckOp::Add(ComponentOne::with(item)));
self self
} }
pub fn alter_items(&mut self, op: PackOp, item: MegaItem) -> &mut Self { #[fn_builder]
self.items.alter(op, ComponentArc::new(item)); pub fn alter_items(&mut self, op: VeckOp<MegaItem>) -> &mut Self {
self.items.alter(op);
self self
} }
@ -170,7 +171,7 @@ impl MegaMenu {
// MegaMenu GETTERS. // MegaMenu GETTERS.
pub fn items(&self) -> &PackComponents { pub fn items(&self) -> &VeckComponents<MegaItem> {
&self.items &self.items
} }

4
pagetop-minimal/src/component/anchor.rs
View file

@ -22,8 +22,8 @@ pub enum AnchorTarget {
Context(String), Context(String),
} }
type AnchorIcon = OneComponent<Icon>; type AnchorIcon = ComponentOne<Icon>;
type AnchorHtml = OneComponent<L10n>; type AnchorHtml = ComponentOne<L10n>;
#[rustfmt::skip] #[rustfmt::skip]
#[derive(Default)] #[derive(Default)]

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

@ -94,17 +94,13 @@ impl Block {
} }
pub fn with_component(mut self, component: impl ComponentTrait) -> Self { pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.stuff.alter(PackOp::Add, ComponentArc::new(component)); self.stuff.alter(PackOp::Add(ComponentArc::with(component)));
self self
} }
pub fn with_component_arc(mut self, arc: ComponentArc) -> Self { #[fn_builder]
self.stuff.alter(PackOp::Add, arc); pub fn alter_components(&mut self, op: PackOp) -> &mut Self {
self self.stuff.alter(op);
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.stuff.alter(op, ComponentArc::new(component));
self self
} }

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

@ -155,17 +155,13 @@ impl Container {
} }
pub fn with_component(mut self, component: impl ComponentTrait) -> Self { pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.stuff.alter(PackOp::Add, ComponentArc::new(component)); self.stuff.alter(PackOp::Add(ComponentArc::with(component)));
self self
} }
pub fn with_component_arc(mut self, arc: ComponentArc) -> Self { #[fn_builder]
self.stuff.alter(PackOp::Add, arc); pub fn alter_components(&mut self, op: PackOp) -> &mut Self {
self self.stuff.alter(op);
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.stuff.alter(op, ComponentArc::new(component));
self self
} }

11
pagetop-minimal/src/component/flex/container.rs
View file

@ -13,7 +13,7 @@ pub struct Container {
renderable: Renderable, renderable: Renderable,
id : IdentifierValue, id : IdentifierValue,
classes : Classes, classes : Classes,
items : PackComponents, items : VeckComponents<flex::Item>,
template : String, template : String,
} }
@ -83,12 +83,13 @@ impl Container {
} }
pub fn with_item(mut self, item: flex::Item) -> Self { pub fn with_item(mut self, item: flex::Item) -> Self {
self.items.alter(PackOp::Add, ComponentArc::new(item)); self.items.alter(VeckOp::Add(ComponentOne::with(item)));
self self
} }
pub fn alter_items(&mut self, op: PackOp, item: flex::Item) -> &mut Self { #[fn_builder]
self.items.alter(op, ComponentArc::new(item)); pub fn alter_items(&mut self, op: VeckOp<flex::Item>) -> &mut Self {
self.items.alter(op);
self self
} }
@ -104,7 +105,7 @@ impl Container {
&self.classes &self.classes
} }
pub fn items(&self) -> &PackComponents { pub fn items(&self) -> &VeckComponents<flex::Item> {
&self.items &self.items
} }

12
pagetop-minimal/src/component/flex/item.rs
View file

@ -136,17 +136,13 @@ impl Item {
} }
pub fn with_component(mut self, component: impl ComponentTrait) -> Self { pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.stuff.alter(PackOp::Add, ComponentArc::new(component)); self.stuff.alter(PackOp::Add(ComponentArc::with(component)));
self self
} }
pub fn with_component_arc(mut self, arc: ComponentArc) -> Self { #[fn_builder]
self.stuff.alter(PackOp::Add, arc); pub fn alter_components(&mut self, op: PackOp) -> &mut Self {
self self.stuff.alter(op);
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.stuff.alter(op, ComponentArc::new(component));
self self
} }

2
pagetop-minimal/src/component/form_element/button.rs
View file

@ -10,7 +10,7 @@ pub enum ButtonType {
Reset, Reset,
} }
type ButtonValue = OneComponent<L10n>; type ButtonValue = ComponentOne<L10n>;
#[rustfmt::skip] #[rustfmt::skip]
#[derive(Default)] #[derive(Default)]

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

@ -21,7 +21,7 @@ pub struct Form {
action : AttributeValue, action : AttributeValue,
charset : AttributeValue, charset : AttributeValue,
method : FormMethod, method : FormMethod,
elements : PackComponents, stuff : PackComponents,
template : String, template : String,
} }
@ -121,17 +121,13 @@ impl Form {
} }
pub fn with_element(mut self, element: impl ComponentTrait) -> Self { pub fn with_element(mut self, element: impl ComponentTrait) -> Self {
self.elements.alter(PackOp::Add, ComponentArc::new(element)); self.stuff.alter(PackOp::Add(ComponentArc::with(element)));
self self
} }
pub fn with_element_arc(mut self, arc: ComponentArc) -> Self { #[fn_builder]
self.elements.alter(PackOp::Add, arc); pub fn alter_elements(&mut self, op: PackOp) -> &mut Self {
self self.stuff.alter(op);
}
pub fn alter_elements(&mut self, op: PackOp, element: impl ComponentTrait) -> &mut Self {
self.elements.alter(op, ComponentArc::new(element));
self self
} }
@ -160,7 +156,7 @@ impl Form {
} }
pub fn elements(&self) -> &PackComponents { pub fn elements(&self) -> &PackComponents {
&self.elements &self.stuff
} }
pub fn template(&self) -> &str { pub fn template(&self) -> &str {

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

@ -13,8 +13,8 @@ pub enum InputType {
Url, Url,
} }
type InputLabel = OneComponent<L10n>; type InputLabel = ComponentOne<L10n>;
type InputHelpText = OneComponent<L10n>; type InputHelpText = ComponentOne<L10n>;
#[rustfmt::skip] #[rustfmt::skip]
#[derive(Default)] #[derive(Default)]

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

@ -136,17 +136,13 @@ impl Column {
} }
pub fn with_component(mut self, component: impl ComponentTrait) -> Self { pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.stuff.alter(PackOp::Add, ComponentArc::new(component)); self.stuff.alter(PackOp::Add(ComponentArc::with(component)));
self self
} }
pub fn with_component_arc(mut self, arc: ComponentArc) -> Self { #[fn_builder]
self.stuff.alter(PackOp::Add, arc); pub fn alter_components(&mut self, op: PackOp) -> &mut Self {
self self.stuff.alter(op);
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.stuff.alter(op, ComponentArc::new(component));
self self
} }

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

@ -13,7 +13,7 @@ pub struct Row {
renderable: Renderable, renderable: Renderable,
id : IdentifierValue, id : IdentifierValue,
classes : Classes, classes : Classes,
columns : PackComponents, columns : VeckComponents<grid::Column>,
template : String, template : String,
} }
@ -83,12 +83,13 @@ impl Row {
} }
pub fn with_column(mut self, column: grid::Column) -> Self { pub fn with_column(mut self, column: grid::Column) -> Self {
self.columns.alter(PackOp::Add, ComponentArc::new(column)); self.columns.alter(VeckOp::Add(ComponentOne::with(column)));
self self
} }
pub fn alter_columns(&mut self, op: PackOp, column: grid::Column) -> &mut Self { #[fn_builder]
self.columns.alter(op, ComponentArc::new(column)); pub fn alter_columns(&mut self, op: VeckOp<grid::Column>) -> &mut Self {
self.columns.alter(op);
self self
} }
@ -104,7 +105,7 @@ impl Row {
&self.classes &self.classes
} }
pub fn columns(&self) -> &PackComponents { pub fn columns(&self) -> &VeckComponents<grid::Column> {
&self.columns &self.columns
} }

2
pagetop-minimal/src/component/heading.rs
View file

@ -25,7 +25,7 @@ pub enum HeadingDisplay {
Subtitle, Subtitle,
} }
type HeadingText = OneComponent<L10n>; type HeadingText = ComponentOne<L10n>;
#[rustfmt::skip] #[rustfmt::skip]
#[derive(Default)] #[derive(Default)]

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

@ -90,17 +90,13 @@ impl Paragraph {
} }
pub fn with_component(mut self, component: impl ComponentTrait) -> Self { pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.stuff.alter(PackOp::Add, ComponentArc::new(component)); self.stuff.alter(PackOp::Add(ComponentArc::with(component)));
self self
} }
pub fn with_component_arc(mut self, arc: ComponentArc) -> Self { #[fn_builder]
self.stuff.alter(PackOp::Add, arc); pub fn alter_components(&mut self, op: PackOp) -> &mut Self {
self self.stuff.alter(op);
}
pub fn alter_components(&mut self, op: PackOp, component: impl ComponentTrait) -> &mut Self {
self.stuff.alter(op, ComponentArc::new(component));
self self
} }

4
pagetop-minimal/src/component/site_branding.rs
View file

@ -6,8 +6,8 @@ use crate::LOCALES_MINIMAL;
new_handle!(COMPONENT_BRANDING); new_handle!(COMPONENT_BRANDING);
type SiteSlogan = OneComponent<L10n>; type SiteSlogan = ComponentOne<L10n>;
type SiteLogo = OneComponent<Image>; type SiteLogo = ComponentOne<Image>;
#[rustfmt::skip] #[rustfmt::skip]
pub struct SiteBranding { pub struct SiteBranding {

13
pagetop/src/core/component.rs
View file

@ -5,17 +5,20 @@ pub type FnContextualPath = fn(cx: &Context) -> &str;
mod definition; mod definition;
pub use definition::{component_as_mut, component_as_ref, ComponentBase, ComponentTrait}; pub use definition::{component_as_mut, component_as_ref, ComponentBase, ComponentTrait};
mod renderable;
pub use renderable::{FnIsRenderable, Renderable};
mod arc; mod arc;
pub use arc::ComponentArc; pub use arc::ComponentArc;
mod one;
pub use one::OneComponent;
mod pack; mod pack;
pub use pack::{PackComponents, PackOp}; pub use pack::{PackComponents, PackOp};
mod renderable; mod one;
pub use renderable::{FnIsRenderable, Renderable}; pub use one::ComponentOne;
mod veck;
pub use veck::{VeckComponents, VeckOp};
pub mod html; pub mod html;
pub mod l10n; pub mod l10n;

33
pagetop/src/core/component/arc.rs
View file

@ -1,14 +1,39 @@
use crate::core::component::{ComponentTrait, Context}; use crate::core::component::{ComponentTrait, Context};
use crate::html::Markup; use crate::html::Markup;
use crate::{Handle, Weight}; use crate::{new_handle, Handle, Weight};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
new_handle!(COMPONENT_NULL for Crate);
#[derive(Default)]
struct ComponentNull;
impl ComponentTrait for ComponentNull {
fn new() -> Self {
ComponentNull::default()
}
fn handle(&self) -> Handle {
COMPONENT_NULL
}
}
#[derive(Clone)] #[derive(Clone)]
pub struct ComponentArc(Arc<RwLock<dyn ComponentTrait>>); pub struct ComponentArc(Arc<RwLock<dyn ComponentTrait>>);
impl Default for ComponentArc {
fn default() -> Self {
ComponentArc(Arc::new(RwLock::new(ComponentNull)))
}
}
impl ComponentArc { impl ComponentArc {
pub fn new(component: impl ComponentTrait) -> Self { pub fn new() -> Self {
ComponentArc::default()
}
pub fn with(component: impl ComponentTrait) -> Self {
ComponentArc(Arc::new(RwLock::new(component))) ComponentArc(Arc::new(RwLock::new(component)))
} }
@ -24,7 +49,9 @@ impl ComponentArc {
self.0.read().unwrap().weight() self.0.read().unwrap().weight()
} }
pub(crate) fn prepare(&self, cx: &mut Context) -> Markup { // ComponentArc PREPARE.
pub fn prepare(&self, cx: &mut Context) -> Markup {
self.0.write().unwrap().prepare(cx) self.0.write().unwrap().prepare(cx)
} }
} }

40
pagetop/src/core/component/one.rs
View file

@ -1,30 +1,46 @@
use crate::core::component::{ComponentTrait, Context}; use crate::core::component::{ComponentTrait, Context};
use crate::html::{html, Markup}; use crate::html::Markup;
use crate::{Handle, Weight};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
#[derive(Clone, Default)] #[derive(Default)]
pub struct OneComponent<T: ComponentTrait + Default>(Option<Arc<RwLock<T>>>); pub struct ComponentOne<T: ComponentTrait + Default>(Arc<RwLock<T>>);
impl<T: ComponentTrait + Default> OneComponent<T> { impl<T: ComponentTrait + Default> Clone for ComponentOne<T> {
fn clone(&self) -> Self {
Self(self.0.clone())
}
}
impl<T: ComponentTrait + Default> ComponentOne<T> {
pub fn new() -> Self { pub fn new() -> Self {
OneComponent::<T>::default() ComponentOne::<T>::default()
} }
pub fn with(component: T) -> Self { pub fn with(component: T) -> Self {
OneComponent(Some(Arc::new(RwLock::new(component)))) ComponentOne(Arc::new(RwLock::new(component)))
} }
pub fn set(&mut self, component: T) { pub fn set(&mut self, component: T) {
self.0 = Some(Arc::new(RwLock::new(component))); self.0 = Arc::new(RwLock::new(component));
} }
// OneComponent PREPARE. pub(crate) fn handle(&self) -> Handle {
self.0.read().unwrap().handle()
}
pub(crate) fn id(&self) -> Option<String> {
self.0.read().unwrap().id()
}
pub(crate) fn weight(&self) -> Weight {
self.0.read().unwrap().weight()
}
// ComponentOne PREPARE.
pub fn prepare(&self, cx: &mut Context) -> Markup { pub fn prepare(&self, cx: &mut Context) -> Markup {
if let Some(component) = &self.0 { self.0.write().unwrap().prepare(cx)
return component.write().unwrap().prepare(cx);
}
html! {}
} }
} }

24
pagetop/src/core/component/pack.rs
View file

@ -3,12 +3,12 @@ use crate::html::{html, Markup};
use crate::Handle; use crate::Handle;
pub enum PackOp { pub enum PackOp {
Add, Add(ComponentArc),
AddAfterId(&'static str), AddAfterId(&'static str, ComponentArc),
AddBeforeId(&'static str), AddBeforeId(&'static str, ComponentArc),
AddFirst, AddFirst(ComponentArc),
RemoveById(&'static str), RemoveById(&'static str),
ReplaceById(&'static str), ReplaceById(&'static str, ComponentArc),
Reset, Reset,
} }
@ -22,7 +22,7 @@ impl PackComponents {
pub fn with(arc: ComponentArc) -> Self { pub fn with(arc: ComponentArc) -> Self {
let mut pack = PackComponents::new(); let mut pack = PackComponents::new();
pack.alter(PackOp::Add, arc); pack.alter(PackOp::Add(arc));
pack pack
} }
@ -36,28 +36,28 @@ impl PackComponents {
// PackComponents BUILDER. // PackComponents BUILDER.
pub fn alter(&mut self, op: PackOp, arc: ComponentArc) -> &mut Self { pub fn alter(&mut self, op: PackOp) -> &mut Self {
match op { match op {
PackOp::Add => self.0.push(arc), PackOp::Add(arc) => self.0.push(arc),
PackOp::AddAfterId(id) => { PackOp::AddAfterId(id, arc) => {
match self.0.iter().position(|c| c.id().as_deref() == Some(id)) { match self.0.iter().position(|c| c.id().as_deref() == Some(id)) {
Some(index) => self.0.insert(index + 1, arc), Some(index) => self.0.insert(index + 1, arc),
_ => self.0.push(arc), _ => self.0.push(arc),
} }
} }
PackOp::AddBeforeId(id) => { PackOp::AddBeforeId(id, arc) => {
match self.0.iter().position(|c| c.id().as_deref() == Some(id)) { match self.0.iter().position(|c| c.id().as_deref() == Some(id)) {
Some(index) => self.0.insert(index, arc), Some(index) => self.0.insert(index, arc),
_ => self.0.insert(0, arc), _ => self.0.insert(0, arc),
} }
} }
PackOp::AddFirst => self.0.insert(0, arc), PackOp::AddFirst(arc) => self.0.insert(0, arc),
PackOp::RemoveById(id) => { PackOp::RemoveById(id) => {
if let Some(index) = self.0.iter().position(|c| c.id().as_deref() == Some(id)) { if let Some(index) = self.0.iter().position(|c| c.id().as_deref() == Some(id)) {
self.0.remove(index); self.0.remove(index);
} }
} }
PackOp::ReplaceById(id) => { PackOp::ReplaceById(id, arc) => {
for c in self.0.iter_mut() { for c in self.0.iter_mut() {
if c.id().as_deref() == Some(id) { if c.id().as_deref() == Some(id) {
*c = arc; *c = arc;

90
pagetop/src/core/component/veck.rs Normal file
View file

@ -0,0 +1,90 @@
use crate::core::component::{ComponentOne, ComponentTrait, Context};
use crate::html::{html, Markup};
use crate::Handle;
pub enum VeckOp<T: ComponentTrait + Default> {
Add(ComponentOne<T>),
AddAfterId(&'static str, ComponentOne<T>),
AddBeforeId(&'static str, ComponentOne<T>),
AddFirst(ComponentOne<T>),
RemoveById(&'static str),
ReplaceById(&'static str, ComponentOne<T>),
Reset,
}
#[derive(Clone, Default)]
pub struct VeckComponents<T: ComponentTrait + Default>(Vec<ComponentOne<T>>);
impl<T: ComponentTrait + Default> VeckComponents<T> {
pub fn new() -> Self {
VeckComponents::<T>::default()
}
pub fn with(one: ComponentOne<T>) -> Self {
let mut veck = VeckComponents::new();
veck.alter(VeckOp::Add(one));
veck
}
// VeckComponents BUILDER.
pub fn alter(&mut self, op: VeckOp<T>) -> &mut Self {
match op {
VeckOp::Add(one) => self.0.push(one),
VeckOp::AddAfterId(id, one) => {
match self.0.iter().position(|c| c.id().as_deref() == Some(id)) {
Some(index) => self.0.insert(index + 1, one),
_ => self.0.push(one),
}
}
VeckOp::AddBeforeId(id, one) => {
match self.0.iter().position(|c| c.id().as_deref() == Some(id)) {
Some(index) => self.0.insert(index, one),
_ => self.0.insert(0, one),
}
}
VeckOp::AddFirst(one) => self.0.insert(0, one),
VeckOp::RemoveById(id) => {
if let Some(index) = self.0.iter().position(|c| c.id().as_deref() == Some(id)) {
self.0.remove(index);
}
}
VeckOp::ReplaceById(id, one) => {
for c in self.0.iter_mut() {
if c.id().as_deref() == Some(id) {
*c = one;
break;
}
}
}
VeckOp::Reset => self.0.clear(),
}
self
}
// VeckComponents GETTERS.
pub fn get_by_id(&self, id: &'static str) -> Option<&ComponentOne<T>> {
self.0.iter().find(|&c| c.id().as_deref() == Some(id))
}
pub fn iter_by_id(&self, id: &'static str) -> impl Iterator<Item = &ComponentOne<T>> {
self.0.iter().filter(|&c| c.id().as_deref() == Some(id))
}
pub fn iter_by_handle(&self, handle: Handle) -> impl Iterator<Item = &ComponentOne<T>> {
self.0.iter().filter(move |&c| c.handle() == handle)
}
// VeckComponents PREPARE.
pub fn prepare(&self, cx: &mut Context) -> Markup {
let mut components = self.0.clone();
components.sort_by_key(|c| c.weight());
html! {
@for c in components.iter() {
" " (c.prepare(cx)) " "
}
}
}
}

4
pagetop/src/core/theme/regions.rs
View file

@ -27,13 +27,13 @@ impl ComponentsRegions {
pub fn add_in(&mut self, region: &'static str, arc: ComponentArc) { pub fn add_in(&mut self, region: &'static str, arc: ComponentArc) {
if let Some(region) = self.0.get_mut(region) { if let Some(region) = self.0.get_mut(region) {
region.alter(PackOp::Add, arc); region.alter(PackOp::Add(arc));
} else { } else {
self.0.insert(region, PackComponents::with(arc)); self.0.insert(region, PackComponents::with(arc));
} }
} }
pub fn get_pack(&self, theme: ThemeRef, region: &str) -> PackComponents { pub fn get_components(&self, theme: ThemeRef, region: &str) -> PackComponents {
let common = COMMON_REGIONS.read().unwrap(); let common = COMMON_REGIONS.read().unwrap();
if let Some(hm) = THEME_REGIONS.read().unwrap().get(&theme.handle()) { if let Some(hm) = THEME_REGIONS.read().unwrap().get(&theme.handle()) {
PackComponents::merge(&[common.0.get(region), self.0.get(region), hm.0.get(region)]) PackComponents::merge(&[common.0.get(region), self.0.get(region), hm.0.get(region)])

10
pagetop/src/response/page.rs
View file

@ -2,7 +2,7 @@ mod action;
pub use action::*; pub use action::*;
use crate::core::component::l10n::L10n; use crate::core::component::l10n::L10n;
use crate::core::component::{ComponentArc, ComponentTrait, Context, ContextOp, OneComponent}; use crate::core::component::{ComponentArc, ComponentOne, ComponentTrait, Context, ContextOp};
use crate::core::theme::ComponentsRegions; use crate::core::theme::ComponentsRegions;
use crate::html::{html, Classes, ClassesOp, Favicon, Markup, DOCTYPE}; use crate::html::{html, Classes, ClassesOp, Favicon, Markup, DOCTYPE};
use crate::response::fatal_error::FatalError; use crate::response::fatal_error::FatalError;
@ -12,8 +12,8 @@ use unic_langid::CharacterDirection;
pub use actix_web::Result as ResultPage; pub use actix_web::Result as ResultPage;
type PageTitle = OneComponent<L10n>; type PageTitle = ComponentOne<L10n>;
type PageDescription = OneComponent<L10n>; type PageDescription = ComponentOne<L10n>;
#[rustfmt::skip] #[rustfmt::skip]
pub struct Page { pub struct Page {
@ -90,7 +90,7 @@ impl Page {
#[fn_builder] #[fn_builder]
pub fn alter_in(&mut self, region: &'static str, component: impl ComponentTrait) -> &mut Self { pub fn alter_in(&mut self, region: &'static str, component: impl ComponentTrait) -> &mut Self {
self.regions.add_in(region, ComponentArc::new(component)); self.regions.add_in(region, ComponentArc::with(component));
self self
} }
@ -173,7 +173,7 @@ impl Page {
pub fn prepare_region(&mut self, region: &str) -> Option<Markup> { pub fn prepare_region(&mut self, region: &str) -> Option<Markup> {
let render = self let render = self
.regions .regions
.get_pack(self.context.theme(), region) .get_components(self.context.theme(), region)
.prepare(self.context()); .prepare(self.context());
if render.is_empty() { if render.is_empty() {
None None