Allow literal string as class in view macro #500
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
g-re-g
commented
Feb 11, 2023
Comment on lines
-151
to
+178
| if nodes.is_empty() { | ||
| let span = Span::call_site(); | ||
| quote_spanned! { | ||
| span => leptos::Unit | ||
| match nodes.len() { | ||
| 0 => { | ||
| let span = Span::call_site(); | ||
| quote_spanned! { | ||
| span => leptos::Unit | ||
| } | ||
| } | ||
| } else if nodes.len() == 1 { | ||
| root_node_to_tokens_ssr(cx, &nodes[0], global_class) | ||
| } else { | ||
| fragment_to_tokens_ssr(cx, Span::call_site(), nodes, global_class) | ||
| 1 => root_node_to_tokens_ssr(cx, &nodes[0], global_class), | ||
| _ => fragment_to_tokens_ssr(cx, Span::call_site(), nodes, global_class), | ||
| } | ||
| } else if nodes.is_empty() { | ||
| let span = Span::call_site(); | ||
| quote_spanned! { | ||
| span => leptos::Unit | ||
| } | ||
| } else if nodes.len() == 1 { | ||
| node_to_tokens(cx, &nodes[0], TagType::Unknown, global_class) | ||
| } else { | ||
| fragment_to_tokens( | ||
| cx, | ||
| Span::call_site(), | ||
| nodes, | ||
| true, | ||
| TagType::Unknown, | ||
| global_class, | ||
| ) | ||
| match nodes.len() { | ||
| 0 => { | ||
| let span = Span::call_site(); | ||
| quote_spanned! { | ||
| span => leptos::Unit | ||
| } | ||
| } | ||
| 1 => node_to_tokens(cx, &nodes[0], TagType::Unknown, global_class), | ||
| _ => fragment_to_tokens( | ||
| cx, | ||
| Span::call_site(), | ||
| nodes, | ||
| true, | ||
| TagType::Unknown, | ||
| global_class, | ||
| ), | ||
| } |
There was a problem hiding this comment.
This is just a rearrangement, no functional changes. While reading it this is how I rearranged the logic in my head and figured I'd update the code to be the same. Happy to revert if the old way is preferred.
g-re-g
force-pushed
the
view_class_allow_string_lit
branch
from
38f5202
to
97f1795
Compare
gbj
approved these changes
Feb 11, 2023
|
Thanks, this looks great and I appreciate the clean-up work here too. |
gbj
pushed a commit
that referenced
this pull request
Feb 12, 2023
gbj
pushed a commit
that referenced
this pull request
Mar 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Render literal string as class in view macro correctly. This is currently allowed but produces incorrect html.
this code:
Pre this PR:
Notice there's an extra attribute
scope-class""="".This is because the quotes in
"scope-class"get rendered and the browser turns that into its own attribute.Post this PR:
The class renders correctly.
As a side note, the
HeaderandBannercomponent that are inside of thescope-classscope don't have thescope-classapplied. I don't know if this is intentional because they are components, but there it is.This PR also includes updated error messaging if a user tries to use a class but forgets the trailing comma.
Pre this PR it would say:
Now it says: