From 46d35029274f422a2fcee3ccaa07425a59c4993a Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Mon, 13 Nov 2023 11:14:49 +0800
Subject: [PATCH] fix:  features tracing, GridItem span attribute conflict

---
 demo/src/pages/grid/mod.rs |  4 ++--
 src/grid/grid_item.rs      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demo/src/pages/grid/mod.rs b/demo/src/pages/grid/mod.rs
index 8b308e9..4897b79 100644
--- a/demo/src/pages/grid/mod.rs
+++ b/demo/src/pages/grid/mod.rs
@@ -69,7 +69,7 @@ pub fn GridPage() -> impl IntoView {
                     <GridItem>"7"</GridItem>
                     <GridItem>"123"</GridItem>
                     <GridItem>"123"</GridItem>
-                    <GridItem span=2>"1234"</GridItem>
+                    <GridItem column=2>"1234"</GridItem>
                     <GridItem>"567"</GridItem>
                     <GridItem>"567"</GridItem>
                 </Grid>
@@ -85,7 +85,7 @@ pub fn GridPage() -> impl IntoView {
                             <GridItem>"7"</GridItem>
                             <GridItem>"123"</GridItem>
                             <GridItem>"123"</GridItem>
-                            <GridItem span=2>"1234"</GridItem>
+                            <GridItem column=2>"1234"</GridItem>
                             <GridItem >"567"</GridItem>
                             <GridItem >"567"</GridItem>
                         </Grid>
diff --git a/src/grid/grid_item.rs b/src/grid/grid_item.rs
index 84e1df6..3fef57c 100644
--- a/src/grid/grid_item.rs
+++ b/src/grid/grid_item.rs
@@ -3,7 +3,7 @@ use leptos::*;
 
 #[component]
 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>,
     children: Children,
 ) -> impl IntoView {
@@ -12,22 +12,22 @@ pub fn GridItem(
     let style = create_memo(move |_| {
         let mut style = String::new();
         let offset = offset.get();
-        let span = i32::from(span.get());
+        let column = i32::from(column.get());
         let x_gap = grid.x_gap.get();
 
         if offset > 0 {
             style.push_str(&format!(
                 "margin-left: calc((100% - {}px) / {} * {} + {}px);",
-                (span + offset - 1) * x_gap,
-                span + offset,
+                (column + offset - 1) * x_gap,
+                column + offset,
                 offset,
                 offset * x_gap
             ));
         }
         style.push_str(&format!(
             "grid-column: span {} / span {};",
-            span + offset,
-            span + offset
+            column + offset,
+            column + offset
         ));
 
         style