Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xilem_html: Experiment with Strong typed attributes/event-listeners owned by the concrete element type #119

Closed
wants to merge 7 commits into from
Closed

xilem_html: Experiment with Strong typed attributes/event-listeners owned by the concrete element type #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3abbc88
Started with strong typing elements and their attributes
Philipp-M Aug 3, 2023
298fadc
Small improvements and comments
Philipp-M Aug 3, 2023
26c23f4
Make the DOM interface traits generic over T and A (App state and act…
Philipp-M Aug 4, 2023
430aef8
Intermediate commit, before cleanup/refactor
Philipp-M Aug 6, 2023
1a2ab25
Refactored the typed elements with the new approach (using an enum fo…
Philipp-M Aug 6, 2023
89d893b
Allow all `Into<AttributeValue>` instead of just `Into<CowStr>` for t…
Philipp-M Aug 6, 2023
39e7a3f
Implemented all HTML DOM interface traits (most without explicit attr…
Philipp-M Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/xilem_html/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typed = [
"web-sys/HtmlTableSectionElement", "web-sys/HtmlTemplateElement", "web-sys/HtmlTextAreaElement",
"web-sys/HtmlTimeElement", "web-sys/HtmlTrackElement", "web-sys/HtmlUListElement",
"web-sys/HtmlVideoElement", "web-sys/InputEvent", "web-sys/KeyboardEvent", "web-sys/MouseEvent",
"web-sys/PointerEvent", "web-sys/WheelEvent",
"web-sys/PointerEvent", "web-sys/WheelEvent", "web-sys/TouchEvent",
]

[dependencies]
Expand Down
25 changes: 25 additions & 0 deletions crates/xilem_html/src/element/attribute_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
use std::collections::BTreeSet;

type CowStr = std::borrow::Cow<'static, str>;

// TODO not sure how useful an extra enum for attribute keys is (comparison is probably a little bit faster...)
// #[derive(PartialEq, Eq)]
// enum AttrKey {
// Width,
// Height,
// Class,
// Untyped(Box<Cow<'static, str>>),
// }

#[derive(PartialEq, Debug)]
pub enum AttributeValue {
True, // for the boolean true, this serializes to an empty string (e.g. for <input checked>)
Expand All @@ -8,6 +19,7 @@ pub enum AttributeValue {
F32(f32),
F64(f64),
String(CowStr),
Classes(BTreeSet<CowStr>),
}

impl AttributeValue {
Expand All @@ -19,6 +31,19 @@ impl AttributeValue {
AttributeValue::F32(n) => n.to_string().into(),
AttributeValue::F64(n) => n.to_string().into(),
AttributeValue::String(s) => s.clone(),
// TODO maybe use Vec as backend (should probably be more performant for few classes, which seems to be the average case)
AttributeValue::Classes(set) => set
.iter()
.fold(String::new(), |mut acc, s| {
if !acc.is_empty() {
acc += " ";
}
if !s.is_empty() {
acc += s;
}
acc
})
.into(),
}
}
}
Expand Down
Loading