Migrate window insets padding modifiers from composed API to `InsetsPaddingModifierNode` by svastven · Pull Request #2572 · JetBrains/compose-multiplatform-core

svastven · 2025-11-13T11:35:28Z

Migrates window insets padding modifiers from composed API to InsetsPaddingModifierNode. Provides PlatformWindowInsets through the root node modifier to child nodes required for creating window insets padding modifiers.

Fixes CMP-8953 Migrate non-Android Insets Padding Modifiers away from "Composed" API to "Modifier.Node"
Fixes CMP-8998 Migrate insets modifiers to InsetsPaddingModifierElement
Fixes CMP-9201 ModalBottomSheet padding interaction on iOS in CMP 1.10.0-alpha03

Testing

Adds test of recomposition behavior to WindowInsetsPaddingTests
Tested by existing tests

Release Notes

Fixes - iOS

Fix incorrectly consumed insets in ModalBottomSheet

Features - Multiple Platforms

Migrate window insets padding modifiers from composed API to InsetsPaddingModifierNode

…ddingModifierNode

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt

…otNodeOwner.skiko.kt Co-authored-by: Andrei Salavei <[email protected]>

...ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/layout/WindowInsetsPaddingTest.kt

ASalavei

Please update release note - the PR not only fixes things, but also adds support for the new API

…stance

…d to compose scene

…owInsets

...se/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/keyboard/KeyboardInsetsTest.kt

MatkovIvan

API/features for 1.10 is already frozen. Blocking until creating a release branch

...se/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/keyboard/KeyboardInsetsTest.kt

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt

...ation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/WindowInsetsPadding.kt

.../src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformWindowInsetsProviderNode.skiko.kt

...ation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/WindowInsetsPadding.kt

MatkovIvan · 2025-12-03T10:28:50Z

compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skiko.kt

    runTestContext: CoroutineContext = EmptyCoroutineContext,
    testTimeout: Duration = Duration.INFINITE,
    semanticsOwnerListener: PlatformContext.SemanticsOwnerListener? = null,
+    windowInsets: PlatformWindowInsets? = null,


I'm not sure that it's the right way to expose it to public (under annotation but anyway) testing API.

In general, I'd keep this out of scope for now. Our own tests have a number of examples of how to provide PlatformContext inside tests

It should only be as part of the internal API since the constructor is marked as internal API and also it can only be provided to the runInternalSkikoComposeUiTest which is marked internal. I followed similar approach as with the semanticsOwnerListener above, which can also be provided only in terms of the internal API.

Well, adding it here indeed doesn't mean that we'll need to support compatiblity forever.
But I still think that the existing pattern (an arg above) is not the right way to expose it.

We might change it in the future, so I won't block PR because of it

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformWindowInsets.skiko.kt

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt

MatkovIvan · 2025-12-03T16:51:39Z

Please update the API dump to make CI green. The diff should have only stable_prop things, not real API changes

svastven added 6 commits November 13, 2025 11:50

Remove unused imports

353d272

Make toWindowInsets function internal

3744760

Align PlatformWindowInsets safeDrawing and safeContent to Android

cc993aa

Migrate window insets padding modifiers from composed API to InsetsPa…

02b0f53

…ddingModifierNode

Add test to WindowInsetsPaddingTest

f5f62c7

Remove unused import

428f757

svastven requested review from ASalavei, MatkovIvan and mazunin-v-jb November 13, 2025 11:35

Lint

d885be1

ASalavei reviewed Nov 13, 2025

View reviewed changes

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt Outdated Show resolved Hide resolved

Update compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/Ro…

7903e54

…otNodeOwner.skiko.kt Co-authored-by: Andrei Salavei <[email protected]>

ASalavei reviewed Nov 13, 2025

View reviewed changes

...ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/layout/WindowInsetsPaddingTest.kt Show resolved Hide resolved

ASalavei requested changes Nov 13, 2025

View reviewed changes

svastven added 8 commits November 13, 2025 23:40

Update exclude function implementation to use PlatformWindowInsets in…

308ab48

…stance

Disable useSoftwareKeyboardInset in ModalBottomSheetDialog properties

6f6912b

Disable useSoftwareKeyboardInset in tests

1ec3640

Remove redundant test

b506bd6

Add windowInsets parameter to internal skiko compose ui test

226c7ef

Do not provide windowInsets with LocalPlatformWindowInsets but instea…

3061bcc

…d to compose scene

Provide windowInsets to ui test directly instead of LocalPlatformWind…

1f3a00b

…owInsets

Remove unused imports

d6ec7e7

ASalavei reviewed Nov 14, 2025

View reviewed changes

...se/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/keyboard/KeyboardInsetsTest.kt Show resolved Hide resolved

ASalavei approved these changes Nov 14, 2025

View reviewed changes

Revert test changes

20adaf1

MatkovIvan requested changes Nov 14, 2025

View reviewed changes

MatkovIvan added changes in common changes in API labels Nov 14, 2025

svastven added 2 commits December 1, 2025 14:20

Update platform window insets tree propagation

06b723d

Merge branch 'jb-main' into svastven/migrate-insets-modifiers

c11ea11

svastven requested a review from ASalavei December 1, 2025 13:22

svastven added 6 commits December 1, 2025 14:25

Remove extra line

3c8d61e

Rename ime padding insets animation tests

3cf6884

Revert removed imports

e0117d0

Fix platform insets calculation to use ancestorWindowInsets

98f0d4a

Make EmptyPlatformWindowInsets object internal API

c807cfb

Merge branch 'jb-main' into svastven/migrate-insets-modifiers

854d8f7

ASalavei reviewed Dec 3, 2025

View reviewed changes

.../src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformWindowInsetsProviderNode.skiko.kt Outdated Show resolved Hide resolved

ASalavei reviewed Dec 3, 2025

View reviewed changes

...ation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/WindowInsetsPadding.kt Outdated Show resolved Hide resolved

Track changes in insetsGetter and update insets padding node state

43f11c9

svastven requested review from ASalavei and MatkovIvan December 3, 2025 10:20

Update taverseKey of PlatformWindowInsetsProviderNode

43e9cf7

MatkovIvan removed the changes in common label Dec 3, 2025

MatkovIvan reviewed Dec 3, 2025

View reviewed changes

svastven added 4 commits December 3, 2025 12:19

MR updates

12bdfa0

Unify EmptyPlatformWindowInsets

77b12f7

Add TODOs

b8ed6c6

Replace equals operator

2bbfee6

MatkovIvan approved these changes Dec 3, 2025

View reviewed changes

Dump API

49fe3e0

ASalavei approved these changes Dec 4, 2025

View reviewed changes

svastven merged commit 9116061 into jb-main Dec 4, 2025
16 checks passed

svastven deleted the svastven/migrate-insets-modifiers branch December 4, 2025 10:49

Comments

Conversation

svastven commented Nov 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing

Release Notes

Fixes - iOS

Features - Multiple Platforms

Uh oh!

Uh oh!

Uh oh!

ASalavei left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MatkovIvan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MatkovIvan Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

svastven Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

MatkovIvan Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MatkovIvan commented Dec 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

svastven commented Nov 13, 2025 •

edited

Loading