Skip to content

Wire PlatformContext's UiMediaScope to Owner #3367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Igor Demin (igordmn) merged 2 commits into from
Sep 1, 2026
Merged

Wire PlatformContext's UiMediaScope to Owner #3367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7362509
Wire PlatformContext's `UiMediaScope` to `Owner`
MatkovIvan Sep 1, 2026
7a72deb
Respect feature flags
MatkovIvan Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,8 @@ internal class RootNodeOwner(
override val semanticsOwner = SemanticsOwner(root, rootSemanticsNode, layoutNodes)
override val windowInfo get() = platformContext.windowInfo

//TODO https://youtrack.jetbrains.com/issue/CMP-10709/Support-mediaQuery-derivedMediaQuery
@ExperimentalMediaQueryApi
override val uiMediaScope: UiMediaScope? get() = null
override val uiMediaScope: UiMediaScope get() = platformContext.mediaScope
override val retainedValuesStore: RetainedValuesStore get() = ForgetfulRetainedValuesStore
override val rectManager = RectManager(layoutNodes)

Expand Down
12 changes: 11 additions & 1 deletion compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/CompositionLocals.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.runtime.ProvidedValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.LocalSaveableStateRegistry
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.ComposeUiFlags
import androidx.compose.ui.ExperimentalMediaQueryApi
import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.LocalUiMediaScope
Expand Down Expand Up @@ -90,16 +91,25 @@ internal fun ProvidePlatformCompositionLocals(
HostDefaultProviderImpl(platformContext)
}

val mediaScope = if (
!ComposeUiFlags.isMinimalistLocalsEnabled &&

@igordmn Igor Demin (igordmn) Sep 1, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created https://youtrack.jetbrains.com/issue/CMP-10733/Support-ComposeUiFlags.isMinimalistLocalsEnabled for the rest of the flags

ComposeUiFlags.isMediaQueryIntegrationEnabled
) {
arrayOf(LocalUiMediaScope provides platformContext.mediaScope)
} else {
emptyArray()
}

CompositionLocalProvider(
*values,
LocalPlatformScreenReader provides platformContext.screenReader,
LocalPlatformWindowInsets provides platformContext.windowInsets,
LocalPlatformPrefetchScheduler provides platformContext.prefetchScheduler,
LocalUiMediaScope provides platformContext.mediaScope,
androidx.lifecycle.compose.LocalLifecycleOwner provides platformContext.architectureComponentsOwner.lifecycleOwner,
LocalSavedStateRegistryOwner provides platformContext.architectureComponentsOwner.savedStateRegistryOwner,
LocalSaveableStateRegistry provides saveableStateRegistry,
LocalHostDefaultProvider provides hostDefaultProvider,
*mediaScope,
content = content,
)
}
6 changes: 3 additions & 3 deletions compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ interface PlatformContext {
* using media state remains safe on platforms that do not provide a richer
* implementation.
*/
@OptIn(ExperimentalMediaQueryApi::class)
@ExperimentalMediaQueryApi
val mediaScope: UiMediaScope get() = EmptyMediaScope

interface RootForTestListener {
Expand Down Expand Up @@ -411,7 +411,7 @@ private object NoOpHapticFeedback : HapticFeedback {
override fun performHapticFeedback(hapticFeedbackType: HapticFeedbackType) = Unit
}

@OptIn(ExperimentalMediaQueryApi::class)
@ExperimentalMediaQueryApi
private object EmptyMediaScope : UiMediaScope {
override val windowPosture: UiMediaScope.Posture
get() = UiMediaScope.Posture.Flat
Expand All @@ -429,4 +429,4 @@ private object EmptyMediaScope : UiMediaScope {
get() = false
override val viewingDistance: UiMediaScope.ViewingDistance
get() = UiMediaScope.ViewingDistance.Near
}
}
Loading