fix: the grid property is changed to a non-negative

This commit is contained in:
luoxiao 2023-11-14 20:54:14 +08:00
parent c46f8f9eac
commit 0404b5bf94
2 changed files with 6 additions and 6 deletions

View file

@ -4,7 +4,7 @@ use leptos::*;
#[component] #[component]
pub fn GridItem( pub fn GridItem(
#[prop(default = MaybeSignal::Static(1u16), into)] column: MaybeSignal<u16>, #[prop(default = MaybeSignal::Static(1u16), into)] column: MaybeSignal<u16>,
#[prop(optional, into)] offset: MaybeSignal<i32>, #[prop(optional, into)] offset: MaybeSignal<u16>,
children: Children, children: Children,
) -> impl IntoView { ) -> impl IntoView {
let grid = use_grid(); let grid = use_grid();
@ -12,7 +12,7 @@ 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 column = i32::from(column.get()); let column = column.get();
let x_gap = grid.x_gap.get(); let x_gap = grid.x_gap.get();
if offset > 0 { if offset > 0 {

View file

@ -6,8 +6,8 @@ use leptos::*;
#[component] #[component]
pub fn Grid( pub fn Grid(
#[prop(default = MaybeSignal::Static(1u16), into)] cols: MaybeSignal<u16>, #[prop(default = MaybeSignal::Static(1u16), into)] cols: MaybeSignal<u16>,
#[prop(optional, into)] x_gap: MaybeSignal<i32>, #[prop(optional, into)] x_gap: MaybeSignal<u16>,
#[prop(optional, into)] y_gap: MaybeSignal<i32>, #[prop(optional, into)] y_gap: MaybeSignal<u16>,
children: Children, children: Children,
) -> impl IntoView { ) -> impl IntoView {
let grid_injection_key = GridInjection::new(x_gap); let grid_injection_key = GridInjection::new(x_gap);
@ -32,11 +32,11 @@ pub fn Grid(
#[derive(Clone)] #[derive(Clone)]
pub(crate) struct GridInjection { pub(crate) struct GridInjection {
x_gap: MaybeSignal<i32>, x_gap: MaybeSignal<u16>,
} }
impl GridInjection { impl GridInjection {
pub fn new(x_gap: MaybeSignal<i32>) -> Self { pub fn new(x_gap: MaybeSignal<u16>) -> Self {
Self { x_gap } Self { x_gap }
} }
} }