Merge pull request #108 from cheonjaeung/cheon/optimizing

Add skipping line calculation for sequaltial grid if all items can't be displayed

Author: cheonjaeung

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

@@ -205,6 +205,11 @@ private class SequentialGridMeasureHelper(
                 measurableIndex++
             }
 
+            // Skip calculation because all items in the line have too much span (span > maxSpan).
+            if (spanLine.isEmpty()) {
+                continue
+            }
+
             val placeableLine = mutableListOf<PlaceableMeasureInfo>()
             val maxMainAxisIntrinsicSize = if (containsFillMaxMainAxisSize) {
                 mainAxisMaxIntrinsicSizes.fastMaxOfOrNull { it ?: 0 }

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

@@ -1,7 +1,9 @@
 package com.cheonjaeung.compose.grid
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -202,6 +204,38 @@ class HorizontalGridSpanTest {
         }
     }
 
+    @Test
+    fun testAllOverSpanItemsAreNotPlaced() {
+        paparazzi.snapshot {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.DarkGray)
+            ) {
+                HorizontalGrid(
+                    modifier = Modifier
+                        .fillMaxHeight()
+                        .background(Color.LightGray),
+                    rows = SimpleGridCells.Fixed(3),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .size(100.dp)
+                            .background(Color.Blue)
+                            .span { maxLineSpan + 1 }
+                    )
+                    Box(
+                        modifier = Modifier
+                            .size(100.dp)
+                            .background(Color.Green)
+                            .span { maxLineSpan + 2 }
+                    )
+                }
+            }
+        }
+    }
+
     @Test
     fun testOverrideSpan() {
         paparazzi.snapshot {

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

@@ -1,8 +1,10 @@
 package com.cheonjaeung.compose.grid
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.ui.Modifier
@@ -202,6 +204,38 @@ class VerticalGridSpanTest {
         }
     }
 
+    @Test
+    fun testAllOverSpanItemsAreNotPlaced() {
+        paparazzi.snapshot {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.DarkGray)
+            ) {
+                VerticalGrid(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(Color.LightGray),
+                    columns = SimpleGridCells.Fixed(3),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .size(100.dp)
+                            .background(Color.Blue)
+                            .span { maxLineSpan + 1 }
+                    )
+                    Box(
+                        modifier = Modifier
+                            .size(100.dp)
+                            .background(Color.Green)
+                            .span { maxLineSpan + 2 }
+                    )
+                }
+            }
+        }
+    }
+
     @Test
     fun testOverrideSpan() {
         paparazzi.snapshot {