peachsim 0.1.899 → 0.1.908

package/kotlin/fork/fork.json

@@ -22,7 +22,7 @@
       "tag": "v1.13.0-alpha01",
       "commit": "a9e47e8aa04c95cfe572ab4297c770f3cbfb234e",
       "patch": "compose-worker-globals.patch",
-      "patchSha256": "7a4002f6ea07fc78b23e8d16851b586521b221ba3e7a9690420b3c1d6be69cd9"
+      "patchSha256": "71beda710e878c2d59d6481bcc4b8a1f256730b3f3b3cad4228c9b2442b5244a"
     },
     {
       "name": "skiko",
@@ -31,7 +31,7 @@
       "tag": "v0.152.0-alpha02",
       "commit": "96378296bb23c23c5f30cd2b0d42d6f8fdeff730",
       "patch": "skiko-worker-clock.patch",
-      "patchSha256": "44b38c49b9f8d860573ec43d54d7ce74c0ad36da59100ec482b46953d9d6ef81"
+      "patchSha256": "37bbfbb362a8759c6648969b20b32c5b6aa2ff140fd6dbdbbdb910bbb74783a8"
     },
     {
       "name": "skia",
@@ -40,7 +40,7 @@
       "tag": "m152-2ca5fe6a81",
       "commit": "2ca5fe6a8170e2f55f519d9de083be4dccc06e70",
       "patch": "skia-android-shaping.patch",
-      "patchSha256": "b6293707ff832c77fa6016d7d1e469b7e3d24e31b7af7d70cdfb5ee1bc68ba7f"
+      "patchSha256": "04fae34c4e29dd92ce4b94dc57ace28848a46fff8e745c820877a7e03bc00867"
     }
   ]
 }

package/kotlin/fork/publish.ts

