peachsim 0.1.1641 → 0.1.1653

package/kotlin/fork/compose-worker-globals.patch

@@ -1,1247 +0,0 @@
-diff --git a/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.web.kt b/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.web.kt
---- a/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.web.kt
-+++ b/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.web.kt
-@@ -12,6 +12,10 @@
-  * 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.
-+ *
-+ * modified for Peach: an explicit locale provider lets a native host supply
-+ * device languages without exposing browser navigator fields to guest code.
-+ * see the fork record for the patch and upstream revision.
-  */
- 
- package androidx.compose.ui.text.intl
-@@ -64,8 +68,18 @@
- // The locale code en-001 denotes the English language spoken in the World.
- private const val FALLBACK_LANGUAGE_TAG = "en-001"
- 
-+private var currentLocaleProvider: () -> LocaleList = {
-+    localeListFromLanguageTags(userPreferredLanguages())
-+}
-+
-+// the host installs the device provider before constructing its first scene.
-+@InternalComposeUiApi
-+fun setPlatformLocaleProvider(provider: () -> LocaleList) {
-+    currentLocaleProvider = provider
-+}
-+
- internal actual fun createPlatformLocaleDelegate(): PlatformLocaleDelegate =
-     object : PlatformLocaleDelegate {
-         override val current: LocaleList
--            get() = localeListFromLanguageTags(userPreferredLanguages())
-+            get() = currentLocaleProvider()
-     }
-diff --git a/compose/ui/ui/src/wasmJsMain/kotlin/androidx/compose/ui/Actuals.wasm.kt b/compose/ui/ui/src/wasmJsMain/kotlin/androidx/compose/ui/Actuals.wasm.kt
-index 26aa8ea..aa4f6d4 100644
---- a/compose/ui/ui/src/wasmJsMain/kotlin/androidx/compose/ui/Actuals.wasm.kt
-+++ b/compose/ui/ui/src/wasmJsMain/kotlin/androidx/compose/ui/Actuals.wasm.kt
-@@ -12,16 +12,22 @@
-  * 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.
-+ *
-+ * Modified for Peach (https://peachsim.com): reads worker-safe globals through
-+ * globalThis instead of window, so this code runs in a Web Worker as well as a
-+ * document. See the Peach fork record for the patch and upstream revision.
-  */
- 
- package androidx.compose.ui
- 
--import kotlinx.browser.window
-+import kotlin.js.js
- 
- internal actual fun areObjectsOfSameType(a: Any, b: Any): Boolean {
-     return a === b || a::class == b::class
- }
- 
- internal actual fun currentTimeMillis(): Long {
--    return window.performance.now().toLong()
--}
-
-+    return performanceNow().toLong()
-+}
-+
-+private fun performanceNow(): Double = js("globalThis.performance.now()")
-diff --git a/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/platform/PlatformClipboard.web.kt b/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/platform/PlatformClipboard.web.kt
-index 7aa3e26..47e20a8 100644
---- a/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/platform/PlatformClipboard.web.kt
-+++ b/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/platform/PlatformClipboard.web.kt
-@@ -12,6 +12,10 @@
-  * 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.
-+ *
-+ * Modified for Peach (https://peachsim.com): reads worker-safe globals through
-+ * globalThis instead of window, so this code runs in a Web Worker as well as a
-+ * document. See the Peach fork record for the patch and upstream revision.
-  */
- 
- package androidx.compose.ui.platform
-@@ -34,20 +38,20 @@ actual typealias NativeClipboard = W3CTemporaryClipboard
- internal fun isFullClipboardApiSupported(): Boolean =
-     js(
-         """Boolean(
--        window.navigator.clipboard && 
--        window.navigator.clipboard.write && 
--        window.navigator.clipboard.read && 
-+        globalThis.navigator.clipboard && 
-+        globalThis.navigator.clipboard.write && 
-+        globalThis.navigator.clipboard.read && 
-         typeof(ClipboardItem) !== 'undefined'
-         )
-     """
-     )
- 
--internal fun isSecureContext(): Boolean = js("window.isSecureContext === true")
-+internal fun isSecureContext(): Boolean = js("globalThis.isSecureContext === true")
- 
- internal fun isFallbackWriteTextApiAvailable(): Boolean =
--    js("Boolean(window.navigator.clipboard && window.navigator.clipboard.writeText)")
-+    js("Boolean(globalThis.navigator.clipboard && globalThis.navigator.clipboard.writeText)")
- 
--internal fun getW3CClipboard(): NativeClipboard = js("window.navigator.clipboard")
-+internal fun getW3CClipboard(): NativeClipboard = js("globalThis.navigator.clipboard")
- 
- /**
-  * https://developer.mozilla.org/en-US/docs/Web/API/Clipboard_API
-diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/SystemTheme.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/SystemTheme.kt
-index a14f182..9c4862d 100644
---- a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/SystemTheme.kt
-+++ b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/SystemTheme.kt
-@@ -12,6 +12,11 @@
-  * 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.
-+ *
-+ * modified for Peach: the system theme composition local is visible to a
-+ * native host, which provides the device's night mode to the scenes it owns,
-+ * as later upstream releases expose it. see the fork record for the patch and
-+ * upstream revision.
-  */
- 
- package androidx.compose.ui
-@@ -27,7 +32,8 @@ enum class SystemTheme {
-     Dark, Light, Unknown
- }
- 
--internal val LocalSystemTheme = staticCompositionLocalOf { currentSystemTheme }
-+@InternalComposeUiApi
-+val LocalSystemTheme = staticCompositionLocalOf { currentSystemTheme }
- 
- @InternalComposeUiApi
- @Composable
-diff --git a/compose/material3/material3/src/webMain/kotlin/androidx/compose/material3/internal/PlatformDateFormat.web.kt b/compose/material3/material3/src/webMain/kotlin/androidx/compose/material3/internal/PlatformDateFormat.web.kt
---- a/compose/material3/material3/src/webMain/kotlin/androidx/compose/material3/internal/PlatformDateFormat.web.kt
-+++ b/compose/material3/material3/src/webMain/kotlin/androidx/compose/material3/internal/PlatformDateFormat.web.kt
-@@ -12,6 +12,9 @@
-  * 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.
-+ *
-+ * modified for Peach: UTC date formatting matches Android independent of the browser time zone.
-+ * see the fork record for the patch and upstream revision.
-  */
- 
- @file:OptIn(ExperimentalTime::class)
-@@ -74,6 +77,7 @@
-             jsDate.toLocaleDateString(
-                 locales = locale.toLanguageTag(),
-                 options = dateLocaleOptions {
-+                    timeZone = "UTC"
-                     month = it
-                 }
-             )
-@@ -83,6 +87,7 @@
-             jsDate.toLocaleDateString(
-                 locales = locale.toLanguageTag(),
-                 options = dateLocaleOptions {
-+                    timeZone = "UTC"
-                     weekday = it
-                 }
-             )
-@@ -106,6 +111,7 @@
-         return jsDate.toLocaleDateString(
-             locales = locale.toLanguageTag(),
-             options = dateLocaleOptions {
-+                timeZone = "UTC"
-                 when {
-                     skeleton.contains("y", true) -> NUMERIC
-                     else -> null
-diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/graphics/SkiaBackedPaint.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/graphics/SkiaBackedPaint.nonAndroid.kt
---- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/graphics/SkiaBackedPaint.nonAndroid.kt
-+++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/graphics/SkiaBackedPaint.nonAndroid.kt
-@@ -12,6 +12,9 @@
-  * 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.
-+ *
-+ * modified for Peach: initial stroke join matches the backing Skia paint and Android default.
-+ * see the fork record for the patch and upstream revision.
-  */
- 
- @file:JvmName("SkiaBackedPaint_skikoKt")
-@@ -99,7 +102,7 @@
-             field = value
-         }
- 
--    override var strokeJoin: StrokeJoin = StrokeJoin.Round
-+    override var strokeJoin: StrokeJoin = StrokeJoin.Miter
-         set(value) {
-             internalSkiaPaint.strokeJoin = value.toSkia()
-             field = value
-diff --git a/navigation/navigation-compose/src/webMain/kotlin/androidx/navigation/compose/DefaultNavTransitions.web.kt b/navigation/navigation-compose/src/webMain/kotlin/androidx/navigation/compose/DefaultNavTransitions.web.kt
---- a/navigation/navigation-compose/src/webMain/kotlin/androidx/navigation/compose/DefaultNavTransitions.web.kt
-+++ b/navigation/navigation-compose/src/webMain/kotlin/androidx/navigation/compose/DefaultNavTransitions.web.kt
-@@ -12,6 +12,9 @@
-  * 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.
-+ *
-+ * modified for Peach: default navigation transitions match the pinned Android implementation.
-+ * see the fork record for the patch and upstream revision.
-  */
- 
- package androidx.navigation.compose
-@@ -20,24 +23,29 @@
- import androidx.compose.animation.EnterTransition
- import androidx.compose.animation.ExitTransition
- import androidx.compose.animation.SizeTransform
-+import androidx.compose.animation.core.spring
-+import androidx.compose.animation.core.tween
-+import androidx.compose.animation.fadeIn
-+import androidx.compose.animation.fadeOut
-+import androidx.compose.animation.scaleOut
- import androidx.navigation.NavBackStackEntry
- 
- public actual object DefaultNavTransitions {
-     public actual val enterTransition:
-         AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition =
--        { EnterTransition.None }
-+        { fadeIn(animationSpec = tween(700)) }
- 
-     public actual val exitTransition:
-         AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition =
--        { ExitTransition.None }
-+        { fadeOut(animationSpec = tween(700)) }
- 
-     public actual val predictivePopEnterTransition:
-         AnimatedContentTransitionScope<NavBackStackEntry>.(Int) -> EnterTransition =
--        { EnterTransition.None }
-+        { fadeIn(spring(dampingRatio = 1.0f, stiffness = 1600.0f)) }
- 
-     public actual val predictivePopExitTransition:
-         AnimatedContentTransitionScope<NavBackStackEntry>.(Int) -> ExitTransition =
--        { ExitTransition.None }
-+        { scaleOut(targetScale = 0.7f) }
- 
- 
-     public actual val sizeTransform:
-diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt
---- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt
-+++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt
-@@ -1,3 +1,4 @@
-+// modified for Peach: Android static text uses integer glyph advances.
- /*
-  * Copyright 2026 The Android Open Source Project
-  *
-@@ -123,7 +124,7 @@
-             )
- 
-             Platform.Android -> FontRasterizationSettings(
--                subpixelPositioning = true,
-+                subpixelPositioning = false,
-                 smoothing = FontSmoothing.AntiAlias,
-                 hinting = FontHinting.Slight,
-                 autoHintingForced = false,
-diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
---- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
-+++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
-@@ -1,3 +1,4 @@
-+// modified for Peach: Android static font sizes and advances follow the native paint.
- /*
-  * Copyright 2020 The Android Open Source Project
-  *
-@@ -19,6 +20,10 @@
- package androidx.compose.ui.text.platform
- 
- import androidx.compose.ui.InternalComposeUiApi
-+import androidx.compose.ui.text.platform.Platform
-+import androidx.compose.ui.text.platform.currentPlatform
-+import androidx.compose.ui.text.style.TextMotion
-+import kotlin.math.floor
- import androidx.compose.ui.geometry.Size
- import androidx.compose.ui.graphics.BlendMode
- import androidx.compose.ui.graphics.Color
-@@ -163,6 +168,8 @@
- 
-         fun toSkTextStyle(fontFamilyResolver: FontFamily.Resolver): SkTextStyle {
-             val res = SkTextStyle()
-+            val resolvedFontSize = if (currentPlatform() == Platform.Android &&
-+                !fontRasterizationSettings.subpixelPositioning) floor(fontSize) else fontSize
-             if (textForegroundStyle.color.isSpecified) {
-                 res.color = textForegroundStyle.color.toArgb()
-             }
-@@ -194,7 +201,7 @@
-             }
- 
-             letterSpacing?.let {
--                res.letterSpacing = it
-+                res.letterSpacing = if (fontSize == 0f) it else it * resolvedFontSize / fontSize
-             }
- 
-             res.addFontFeatures(FontFeature.parseW3(fontFeatureSettings.orEmpty()))
-@@ -338,6 +345,7 @@
-     blendMode: BlendMode = DrawScope.DefaultBlendMode,
-     lineHeight: TextUnit,
-     lineHeightStyle: LineHeightStyle?,
-+    textMotion: TextMotion?,
- ) = ComputedStyle.Mutable(
-     textForegroundStyle = spanStyle.toParagraphTextForegroundStyle(),
-     brushSize = brushSize,
-@@ -347,7 +355,10 @@
-     fontSynthesis = spanStyle.fontSynthesis,
-     fontFamily = spanStyle.fontFamily,
-     fontFeatureSettings = spanStyle.fontFeatureSettings,
--    fontRasterizationSettings = platformParagraphStyle?.fontRasterizationSettings ?: FontRasterizationSettings.PlatformDefault,
-+    fontRasterizationSettings = platformParagraphStyle?.fontRasterizationSettings ?:
-+        if (currentPlatform() == Platform.Android && textMotion === TextMotion.Animated) {
-+            FontRasterizationSettings(FontSmoothing.AntiAlias, FontHinting.Slight, true, false)
-+        } else FontRasterizationSettings.PlatformDefault,
-     letterSpacing = if (spanStyle.letterSpacing.isSpecified) {
-         with(density) { spanStyle.letterSpacing.toPx() }
-     } else null,
-@@ -401,6 +412,7 @@
-             blendMode = blendMode,
-             lineHeight = textStyle.lineHeight,
-             lineHeightStyle = textStyle.lineHeightStyle,
-+            textMotion = textStyle.textMotion,
-         ).toImmutable()
-     }
- 
-@@ -609,7 +621,8 @@
-             brushSize = brushSize,
-             blendMode = blendMode,
-             lineHeight = textStyle.lineHeight,
--            lineHeightStyle = textStyle.lineHeightStyle
-+            lineHeightStyle = textStyle.lineHeightStyle,
-+            textMotion = textStyle.textMotion,
-         )
-         for (i in 1 until activeStyles.size) {
-             style.merge(density, activeStyles[i])
-diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoParagraph.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoParagraph.nonAndroid.kt
---- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoParagraph.nonAndroid.kt
-+++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoParagraph.nonAndroid.kt
-@@ -1,3 +1,4 @@
-+// modified for peach: Android text bounds and intrinsic padding match the platform.
- /*
-  * Copyright 2023 The Android Open Source Project
-  *
-@@ -35,6 +36,8 @@
- import androidx.compose.ui.graphics.toComposeRect
- import androidx.compose.ui.text.PlatformParagraph
- import androidx.compose.ui.text.platform.SkikoParagraphIntrinsics
-+import androidx.compose.ui.text.platform.Platform
-+import androidx.compose.ui.text.platform.currentPlatform
- import androidx.compose.ui.text.platform.cursorHorizontalPosition
- import androidx.compose.ui.text.style.LineHeightStyle
- import androidx.compose.ui.text.style.ResolvedTextDirection
-@@ -43,6 +46,7 @@
- import androidx.compose.ui.text.style.TextOverflow
- import androidx.compose.ui.unit.Constraints
- import androidx.compose.ui.unit.isUnspecified
-+import kotlin.math.ceil
- import kotlin.math.floor
- import org.jetbrains.skia.FontMetrics
- import org.jetbrains.skia.IRange
-@@ -216,11 +220,31 @@
-         )
-     }
- 
-+    private val usesAndroidBoringLayout: Boolean
-+        get() = paragraphIntrinsics.androidBoringMetrics &&
-+            maxIntrinsicWidth <= width && lineCount == 1 && !didExceedMaxLines
-+
-     override fun getLineLeft(lineIndex: Int): Float =
--        lineMetrics.getOrNull(lineIndex)?.left?.toFloat() ?: 0f
-+        lineMetrics.getOrNull(lineIndex)?.let { line ->
-+            if (currentPlatform() == Platform.Android && paragraphIntrinsics.style.textAlign == TextAlign.Center) {
-+                floor((width - line.width.toFloat()) / 2)
-+            } else if (usesAndroidBoringLayout) {
-+                if (paragraphIntrinsics.style.textAlign == TextAlign.Right ||
-+                    paragraphIntrinsics.style.textAlign == TextAlign.End)
-+                    width - paragraphIntrinsics.androidBoringWidth else 0f
-+            } else line.left.toFloat()
-+        } ?: 0f
- 
-     override fun getLineRight(lineIndex: Int): Float =
--        lineMetrics.getOrNull(lineIndex)?.right?.toFloat() ?: 0f
-+        lineMetrics.getOrNull(lineIndex)?.let { line ->
-+            if (currentPlatform() == Platform.Android && paragraphIntrinsics.style.textAlign == TextAlign.Center) {
-+                ceil((width + line.width.toFloat()) / 2)
-+            } else if (usesAndroidBoringLayout) {
-+                if (paragraphIntrinsics.style.textAlign == TextAlign.Right ||
-+                    paragraphIntrinsics.style.textAlign == TextAlign.End)
-+                    width else paragraphIntrinsics.androidBoringWidth
-+            } else line.right.toFloat()
-+        } ?: 0f
- 
-     override fun getLineTop(lineIndex: Int) =
-         lineMetrics.getOrNull(lineIndex)?.let { line ->
-diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphIntrinsics.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphIntrinsics.nonAndroid.kt
---- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphIntrinsics.nonAndroid.kt
-+++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphIntrinsics.nonAndroid.kt
-@@ -1,3 +1,4 @@
-+// modified for peach: Android text bounds and intrinsic padding match the platform.
- @file:OptIn(InternalComposeUiApi::class)
- 
- /*
-@@ -23,9 +24,12 @@
- import androidx.compose.ui.InternalComposeUiApi
- import androidx.compose.ui.text.AnnotatedString
- import androidx.compose.ui.text.AnnotatedString.Range
-+import androidx.compose.ui.text.Bullet
-+import androidx.compose.ui.text.ParagraphStyle
- import androidx.compose.ui.text.ParagraphIntrinsics
- import androidx.compose.ui.text.Placeholder
- import androidx.compose.ui.text.StrongDirectionType
-+import androidx.compose.ui.text.SpanStyle
- import androidx.compose.ui.text.TextStyle
- import androidx.compose.ui.text.firstStrongDirectionType
- import androidx.compose.ui.text.font.FontFamily
-@@ -33,19 +37,40 @@
- import androidx.compose.ui.text.intl.LocaleList
- import androidx.compose.ui.text.intl.isRtl
- import androidx.compose.ui.text.style.ResolvedTextDirection
-+import androidx.compose.ui.text.style.TextIndent
- import androidx.compose.ui.text.style.TextDirection
- import androidx.compose.ui.unit.Density
-+import androidx.compose.ui.unit.TextUnit
-+import androidx.compose.ui.unit.isUnspecified
- import kotlin.math.ceil
- 
- internal class SkikoParagraphIntrinsics(
-     val text: String,
--    private val style: TextStyle,
-+    val style: TextStyle,
-     private val annotations: List<AnnotatedString.Range<out AnnotatedString.Annotation>>,
-     private val placeholders: List<Range<Placeholder>>,
-     private val density: Density,
-     private val fontFamilyResolver: FontFamily.Resolver
- ) : ParagraphIntrinsics {
-     val textDirection = resolveTextDirection(text, style.textDirection, style.localeList)
-+
-+    // android boring layout ceilings the extent without rounding glyph positions.
-+    val androidBoringMetrics = currentPlatform() == Platform.Android &&
-+        textDirection == ResolvedTextDirection.Ltr && style.lineHeight.isUnspecified &&
-+        (style.textIndent == null || style.textIndent == TextIndent.None) &&
-+        style.baselineShift?.multiplier?.let { it == 0f } != false &&
-+        placeholders.isEmpty() && annotations.none {
-+            val annotation = it.item
-+            annotation is ParagraphStyle || annotation is Bullet ||
-+                (annotation is SpanStyle && annotation.baselineShift?.multiplier?.let { it != 0f } == true)
-+        } && text.none {
-+            it == '\n' || it == '\t' || it in '\u0590'..'\u08FF' ||
-+                it == '\u200E' || it == '\u200F' || it in '\u202A'..'\u202E' ||
-+                it in '\u2066'..'\u2069' || it in '\uD800'..'\uDFFF' ||
-+                it in '\uFB1D'..'\uFDFF' || it in '\uFE70'..'\uFEFE'
-+        }
-+    var androidBoringWidth = 0f
-+        private set
- 
-     //we need to track it reactively to invalidate the UI
-     override var hasStaleResolvedFonts: Boolean by mutableStateOf(false)
-@@ -79,6 +104,17 @@
-         val para = layouter!!.layoutParagraph(Float.POSITIVE_INFINITY)
-         minIntrinsicWidth = ceil(para.minIntrinsicWidth)
-         maxIntrinsicWidth = ceil(para.maxIntrinsicWidth)
-+        androidBoringWidth = maxIntrinsicWidth
-+        val hasLetterSpacing =
-+            (style.letterSpacing != TextUnit.Unspecified && style.letterSpacing.value != 0f) ||
-+                annotations.any {
-+                    val span = it.item
-+                    span is SpanStyle && span.letterSpacing != TextUnit.Unspecified &&
-+                        span.letterSpacing.value != 0f
-+                }
-+        if (currentPlatform() == Platform.Android && maxIntrinsicWidth != 0f && hasLetterSpacing) {
-+            maxIntrinsicWidth += 0.5f
-+        }
-     }
- }
- 
-diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
---- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
-+++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
-@@ -832,7 +832,7 @@
-     return when (this) {
-         TextAlign.Left -> SkAlignment.LEFT
-         TextAlign.Right -> SkAlignment.RIGHT
--        TextAlign.Center -> SkAlignment.CENTER
-+        TextAlign.Center -> if (currentPlatform() == Platform.Android) SkAlignment.CENTER_ANDROID else SkAlignment.CENTER
-         TextAlign.Justify -> SkAlignment.JUSTIFY
-         TextAlign.Start -> SkAlignment.START
-         TextAlign.End -> SkAlignment.END
-diff --git a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/RequestFocusOnClick.web.kt b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/RequestFocusOnClick.web.kt
---- a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/RequestFocusOnClick.web.kt
-+++ b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/RequestFocusOnClick.web.kt
-@@ -12,8 +12,11 @@
-  * 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.
-+ *
-+ * modified for Peach: Android touch focus keeps sibling controls from
-+ * taking the active field on press. see the fork record for the source pin.
-  */
-
- package androidx.compose.foundation
-
--internal actual fun isRequestFocusOnClickEnabled(): Boolean = true
-+internal actual fun isRequestFocusOnClickEnabled(): Boolean = false
-diff --git a/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/focus/Focusability.web.kt b/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/focus/Focusability.web.kt
---- a/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/focus/Focusability.web.kt
-+++ b/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/focus/Focusability.web.kt
-@@ -12,10 +12,14 @@
-  * 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.
-+ *
-+ * modified for Peach: Android touch focus keeps sibling controls from
-+ * taking the active field on press. see the fork record for the source pin.
-  */
-
- package androidx.compose.ui.focus
-
- import androidx.compose.ui.node.CompositionLocalConsumerModifierNode
-
--internal actual fun systemDefinedCanFocus(node: CompositionLocalConsumerModifierNode) = true
-
-+internal actual fun systemDefinedCanFocus(node: CompositionLocalConsumerModifierNode) =
-+    mobilePlatformSystemDefinedCanFocus(node)
-diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt
---- a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt
-+++ b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt
-@@ -13,4 +13,7 @@
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-+ *
-+ * modified for Peach: dialogs attach a distinct native receiving window and
-+ * navigation dispatcher, isolating back from the activity underneath.
-  */
-
-@@ -51,4 +54,5 @@
- import androidx.compose.ui.text.intl.LocaleList
- import androidx.compose.ui.unit.Dp
-+import androidx.navigationevent.NavigationEventDispatcher
- import androidx.lifecycle.Lifecycle
- import androidx.lifecycle.LifecycleOwner
-@@ -83,4 +87,8 @@
-      */
-     val architectureComponentsOwner: PlatformArchitectureComponentsOwner get() = EmptyArchitectureComponentsOwner
-+
-+    // the host owns a dialog window until its composition is disposed.
-+    fun attachDialogWindow(dispatcher: NavigationEventDispatcher): AutoCloseable =
-+        error("the native host must attach a dialog receiving window")
-
-     /**
-diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt
---- a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt
-+++ b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt
-@@ -13,4 +13,7 @@
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-+ *
-+ * modified for Peach: dialogs attach a distinct native receiving window and
-+ * navigation dispatcher, isolating back from the activity underneath.
-  */
-
-@@ -19,4 +22,5 @@
- import androidx.compose.runtime.Composable
- import androidx.compose.runtime.CompositionContext
-+import androidx.compose.runtime.CompositionLocalProvider
- import androidx.compose.runtime.DisposableEffect
- import androidx.compose.runtime.Immutable
-@@ -34,4 +38,5 @@
- import androidx.compose.ui.ComposeUiFlags
- import androidx.compose.ui.ExperimentalComposeUiApi
-+import androidx.compose.ui.InternalComposeUiApi
- import androidx.compose.ui.Modifier
- import androidx.compose.ui.MotionDurationScale
-@@ -57,4 +62,6 @@
- import androidx.compose.ui.platform.union
- import androidx.compose.ui.scene.ComposeSceneLayer
-+import androidx.compose.ui.scene.LocalComposeSceneContext
-+import androidx.compose.ui.scene.requireCurrent
- import androidx.compose.ui.scene.Content
- import androidx.compose.ui.scene.rememberComposeSceneLayer
-@@ -65,4 +72,6 @@
- import androidx.compose.ui.unit.center
- import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner
-+import androidx.navigationevent.NavigationEventDispatcher
-+import androidx.navigationevent.NavigationEventDispatcherOwner
- import kotlin.coroutines.CoroutineContext
- import kotlin.time.Duration.Companion.seconds
-@@ -167,5 +176,5 @@
- }
-
--@OptIn(InternalComposeApi::class)
-+@OptIn(InternalComposeApi::class, InternalComposeUiApi::class)
- @Composable
- actual fun Dialog(
-@@ -182,8 +191,15 @@
-         onBackHandler.backClickIsEnabled = properties.dismissOnBackPress
-     }
--    val navigationEventDispatcher =
--        requireNotNull(LocalNavigationEventDispatcherOwner.current) {
--            error("NavigationEventDispatcherOwner not found")
--        }.navigationEventDispatcher
-+    val dialogOwner = remember {
-+        object : NavigationEventDispatcherOwner {
-+            override val navigationEventDispatcher = NavigationEventDispatcher()
-+        }
-+    }
-+    val navigationEventDispatcher = dialogOwner.navigationEventDispatcher
-+    val platformContext = LocalComposeSceneContext.requireCurrent().platformContext
-+    DisposableEffect(platformContext, navigationEventDispatcher) {
-+        val window = platformContext.attachDialogWindow(navigationEventDispatcher)
-+        onDispose { window.close(); navigationEventDispatcher.dispose() }
-+    }
-     DisposableEffect(navigationEventDispatcher, onBackHandler) {
-         navigationEventDispatcher.addHandler(onBackHandler)
-@@ -208,5 +224,7 @@
-         onOutsidePointerEvent = onOutsidePointerEvent,
-         properties = properties,
--        content = content
-+        content = {
-+            CompositionLocalProvider(LocalNavigationEventDispatcherOwner provides dialogOwner, content = content)
-+        }
-     )
- }
-diff --git a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/Magnifier.web.kt b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/Magnifier.web.kt
-new file mode 100644
---- /dev/null
-+++ b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/Magnifier.web.kt
-@@ -0,0 +1,470 @@
-+/*
-+ * Copyright 2021 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.foundation
-+
-+// modified by peach: android magnifier lifecycle with a scene-owned native backend.
-+
-+import androidx.compose.runtime.State
-+import androidx.compose.runtime.derivedStateOf
-+import androidx.compose.runtime.getValue
-+import androidx.compose.runtime.mutableStateOf
-+import androidx.compose.runtime.neverEqualPolicy
-+import androidx.compose.runtime.setValue
-+import androidx.compose.runtime.withFrameMillis
-+import androidx.compose.ui.Modifier
-+import androidx.compose.ui.composed
-+import androidx.compose.ui.geometry.Offset
-+import androidx.compose.ui.geometry.isSpecified
-+import androidx.compose.ui.graphics.drawscope.ContentDrawScope
-+import androidx.compose.ui.layout.LayoutCoordinates
-+import androidx.compose.ui.layout.positionInRoot
-+import androidx.compose.ui.node.DrawModifierNode
-+import androidx.compose.ui.node.GlobalPositionAwareModifierNode
-+import androidx.compose.ui.node.ModifierNodeElement
-+import androidx.compose.ui.node.ObserverModifierNode
-+import androidx.compose.ui.node.SemanticsModifierNode
-+import androidx.compose.ui.node.observeReads
-+import androidx.compose.ui.node.requireDensity
-+import androidx.compose.ui.platform.InspectorInfo
-+import androidx.compose.ui.semantics.SemanticsPropertyKey
-+import androidx.compose.ui.semantics.SemanticsPropertyReceiver
-+import androidx.compose.ui.unit.Density
-+import androidx.compose.ui.unit.Dp
-+import androidx.compose.ui.unit.DpSize
-+import androidx.compose.ui.unit.IntSize
-+import androidx.compose.ui.unit.toSize
-+import kotlinx.coroutines.CoroutineStart
-+import kotlinx.coroutines.channels.Channel
-+import kotlinx.coroutines.launch
-+
-+/**
-+ * A function on elements that are magnified with a [magnifier] modifier that returns the position
-+ * of the center of the magnified content in the coordinate space of the root composable.
-+ */
-+internal val MagnifierPositionInRoot = SemanticsPropertyKey<() -> Offset>("MagnifierPositionInRoot")
-+
-+/**
-+ * Shows a [Magnifier] widget that shows an enlarged version of the content at [sourceCenter]
-+ * relative to the current layout node.
-+ *
-+ * This function returns a no-op modifier on API levels below P (28), since the framework does not
-+ * support the [Magnifier] widget on those levels. However, even on higher API levels, not all
-+ * magnifier features are supported on all platforms. Please refer to parameter explanations below
-+ * to learn more about supported features on different platform versions.
-+ *
-+ * This function does not allow configuration of [source bounds][Magnifier.Builder.setSourceBounds]
-+ * since the magnifier widget does not support constraining to the bounds of composables.
-+ *
-+ * @sample androidx.compose.foundation.samples.MagnifierSample
-+ * @param sourceCenter The offset of the center of the magnified content. Measured in pixels from
-+ *   the top-left of the layout node this modifier is applied to. This offset is passed to
-+ *   [Magnifier.show].
-+ * @param magnifierCenter The offset of the magnifier widget itself, where the magnified content is
-+ *   rendered over the original content. Measured in density-independent pixels from the top-left of
-+ *   the layout node this modifier is applied to. If left null or returns an
-+ *   [unspecified][DpOffset.Unspecified] value, the magnifier widget will be placed at a default
-+ *   offset relative to [sourceCenter]. The value of that offset is specified by the system.
-+ * @param onSizeChanged An optional callback that will be invoked when the magnifier widget is
-+ *   initialized to report on its actual size. This can be useful when [size] parameter is left
-+ *   unspecified.
-+ * @param zoom See [Magnifier.setZoom]. Only supported on API 29+.
-+ * @param size See [Magnifier.Builder.setSize]. Only supported on API 29+.
-+ * @param cornerRadius See [Magnifier.Builder.setCornerRadius]. Only supported on API 29+.
-+ * @param elevation See [Magnifier.Builder.setElevation]. Only supported on API 29+.
-+ * @param clip See [Magnifier.Builder.setClippingEnabled]. Only supported on API 29+.
-+ */
-+public fun Modifier.magnifier(
-+    sourceCenter: Density.() -> Offset,
-+    magnifierCenter: (Density.() -> Offset)? = null,
-+    onSizeChanged: ((DpSize) -> Unit)? = null,
-+    zoom: Float = Float.NaN,
-+    size: DpSize = DpSize.Unspecified,
-+    cornerRadius: Dp = Dp.Unspecified,
-+    elevation: Dp = Dp.Unspecified,
-+    clip: Boolean = true,
-+): Modifier {
-+    return magnifier(
-+        sourceCenter = sourceCenter,
-+        magnifierCenter = magnifierCenter,
-+        onSizeChanged = onSizeChanged,
-+        zoom = zoom,
-+        useTextDefault = false,
-+        size = size,
-+        cornerRadius = cornerRadius,
-+        elevation = elevation,
-+        clippingEnabled = clip,
-+    )
-+}
-+
-+/**
-+ * For testing and internal Text usage purposes.
-+ *
-+ * TextField and SelectionManager uses this internal API to pass `useTextDefault` as true.
-+ */
-+internal fun Modifier.magnifier(
-+    sourceCenter: Density.() -> Offset,
-+    magnifierCenter: (Density.() -> Offset)? = null,
-+    onSizeChanged: ((DpSize) -> Unit)? = null,
-+    zoom: Float = Float.NaN,
-+    useTextDefault: Boolean = false,
-+    size: DpSize = DpSize.Unspecified,
-+    cornerRadius: Dp = Dp.Unspecified,
-+    elevation: Dp = Dp.Unspecified,
-+    clippingEnabled: Boolean = true,
-+    platformMagnifierFactory: PlatformMagnifierFactory? = null,
-+): Modifier {
-+    return composed {
-+        MagnifierElement(
-+            sourceCenter = sourceCenter,
-+            magnifierCenter = magnifierCenter,
-+            onSizeChanged = onSizeChanged,
-+            useTextDefault = useTextDefault,
-+            zoom = zoom,
-+            size = size,
-+            cornerRadius = cornerRadius,
-+            elevation = elevation,
-+            clippingEnabled = clippingEnabled,
-+            platformMagnifierFactory = platformMagnifierFactory ?: LocalPlatformMagnifierFactory.current,
-+        )
-+    }
-+}
-+
-+internal class MagnifierElement(
-+    private val sourceCenter: Density.() -> Offset,
-+    private val magnifierCenter: (Density.() -> Offset)? = null,
-+    private val onSizeChanged: ((DpSize) -> Unit)? = null,
-+    private val zoom: Float = Float.NaN,
-+    private val useTextDefault: Boolean = false,
-+    private val size: DpSize = DpSize.Unspecified,
-+    private val cornerRadius: Dp = Dp.Unspecified,
-+    private val elevation: Dp = Dp.Unspecified,
-+    private val clippingEnabled: Boolean = true,
-+    private val platformMagnifierFactory: PlatformMagnifierFactory,
-+) : ModifierNodeElement<MagnifierNode>() {
-+
-+    override fun create(): MagnifierNode {
-+        return MagnifierNode(
-+            sourceCenter = sourceCenter,
-+            magnifierCenter = magnifierCenter,
-+            zoom = zoom,
-+            useTextDefault = useTextDefault,
-+            size = size,
-+            cornerRadius = cornerRadius,
-+            elevation = elevation,
-+            clippingEnabled = clippingEnabled,
-+            onSizeChanged = onSizeChanged,
-+            platformMagnifierFactory = platformMagnifierFactory,
-+        )
-+    }
-+
-+    override fun update(node: MagnifierNode) {
-+        node.update(
-+            sourceCenter = sourceCenter,
-+            magnifierCenter = magnifierCenter,
-+            zoom = zoom,
-+            useTextDefault = useTextDefault,
-+            size = size,
-+            cornerRadius = cornerRadius,
-+            elevation = elevation,
-+            clippingEnabled = clippingEnabled,
-+            onSizeChanged = onSizeChanged,
-+            platformMagnifierFactory = platformMagnifierFactory,
-+        )
-+    }
-+
-+    override fun equals(other: Any?): Boolean {
-+        if (this === other) return true
-+        if (other !is MagnifierElement) return false
-+
-+        if (sourceCenter !== other.sourceCenter) return false
-+        if (magnifierCenter !== other.magnifierCenter) return false
-+        if (zoom != other.zoom) return false
-+        if (useTextDefault != other.useTextDefault) return false
-+        if (size != other.size) return false
-+        if (cornerRadius != other.cornerRadius) return false
-+        if (elevation != other.elevation) return false
-+        if (clippingEnabled != other.clippingEnabled) return false
-+        if (onSizeChanged !== other.onSizeChanged) return false
-+        if (platformMagnifierFactory != other.platformMagnifierFactory) return false
-+
-+        return true
-+    }
-+
-+    override fun hashCode(): Int {
-+        var result = sourceCenter.hashCode()
-+        result = 31 * result + magnifierCenter.hashCode()
-+        result = 31 * result + zoom.hashCode()
-+        result = 31 * result + useTextDefault.hashCode()
-+        result = 31 * result + size.hashCode()
-+        result = 31 * result + cornerRadius.hashCode()
-+        result = 31 * result + elevation.hashCode()
-+        result = 31 * result + clippingEnabled.hashCode()
-+        result = 31 * result + (onSizeChanged?.hashCode() ?: 0)
-+        result = 31 * result + platformMagnifierFactory.hashCode()
-+        return result
-+    }
-+
-+    override fun InspectorInfo.inspectableProperties() {
-+        name = "magnifier"
-+        properties["sourceCenter"] = sourceCenter
-+        properties["magnifierCenter"] = magnifierCenter
-+        properties["zoom"] = zoom
-+        properties["size"] = size
-+        properties["cornerRadius"] = cornerRadius
-+        properties["elevation"] = elevation
-+        properties["clippingEnabled"] = clippingEnabled
-+    }
-+}
-+
-+internal class MagnifierNode(
-+    var sourceCenter: Density.() -> Offset,
-+    var magnifierCenter: (Density.() -> Offset)? = null,
-+    var onSizeChanged: ((DpSize) -> Unit)? = null,
-+    var zoom: Float = Float.NaN,
-+    var useTextDefault: Boolean = false,
-+    var size: DpSize = DpSize.Unspecified,
-+    var cornerRadius: Dp = Dp.Unspecified,
-+    var elevation: Dp = Dp.Unspecified,
-+    var clippingEnabled: Boolean = true,
-+    var platformMagnifierFactory: PlatformMagnifierFactory,
-+) :
-+    Modifier.Node(),
-+    GlobalPositionAwareModifierNode,
-+    DrawModifierNode,
-+    SemanticsModifierNode,
-+    ObserverModifierNode {
-+
-+    /**
-+     * Current density provided by [requireDensity]. Used as a receiver to callback functions that
-+     * are expected return pixel targeted offsets.
-+     */
-+    private var density: Density? = null
-+
-+    /** Current magnifier instance. */
-+    private var magnifier: PlatformMagnifier? = null
-+
-+    /**
-+     * The latest [LayoutCoordinates] that is reported by [onGloballyPositioned] callback. Using
-+     * [neverEqualPolicy] guarantees that every update to this value restarts snapshots aware
-+     * listeners since the [LayoutCoordinates] instance itself does not change.
-+     */
-+    private var layoutCoordinates: LayoutCoordinates? by mutableStateOf(null, neverEqualPolicy())
-+
-+    /**
-+     * Lazily initialized state that keeps track of anchor Composable's position in root layout.
-+     * This state should be derived from [layoutCoordinates]. This variable shouldn't be used
-+     * directly from the code, only [anchorPositionInRoot] should initialize and read from this.
-+     */
-+    private var anchorPositionInRootState: State<Offset>? = null
-+
-+    private val anchorPositionInRoot: Offset
-+        get() {
-+            if (anchorPositionInRootState == null) {
-+                anchorPositionInRootState = derivedStateOf {
-+                    layoutCoordinates?.positionInRoot() ?: Offset.Unspecified
-+                }
-+            }
-+            return anchorPositionInRootState?.value ?: Offset.Unspecified
-+        }
-+
-+    /**
-+     * Position where [sourceCenter] is mapped on root layout. This is passed to platform magnifier
-+     * to precisely target the requested location.
-+     */
-+    private var sourceCenterInRoot: Offset = Offset.Unspecified
-+
-+    /**
-+     * Last reported size to [onSizeChanged]. This is compared to the current size before calling
-+     * the lambda again.
-+     */
-+    private var previousSize: IntSize? = null
-+
-+    private var drawSignalChannel: Channel<Unit>? = null
-+
-+    fun update(
-+        sourceCenter: Density.() -> Offset,
-+        magnifierCenter: (Density.() -> Offset)?,
-+        zoom: Float,
-+        useTextDefault: Boolean,
-+        size: DpSize,
-+        cornerRadius: Dp,
-+        elevation: Dp,
-+        clippingEnabled: Boolean,
-+        onSizeChanged: ((DpSize) -> Unit)?,
-+        platformMagnifierFactory: PlatformMagnifierFactory,
-+    ) {
-+        val previousZoom = this.zoom
-+        val previousSize = this.size
-+        val previousCornerRadius = this.cornerRadius
-+        val previousUseTextDefault = this.useTextDefault
-+        val previousElevation = this.elevation
-+        val previousClippingEnabled = this.clippingEnabled
-+        val previousPlatformMagnifierFactory = this.platformMagnifierFactory
-+        val previousDensity = this.density
-+
-+        this.sourceCenter = sourceCenter
-+        this.magnifierCenter = magnifierCenter
-+        this.zoom = zoom
-+        this.useTextDefault = useTextDefault
-+        this.size = size
-+        this.cornerRadius = cornerRadius
-+        this.elevation = elevation
-+        this.clippingEnabled = clippingEnabled
-+        this.onSizeChanged = onSizeChanged
-+        this.platformMagnifierFactory = platformMagnifierFactory
-+
-+        val density = requireDensity()
-+
-+        val shouldRecreate =
-+            magnifier != null && // only recreate if it was already created
-+                // On platforms >=Q, the zoom level can be updated dynamically on an existing
-+                // magnifier,
-+                // so if the zoom changes between recompositions we don't need to recreate the
-+                // magnifier. On older platforms, the zoom can only be set initially, so we use the
-+                // zoom itself as a key so the magnifier gets recreated if it changes.
-+                ((!zoom.equalsIncludingNaN(previousZoom) &&
-+                    !platformMagnifierFactory.canUpdateZoom) ||
-+                    size != previousSize ||
-+                    cornerRadius != previousCornerRadius ||
-+                    elevation != previousElevation ||
-+                    useTextDefault != previousUseTextDefault ||
-+                    clippingEnabled != previousClippingEnabled ||
-+                    platformMagnifierFactory != previousPlatformMagnifierFactory ||
-+                    density != previousDensity)
-+
-+        if (shouldRecreate) {
-+            recreateMagnifier()
-+        }
-+
-+        updateMagnifier()
-+    }
-+
-+    override fun onAttach() {
-+        onObservedReadsChanged()
-+        drawSignalChannel = Channel()
-+        // Launch undispatched, otherwise we could miss the first draw signal
-+        coroutineScope.launch(start = CoroutineStart.UNDISPATCHED) {
-+            while (true) {
-+                drawSignalChannel?.receive()
-+                // don't update the magnifier immediately, actual frame draw happens right after
-+                // all draw commands are recorded. Magnifier update should happen in the next frame.
-+                if (magnifier != null) {
-+                    withFrameMillis {}
-+                    magnifier?.updateContent()
-+                }
-+            }
-+        }
-+    }
-+
-+    override fun onDetach() {
-+        magnifier?.dismiss()
-+        magnifier = null
-+    }
-+
-+    override fun onObservedReadsChanged() {
-+        observeReads { updateMagnifier() }
-+    }
-+
-+    private fun recreateMagnifier() {
-+        magnifier?.dismiss()
-+        val density = (density ?: requireDensity()).also { density = it }
-+        magnifier =
-+            platformMagnifierFactory.create(
-+                useTextDefault = useTextDefault,
-+                size = size,
-+                cornerRadius = cornerRadius,
-+                elevation = elevation,
-+                clippingEnabled = clippingEnabled,
-+                density = density,
-+                initialZoom = zoom,
-+            )
-+        updateSizeIfNecessary()
-+    }
-+
-+    private fun updateMagnifier() {
-+        val density = density ?: requireDensity().also { density = it }
-+
-+        val sourceCenterOffset = sourceCenter(density)
-+
-+        // the order of these checks are important since we don't want to query
-+        // `anchorPositionInRoot` if `sourceCenterOffset` is unspecified.
-+        if (sourceCenterOffset.isSpecified && anchorPositionInRoot.isSpecified) {
-+            sourceCenterInRoot = anchorPositionInRoot + sourceCenterOffset
-+            // Calculate magnifier center if it's provided. Only accept if the returned
-+            // value is specified. Then add [anchorPositionInRoot] for relative positioning.
-+            val magnifierCenter =
-+                magnifierCenter
-+                    ?.invoke(density)
-+                    ?.takeIf { it.isSpecified }
-+                    ?.let { anchorPositionInRoot + it } ?: Offset.Unspecified
-+
-+            if (magnifier == null) {
-+                recreateMagnifier()
-+            }
-+
-+            magnifier?.update(
-+                sourceCenter = sourceCenterInRoot,
-+                magnifierCenter = magnifierCenter,
-+                zoom = zoom,
-+            )
-+            updateSizeIfNecessary()
-+            return
-+        }
-+
-+        // If the flow reaches here, it means that the magnifier could not be placed at a specified
-+        // position. We now need to hide it so it doesn't show up at an invalid location.
-+        sourceCenterInRoot = Offset.Unspecified
-+        magnifier?.dismiss()
-+    }
-+
-+    private fun updateSizeIfNecessary() {
-+        val magnifier = magnifier ?: return
-+        val density = density ?: return
-+
-+        if (magnifier.size != previousSize) {
-+            onSizeChanged?.invoke(with(density) { magnifier.size.toSize().toDpSize() })
-+            previousSize = magnifier.size
-+        }
-+    }
-+
-+    override fun ContentDrawScope.draw() {
-+        drawContent()
-+        drawSignalChannel?.trySend(Unit)
-+    }
-+
-+    override fun onGloballyPositioned(coordinates: LayoutCoordinates) {
-+        // The mutable state must store the Offset, not the LocalCoordinates, because the same
-+        // LocalCoordinates instance may be sent to this callback multiple times, not implement
-+        // equals, or be stable, and so won't invalidate the snapshotFlow.
-+        layoutCoordinates = coordinates
-+    }
-+
-+    override fun SemanticsPropertyReceiver.applySemantics() {
-+        this[MagnifierPositionInRoot] = { sourceCenterInRoot }
-+    }
-+}
-+
-+
-+/**
-+ * Normally `Float.NaN == Float.NaN` returns false but we use [Float.NaN] to mean Unspecified. The
-+ * comparison between two unspecified values should return _equal_ if we are only interested in
-+ * state changes.
-+ */
-+internal fun Float.equalsIncludingNaN(other: Float): Boolean {
-+    if (this.isNaN() && other.isNaN()) return true
-+    return this == other
-+}
-diff --git a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/PlatformMagnifier.web.kt b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/PlatformMagnifier.web.kt
-new file mode 100644
---- /dev/null
-+++ b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/PlatformMagnifier.web.kt
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright 2021 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.foundation
-+
-+// modified by peach: the native scene supplies the android magnifier backend.
-+import androidx.compose.runtime.ProvidableCompositionLocal
-+import androidx.compose.runtime.Stable
-+import androidx.compose.runtime.staticCompositionLocalOf
-+import androidx.compose.ui.geometry.Offset
-+import androidx.compose.ui.unit.Density
-+import androidx.compose.ui.unit.Dp
-+import androidx.compose.ui.unit.DpSize
-+import androidx.compose.ui.unit.IntSize
-+
-+@Stable
-+public interface PlatformMagnifierFactory {
-+    public val canUpdateZoom: Boolean
-+    public fun create(
-+        useTextDefault: Boolean,
-+        size: DpSize,
-+        cornerRadius: Dp,
-+        elevation: Dp,
-+        clippingEnabled: Boolean,
-+        density: Density,
-+        initialZoom: Float,
-+    ): PlatformMagnifier
-+}
-+
-+public interface PlatformMagnifier {
-+    public val size: IntSize
-+    public fun updateContent(): Unit
-+    public fun update(sourceCenter: Offset, magnifierCenter: Offset, zoom: Float): Unit
-+    public fun dismiss(): Unit
-+}
-+
-+public val LocalPlatformMagnifierFactory: ProvidableCompositionLocal<PlatformMagnifierFactory> = staticCompositionLocalOf<PlatformMagnifierFactory> {
-+    error("the native scene must provide its platform magnifier factory")
-+}
-diff --git a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.web.kt b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.web.kt
---- a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.web.kt
-+++ b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.web.kt
-@@ -16,6 +16,17 @@
-
- package androidx.compose.foundation.text.selection
-
-+// modified by peach: use android magnifier placement, animation and lifetime.
-+
-+import androidx.compose.foundation.LocalPlatformMagnifierFactory
-+import androidx.compose.foundation.magnifier
-+import androidx.compose.runtime.getValue
-+import androidx.compose.runtime.mutableStateOf
-+import androidx.compose.runtime.remember
-+import androidx.compose.runtime.setValue
-+import androidx.compose.ui.composed
-+import androidx.compose.ui.platform.LocalDensity
-+import androidx.compose.ui.unit.IntSize
- import androidx.compose.foundation.text.TextContextMenuItems
- import androidx.compose.foundation.text.TextContextMenuItems.Copy
- import androidx.compose.foundation.text.TextContextMenuItems.Cut
-@@ -30,7 +41,30 @@
- import kotlinx.coroutines.CoroutineStart
- import kotlinx.coroutines.launch
-
--internal actual fun Modifier.textFieldMagnifier(manager: TextFieldSelectionManager): Modifier = this
-+internal actual fun Modifier.textFieldMagnifier(manager: TextFieldSelectionManager): Modifier {
-+    return composed {
-+        val density = LocalDensity.current
-+        val factory = LocalPlatformMagnifierFactory.current
-+        var magnifierSize by remember { mutableStateOf(IntSize.Zero) }
-+        animatedSelectionMagnifier(
-+            magnifierCenter = { calculateSelectionMagnifierCenterAndroid(manager, magnifierSize) },
-+            platformMagnifier = { center ->
-+                Modifier.magnifier(
-+                    sourceCenter = { center() },
-+                    onSizeChanged = { size ->
-+                        magnifierSize =
-+                            with(density) {
-+                                IntSize(size.width.roundToPx(), size.height.roundToPx())
-+                            }
-+                    },
-+                    useTextDefault = true,
-+                    platformMagnifierFactory = factory,
-+                )
-+            },
-+        )
-+    }
-+}
-+
-
- /**
-  * Whether the selection handle is in the visible bound of the TextField.
-diff --git a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/UndoManager.web.kt b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/UndoManager.web.kt
---- a/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/UndoManager.web.kt
-+++ b/compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/text/UndoManager.web.kt
-@@ -16,7 +16,10 @@
-
- package androidx.compose.foundation.text
-
--import kotlinx.browser.window
-+// modified by peach: use the worker clock without a document global.
-+import kotlin.js.js
-
--internal actual fun timeNowMillis(): Long = window.performance.now().toLong()
-+internal actual fun timeNowMillis(): Long = performanceNow().toLong()
-
-+
-+private fun performanceNow(): Double = js("globalThis.performance.now()")
-diff --git a/compose/foundation/foundation/src/wasmJsMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.wasm.kt b/compose/foundation/foundation/src/wasmJsMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.wasm.kt
---- a/compose/foundation/foundation/src/wasmJsMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.wasm.kt
-+++ b/compose/foundation/foundation/src/wasmJsMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.wasm.kt
-@@ -17,6 +17,8 @@
- @file:OptIn(ExperimentalComposeUiApi::class)
-
- package androidx.compose.foundation.internal
-+
-+// modified by peach: query the worker clipboard capability without a document global.
-
- import androidx.compose.ui.ExperimentalComposeUiApi
- import androidx.compose.ui.InternalComposeUiApi
-@@ -62,13 +64,13 @@
-     isClipboardReadSupported()
-
- private fun isClipboardReadSupported(): Boolean =
--    js("Boolean(window.navigator.clipboard && window.navigator.clipboard.read)")
-+    js("Boolean(globalThis.navigator.clipboard && globalThis.navigator.clipboard.read)")
-
- internal actual fun Clipboard.isWriteSupported(): Boolean =
-     isClipboardWriteSupported()
-
- private fun isClipboardWriteSupported(): Boolean =
--    js("Boolean(window.navigator.clipboard && (window.navigator.clipboard.write || window.navigator.clipboard.writeText))")
-+    js("Boolean(globalThis.navigator.clipboard && (globalThis.navigator.clipboard.write || globalThis.navigator.clipboard.writeText))")
-
- @Suppress("UNUSED_PARAMETER")
- private fun doesJsArrayContainValue(jsArray: JsArray<*>, value: JsAny): Boolean =