Merge pull request #66 from cheonjaeung/span-overriding

Fix span overriding bug

Author: cheonjaeung

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/BoxGridSpanModifier.kt

@@ -39,8 +39,8 @@ internal class BoxGridSpanNode(
 ) : Modifier.Node(), ParentDataModifierNode {
     override fun Density.modifyParentData(parentData: Any?): Any {
         val p = parentData as? BoxGridParentData ?: BoxGridParentData()
-        span?.let {
-            p.span = it
+        if (p.span == null) {
+            p.span = span
         }
         return p
     }

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/HorizontalVerticalGridSpanModifier.kt

@@ -39,7 +39,9 @@ internal class HorizontalVerticalGridSpanNode(
 ) : Modifier.Node(), ParentDataModifierNode {
     override fun Density.modifyParentData(parentData: Any?): Any {
         val p = parentData as? HorizontalVerticalGridParentData ?: HorizontalVerticalGridParentData()
-        p.span = span
+        if (p.span == HorizontalVerticalGridParentData.DefaultSpan) {
+            p.span = span
+        }
         return p
     }
 }

grid/src/test/java/com/cheonjaeung/compose/grid/BoxGridSpanTest.kt

@@ -255,4 +255,25 @@ class BoxGridSpanTest {
             }
         }
     }
+
+    @Test
+    fun testOverrideSpan() {
+        paparazzi.snapshot {
+            BoxGrid(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.LightGray),
+                rows = SimpleGridCells.Fixed(4),
+                columns = SimpleGridCells.Fixed(4)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .size(100.dp)
+                        .background(Color.Blue)
+                        .span { BoxGridItemSpan(row = 1, column = 1) }
+                        .span { BoxGridItemSpan(row = 2, column = 2) }
+                )
+            }
+        }
+    }
 }

grid/src/test/java/com/cheonjaeung/compose/grid/HorizontalGridSpanTest.kt

@@ -200,4 +200,24 @@ class HorizontalGridSpanTest {
             }
         }
     }
+
+    @Test
+    fun testOverrideSpan() {
+        paparazzi.snapshot {
+            HorizontalGrid(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.LightGray),
+                rows = SimpleGridCells.Fixed(3)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .size(100.dp)
+                        .background(Color.Blue)
+                        .span { 1 }
+                        .span { 2 }
+                )
+            }
+        }
+    }
 }

grid/src/test/java/com/cheonjaeung/compose/grid/VerticalGridSpanTest.kt

@@ -200,4 +200,24 @@ class VerticalGridSpanTest {
             }
         }
     }
+
+    @Test
+    fun testOverrideSpan() {
+        paparazzi.snapshot {
+            VerticalGrid(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.LightGray),
+                columns = SimpleGridCells.Fixed(3)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .size(100.dp)
+                        .background(Color.Blue)
+                        .span { 1 }
+                        .span { 2 }
+                )
+            }
+        }
+    }
 }