Replace CValue<CGRect>.useContents { toDpRect() } (#3031)

m-sasha · web-flow · commit 4e4c5c01601b · 2026-05-05T23:59:01.000+03:00
diff --git a/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interop/UIKitInteropUILabelSizingTest.kt b/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interop/UIKitInteropUILabelSizingTest.kt
@@ -69,7 +69,7 @@ class UIKitInteropUILabelSizingTest {
                     UILabel().apply {
                         numberOfLines = 1
                         text = SHORT_TEXT
-                        uiLabelRect = { frame.useContents { toDpRect() } }
+                        uiLabelRect = { frame.toDpRect() }
                     }
                 },
                 modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },
@@ -92,7 +92,7 @@ class UIKitInteropUILabelSizingTest {
                     UILabel().apply {
                         numberOfLines = 0
                         text = SHORT_TEXT
-                        uiLabelRect = { frame.useContents { toDpRect() } }
+                        uiLabelRect = { frame.toDpRect() }
                     }
                 },
                 modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },
@@ -115,7 +115,7 @@ class UIKitInteropUILabelSizingTest {
                     UILabel().apply {
                         numberOfLines = 1
                         text = LONG_TEXT
-                        uiLabelRect = { frame.useContents { toDpRect() } }
+                        uiLabelRect = { frame.toDpRect() }
                     }
                 },
                 modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },
@@ -138,7 +138,7 @@ class UIKitInteropUILabelSizingTest {
                     UILabel().apply {
                         numberOfLines = 0
                         text = LONG_TEXT
-                        uiLabelRect = { frame.useContents { toDpRect() } }
+                        uiLabelRect = { frame.toDpRect() }
                     }
                 },
                 modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },
@@ -492,7 +492,7 @@ class UIKitInteropUILabelSizingTest {
             }
         }
 
-        assertEquals(composeRect, uiKitView.frame.useContents { toDpRect() })
+        assertEquals(composeRect, uiKitView.frame.toDpRect())
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class UIKitInteropUILabelSizingTest {`
`69`	`69`	`UILabel().apply {`
`70`	`70`	`numberOfLines = 1`
`71`	`71`	`text = SHORT_TEXT`
`72`		`- uiLabelRect = { frame.useContents { toDpRect() } }`
	`72`	`+ uiLabelRect = { frame.toDpRect() }`
`73`	`73`	`}`
`74`	`74`	`},`
`75`	`75`	`modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },`
`@@ -92,7 +92,7 @@ class UIKitInteropUILabelSizingTest {`
`92`	`92`	`UILabel().apply {`
`93`	`93`	`numberOfLines = 0`
`94`	`94`	`text = SHORT_TEXT`
`95`		`- uiLabelRect = { frame.useContents { toDpRect() } }`
	`95`	`+ uiLabelRect = { frame.toDpRect() }`
`96`	`96`	`}`
`97`	`97`	`},`
`98`	`98`	`modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },`
`@@ -115,7 +115,7 @@ class UIKitInteropUILabelSizingTest {`
`115`	`115`	`UILabel().apply {`
`116`	`116`	`numberOfLines = 1`
`117`	`117`	`text = LONG_TEXT`
`118`		`- uiLabelRect = { frame.useContents { toDpRect() } }`
	`118`	`+ uiLabelRect = { frame.toDpRect() }`
`119`	`119`	`}`
`120`	`120`	`},`
`121`	`121`	`modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },`
`@@ -138,7 +138,7 @@ class UIKitInteropUILabelSizingTest {`
`138`	`138`	`UILabel().apply {`
`139`	`139`	`numberOfLines = 0`
`140`	`140`	`text = LONG_TEXT`
`141`		`- uiLabelRect = { frame.useContents { toDpRect() } }`
	`141`	`+ uiLabelRect = { frame.toDpRect() }`
`142`	`142`	`}`
`143`	`143`	`},`
`144`	`144`	`modifier = Modifier.onGloballyPositioned { interopRect = it.boundsInRoot().toDpRect(density) },`
`@@ -492,7 +492,7 @@ class UIKitInteropUILabelSizingTest {`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`
`495`		`- assertEquals(composeRect, uiKitView.frame.useContents { toDpRect() })`
	`495`	`+ assertEquals(composeRect, uiKitView.frame.toDpRect())`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`@Test`