Merge pull request #54 from cheonjaeung/boxgriditemspan-default

cheonjaeung · web-flow · commit 9487648283f0 · 2025-07-26T20:11:03.000+09:00
Add default parameter to BoxGridItemSpan
diff --git a/grid/api/android/grid.api b/grid/api/android/grid.api
@@ -1,5 +1,4 @@
 public final class com/cheonjaeung/compose/grid/BoxGridItemSpan {
-	public static final field Companion Lcom/cheonjaeung/compose/grid/BoxGridItemSpan$Companion;
 	public static final synthetic fun box-impl (J)Lcom/cheonjaeung/compose/grid/BoxGridItemSpan;
 	public static final fun component1-impl (J)I
 	public static final fun component2-impl (J)I
@@ -15,9 +14,6 @@ public final class com/cheonjaeung/compose/grid/BoxGridItemSpan {
 	public final synthetic fun unbox-impl ()J
 }
 
-public final class com/cheonjaeung/compose/grid/BoxGridItemSpan$Companion {
-}
-
 public abstract interface class com/cheonjaeung/compose/grid/BoxGridItemSpanScope {
 	public abstract fun getMaxColumnSpan ()I
 	public abstract fun getMaxCurrentColumnSpan ()I
@@ -38,6 +34,7 @@ public final class com/cheonjaeung/compose/grid/BoxGridScope$DefaultImpls {
 
 public final class com/cheonjaeung/compose/grid/BoxGridSpanKt {
 	public static final fun BoxGridItemSpan (II)J
+	public static synthetic fun BoxGridItemSpan$default (IIILjava/lang/Object;)J
 }
 
 public abstract interface annotation class com/cheonjaeung/compose/grid/ExperimentalGridApi : java/lang/annotation/Annotation {
diff --git a/grid/api/jvm/grid.api b/grid/api/jvm/grid.api
@@ -1,5 +1,4 @@
 public final class com/cheonjaeung/compose/grid/BoxGridItemSpan {
-	public static final field Companion Lcom/cheonjaeung/compose/grid/BoxGridItemSpan$Companion;
 	public static final synthetic fun box-impl (J)Lcom/cheonjaeung/compose/grid/BoxGridItemSpan;
 	public static final fun component1-impl (J)I
 	public static final fun component2-impl (J)I
@@ -15,9 +14,6 @@ public final class com/cheonjaeung/compose/grid/BoxGridItemSpan {
 	public final synthetic fun unbox-impl ()J
 }
 
-public final class com/cheonjaeung/compose/grid/BoxGridItemSpan$Companion {
-}
-
 public abstract interface class com/cheonjaeung/compose/grid/BoxGridItemSpanScope {
 	public abstract fun getMaxColumnSpan ()I
 	public abstract fun getMaxCurrentColumnSpan ()I
@@ -38,6 +34,7 @@ public final class com/cheonjaeung/compose/grid/BoxGridScope$DefaultImpls {
 
 public final class com/cheonjaeung/compose/grid/BoxGridSpanKt {
 	public static final fun BoxGridItemSpan (II)J
+	public static synthetic fun BoxGridItemSpan$default (IIILjava/lang/Object;)J
 }
 
 public abstract interface annotation class com/cheonjaeung/compose/grid/ExperimentalGridApi : java/lang/annotation/Annotation {
diff --git a/grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/BoxGridMeasurePolicy.kt b/grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/BoxGridMeasurePolicy.kt
@@ -147,7 +147,7 @@ private class BoxGridMeasureHelper(
             val span = if (spanFunction != null) {
                 with(spanScope) { spanFunction() }
             } else {
-                BoxGridItemSpan.Default
+                BoxGridItemSpan()
             }
             val (rowSpan, columnSpan) = span
 
diff --git a/grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/BoxGridSpan.kt b/grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/BoxGridSpan.kt
@@ -10,7 +10,7 @@ import kotlin.jvm.JvmInline
 /**
  * Create a [BoxGridItemSpan] from the given [row] and [column] span size parameter..
  */
-fun BoxGridItemSpan(row: Int, column: Int): BoxGridItemSpan {
+fun BoxGridItemSpan(row: Int = 1, column: Int = 1): BoxGridItemSpan {
     require(row > 0) { "span must be bigger than zero but rowSpan is $row" }
     require(column > 0) { "span must be bigger than zero but columnSpan is $column" }
     return BoxGridItemSpan(packedValue = packInts(row, column))
@@ -35,11 +35,6 @@ value class BoxGridItemSpan internal constructor(private val packedValue: Long)
 
     @Stable
     operator fun component2(): Int = columnSpan
-
-    companion object {
-        @Stable
-        internal val Default = BoxGridItemSpan(row = 1, column = 1)
-    }
 }
 
 /**
diff --git a/grid/src/test/java/com/cheonjaeung/compose/grid/BoxGridSpanTest.kt b/grid/src/test/java/com/cheonjaeung/compose/grid/BoxGridSpanTest.kt
@@ -102,7 +102,7 @@ class BoxGridSpanTest {
                     modifier = Modifier
                         .size(100.dp)
                         .background(Color.Blue)
-                        .span { BoxGridItemSpan(row = 2, column = 1) }
+                        .span { BoxGridItemSpan(row = 2) }
                 )
                 Box(
                     modifier = Modifier
@@ -118,7 +118,7 @@ class BoxGridSpanTest {
                         .column(2)
                         .size(100.dp)
                         .background(Color.Yellow)
-                        .span { BoxGridItemSpan(row = 1, column = 2) }
+                        .span { BoxGridItemSpan(column = 2) }
                 )
             }
         }
@@ -138,7 +138,7 @@ class BoxGridSpanTest {
                     modifier = Modifier
                         .size(100.dp)
                         .background(Color.Blue)
-                        .span { BoxGridItemSpan(row = 2, column = 1) }
+                        .span { BoxGridItemSpan(row = 2) }
                 )
                 Box(
                     modifier = Modifier
@@ -154,7 +154,7 @@ class BoxGridSpanTest {
                         .column(2)
                         .size(100.dp)
                         .background(Color.Yellow)
-                        .span { BoxGridItemSpan(row = 1, column = 2) }
+                        .span { BoxGridItemSpan(column = 2) }
                 )
             }
         }
@@ -174,7 +174,7 @@ class BoxGridSpanTest {
                     modifier = Modifier
                         .size(100.dp)
                         .background(Color.Blue)
-                        .span { BoxGridItemSpan(row = maxRowSpan, column = 1) }
+                        .span { BoxGridItemSpan(row = maxRowSpan) }
                 )
                 Box(
                     modifier = Modifier
@@ -215,15 +215,15 @@ class BoxGridSpanTest {
                         .column(1)
                         .size(100.dp)
                         .background(Color.Green)
-                        .span { BoxGridItemSpan(row = maxCurrentRowSpan, column = 1) }
+                        .span { BoxGridItemSpan(row = maxCurrentRowSpan) }
                 )
                 Box(
                     modifier = Modifier
                         .row(2)
                         .column(2)
                         .size(100.dp)
                         .background(Color.Yellow)
-                        .span { BoxGridItemSpan(row = 1, column = maxCurrentColumnSpan) }
+                        .span { BoxGridItemSpan(column = maxCurrentColumnSpan) }
                 )
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private class BoxGridMeasureHelper(`
`147`	`147`	`val span = if (spanFunction != null) {`
`148`	`148`	`with(spanScope) { spanFunction() }`
`149`	`149`	`} else {`
`150`		`- BoxGridItemSpan.Default`
	`150`	`+ BoxGridItemSpan()`
`151`	`151`	`}`
`152`	`152`	`val (rowSpan, columnSpan) = span`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ class BoxGridSpanTest {`
`102`	`102`	`modifier = Modifier`
`103`	`103`	`.size(100.dp)`
`104`	`104`	`.background(Color.Blue)`
`105`		`- .span { BoxGridItemSpan(row = 2, column = 1) }`
	`105`	`+ .span { BoxGridItemSpan(row = 2) }`
`106`	`106`	`)`
`107`	`107`	`Box(`
`108`	`108`	`modifier = Modifier`
`@@ -118,7 +118,7 @@ class BoxGridSpanTest {`
`118`	`118`	`.column(2)`
`119`	`119`	`.size(100.dp)`
`120`	`120`	`.background(Color.Yellow)`
`121`		`- .span { BoxGridItemSpan(row = 1, column = 2) }`
	`121`	`+ .span { BoxGridItemSpan(column = 2) }`
`122`	`122`	`)`
`123`	`123`	`}`
`124`	`124`	`}`
`@@ -138,7 +138,7 @@ class BoxGridSpanTest {`
`138`	`138`	`modifier = Modifier`
`139`	`139`	`.size(100.dp)`
`140`	`140`	`.background(Color.Blue)`
`141`		`- .span { BoxGridItemSpan(row = 2, column = 1) }`
	`141`	`+ .span { BoxGridItemSpan(row = 2) }`
`142`	`142`	`)`
`143`	`143`	`Box(`
`144`	`144`	`modifier = Modifier`
`@@ -154,7 +154,7 @@ class BoxGridSpanTest {`
`154`	`154`	`.column(2)`
`155`	`155`	`.size(100.dp)`
`156`	`156`	`.background(Color.Yellow)`
`157`		`- .span { BoxGridItemSpan(row = 1, column = 2) }`
	`157`	`+ .span { BoxGridItemSpan(column = 2) }`
`158`	`158`	`)`
`159`	`159`	`}`
`160`	`160`	`}`
`@@ -174,7 +174,7 @@ class BoxGridSpanTest {`
`174`	`174`	`modifier = Modifier`
`175`	`175`	`.size(100.dp)`
`176`	`176`	`.background(Color.Blue)`
`177`		`- .span { BoxGridItemSpan(row = maxRowSpan, column = 1) }`
	`177`	`+ .span { BoxGridItemSpan(row = maxRowSpan) }`
`178`	`178`	`)`
`179`	`179`	`Box(`
`180`	`180`	`modifier = Modifier`
`@@ -215,15 +215,15 @@ class BoxGridSpanTest {`
`215`	`215`	`.column(1)`
`216`	`216`	`.size(100.dp)`
`217`	`217`	`.background(Color.Green)`
`218`		`- .span { BoxGridItemSpan(row = maxCurrentRowSpan, column = 1) }`
	`218`	`+ .span { BoxGridItemSpan(row = maxCurrentRowSpan) }`
`219`	`219`	`)`
`220`	`220`	`Box(`
`221`	`221`	`modifier = Modifier`
`222`	`222`	`.row(2)`
`223`	`223`	`.column(2)`
`224`	`224`	`.size(100.dp)`
`225`	`225`	`.background(Color.Yellow)`
`226`		`- .span { BoxGridItemSpan(row = 1, column = maxCurrentColumnSpan) }`
	`226`	`+ .span { BoxGridItemSpan(column = maxCurrentColumnSpan) }`
`227`	`227`	`)`
`228`	`228`	`}`
`229`	`229`	`}`