@@ -22,7 +22,14 @@ const files = readdirSync(delivered)
 const record = files.filter(
   (name) =>
     name.endsWith('.patch') ||
-    ['fork.json', 'LICENSE', 'SKIA_LICENSE', 'NOTICE', 'artifacts.sha256'].includes(name),
+    [
+      'fork.json',
+      'LICENSE',
+      'SKIA_LICENSE',
+      'NOTICE',
+      'artifacts.sha256',
+      'skiko-local.init.gradle',
+    ].includes(name),
 )
 if (
   record.length !==

package/kotlin/fork/skia-android-shaping.patch

@@ -157,3 +157,33 @@ diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.c
          }
 
          if ((fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag) == 0) {
+diff --git a/modules/skparagraph/include/DartTypes.h b/modules/skparagraph/include/DartTypes.h
+--- a/modules/skparagraph/include/DartTypes.h
++++ b/modules/skparagraph/include/DartTypes.h
+@@ -1,3 +1,4 @@
++// modified for peach: Android center alignment retains its integer origin.
+ // Copyright 2019 Google LLC
+ 
+ #ifndef DartTypes_DEFINED
+@@ -56,6 +57,7 @@
+     kJustify,
+     kStart,
+     kEnd,
++    kCenterAndroid,
+ };
+ 
+ enum class TextDirection {
+diff --git a/modules/skparagraph/src/TextLine.cpp b/modules/skparagraph/src/TextLine.cpp
+--- a/modules/skparagraph/src/TextLine.cpp
++++ b/modules/skparagraph/src/TextLine.cpp
+@@ -318,6 +318,10 @@
+         }
+     } else if (align == TextAlign::kRight) {
+         fShift = delta;
++    } else if (align == TextAlign::kCenterAndroid) {
++        const int extent = static_cast<int>(this->width()) & ~1;
++        fShift = ((static_cast<int>(maxWidth - fIndent) - extent) >> 1) +
++                 (isRtl ? 0 : fIndent);
+     } else if (align == TextAlign::kCenter) {
+         fShift = delta / 2 + (isRtl ? 0 : fIndent);
+     } else if (align == TextAlign::kLeft) {

package/kotlin/fork/skiko-local.init.gradle

@@ -0,0 +1,10 @@
+// consumes the fork built earlier in this invocation.
+allprojects {
+    def forkRepository = repositories.maven {
+        name = "peachSkikoFork"
+        url = uri(System.getProperty("maven.repo.local"))
+        content { includeModule("org.jetbrains.skiko", "skiko-wasm-js") }
+    }
+    repositories.remove(forkRepository)
+    repositories.addFirst(forkRepository)
+}

package/kotlin/fork/skiko-worker-clock.patch

@@ -91,3 +91,20 @@ diff --git a/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfigu
                  addAll(buildType.clangFlags)
                  add("-fno-rtti")
                  add("-fno-exceptions")
+diff --git a/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt b/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt
+--- a/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt
++++ b/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt
+@@ -1,3 +1,4 @@
++// modified for peach: carries Android center alignment to the native paragraph.
+ package org.jetbrains.skia.paragraph
+ 
+ enum class Alignment {
+@@ -6,5 +7,6 @@
+     CENTER,
+     JUSTIFY,
+     START,
+-    END;
++    END,
++    CENTER_ANDROID;
+ }
+

package/kotlin/toolchain.json

@@ -33,9 +33,9 @@
       "sha256": "fc48b8999ea9812e86d9922d9b8ef1b022e9fb32ee07dcf929bcd80bac441d01"
     },
     {
-      "name": "skiko-wasm-js-0.152.0-alpha02-peach-3834433e1790.klib",
-      "url": "https://r2.rnxsim.com/peach-kotlin-fork/3834433e17902a3d86dc973abb245b7af5aae0012ca29e1ac9668d74335f3115/skiko-wasm-js-0.152.0-alpha02.klib",
-      "sha256": "3834433e17902a3d86dc973abb245b7af5aae0012ca29e1ac9668d74335f3115"
+      "name": "skiko-wasm-js-0.152.0-alpha02-peach-6442c264f2e2.klib",
+      "url": "https://r2.rnxsim.com/peach-kotlin-fork/6442c264f2e2b839fa4b1a3ac35714c643b24d1b22d544ec434986031dffba1b/skiko-wasm-js-0.152.0-alpha02.klib",
+      "sha256": "6442c264f2e2b839fa4b1a3ac35714c643b24d1b22d544ec434986031dffba1b"
     },
     {
       "name": "annotation-wasm-js-1.9.1.klib",
@@ -68,9 +68,9 @@
       "sha256": "63f16892ab6435778c60e217a0959516f4fcd46cad8862d6831f055ac30f09d8"
     },
     {
-      "name": "ui-skiko-wasm-js-1.13.0-alpha01-peach-1aa9f1b32539.klib",
-      "url": "https://r2.rnxsim.com/peach-kotlin-fork/1aa9f1b3253964ff20f60d6b057aa0ddaed0343e93d7b4defc613b3ed5b65c3d/ui-skiko-wasm-js-1.13.0-alpha01.klib",
-      "sha256": "1aa9f1b3253964ff20f60d6b057aa0ddaed0343e93d7b4defc613b3ed5b65c3d"
+      "name": "ui-skiko-wasm-js-1.13.0-alpha01-peach-c1c532120db6.klib",
+      "url": "https://r2.rnxsim.com/peach-kotlin-fork/c1c532120db605507e75a47ea72c66de314861322a0fd42fbee7fd4eb1d43294/ui-skiko-wasm-js-1.13.0-alpha01.klib",
+      "sha256": "c1c532120db605507e75a47ea72c66de314861322a0fd42fbee7fd4eb1d43294"
     },
     {
       "name": "ui-text-wasm-js-1.13.0-alpha01-peach-10c54ff0fa5f.klib",
@@ -325,9 +325,9 @@
     "skiko": "0.152.0-alpha02"
   },
   "composeRuntime": {
-    "name": "skiko-wasm-0.152.0-alpha02-peach-bf4a72712ff0.jar",
-    "url": "https://r2.rnxsim.com/peach-kotlin-fork/bf4a72712ff0ab67c5a5d28e058f6743497545392b593111a212e95b7435a339/skiko-wasm-0.152.0-alpha02.jar",
-    "sha256": "bf4a72712ff0ab67c5a5d28e058f6743497545392b593111a212e95b7435a339"
+    "name": "skiko-wasm-0.152.0-alpha02-peach-3d68b5a68311.jar",
+    "url": "https://r2.rnxsim.com/peach-kotlin-fork/3d68b5a68311fedbd5f08ddd7bbd6fc8c8c19cb1c17c4394959b2507b125c323/skiko-wasm-0.152.0-alpha02.jar",
+    "sha256": "3d68b5a68311fedbd5f08ddd7bbd6fc8c8c19cb1c17c4394959b2507b125c323"
   },
   "composeJsLibraries": [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.899",
+  "version": "0.1.908",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/skills/peach-debug/SKILL.md

@@ -174,6 +174,17 @@ peach debug state scroll-input
 peach debug state scroll-mirror
 ```
 
+for responder negotiation, record the `touch` debug channel:
+
+```sh
+peach debug enable touch
+# reproduce the drag
+peach debug recent touch 40
+peach debug disable touch
+```
+
+`gesture` is a timeline kind; responder debug events use `touch`.
+
 reading `describe` output:
 
 ```
@@ -269,105 +280,8 @@ watch out for:
 
 ## branch — accessibility
 
-```sh
-peach get a11y                          # roles, labels, hints, and target geometry
-peach get layout --styling              # boxes, styles, and native pixel contrast
-peach describe --a11y                   # inline a11y info on every node
-```
-
-native styled layout reads rendered pixels rather than inferring contrast from
-tokens. it compares the normal frame with one CanvasKit capture where text is
-suppressed and adds each text score to the existing layout row and issue list.
-
-contrast summary format:
-
-```
-#loginButton @(24,347) 120x24 font:16 color:#777 contrast:1.4/4.5 FAIL on:#888888 "Sign in"
-```
-
-finding offenders fast:
-
-```sh
-peach find --no-label                   # interactive nodes missing label
-peach find --no-role                    # interactive nodes missing role
-peach find --pressable --max-dim 44     # undersized tap targets
-```
-
-what gets checked:
-
-- **missing labels** — interactive nodes without `accessibilityLabel`
-- **missing roles** — `Pressable`/`Touchable` without `accessibilityRole`
-- **missing hints** — complex interactions without `accessibilityHint`
-- **touch target size** — tappable nodes with hitSlop-expanded rect <44×44
-- **contrast** — run `peach get layout --styling`; it samples final text and
-  text-suppressed background pixels, including gradients and composited opacity
-- **label / visible-text mismatch** — label that reads differently from
-  the text VoiceOver would fall back to (often a translation bug)
-- **duplicate labels** — two reachable nodes with identical labels on
-  one screen ("Open" + "Open" leaves no way to disambiguate)
-
-triage order:
-
-- **P0** — interactive node with no label or no role (blocks screen
-  reader entirely)
-- **P1** — tap target <44×44, duplicate labels
-- **P2** — contrast, label/visible-text mismatch
-
-fix → verify loop (the same shape as debugging):
-
-```sh
-peach get a11y > before-a11y.txt
-peach get layout --styling --json > before-layout.json
-# apply the fix
-peach get a11y > after-a11y.txt
-peach get layout --styling --json > after-layout.json
-diff before-a11y.txt after-a11y.txt
-diff before-layout.json after-layout.json
-```
-
-fixing common cases:
-
-```tsx
-// bad: icon button with no accessible name
-<Pressable onPress={onBack}>
-  <ChevronLeftIcon />
-</Pressable>
-
-// good: labeled + roled + hinted + hitSlop'd
-<Pressable
-  onPress={onBack}
-  accessibilityRole="button"
-  accessibilityLabel="Back"
-  accessibilityHint="Returns to the previous screen"
-  hitSlop={12}    // bumps tap target to 44×44 minimum
->
-  <ChevronLeftIcon />
-</Pressable>
-
-// bad: text input with no programmatic label
-<TextInput placeholder="Email" onChangeText={setEmail} />
-
-// good: label survives even when placeholder is hidden
-<TextInput
-  placeholder="Email"
-  accessibilityLabel="Email address"
-  onChangeText={setEmail}
-/>
-```
-
-watch out for:
-
-- **placeholders are not labels.** they disappear after the user types.
-- **hitSlop expands the a11y rect too.** rarely need to make the
-  rendered button bigger — `hitSlop={12}` is usually enough.
-- **`accessibilityRole="image"` is not an `alt` tag.** pair it with
-  `accessibilityLabel` or VoiceOver reads "image" and nothing else.
-- **`importantForAccessibility="no-hide-descendants"` hides an entire
-  subtree.** useful for decorative chrome, dangerous if you forget it.
-
-run the screen reader on a real device at least once before shipping —
-labels that read fine on paper often sound robotic ("delete_message_btn_v2"
-type names sneak in).
+Read [accessibility](references/accessibility.md) for contrast capture, labels,
+roles, touch targets and the verification commands.
 
 ## recovery — common failure modes
 
@@ -388,57 +302,5 @@ type names sneak in).
 
 ## reference
 
