forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 154
[web] Reuse same mediaQuery listener logic both for resize and theme listener #3231
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.
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
Shagen Ogandzhanian (Schahen)
merged 4 commits into
jb-main
from
sh/media_query_listener
Jul 16, 2026
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
dcd426a
[web] Reuse same mediaQuery listener logic both for resize and theme …
Schahen 6035835
Nothing to dispose if no query events were actually registered
Schahen 8ea22ee
Introduce dedicated MediaQueryStatus instead of nullable Boolean
Schahen 2bc6ec6
dump api
Schahen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/window/MediaQueryListener.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package androidx.compose.ui.window | ||
|
|
||
| import kotlin.js.js | ||
| import kotlinx.browser.window | ||
| import org.w3c.dom.MediaQueryList | ||
| import org.w3c.dom.MediaQueryListEvent | ||
| import org.w3c.dom.events.Event | ||
|
|
||
| internal abstract class MediaQueryListener(private val query: String) { | ||
| private val media: MediaQueryList by lazy { | ||
| window.matchMedia(query) | ||
| } | ||
|
|
||
| abstract fun onChange(matches: Boolean) | ||
|
|
||
| private val listener: (Event) -> Unit = { event -> | ||
| event as MediaQueryListEvent | ||
| onChange(event.matches) | ||
| } | ||
|
|
||
| fun dispose() { | ||
| if (!isMatchMediaSupported()) return | ||
| try { | ||
| media.removeEventListener("change", listener) | ||
| } catch (t : Throwable) { | ||
| media.removeListener(listener) | ||
| } | ||
| } | ||
|
|
||
| init { | ||
| if (isMatchMediaSupported()) { | ||
| try { | ||
| media.addEventListener("change", listener) | ||
| } catch (t: Throwable) { | ||
| media.addListener(listener) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun matches(): MediaQueryStatus { | ||
| return when { | ||
| !isMatchMediaSupported() -> MediaQueryStatus.UNSUPPORTED | ||
| else -> if (media.matches) MediaQueryStatus.MATCH else MediaQueryStatus.NO_MATCH | ||
| } | ||
| } | ||
| } | ||
|
|
||
| internal sealed interface MediaQueryStatus { | ||
| object UNSUPPORTED : MediaQueryStatus | ||
| object MATCH : MediaQueryStatus | ||
| object NO_MATCH : MediaQueryStatus | ||
| } | ||
|
|
||
| // supported by all browsers since 2015 | ||
| // https://developer.mozilla.org/en-US/docs/Web/API/Window/matchMedia | ||
| // Changed from `@JsFun` annotation because in 2.2.20 it's marked as not available on LV = 2.0 | ||
| // TODO: Cannot add opt-in with LV = 2.0 due to https://youtrack.jetbrains.com/issue/KT-79716 | ||
| private fun isMatchMediaSupported(): Boolean = js("window.matchMedia != undefined") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.