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_web: Rewrite modifiers (Attributes, Classes and Styles), and cleanup/extend docs #699

Merged
merged 10 commits into from
Oct 23, 2024
Merged

xilem_web: Rewrite modifiers (Attributes, Classes and Styles), and cleanup/extend docs #699

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d1ce25d
xilem_web: Rewrite modifiers (`Attributes`, `Classes` and `Styles`)
Philipp-M Oct 18, 2024
7ebe66a
Move modifiers into its own module
Philipp-M Oct 19, 2024
22aad77
xilem_web: Remove "hydration" feature, make it default, and fix some …
Philipp-M Oct 20, 2024
128b3f7
Don't reserve unnecessary memory (marker were removed)
Philipp-M Oct 20, 2024
d4c9719
doc-comment fixes
Philipp-M Oct 20, 2024
602a990
Improve docs and add some debug assertions
Philipp-M Oct 20, 2024
14438b7
Move `With` into `modifiers` module, document `modifiers` module.
Philipp-M Oct 20, 2024
a2babe4
Fix assertions
Philipp-M Oct 20, 2024
cb03e6e
Fix CI
Philipp-M Oct 20, 2024
c80fc21
xilem_web: Cleanup size_hint propagation and hydration handling
Philipp-M Oct 23, 2024
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
27 changes: 27 additions & 0 deletions xilem_core/src/views/one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,33 @@ where
}
}

impl<T, A, B, C, D, E, F, G, H, I> AsMut<T> for OneOf<A, B, C, D, E, F, G, H, I>
where
A: AsMut<T>,
B: AsMut<T>,
C: AsMut<T>,
D: AsMut<T>,
E: AsMut<T>,
F: AsMut<T>,
G: AsMut<T>,
H: AsMut<T>,
I: AsMut<T>,
{
fn as_mut(&mut self) -> &mut T {
match self {
OneOf::A(e) => <A as AsMut<T>>::as_mut(e),
OneOf::B(e) => <B as AsMut<T>>::as_mut(e),
OneOf::C(e) => <C as AsMut<T>>::as_mut(e),
OneOf::D(e) => <D as AsMut<T>>::as_mut(e),
OneOf::E(e) => <E as AsMut<T>>::as_mut(e),
OneOf::F(e) => <F as AsMut<T>>::as_mut(e),
OneOf::G(e) => <G as AsMut<T>>::as_mut(e),
OneOf::H(e) => <H as AsMut<T>>::as_mut(e),
OneOf::I(e) => <I as AsMut<T>>::as_mut(e),
}
}
}

Comment on lines +87 to +113
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This resulted from some experiments prior to the With trait, but I don't think it hurts to include this as well to xilem_core.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really like the existing AsRef implementation, but I've not spent too much time reasoning about it. That being said, this is fine to add this for consistency.

/// A context type which can support [`OneOf9`] and [related views](super::one_of).
///
/// This should be implemented by users of Xilem Core.
Expand Down
3 changes: 1 addition & 2 deletions xilem_web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ features = [
]

[features]
default = ["hydration"]
hydration = []
default = []
# This interns some often used strings, such as element tags ("div" etc.), which slightly improves performance when creating elements at the cost of a bigger wasm binary
intern_strings = ["wasm-bindgen/enable-interning"]
1 change: 0 additions & 1 deletion xilem_web/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ where
&inner.root,
inner.ctx.fragment.clone(),
false,
#[cfg(feature = "hydration")]
false,
);
new_fragment.seq_rebuild(
Expand Down
Loading