-### finding and interacting
-
-```sh
-peach describe                          # all visible elements with styles
-peach describe button                   # filter by text/role/label/testID
-peach describe --testid foo             # only the subtree under a testID
-peach describe --verbose                # include every style property
-
-peach find "Sign in"                    # by text content
-peach find --testid loginButton
-peach find --role button
-peach find --pressable
-peach find --visible                    # only on-screen nodes
-
-peach do tap loginButton                # tap by testID (preferred)
-peach do tap-text "Submit"              # tap by text
-peach do tap 196 400                    # tap at coordinates
-peach do type "hello world"             # type into focused input
-peach do type-into emailInput "a@b"     # focus then type
-peach do key return                     # special key (return, backspace, …)
-peach do scroll feed-list 0 500         # scroll a testID to absolute x/y offsets
-peach do swipe feed-list left           # directional swipe
-peach do long-press messageRow 800      # ms hold
-```
-
-### errors and requests
-
-```sh
-peach get errors 5                      # last 5 console errors
-peach get warnings 5
-peach get requests 5                    # recent failed requests
-peach logs --since 30s                  # recent console output
-peach network --since 30s               # recent network traffic
-```
-
-### snapshots and diff
-
-```sh
-peach debug snapshot before
-# interact
-peach debug snapshot after
-peach debug diff before after           # added / removed / changed nodes
-```
-
-### debug channels
-
-useful: `animated`, `layout`, `onlayout`, `render`, `sheets`, `portals`,
-`gesture`, `scroll`, `text`, `image`.
-
-```sh
-peach debug enable animated,layout,sheets,portals
-peach debug recent layout 20            # last 20 events on the channel
-peach debug disable animated,layout,sheets,portals
-```
+Read [commands](references/commands.md) for finding, interaction, error,
+snapshot and debug-channel commands.

