adam/thaw
1
0
Fork 0
mirror of https://github.com/adoyle0/thaw.git synced 2025-02-02 08:34:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: features tracing, GridItem span attribute conflict

Browse source
This commit is contained in:
luoxiao 2023-11-13 11:14:49 +08:00
parent 012646f955
commit 46d3502927
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
demo/src/pages/grid/mod.rs
View file

@ -69,7 +69,7 @@ pub fn GridPage() -> impl IntoView {
<GridItem>"7"</GridItem> <GridItem>"7"</GridItem>
<GridItem>"123"</GridItem> <GridItem>"123"</GridItem>
<GridItem>"123"</GridItem> <GridItem>"123"</GridItem>
<GridItem span=2>"1234"</GridItem> <GridItem column=2>"1234"</GridItem>
<GridItem>"567"</GridItem> <GridItem>"567"</GridItem>
<GridItem>"567"</GridItem> <GridItem>"567"</GridItem>
</Grid> </Grid>
@ -85,7 +85,7 @@ pub fn GridPage() -> impl IntoView {
<GridItem>"7"</GridItem> <GridItem>"7"</GridItem>
<GridItem>"123"</GridItem> <GridItem>"123"</GridItem>
<GridItem>"123"</GridItem> <GridItem>"123"</GridItem>
<GridItem span=2>"1234"</GridItem> <GridItem column=2>"1234"</GridItem>
<GridItem >"567"</GridItem> <GridItem >"567"</GridItem>
<GridItem >"567"</GridItem> <GridItem >"567"</GridItem>
</Grid> </Grid>

12
src/grid/grid_item.rs
View file

@ -3,7 +3,7 @@ use leptos::*;
#[component] #[component]
pub fn GridItem( pub fn GridItem(
#[prop(default = MaybeSignal::Static(1u16), into)] span: MaybeSignal<u16>, #[prop(default = MaybeSignal::Static(1u16), into)] column: MaybeSignal<u16>,
#[prop(optional, into)] offset: MaybeSignal<i32>, #[prop(optional, into)] offset: MaybeSignal<i32>,
children: Children, children: Children,
) -> impl IntoView { ) -> impl IntoView {
@ -12,22 +12,22 @@ pub fn GridItem(
let style = create_memo(move |_| { let style = create_memo(move |_| {
let mut style = String::new(); let mut style = String::new();
let offset = offset.get(); let offset = offset.get();
let span = i32::from(span.get()); let column = i32::from(column.get());
let x_gap = grid.x_gap.get(); let x_gap = grid.x_gap.get();
if offset > 0 { if offset > 0 {
style.push_str(&format!( style.push_str(&format!(
"margin-left: calc((100% - {}px) / {} * {} + {}px);", "margin-left: calc((100% - {}px) / {} * {} + {}px);",
(span + offset - 1) * x_gap, (column + offset - 1) * x_gap,
span + offset, column + offset,
offset, offset,
offset * x_gap offset * x_gap
)); ));
} }
style.push_str(&format!( style.push_str(&format!(
"grid-column: span {} / span {};", "grid-column: span {} / span {};",
span + offset, column + offset,
span + offset column + offset
)); ));
style style