Skip to content

Commit 9ac00a9

Browse files
committed
Refactor inspection info for span modifier
1 parent c20a795 commit 9ac00a9

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Immutable
55
import androidx.compose.runtime.Stable
66
import androidx.compose.ui.Alignment
77
import androidx.compose.ui.Modifier
8+
import androidx.compose.ui.platform.debugInspectorInfo
89

910
/**
1011
* A Scope for the children of [HorizontalGrid] or [VerticalGrid].
@@ -30,7 +31,15 @@ interface GridScope {
3031

3132
internal object GridScopeInstance : GridScope {
3233
override fun Modifier.span(span: (GridItemSpanScope.() -> Int)?): Modifier {
33-
return this.then(HorizontalVerticalGridSpanElement(span = span))
34+
return this.then(
35+
HorizontalVerticalGridSpanElement(
36+
span = span,
37+
inspectorInfo = debugInspectorInfo {
38+
name = "span"
39+
value = span
40+
}
41+
)
42+
)
3443
}
3544

3645
override fun Modifier.align(alignment: Alignment): Modifier {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import androidx.compose.ui.platform.InspectorInfo
77
import androidx.compose.ui.unit.Density
88

99
internal class HorizontalVerticalGridSpanElement(
10-
val span: (GridItemSpanScope.() -> Int)?
10+
val span: (GridItemSpanScope.() -> Int)?,
11+
val inspectorInfo: InspectorInfo.() -> Unit
1112
) : ModifierNodeElement<HorizontalVerticalGridSpanNode>() {
1213
override fun create(): HorizontalVerticalGridSpanNode {
1314
return HorizontalVerticalGridSpanNode(span)
@@ -18,8 +19,7 @@ internal class HorizontalVerticalGridSpanElement(
1819
}
1920

2021
override fun InspectorInfo.inspectableProperties() {
21-
name = "span"
22-
value = span
22+
inspectorInfo()
2323
}
2424

2525
override fun equals(other: Any?): Boolean {

0 commit comments

Comments
 (0)