package/skills/peach-debug/references/accessibility.md

@@ -0,0 +1,102 @@
+# accessibility
+
+```sh
+peach get a11y                          # roles, labels, hints, and target geometry
+peach get layout --styling              # boxes, styles, and native pixel contrast
+peach describe --a11y                   # inline a11y info on every node
+```
+
+native styled layout reads rendered pixels rather than inferring contrast from
+tokens. it compares the normal frame with one CanvasKit capture where text is
+suppressed and adds each text score to the existing layout row and issue list.
+
+contrast summary format:
+
+```
+#loginButton @(24,347) 120x24 font:16 color:#777 contrast:1.4/4.5 FAIL on:#888888 "Sign in"
+```
+
+finding offenders fast:
+
+```sh
+peach find --no-label                   # interactive nodes missing label
+peach find --no-role                    # interactive nodes missing role
+peach find --pressable --max-dim 44     # undersized tap targets
+```
+
+what gets checked:
+
+- **missing labels** — interactive nodes without `accessibilityLabel`
+- **missing roles** — `Pressable`/`Touchable` without `accessibilityRole`
+- **missing hints** — complex interactions without `accessibilityHint`
+- **touch target size** — tappable nodes with hitSlop-expanded rect <44×44
+- **contrast** — run `peach get layout --styling`; it samples final text and
+  text-suppressed background pixels, including gradients and composited opacity
+- **label / visible-text mismatch** — label that reads differently from
+  the text VoiceOver would fall back to (often a translation bug)
+- **duplicate labels** — two reachable nodes with identical labels on
+  one screen ("Open" + "Open" leaves no way to disambiguate)
+
+triage order:
+
+- **P0** — interactive node with no label or no role (blocks screen
+  reader entirely)
+- **P1** — tap target <44×44, duplicate labels
+- **P2** — contrast, label/visible-text mismatch
+
+fix → verify loop (the same shape as debugging):
+
+```sh
+peach get a11y > before-a11y.txt
+peach get layout --styling --json > before-layout.json
+# apply the fix
+peach get a11y > after-a11y.txt
+peach get layout --styling --json > after-layout.json
+diff before-a11y.txt after-a11y.txt
+diff before-layout.json after-layout.json
+```
+
+fixing common cases:
+
+```tsx
+// bad: icon button with no accessible name
+<Pressable onPress={onBack}>
+  <ChevronLeftIcon />
+</Pressable>
+
+// good: labeled + roled + hinted + hitSlop'd
+<Pressable
+  onPress={onBack}
+  accessibilityRole="button"
+  accessibilityLabel="Back"
+  accessibilityHint="Returns to the previous screen"
+  hitSlop={12}    // bumps tap target to 44×44 minimum
+>
+  <ChevronLeftIcon />
+</Pressable>
+
+// bad: text input with no programmatic label
+<TextInput placeholder="Email" onChangeText={setEmail} />
+
+// good: label survives even when placeholder is hidden
+<TextInput
+  placeholder="Email"
+  accessibilityLabel="Email address"
+  onChangeText={setEmail}
+/>
+```
+
+watch out for:
+
+- **placeholders are not labels.** they disappear after the user types.
+- **hitSlop expands the a11y rect too.** rarely need to make the
+  rendered button bigger — `hitSlop={12}` is usually enough.
+- **`accessibilityRole="image"` is not an `alt` tag.** pair it with
+  `accessibilityLabel` or VoiceOver reads "image" and nothing else.
+- **`importantForAccessibility="no-hide-descendants"` hides an entire
+  subtree.** useful for decorative chrome, dangerous if you forget it.
+
+run the screen reader on a real device at least once before shipping —
+labels that read fine on paper often sound robotic ("delete_message_btn_v2"
+type names sneak in).
+

