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

🚧 [megamenu] Improve linking with dynamic urls

Browse source
This commit is contained in:
Manuel Cillero 2023-07-31 11:46:28 +02:00
parent c054081390
commit 7b821da411
3 changed files with 45 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,18 +2,20 @@ use pagetop::prelude::*;
use crate::component::MegaMenu;
new_handle!(COMPONENT_MEGAMENUITEM);
new_handle!(COMPONENT_MEGAITEM);
type Label = OneComponent<L10n>;
type Content = OneComponent<L10n>;
type Content = OneComponent<Html>;
pub type MegaItemPath = fn(cx: &Context) -> &str;
#[derive(Default)]
pub enum MegaMenuItemType {
pub enum MegaItemType {
#[default]
Void,
Label(Label),
Link(Label, String),
LinkBlank(Label, String),
Link(Label, MegaItemPath),
LinkBlank(Label, MegaItemPath),
Html(Content),
Submenu(Label, MegaMenu),
Separator,
@ -23,19 +25,19 @@ pub enum MegaMenuItemType {
#[rustfmt::skip]
#[derive(Default)]
pub struct MegaMenuItem {
pub struct MegaItem {
weight : Weight,
renderable: Renderable,
item_type : MegaMenuItemType,
item_type : MegaItemType,
}
impl ComponentTrait for MegaMenuItem {
impl ComponentTrait for MegaItem {
fn new() -> Self {
MegaMenuItem::default()
MegaItem::default()
}
fn handle(&self) -> Handle {
COMPONENT_MEGAMENUITEM
COMPONENT_MEGAITEM
}
fn weight(&self) -> Weight {
@ -48,23 +50,20 @@ impl ComponentTrait for MegaMenuItem {
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
match self.item_type() {
MegaMenuItemType::Void => PrepareMarkup::None,
MegaMenuItemType::Label(label) => PrepareMarkup::With(html! {
li class="label" { a href="#" { (label.prepare(cx)) } }
MegaItemType::Void => PrepareMarkup::None,
MegaItemType::Label(label) => PrepareMarkup::With(html! {
li class="link" { a href="#" { (label.prepare(cx)) } }
}),
MegaMenuItemType::Link(label, path) => PrepareMarkup::With(html! {
li class="link" { a href=(path) { (label.prepare(cx)) } }
MegaItemType::Link(label, path) => PrepareMarkup::With(html! {
li class="link" { a href=(path(cx)) { (label.prepare(cx)) } }
}),
MegaMenuItemType::LinkBlank(label, path) => PrepareMarkup::With(html! {
li class="link_blank" {
a href=(path) target="_blank" { (label.prepare(cx)) }
}
MegaItemType::LinkBlank(label, path) => PrepareMarkup::With(html! {
li class="link" { a href=(path(cx)) target="_blank" { (label.prepare(cx)) } }
}),
MegaMenuItemType::Html(content) => PrepareMarkup::With(html! {
MegaItemType::Html(content) => PrepareMarkup::With(html! {
li class="html" { (content.prepare(cx)) }
}),
MegaMenuItemType::Submenu(label, menu) => PrepareMarkup::With(html! {
MegaItemType::Submenu(label, menu) => PrepareMarkup::With(html! {
li class="submenu" {
a href="#" { (label.prepare(cx)) }
ul {
@ -72,57 +71,57 @@ impl ComponentTrait for MegaMenuItem {
}
}
}),
MegaMenuItemType::Separator => PrepareMarkup::With(html! {
MegaItemType::Separator => PrepareMarkup::With(html! {
li class="separator" { }
}),
}
}
}
impl MegaMenuItem {
impl MegaItem {
pub fn label(label: L10n) -> Self {
MegaMenuItem {
item_type: MegaMenuItemType::Label(OneComponent::new_with(label)),
MegaItem {
item_type: MegaItemType::Label(OneComponent::new_with(label)),
..Default::default()
}
}
pub fn link(label: L10n, path: &str) -> Self {
MegaMenuItem {
item_type: MegaMenuItemType::Link(OneComponent::new_with(label), path.to_owned()),
pub fn link(label: L10n, path: MegaItemPath) -> Self {
MegaItem {
item_type: MegaItemType::Link(OneComponent::new_with(label), path),
..Default::default()
}
}
pub fn link_blank(label: L10n, path: &str) -> Self {
MegaMenuItem {
item_type: MegaMenuItemType::LinkBlank(OneComponent::new_with(label), path.to_owned()),
pub fn link_blank(label: L10n, path: MegaItemPath) -> Self {
MegaItem {
item_type: MegaItemType::LinkBlank(OneComponent::new_with(label), path),
..Default::default()
}
}
pub fn html(content: L10n) -> Self {
MegaMenuItem {
item_type: MegaMenuItemType::Html(OneComponent::new_with(content)),
pub fn html(content: Html) -> Self {
MegaItem {
item_type: MegaItemType::Html(OneComponent::new_with(content)),
..Default::default()
}
}
pub fn submenu(label: L10n, menu: MegaMenu) -> Self {
MegaMenuItem {
item_type: MegaMenuItemType::Submenu(OneComponent::new_with(label), menu),
MegaItem {
item_type: MegaItemType::Submenu(OneComponent::new_with(label), menu),
..Default::default()
}
}
pub fn separator() -> Self {
MegaMenuItem {
item_type: MegaMenuItemType::Separator,
MegaItem {
item_type: MegaItemType::Separator,
..Default::default()
}
}
// MegaMenuItem BUILDER.
// MegaItem BUILDER.
#[fn_builder]
pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
@ -136,9 +135,9 @@ impl MegaMenuItem {
self
}
// MegaMenuItem GETTERS.
// MegaItem GETTERS.
pub fn item_type(&self) -> &MegaMenuItemType {
pub fn item_type(&self) -> &MegaItemType {
&self.item_type
}
}

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

@ -1,7 +1,7 @@
use pagetop::prelude::*;
use pagetop_jquery::JQuery;
use crate::component::MegaMenuItem;
use crate::component::MegaItem;
use crate::LOCALES_MEGAMENU;
new_handle!(COMPONENT_MEGAMENU);
@ -138,12 +138,12 @@ impl MegaMenu {
self
}
pub fn with_item(mut self, item: MegaMenuItem) -> Self {
pub fn with_item(mut self, item: MegaItem) -> Self {
self.items.alter(PackOp::Add, ComponentRef::to(item));
self
}
pub fn alter_items(&mut self, op: PackOp, item: MegaMenuItem) -> &mut Self {
pub fn alter_items(&mut self, op: PackOp, item: MegaItem) -> &mut Self {
self.items.alter(op, ComponentRef::to(item));
self
}

2
pagetop-megamenu/src/lib.rs
View file

@ -2,7 +2,7 @@ use pagetop::prelude::*;
pub mod component {
mod item;
pub use item::{MegaMenuItem, MegaMenuItemType, COMPONENT_MEGAMENUITEM};
pub use item::{MegaItem, MegaItemPath, MegaItemType, COMPONENT_MEGAITEM};
mod menu;
pub use menu::{MegaMenu, COMPONENT_MEGAMENU};
}