🩹 Fix component reference unwrap() issues

This commit is contained in:
Manuel Cillero 2023-11-18 08:27:40 +01:00
parent 37f873131b
commit ed495121dd
3 changed files with 293 additions and 175 deletions

View file

@ -33,91 +33,141 @@ impl ThemeTrait for Bulmix {
fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) {
match component.handle() {
COMPONENT_BASE_ICON => {
let i = component_as_mut::<Icon>(component);
match i.font_size() {
FontSize::ExtraLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-1");
}
FontSize::XxLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-2");
}
FontSize::XLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-3");
}
FontSize::Large => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-4");
}
FontSize::Medium => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-5");
}
_ => {}
};
if let Some(icon) = component_as_mut::<Icon>(component) {
match icon.font_size() {
FontSize::ExtraLarge => {
icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-1",
);
}
FontSize::XxLarge => {
icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-2",
);
}
FontSize::XLarge => {
icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-3",
);
}
FontSize::Large => {
icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-4",
);
}
FontSize::Medium => {
icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-5",
);
}
_ => {}
};
}
}
COMPONENT_BASE_BUTTON => {
let a = component_as_mut::<Button>(component);
match a.font_size() {
FontSize::ExtraLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-1");
}
FontSize::XxLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-2");
}
FontSize::XLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-3");
}
FontSize::Large => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-4");
}
FontSize::Medium => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-5");
}
_ => {}
};
match a.button_type() {
ButtonType::Link => {
a.alter_classes(
ClassesOp::Replace(a.button_type().to_string()),
"button is-text",
);
}
ButtonType::Primary => {
a.alter_classes(
ClassesOp::Replace(a.button_type().to_string()),
"button is-primary",
);
}
if let Some(button) = component_as_mut::<Button>(component) {
match button.font_size() {
FontSize::ExtraLarge => {
button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-1",
);
}
FontSize::XxLarge => {
button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-2",
);
}
FontSize::XLarge => {
button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-3",
);
}
FontSize::Large => {
button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-4",
);
}
FontSize::Medium => {
button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-5",
);
}
_ => {}
};
match button.button_type() {
ButtonType::Link => {
button.alter_classes(
ClassesOp::Replace(button.button_type().to_string()),
"button is-text",
);
}
ButtonType::Primary => {
button.alter_classes(
ClassesOp::Replace(button.button_type().to_string()),
"button is-primary",
);
}
};
}
}
COMPONENT_BASE_HEADING => {
let h = component_as_mut::<Heading>(component);
match h.display() {
HeadingDisplay::Subtitle => {
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "subtitle")
}
_ => h.alter_classes(ClassesOp::Add, "title"),
};
if let Some(heading) = component_as_mut::<Heading>(component) {
match heading.display() {
HeadingDisplay::Subtitle => heading.alter_classes(
ClassesOp::Replace(heading.display().to_string()),
"subtitle",
),
_ => heading.alter_classes(ClassesOp::Add, "title"),
};
}
}
COMPONENT_BASE_PARAGRAPH => {
let p = component_as_mut::<Paragraph>(component);
p.alter_classes(ClassesOp::Add, "block");
match p.font_size() {
FontSize::ExtraLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-1");
}
FontSize::XxLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-2");
}
FontSize::XLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-3");
}
FontSize::Large => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-4");
}
FontSize::Medium => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-5");
}
_ => {}
};
if let Some(paragraph) = component_as_mut::<Paragraph>(component) {
paragraph.alter_classes(ClassesOp::Add, "block");
match paragraph.font_size() {
FontSize::ExtraLarge => {
paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-1",
);
}
FontSize::XxLarge => {
paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-2",
);
}
FontSize::XLarge => {
paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-3",
);
}
FontSize::Large => {
paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-4",
);
}
FontSize::Medium => {
paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-5",
);
}
_ => {}
};
}
}
_ => {}
}
@ -130,11 +180,15 @@ impl ThemeTrait for Bulmix {
) -> Option<Markup> {
match component.handle() {
COMPONENT_BASE_ICON => {
let icon = component_as_ref::<Icon>(component);
match icon.icon_name().get() {
None => None,
_ => Some(html! { span class="icon" { i class=[icon.classes().get()] {} } }),
if let Some(icon) = component_as_ref::<Icon>(component) {
return match icon.icon_name().get() {
None => None,
_ => {
Some(html! { span class="icon" { i class=[icon.classes().get()] {} } })
}
};
}
None
}
_ => None,
}