package/skills/peach-debug/references/commands.md

@@ -0,0 +1,56 @@
+# commands
+
+### finding and interacting
+
+```sh
+peach describe                          # all visible elements with styles
+peach describe button                   # filter by text/role/label/testID
+peach describe --testid foo             # only the subtree under a testID
+peach describe --verbose                # include every style property
+
+peach find "Sign in"                    # by text content
+peach find --testid loginButton
+peach find --role button
+peach find --pressable
+peach find --visible                    # only on-screen nodes
+
+peach do tap loginButton                # tap by testID (preferred)
+peach do tap-text "Submit"              # tap by text
+peach do tap 196 400                    # tap at coordinates
+peach do type "hello world"             # type into focused input
+peach do type-into emailInput "a@b"     # focus then type
+peach do key return                     # special key (return, backspace, …)
+peach do scroll feed-list 0 500         # scroll a testID to absolute x/y offsets
+peach do swipe feed-list left           # directional swipe
+peach do long-press messageRow 800      # ms hold
+```
+
+### errors and requests
+
+```sh
+peach get errors 5                      # last 5 console errors
+peach get warnings 5
+peach get requests 5                    # recent failed requests
+peach logs --since 30s                  # recent console output
+peach network --since 30s               # recent network traffic
+```
+
+### snapshots and diff
+
+```sh
+peach debug snapshot before
+# interact
+peach debug snapshot after
+peach debug diff before after           # added / removed / changed nodes
+```
+
+### debug channels
+
+useful: `animated`, `layout`, `onlayout`, `render`, `sheets`, `portals`,
+`touch`, `scroll`, `text`, `image`.
+
+```sh
+peach debug enable animated,layout,sheets,portals
+peach debug recent layout 20            # last 20 events on the channel
+peach debug disable animated,layout,sheets,portals
+```

package/src/expo-swift-host.ts

@@ -84,7 +84,8 @@ export async function collectExpoSwiftSources(
   const namespacesSeen = new Set<string>()
   let bytes = 0
   let fileCount = 0
-  for (const entry of Object.values(search)) {
+  // native Expo resolves packages by name before generating its Apple provider.
+  for (const [, entry] of Object.entries(search).sort(([a], [b]) => a.localeCompare(b))) {
     if (!entry || typeof entry !== 'object')
       throw new Error('invalid Expo autolinking entry')
     const sourceRoot = Reflect.get(entry, 'path')
@@ -125,9 +126,17 @@ export async function collectExpoSwiftSources(
     const classes: { name: string; registration: string }[] = []
     for (const module of modules) {
       const className =
-        module && typeof module === 'object' ? Reflect.get(module, 'class') : null
+        typeof module === 'string'
+          ? module
+          : module && typeof module === 'object'
+            ? Reflect.get(module, 'class')
+            : null
       const name =
-        module && typeof module === 'object' ? Reflect.get(module, 'name') : null
+        typeof module === 'string'
+          ? null
+          : module && typeof module === 'object'
+            ? Reflect.get(module, 'name')
+            : null
       if (
         typeof className !== 'string' ||
         !/^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)*$/.test(className) ||
@@ -165,7 +174,9 @@ export async function collectExpoSwiftSources(
         files[
           `Sources/${namespace}/${path.relative(ios, file).split(path.sep).join('/')}`
         ] =
-          `#sourceLocation(file: ${JSON.stringify(file)}, line: 1)\n${fs.readFileSync(file, 'utf8')}`
+          // CocoaPods' iOS umbrella header imports UIKit into every Swift file
+          // through the underlying module; these source units have no clang pod.
+          `import UIKit\n#sourceLocation(file: ${JSON.stringify(file)}, line: 1)\n${fs.readFileSync(file, 'utf8')}`
       }
     }
     walk(ios)

package/src/vite-plugin.ts

@@ -636,10 +636,10 @@ const ENGINE_WORKER_BOOT_CLOSURES: WorkerBootClosure[] = [
 // although the shell renders only the plain sheet: 67kB of the boot file.
 const WORKER_SIDE_EFFECT_FREE_PACKAGES = [
   { test: /\/node_modules\/@gorhom\/bottom-sheet\//, sideEffects: false },
-  // legacy wrapper construction only creates exported components. keep rngh's
-  // index initialization and createHandler's event registrations side-effectful.
+  // button, touchable, and legacy/v3 wrapper modules only construct components.
+  // keep rngh's index initialization and createHandler's registrations side-effectful.
   {
-    test: /\/node_modules\/react-native-gesture-handler\/(?:src|lib\/module)\/components\/GestureComponents\.[jt]sx?$/,
+    test: /\/node_modules\/react-native-gesture-handler\/(?:src|lib\/module)\/(?:components\/(?:GestureComponents|GestureButtons)\.[jt]sx?|components\/touchables\/[^/]+\.[jt]sx?|v3\/components\/(?:GestureComponents|GestureButtons)\.[jt]sx?)$/,
     sideEffects: false,
   },
 ]