From 5793305fa33850eaa54e46ffde179ccd0129b822 Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 20:13:40 +0200
Subject: [PATCH 1/8] improve tests

---
 .maestro/README.md                            |  12 +-
 .maestro/flows/basic-pager/ensure-ltr.yaml    |  22 ++++
 .maestro/flows/basic-pager/ensure-rtl.yaml    |  22 ++++
 .maestro/flows/basic-pager/open.yaml          |  12 ++
 .../flows/basic-pager/verify-controls.yaml    |  52 ++++++++
 .../verify-horizontal-ltr-swipe.yaml          |  29 +++++
 .../verify-horizontal-rtl-swipe.yaml          |  29 +++++
 .../basic-pager/verify-vertical-swipe.yaml    |  27 ++++
 .maestro/setup/pager_basic_example_setup.yaml |   7 --
 .../pager_vertical_basic_example_setup.yaml   |   7 --
 .maestro/smoke-test.yaml                      |   6 +-
 .maestro/tests/pager_basic_example.yaml       |  55 ++-------
 .maestro/tests/pager_rtl_example.yaml         |  12 ++
 .../tests/pager_vertical_basic_example.yaml   |  53 ++------
 .../tests/rtl/pager_basic_example_rtl.yaml    | 115 ------------------
 .../rtl/pager_vertical_basic_example_rtl.yaml | 113 -----------------
 example/src/App.tsx                           |  19 ++-
 example/src/BasicPagerViewExample.tsx         |   5 +-
 scripts/run-maestro-tests.sh                  |   1 -
 19 files changed, 255 insertions(+), 343 deletions(-)
 create mode 100644 .maestro/flows/basic-pager/ensure-ltr.yaml
 create mode 100644 .maestro/flows/basic-pager/ensure-rtl.yaml
 create mode 100644 .maestro/flows/basic-pager/open.yaml
 create mode 100644 .maestro/flows/basic-pager/verify-controls.yaml
 create mode 100644 .maestro/flows/basic-pager/verify-horizontal-ltr-swipe.yaml
 create mode 100644 .maestro/flows/basic-pager/verify-horizontal-rtl-swipe.yaml
 create mode 100644 .maestro/flows/basic-pager/verify-vertical-swipe.yaml
 delete mode 100644 .maestro/setup/pager_basic_example_setup.yaml
 delete mode 100644 .maestro/setup/pager_vertical_basic_example_setup.yaml
 create mode 100644 .maestro/tests/pager_rtl_example.yaml
 delete mode 100644 .maestro/tests/rtl/pager_basic_example_rtl.yaml
 delete mode 100644 .maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml

diff --git a/.maestro/README.md b/.maestro/README.md
index 33abb1e4..8660c71d 100644
--- a/.maestro/README.md
+++ b/.maestro/README.md
@@ -19,6 +19,12 @@ bun run maestro:test:android
 Use `bun run maestro:smoke` to run only the smoke flow.
 `maestro:debug` writes failure artifacts to `.maestro/debug-output`.
 
-The smoke flow targets the example app ID `com.pagerviewexample` and verifies the Basic Example pager using stable `testID` selectors.
-Additional Basic Example regression flows live in `.maestro/basic_example`.
-Nested PagerView regression flows live in `.maestro/nested_pager_view_example`.
+The smoke flow targets the example app ID `com.pagerviewexample` and verifies the horizontal pager using stable `testID` selectors.
+
+Basic PagerView regression coverage is split into three deterministic flows:
+
+- `tests/pager_basic_example.yaml` verifies horizontal paging in LTR.
+- `tests/pager_vertical_basic_example.yaml` verifies vertical paging in LTR.
+- `tests/pager_rtl_example.yaml` switches to RTL before verifying the reversed horizontal gesture.
+
+Shared setup and assertions live in `flows/basic-pager`. Each flow resets the app to the required layout direction, so a failed RTL run cannot affect the next test.
diff --git a/.maestro/flows/basic-pager/ensure-ltr.yaml b/.maestro/flows/basic-pager/ensure-ltr.yaml
new file mode 100644
index 00000000..a60a4670
--- /dev/null
+++ b/.maestro/flows/basic-pager/ensure-ltr.yaml
@@ -0,0 +1,22 @@
+appId: com.pagerviewexample
+---
+- launchApp:
+    stopApp: true
+
+- extendedWaitUntil:
+    visible:
+      text: 'PagerView Example'
+    timeout: 15000
+
+- runFlow:
+    when:
+      visible:
+        id: 'layout-direction-rtl'
+    commands:
+      - tapOn:
+          id: 'layout-direction-rtl'
+
+- extendedWaitUntil:
+    visible:
+      id: 'layout-direction-ltr'
+    timeout: 15000
diff --git a/.maestro/flows/basic-pager/ensure-rtl.yaml b/.maestro/flows/basic-pager/ensure-rtl.yaml
new file mode 100644
index 00000000..7b02ea68
--- /dev/null
+++ b/.maestro/flows/basic-pager/ensure-rtl.yaml
@@ -0,0 +1,22 @@
+appId: com.pagerviewexample
+---
+- launchApp:
+    stopApp: true
+
+- extendedWaitUntil:
+    visible:
+      text: 'PagerView Example'
+    timeout: 15000
+
+- runFlow:
+    when:
+      visible:
+        id: 'layout-direction-ltr'
+    commands:
+      - tapOn:
+          id: 'layout-direction-ltr'
+
+- extendedWaitUntil:
+    visible:
+      id: 'layout-direction-rtl'
+    timeout: 15000
diff --git a/.maestro/flows/basic-pager/open.yaml b/.maestro/flows/basic-pager/open.yaml
new file mode 100644
index 00000000..da9d4350
--- /dev/null
+++ b/.maestro/flows/basic-pager/open.yaml
@@ -0,0 +1,12 @@
+appId: com.pagerviewexample
+---
+- tapOn:
+    id: ${EXAMPLE_ID}
+
+- extendedWaitUntil:
+    visible:
+      id: ${PAGER_ID}
+    timeout: 10000
+
+- assertVisible:
+    id: 'pageNumber0'
diff --git a/.maestro/flows/basic-pager/verify-controls.yaml b/.maestro/flows/basic-pager/verify-controls.yaml
new file mode 100644
index 00000000..1fcad56e
--- /dev/null
+++ b/.maestro/flows/basic-pager/verify-controls.yaml
@@ -0,0 +1,52 @@
+appId: com.pagerviewexample
+---
+- tapOn:
+    id: 'next-page-button'
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber2'
+    timeout: 5000
+
+- tapOn:
+    id: 'prev-page-button'
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber1'
+    timeout: 5000
+
+- tapOn:
+    id: 'start-page-button'
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber0'
+    timeout: 5000
+
+- tapOn:
+    id: 'last-page-button'
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber9'
+    timeout: 5000
+
+- tapOn:
+    id: 'remove-page-button'
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber8'
+    timeout: 5000
+
+- tapOn:
+    id: 'add-page-button'
+
+- tapOn:
+    id: 'next-page-button'
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber9'
+    timeout: 5000
diff --git a/.maestro/flows/basic-pager/verify-horizontal-ltr-swipe.yaml b/.maestro/flows/basic-pager/verify-horizontal-ltr-swipe.yaml
new file mode 100644
index 00000000..22fc19da
--- /dev/null
+++ b/.maestro/flows/basic-pager/verify-horizontal-ltr-swipe.yaml
@@ -0,0 +1,29 @@
+appId: com.pagerviewexample
+---
+- tapOn:
+    id: 'scroll-enabled-button'
+
+- swipe:
+    from:
+      id: 'pager-view-horizontal'
+    start: 90%, 50%
+    end: 10%, 50%
+    duration: 100
+
+- assertVisible:
+    id: 'pageNumber0'
+
+- tapOn:
+    id: 'scroll-enabled-button'
+
+- swipe:
+    from:
+      id: 'pager-view-horizontal'
+    start: 90%, 50%
+    end: 10%, 50%
+    duration: 100
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber1'
+    timeout: 5000
diff --git a/.maestro/flows/basic-pager/verify-horizontal-rtl-swipe.yaml b/.maestro/flows/basic-pager/verify-horizontal-rtl-swipe.yaml
new file mode 100644
index 00000000..fd8aa15d
--- /dev/null
+++ b/.maestro/flows/basic-pager/verify-horizontal-rtl-swipe.yaml
@@ -0,0 +1,29 @@
+appId: com.pagerviewexample
+---
+- tapOn:
+    id: 'scroll-enabled-button'
+
+- swipe:
+    from:
+      id: 'pager-view-horizontal'
+    start: 10%, 50%
+    end: 90%, 50%
+    duration: 100
+
+- assertVisible:
+    id: 'pageNumber0'
+
+- tapOn:
+    id: 'scroll-enabled-button'
+
+- swipe:
+    from:
+      id: 'pager-view-horizontal'
+    start: 10%, 50%
+    end: 90%, 50%
+    duration: 100
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber1'
+    timeout: 5000
diff --git a/.maestro/flows/basic-pager/verify-vertical-swipe.yaml b/.maestro/flows/basic-pager/verify-vertical-swipe.yaml
new file mode 100644
index 00000000..a160d576
--- /dev/null
+++ b/.maestro/flows/basic-pager/verify-vertical-swipe.yaml
@@ -0,0 +1,27 @@
+appId: com.pagerviewexample
+---
+- tapOn:
+    id: 'scroll-enabled-button'
+
+- swipe:
+    from:
+      id: 'pager-view-vertical'
+    direction: UP
+    duration: 100
+
+- assertVisible:
+    id: 'pageNumber0'
+
+- tapOn:
+    id: 'scroll-enabled-button'
+
+- swipe:
+    from:
+      id: 'pager-view-vertical'
+    direction: UP
+    duration: 100
+
+- extendedWaitUntil:
+    visible:
+      id: 'pageNumber1'
+    timeout: 5000
diff --git a/.maestro/setup/pager_basic_example_setup.yaml b/.maestro/setup/pager_basic_example_setup.yaml
deleted file mode 100644
index 1389cdce..00000000
--- a/.maestro/setup/pager_basic_example_setup.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-appId: ${APP_ID}
-#  Nest PagerView Example tab is active and accessible
----
-- launchApp
-- assertVisible: 'PagerView Example'
-- tapOn: 'Basic Example'
-- assertVisible: '7 likes'
diff --git a/.maestro/setup/pager_vertical_basic_example_setup.yaml b/.maestro/setup/pager_vertical_basic_example_setup.yaml
deleted file mode 100644
index 2d6ad62e..00000000
--- a/.maestro/setup/pager_vertical_basic_example_setup.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-appId: ${APP_ID}
-# Vertical Basic Example tab is active and accessible
----
-- launchApp
-- assertVisible: 'PagerView Example'
-- tapOn: 'Vertical Basic Example'
-- assertVisible: '7 likes'
diff --git a/.maestro/smoke-test.yaml b/.maestro/smoke-test.yaml
index 3a162642..62cb0f67 100644
--- a/.maestro/smoke-test.yaml
+++ b/.maestro/smoke-test.yaml
@@ -10,15 +10,15 @@ tags:
 
 - extendedWaitUntil:
     visible:
-      id: 'Basic Example'
+      id: 'example-basic-horizontal'
     timeout: 15000
 
 - tapOn:
-    id: 'Basic Example'
+    id: 'example-basic-horizontal'
 
 - extendedWaitUntil:
     visible:
-      id: 'pager-view'
+      id: 'pager-view-horizontal'
     timeout: 10000
 
 - assertVisible:
diff --git a/.maestro/tests/pager_basic_example.yaml b/.maestro/tests/pager_basic_example.yaml
index 16b4faa0..d6bdc1c9 100644
--- a/.maestro/tests/pager_basic_example.yaml
+++ b/.maestro/tests/pager_basic_example.yaml
@@ -1,47 +1,12 @@
 appId: com.pagerviewexample
 ---
-- runFlow: ../setup/pager_basic_example_setup.yaml
-- tapOn: 'Scroll Enabled'
-- swipe:
-    from:
-      id: 'pager-view'
-    start: 90%, 50%
-    end: 10%, 50%
-    duration: 100
-- assertVisible:
-    text: 'page number 0'
-- tapOn: 'Scroll Disabled'
-- swipe:
-    from:
-      id: 'pager-view'
-    start: 90%, 50%
-    end: 10%, 50%
-    duration: 100
-- assertVisible:
-    text: 'page number 1'
-- tapOn:
-    id: 'next-page-button'
-- assertVisible:
-    text: 'page number 2'
-- tapOn:
-    id: 'prev-page-button'
-- assertVisible:
-    text: 'page number 1'
-- tapOn:
-    id: 'start-page-button'
-- assertVisible:
-    text: 'page number 0'
-- tapOn:
-    id: 'last-page-button'
-- assertVisible:
-    text: 'page number 9'
-- tapOn:
-    id: 'remove-page-button'
-- assertVisible:
-    text: 'page number 8'
-- tapOn:
-    id: 'add-page-button'
-- tapOn:
-    id: 'next-page-button'
-- assertVisible:
-    text: 'page number 9'
+- runFlow: ../flows/basic-pager/ensure-ltr.yaml
+
+- runFlow:
+    file: ../flows/basic-pager/open.yaml
+    env:
+      EXAMPLE_ID: 'example-basic-horizontal'
+      PAGER_ID: 'pager-view-horizontal'
+
+- runFlow: ../flows/basic-pager/verify-horizontal-ltr-swipe.yaml
+- runFlow: ../flows/basic-pager/verify-controls.yaml
diff --git a/.maestro/tests/pager_rtl_example.yaml b/.maestro/tests/pager_rtl_example.yaml
new file mode 100644
index 00000000..7448acd1
--- /dev/null
+++ b/.maestro/tests/pager_rtl_example.yaml
@@ -0,0 +1,12 @@
+appId: com.pagerviewexample
+---
+- runFlow: ../flows/basic-pager/ensure-rtl.yaml
+
+- runFlow:
+    file: ../flows/basic-pager/open.yaml
+    env:
+      EXAMPLE_ID: 'example-basic-horizontal'
+      PAGER_ID: 'pager-view-horizontal'
+
+- runFlow: ../flows/basic-pager/verify-horizontal-rtl-swipe.yaml
+- runFlow: ../flows/basic-pager/verify-controls.yaml
diff --git a/.maestro/tests/pager_vertical_basic_example.yaml b/.maestro/tests/pager_vertical_basic_example.yaml
index b8907646..2e02b221 100644
--- a/.maestro/tests/pager_vertical_basic_example.yaml
+++ b/.maestro/tests/pager_vertical_basic_example.yaml
@@ -1,45 +1,12 @@
 appId: com.pagerviewexample
 ---
-- runFlow: ../setup/pager_vertical_basic_example_setup.yaml
-- tapOn: 'Scroll Enabled'
-- swipe:
-    from:
-      id: 'pager-view'
-    direction: UP
-    duration: 100
-- assertVisible:
-    text: 'page number 0'
-- tapOn: 'Scroll Disabled'
-- swipe:
-    from:
-      id: 'pager-view'
-    direction: UP
-    duration: 100
-- assertVisible:
-    text: 'page number 1'
-- tapOn:
-    id: 'next-page-button'
-- assertVisible:
-    text: 'page number 2'
-- tapOn:
-    id: 'prev-page-button'
-- assertVisible:
-    text: 'page number 1'
-- tapOn:
-    id: 'start-page-button'
-- assertVisible:
-    text: 'page number 0'
-- tapOn:
-    id: 'last-page-button'
-- assertVisible:
-    text: 'page number 9'
-- tapOn:
-    id: 'remove-page-button'
-- assertVisible:
-    text: 'page number 8'
-- tapOn:
-    id: 'add-page-button'
-- tapOn:
-    id: 'next-page-button'
-- assertVisible:
-    text: 'page number 9'
+- runFlow: ../flows/basic-pager/ensure-ltr.yaml
+
+- runFlow:
+    file: ../flows/basic-pager/open.yaml
+    env:
+      EXAMPLE_ID: 'example-basic-vertical'
+      PAGER_ID: 'pager-view-vertical'
+
+- runFlow: ../flows/basic-pager/verify-vertical-swipe.yaml
+- runFlow: ../flows/basic-pager/verify-controls.yaml
diff --git a/.maestro/tests/rtl/pager_basic_example_rtl.yaml b/.maestro/tests/rtl/pager_basic_example_rtl.yaml
deleted file mode 100644
index 933adb73..00000000
--- a/.maestro/tests/rtl/pager_basic_example_rtl.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-appId: com.pagerviewexample
----
-- launchApp
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 15000
-
-- runFlow:
-    when:
-      visible: 'LTR'
-    commands:
-      - tapOn: 'LTR'
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 15000
-
-- extendedWaitUntil:
-    visible:
-      text: 'RTL'
-    timeout: 15000
-
-- tapOn: 'Basic Example'
-
-- extendedWaitUntil:
-    visible:
-      id: 'pager-view'
-    timeout: 10000
-
-- assertVisible: '7 likes'
-
-- tapOn: 'Scroll Enabled'
-
-- swipe:
-    from:
-      id: 'pager-view'
-    start: 10%, 50%
-    end: 90%, 50%
-    duration: 100
-
-- assertVisible:
-    text: 'page number 0'
-
-- tapOn: 'Scroll Disabled'
-
-- swipe:
-    from:
-      id: 'pager-view'
-    start: 10%, 50%
-    end: 90%, 50%
-    duration: 100
-
-- assertVisible:
-    text: 'page number 1'
-
-- tapOn:
-    id: 'next-page-button'
-
-- assertVisible:
-    text: 'page number 2'
-
-- tapOn:
-    id: 'prev-page-button'
-
-- assertVisible:
-    text: 'page number 1'
-
-- tapOn:
-    id: 'start-page-button'
-
-- assertVisible:
-    text: 'page number 0'
-
-- tapOn:
-    id: 'last-page-button'
-
-- assertVisible:
-    text: 'page number 9'
-
-- tapOn:
-    id: 'remove-page-button'
-
-- assertVisible:
-    text: 'page number 8'
-
-- tapOn:
-    id: 'add-page-button'
-
-- tapOn:
-    id: 'next-page-button'
-
-- assertVisible:
-    text: 'page number 9'
-
-- tapOn: 'Navigate up'
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 10000
-
-- tapOn: 'RTL'
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 15000
-
-- extendedWaitUntil:
-    visible:
-      text: 'LTR'
-    timeout: 15000
diff --git a/.maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml b/.maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml
deleted file mode 100644
index d75a47ee..00000000
--- a/.maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
-appId: com.pagerviewexample
----
-- launchApp
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 15000
-
-- runFlow:
-    when:
-      visible: 'LTR'
-    commands:
-      - tapOn: 'LTR'
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 15000
-
-- extendedWaitUntil:
-    visible:
-      text: 'RTL'
-    timeout: 15000
-
-- tapOn: 'Vertical Basic Example'
-
-- extendedWaitUntil:
-    visible:
-      id: 'pager-view'
-    timeout: 10000
-
-- assertVisible: '7 likes'
-
-- tapOn: 'Scroll Enabled'
-
-- swipe:
-    from:
-      id: 'pager-view'
-    direction: UP
-    duration: 100
-
-- assertVisible:
-    text: 'page number 0'
-
-- tapOn: 'Scroll Disabled'
-
-- swipe:
-    from:
-      id: 'pager-view'
-    direction: UP
-    duration: 100
-
-- assertVisible:
-    text: 'page number 1'
-
-- tapOn:
-    id: 'next-page-button'
-
-- assertVisible:
-    text: 'page number 2'
-
-- tapOn:
-    id: 'prev-page-button'
-
-- assertVisible:
-    text: 'page number 1'
-
-- tapOn:
-    id: 'start-page-button'
-
-- assertVisible:
-    text: 'page number 0'
-
-- tapOn:
-    id: 'last-page-button'
-
-- assertVisible:
-    text: 'page number 9'
-
-- tapOn:
-    id: 'remove-page-button'
-
-- assertVisible:
-    text: 'page number 8'
-
-- tapOn:
-    id: 'add-page-button'
-
-- tapOn:
-    id: 'next-page-button'
-
-- assertVisible:
-    text: 'page number 9'
-
-- tapOn: 'Navigate up'
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 10000
-
-- tapOn: 'RTL'
-
-- extendedWaitUntil:
-    visible:
-      text: 'PagerView Example'
-    timeout: 15000
-
-- extendedWaitUntil:
-    visible:
-      text: 'LTR'
-    timeout: 15000
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 5883964c..b3e8491d 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -43,14 +43,22 @@ function VerticalBasicPagerViewExampleScreen() {
   return <BasicPagerViewExample isHorizontal={false} />;
 }
 
-const examples = [
+type Example = {
+  component: React.ComponentType;
+  name: string;
+  testID?: string;
+};
+
+const examples: Example[] = [
   {
     component: BasicPagerViewExampleScreen,
     name: 'Basic Example',
+    testID: 'example-basic-horizontal',
   },
   {
     component: VerticalBasicPagerViewExampleScreen,
     name: 'Vertical Basic Example',
+    testID: 'example-basic-vertical',
   },
 
   { component: OnPageScrollExample, name: 'OnPageScroll Example' },
@@ -80,14 +88,14 @@ const examples = [
   },
 ];
 
-const tabViewExamples = [
+const tabViewExamples: Example[] = [
   { component: MaterialTopBarExample, name: 'MaterialTopBarExample' },
   { component: TabBarIconExample, name: 'TabBarIconExample' },
   { component: CustomTabBarExample, name: 'CustomTabBarExample' },
   { component: CoverflowExample, name: 'CoverflowExample' },
 ];
 
-const additionalExamples = [
+const additionalExamples: Example[] = [
   { component: PagerHookExample, name: 'Pager Hook Example' },
   { component: KeyboardExample, name: 'Keyboard Example' },
   { component: HeadphonesCarouselExample, name: 'Headphones Carousel Example' },
@@ -108,7 +116,7 @@ function App() {
       {examples.map((example) => (
         <TouchableOpacity
           key={example.name}
-          testID={example.name}
+          testID={example.testID ?? example.name}
           style={styles.exampleTouchable}
           onPress={() => {
             //@ts-ignore
@@ -192,6 +200,9 @@ export function Navigation() {
                 <Button
                   title={I18nManager.getConstants().isRTL ? 'RTL' : 'LTR'}
                   color="orange"
+                  testID={`layout-direction-${
+                    I18nManager.getConstants().isRTL ? 'rtl' : 'ltr'
+                  }`}
                   onPress={() => {
                     I18nManager.forceRTL(!I18nManager.getConstants().isRTL);
                     DevSettings.reload();
diff --git a/example/src/BasicPagerViewExample.tsx b/example/src/BasicPagerViewExample.tsx
index 779bec10..0a415323 100644
--- a/example/src/BasicPagerViewExample.tsx
+++ b/example/src/BasicPagerViewExample.tsx
@@ -17,16 +17,17 @@ export function BasicPagerViewExample({
   isHorizontal,
 }: BasicPagerViewExampleProps) {
   const { ref, ...navigationPanel } = useNavigationPanel();
+  const orientation = isHorizontal ? 'horizontal' : 'vertical';
 
   return (
     <SafeAreaView style={styles.container}>
       <AnimatedPagerView
         {...navigationPanel}
-        testID="pager-view"
+        testID={`pager-view-${orientation}`}
         ref={ref}
         style={styles.PagerView}
         initialPage={0}
-        orientation={isHorizontal ? 'horizontal' : 'vertical'}
+        orientation={orientation}
         pageMargin={10}
       >
         {useMemo(
diff --git a/scripts/run-maestro-tests.sh b/scripts/run-maestro-tests.sh
index 4469c881..0ff9b9c3 100644
--- a/scripts/run-maestro-tests.sh
+++ b/scripts/run-maestro-tests.sh
@@ -48,7 +48,6 @@ shopt -s nullglob
 allTestFiles=(
   .maestro/tests/*.yaml
   .maestro/"$PLATFORM"-only/*.yaml
-  .maestro/tests/rtl/*.yaml
 )
 
 if [ ${#allTestFiles[@]} -eq 0 ]; then

From 9c4a2182db93a6ec8a46b64cfeada58504503f3b Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 20:38:29 +0200
Subject: [PATCH 2/8] fix ios example

---
 example/bun.lock         |  3 ++-
 example/ios/Podfile.lock | 12 ++++++------
 example/package.json     |  3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/example/bun.lock b/example/bun.lock
index 88ee5bef..e5340e1c 100644
--- a/example/bun.lock
+++ b/example/bun.lock
@@ -10,6 +10,7 @@
         "@react-navigation/native": "^7.3.7",
         "@react-navigation/native-stack": "^7.17.9",
         "@react-navigation/stack": "^7.10.10",
+        "@rnx-kit/react-native-host": "0.5.21",
         "babel-plugin-module-resolver": "^5.0.3",
         "react": "19.2.3",
         "react-native": "0.85.3",
@@ -482,7 +483,7 @@
 
     "@rnx-kit/metro-config": ["@rnx-kit/metro-config@2.2.4", "", { "dependencies": { "@rnx-kit/tools-node": "^3.0.0", "@rnx-kit/tools-react-native": "^2.3.1", "@rnx-kit/tools-workspaces": "^0.2.0" }, "peerDependencies": { "@react-native/metro-config": "*", "react": "*", "react-native": "*" }, "optionalPeers": ["@react-native/metro-config"] }, "sha512-OPdGePL/RuzhbyM8hzUR3qcp1PVNju8G5D9f2evYfiowjorYRAP2lIey/zmbGDNezZSTbAzvHxN3BeEYWR4wKQ=="],
 
-    "@rnx-kit/react-native-host": ["@rnx-kit/react-native-host@0.5.20", "", { "peerDependencies": { "react-native": ">=0.66" } }, "sha512-QOi/D+QuTT6ZCq3DVHiFXqna3uDWZIlpNgdBYT2D2eRspAVOssgkRAOxHMk0JvKUFa8iAh00y7y2sjEAELja/Q=="],
+    "@rnx-kit/react-native-host": ["@rnx-kit/react-native-host@0.5.21", "", { "peerDependencies": { "react-native": ">=0.66" } }, "sha512-iXB8o7j/ervwYQk7tPANpq7/3t6zmji1vt699MRpZR31d/aMfjXTyTogUXBaJxMQtqGlrE8HwGlkJn3F0j3MOw=="],
 
     "@rnx-kit/tools-filesystem": ["@rnx-kit/tools-filesystem@0.2.0", "", { "peerDependencies": { "memfs": ">=4.0.0" }, "optionalPeers": ["memfs"] }, "sha512-r5YTy8yy8DWMGdM8yNFlFdX8gE71CHJ2KtpsdSAQN4mol9FFMoAYMwIHrz1i5TyUbtdLd7N/lwWCAK0ZxJYqyQ=="],
 
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 3be8049b..ca19358f 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1402,7 +1402,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - react-native-pager-view (8.0.3):
+  - react-native-pager-view (9.0.0):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1879,7 +1879,7 @@ PODS:
     - React-utils (= 0.85.3)
     - ReactNativeDependencies
   - ReactNativeDependencies (0.85.3)
-  - ReactNativeHost (0.5.19):
+  - ReactNativeHost (0.5.21):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1903,7 +1903,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - ReactTestApp-DevSupport (5.4.1):
+  - ReactTestApp-DevSupport (5.4.4):
     - React-Core
     - React-jsi
   - ReactTestApp-Resources (1.0.0-dev)
@@ -2496,7 +2496,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 1aa9126122d4247ffc24bf9d28d50ce923499a71
   React-microtasksnativemodule: d86581169e9bb5bb6f5fc3c5052f890016c1bf21
   React-mutationobservernativemodule: 9a0c4e866f1ef2a57acebc902ebacbdf469ae741
-  react-native-pager-view: cf6b0a0ef69c1aca3eeec7c172daf427da4920d9
+  react-native-pager-view: 91a6d37f552b9c47445cc94792ad75cfa08487b2
   react-native-safe-area-context: c1eb308f4b36372a4de4b3bdaa8ed695ec3dd461
   React-NativeModulesApple: cc6ec4767844d610e92cc358bd3ea34937438d56
   React-networking: a8ce15641ed7775d5b54a9d0d32defc367c2216e
@@ -2532,8 +2532,8 @@ SPEC CHECKSUMS:
   ReactCodegen: 9af5798e943781fd2318dab7b60f25337388047c
   ReactCommon: 3ec2a55999d296af90c24beb66c8a77dc660d3ef
   ReactNativeDependencies: 15cf32e2807e82c7dca7ef543c5a095da41dc9e2
-  ReactNativeHost: 4581e6dbba05390331bdf0958c660aad11a62f2a
-  ReactTestApp-DevSupport: a139ca54333640557f2686c1ef85c625aa0677a2
+  ReactNativeHost: 035cd87713a3b8ce508f37d721fc4433011cc200
+  ReactTestApp-DevSupport: 754876d5c25e6dd12e321a87d54bf618c71cbbd1
   ReactTestApp-Resources: 1bd9ff10e4c24f2ad87101a32023721ae923bccf
   RNGestureHandler: 5cbe8c5f54204b2175c5d2b8fe6538b02da3aaf5
   RNReanimated: 516d842d105966ae05a6a1ad7ad2a0dc1e968d6b
diff --git a/example/package.json b/example/package.json
index 41d35e74..5afe7406 100644
--- a/example/package.json
+++ b/example/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "start": "react-native start",
-    "pods": "pod install --project-directory=ios",
+    "pods": "bundle install && cd ios && bundle exec pod install && cd ..",
     "test": "jest",
     "lint": "eslint .",
     "mkdist": "node -e \"require('node:fs').mkdirSync('dist', { recursive: true, mode: 0o755 })\"",
@@ -21,6 +21,7 @@
     "@react-navigation/native": "^7.3.7",
     "@react-navigation/native-stack": "^7.17.9",
     "@react-navigation/stack": "^7.10.10",
+    "@rnx-kit/react-native-host": "0.5.21",
     "babel-plugin-module-resolver": "^5.0.3",
     "react": "19.2.3",
     "react-native": "0.85.3",

From 4c55b4b36457bedf231056abd530e7f528d53cca Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 20:49:06 +0200
Subject: [PATCH 3/8] run failed test at the end

---
 scripts/run-maestro-tests.sh | 80 +++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/scripts/run-maestro-tests.sh b/scripts/run-maestro-tests.sh
index 0ff9b9c3..bd995105 100644
--- a/scripts/run-maestro-tests.sh
+++ b/scripts/run-maestro-tests.sh
@@ -60,6 +60,38 @@ mkdir -p .maestro/debug-output
 failedTests=()
 idx=0
 
+runTest() {
+  local file=$1
+  local attempt=$2
+  local testName
+  local artifactDir
+  local maestroCommand
+
+  testName=$(basename "${file%.*}")
+  if [ "$attempt" -eq 1 ]; then
+    artifactDir=".maestro/debug-output/$testName"
+  else
+    artifactDir=".maestro/debug-output/$testName-retry-$((attempt - 1))"
+  fi
+
+  maestroCommand=(
+    maestro test
+    -p "$PLATFORM"
+    "$file"
+    -e APP_ID="$APPID"
+    --debug-output "$artifactDir"
+    --flatten-debug-output
+  )
+
+  if [ -n "$DEVICE_ID" ]; then
+    maestroCommand+=(--device "$DEVICE_ID")
+  fi
+
+  "${maestroCommand[@]}"
+}
+
+# Run every test once before retrying. This prevents one flaky test from
+# delaying the first attempt of every test after it.
 for file in "${allTestFiles[@]}"; do
   if [ -n "$SHARD_COUNT" ]; then
     mod=$((idx % SHARD_COUNT))
@@ -69,46 +101,26 @@ for file in "${allTestFiles[@]}"; do
     fi
   fi
 
-  testName=$(basename "${file%.*}")
-  success=false
+  if ! runTest "$file" 1; then
+    failedTests+=("$file")
+  fi
 
-  for attempt in $(seq 1 "$MAX_ATTEMPTS"); do
-    if [ "$attempt" -eq 1 ]; then
-      artifactDir=".maestro/debug-output/$testName"
-    else
-      artifactDir=".maestro/debug-output/$testName-retry-$((attempt - 1))"
-    fi
+  idx=$((idx + 1))
+done
 
-    maestroCommand=(
-      maestro test
-      -p "$PLATFORM"
-      "$file"
-      -e APP_ID="$APPID"
-      --debug-output "$artifactDir"
-      --flatten-debug-output
-    )
-
-    if [ -n "$DEVICE_ID" ]; then
-      maestroCommand+=(--device "$DEVICE_ID")
-    fi
+for ((attempt = 2; attempt <= MAX_ATTEMPTS && ${#failedTests[@]} > 0; attempt++)); do
+  delay=${RETRY_DELAYS[$((attempt - 2))]:-120}
+  echo "${#failedTests[@]} test(s) failed. Retrying them in ${delay}s..."
+  sleep "$delay"
 
-    if "${maestroCommand[@]}"; then
-      success=true
-      break
-    fi
+  retryTests=("${failedTests[@]}")
+  failedTests=()
 
-    if [ "$attempt" -lt "$MAX_ATTEMPTS" ]; then
-      delay=${RETRY_DELAYS[$((attempt - 1))]:-120}
-      echo "Test ${file} failed. Retrying in ${delay}s..."
-      sleep "$delay"
+  for file in "${retryTests[@]}"; do
+    if ! runTest "$file" "$attempt"; then
+      failedTests+=("$file")
     fi
   done
-
-  if [ "$success" = false ]; then
-    failedTests+=("$file")
-  fi
-
-  idx=$((idx + 1))
 done
 
 if [ ${#failedTests[@]} -eq 0 ]; then

From 1363962e543d29ff9c7f3a16727d995f5bced156 Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 21:16:54 +0200
Subject: [PATCH 4/8] add retry argument

---
 scripts/run-maestro-tests.sh | 49 +++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/scripts/run-maestro-tests.sh b/scripts/run-maestro-tests.sh
index bd995105..2a74d58d 100644
--- a/scripts/run-maestro-tests.sh
+++ b/scripts/run-maestro-tests.sh
@@ -5,7 +5,8 @@ set -uo pipefail
 
 trap 'exit 130' INT TERM
 
-PLATFORM=${1:-}
+PLATFORM=""
+RETRY_FAILED_TESTS=false
 APPID="com.pagerviewexample"
 MAX_ATTEMPTS=${MAX_ATTEMPTS:-3}
 RETRY_DELAYS=(5 15)
@@ -13,6 +14,28 @@ DEVICE_ID=${MAESTRO_DEVICE:-${DEVICE_ID:-}}
 SHARD_COUNT=${SHARD_COUNT:-}
 SHARD_INDEX=${SHARD_INDEX:-}
 
+for argument in "$@"; do
+  case $argument in
+    ios | android )
+      if [ -n "$PLATFORM" ]; then
+        echo "Error! Only one platform may be passed."
+        exit 1
+      fi
+      PLATFORM=$argument
+      ;;
+
+    --retry )
+      RETRY_FAILED_TESTS=true
+      ;;
+
+    *)
+      echo "Error! Unknown argument '$argument'."
+      echo "Usage: $0 <android|ios> [--retry]"
+      exit 1
+      ;;
+  esac
+done
+
 # Validate passed platform
 case $PLATFORM in
   ios | android )
@@ -108,20 +131,22 @@ for file in "${allTestFiles[@]}"; do
   idx=$((idx + 1))
 done
 
-for ((attempt = 2; attempt <= MAX_ATTEMPTS && ${#failedTests[@]} > 0; attempt++)); do
-  delay=${RETRY_DELAYS[$((attempt - 2))]:-120}
-  echo "${#failedTests[@]} test(s) failed. Retrying them in ${delay}s..."
-  sleep "$delay"
+if [ "$RETRY_FAILED_TESTS" = true ]; then
+  for ((attempt = 2; attempt <= MAX_ATTEMPTS && ${#failedTests[@]} > 0; attempt++)); do
+    delay=${RETRY_DELAYS[$((attempt - 2))]:-120}
+    echo "${#failedTests[@]} test(s) failed. Retrying them in ${delay}s..."
+    sleep "$delay"
 
-  retryTests=("${failedTests[@]}")
-  failedTests=()
+    retryTests=("${failedTests[@]}")
+    failedTests=()
 
-  for file in "${retryTests[@]}"; do
-    if ! runTest "$file" "$attempt"; then
-      failedTests+=("$file")
-    fi
+    for file in "${retryTests[@]}"; do
+      if ! runTest "$file" "$attempt"; then
+        failedTests+=("$file")
+      fi
+    done
   done
-done
+fi
 
 if [ ${#failedTests[@]} -eq 0 ]; then
     exit 0

From d3eee902dd4075a17c116759f7c7fe00fcd0b960 Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 21:17:22 +0200
Subject: [PATCH 5/8] fix pager_vertical_basic_example.yaml

---
 ios/PagerView.swift | 66 +++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/ios/PagerView.swift b/ios/PagerView.swift
index e3852c23..e0e7e501 100644
--- a/ios/PagerView.swift
+++ b/ios/PagerView.swift
@@ -1,3 +1,6 @@
+// Vertical pager layout adapted from VTabView by Lorenzo Fiamingo:
+// https://github.com/lorenzofiamingo/swiftui-vertical-tab-view/blob/main/Sources/VTabView/VTabView.swift
+
 import SwiftUI
 @_spi(Advanced) import SwiftUIIntrospect
 
@@ -8,35 +11,46 @@ struct PagerView: View {
 
   @Weak var collectionView: UICollectionView?
 
-  var body: some View {
-    TabView(selection: $props.currentPage) {
-      ForEach(Array(props.children.enumerated()), id: \.element.id) { index, child in
-        RepresentableView(view: child.view)
-          .tag(index)
-      }
-    }
-    .id(props.children.count)
-    .background(.clear)
-    .tabViewStyle(.page(indexDisplayMode: .never))
-    .ignoresSafeArea()
-    .environment(\.layoutDirection, props.layoutDirection.converted)
-    .introspect(.tabView(style: .page), on: .iOS(.v14...)) { collectionView in
-      self.collectionView = collectionView
-      collectionView.bounces = props.overdrag
-      collectionView.isScrollEnabled = props.scrollEnabled
-      collectionView.keyboardDismissMode = props.keyboardDismissMode
-      collectionView.showsVerticalScrollIndicator = false
-      collectionView.showsHorizontalScrollIndicator = false
+  private var isVertical: Bool {
+    props.orientation == .vertical
+  }
 
-      if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout {
-        layout.scrollDirection = props.orientation
+  var body: some View {
+    GeometryReader { proxy in
+      TabView(selection: $props.currentPage) {
+        ForEach(Array(props.children.enumerated()), id: \.element.id) { index, child in
+          RepresentableView(view: child.view)
+            .frame(width: proxy.size.width, height: proxy.size.height)
+            .rotationEffect(isVertical ? .degrees(-90) : .zero)
+            .tag(index)
+        }
       }
+      .id(props.children.count)
+      .background(.clear)
+      .tabViewStyle(.page(indexDisplayMode: .never))
+      .frame(
+        width: isVertical ? proxy.size.height : proxy.size.width,
+        height: isVertical ? proxy.size.width : proxy.size.height
+      )
+      .rotationEffect(isVertical ? .degrees(90) : .zero, anchor: .topLeading)
+      .offset(x: isVertical ? proxy.size.width : 0)
+      .ignoresSafeArea()
+      .environment(\.layoutDirection, props.layoutDirection.converted)
+      .introspect(.tabView(style: .page), on: .iOS(.v14...)) { collectionView in
+        self.collectionView = collectionView
+        collectionView.bounces = props.overdrag
+        collectionView.isScrollEnabled = props.scrollEnabled
+        collectionView.keyboardDismissMode = props.keyboardDismissMode
+        collectionView.showsVerticalScrollIndicator = false
+        collectionView.showsHorizontalScrollIndicator = false
 
-      if scrollDelegate.originalDelegate == nil {
-        scrollDelegate.originalDelegate = collectionView.delegate
-        scrollDelegate.delegate = delegate
-        scrollDelegate.orientation = props.orientation
-        collectionView.delegate = scrollDelegate
+        if scrollDelegate.originalDelegate == nil {
+          scrollDelegate.originalDelegate = collectionView.delegate
+          scrollDelegate.delegate = delegate
+          // VTabView-style rotation preserves TabView's horizontal collection view.
+          scrollDelegate.orientation = .horizontal
+          collectionView.delegate = scrollDelegate
+        }
       }
     }
     .onAppear {

From daa133ba2d5ac982f42b5750cc546bb0d60ffd2b Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 21:24:44 +0200
Subject: [PATCH 6/8] fix on_page_selected_example.yaml

---
 ios/PagerView.swift | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ios/PagerView.swift b/ios/PagerView.swift
index e0e7e501..5d90f7f6 100644
--- a/ios/PagerView.swift
+++ b/ios/PagerView.swift
@@ -7,6 +7,7 @@ import SwiftUI
 struct PagerView: View {
   @ObservedObject var props: PagerViewProps
   @State private var scrollDelegate = PagerScrollDelegate()
+  @State private var didEmitInitialPageSelection = false
   weak var delegate: PagerViewProviderDelegate?
 
   @Weak var collectionView: UICollectionView?
@@ -60,6 +61,14 @@ struct PagerView: View {
         collectionView?.isScrollEnabled = props.scrollEnabled
         collectionView?.bounces = props.overdrag
       }
+
+      // `onChange` does not fire for the initial `currentPage` value. Emit the
+      // initial selection once so React Native receives `onPageSelected` for
+      // `initialPage`, just as it does for subsequent page changes.
+      if !didEmitInitialPageSelection && props.currentPage >= 0 {
+        didEmitInitialPageSelection = true
+        delegate?.onPageSelected(position: props.currentPage)
+      }
     }
     .onChange(of: props.children) { newValue in
       if props.currentPage >= newValue.count && !newValue.isEmpty {

From 43ac6cc8e5489dee6002ec9903922448ff175902 Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 21:58:13 +0200
Subject: [PATCH 7/8] improve test rendering

---
 scripts/run-maestro-tests.sh | 162 ++++++++++++++++++++++++++++-------
 1 file changed, 133 insertions(+), 29 deletions(-)

diff --git a/scripts/run-maestro-tests.sh b/scripts/run-maestro-tests.sh
index 2a74d58d..160c2236 100644
--- a/scripts/run-maestro-tests.sh
+++ b/scripts/run-maestro-tests.sh
@@ -3,7 +3,38 @@
 # Source https://github.com/stripe/stripe-react-native/blob/master/scripts/run-maestro-tests
 set -uo pipefail
 
-trap 'exit 130' INT TERM
+if [ -t 1 ] && [ "${NO_COLOR:-}" != "1" ] && [ "${TERM:-}" != "dumb" ]; then
+  BOLD=$'\033[1m'
+  DIM=$'\033[2m'
+  RESET=$'\033[0m'
+  BLUE=$'\033[34m'
+  GREEN=$'\033[32m'
+  RED=$'\033[31m'
+  YELLOW=$'\033[33m'
+else
+  BOLD=""
+  DIM=""
+  RESET=""
+  BLUE=""
+  GREEN=""
+  RED=""
+  YELLOW=""
+fi
+
+formatDuration() {
+  local seconds=$1
+  printf '%dm %02ds' "$((seconds / 60))" "$((seconds % 60))"
+}
+
+printDivider() {
+  printf '%s%s────────────────────────────────────────────────────────────────%s\n' "$DIM" "$BLUE" "$RESET"
+}
+
+printError() {
+  printf '%sERROR%s %s\n' "$RED$BOLD" "$RESET" "$*" >&2
+}
+
+trap 'printf "\n%sINTERRUPTED%s Maestro run stopped.\n" "$YELLOW$BOLD" "$RESET"; exit 130' INT TERM
 
 PLATFORM=""
 RETRY_FAILED_TESTS=false
@@ -18,7 +49,7 @@ for argument in "$@"; do
   case $argument in
     ios | android )
       if [ -n "$PLATFORM" ]; then
-        echo "Error! Only one platform may be passed."
+        printError "Only one platform may be passed."
         exit 1
       fi
       PLATFORM=$argument
@@ -29,7 +60,7 @@ for argument in "$@"; do
       ;;
 
     *)
-      echo "Error! Unknown argument '$argument'."
+      printError "Unknown argument '$argument'."
       echo "Usage: $0 <android|ios> [--retry]"
       exit 1
       ;;
@@ -42,29 +73,27 @@ case $PLATFORM in
     ;;
 
   *)
-    echo "Error! You must pass either 'android' or 'ios'"
+    printError "You must pass either 'android' or 'ios'."
     echo ""
     exit 1
     ;;
 esac
 
 if { [ -n "$SHARD_COUNT" ] || [ -n "$SHARD_INDEX" ]; } && { [ -z "$SHARD_COUNT" ] || [ -z "$SHARD_INDEX" ]; }; then
-  echo "Error! Both SHARD_COUNT and SHARD_INDEX must be set to enable sharding."
+  printError "Both SHARD_COUNT and SHARD_INDEX must be set to enable sharding."
   exit 1
 fi
 
 if [ -n "$SHARD_COUNT" ]; then
   if ! [[ $SHARD_COUNT =~ ^[0-9]+$ ]] || ! [[ $SHARD_INDEX =~ ^[0-9]+$ ]]; then
-    echo "Error! SHARD_COUNT and SHARD_INDEX must be integers."
+    printError "SHARD_COUNT and SHARD_INDEX must be integers."
     exit 1
   fi
 
   if [ "$SHARD_COUNT" -le 0 ] || [ "$SHARD_INDEX" -lt 0 ] || [ "$SHARD_INDEX" -ge "$SHARD_COUNT" ]; then
-    echo "Error! SHARD_INDEX must satisfy 0 <= SHARD_INDEX < SHARD_COUNT. Got SHARD_INDEX=$SHARD_INDEX, SHARD_COUNT=$SHARD_COUNT"
+    printError "SHARD_INDEX must satisfy 0 <= SHARD_INDEX < SHARD_COUNT. Got SHARD_INDEX=$SHARD_INDEX, SHARD_COUNT=$SHARD_COUNT"
     exit 1
   fi
-
-  echo "Sharding enabled: SHARD_INDEX=$SHARD_INDEX SHARD_COUNT=$SHARD_COUNT"
 fi
 
 shopt -s nullglob
@@ -74,14 +103,28 @@ allTestFiles=(
 )
 
 if [ ${#allTestFiles[@]} -eq 0 ]; then
-  echo "Error! No Maestro test files found for platform '$PLATFORM'."
+  printError "No Maestro test files found for platform '$PLATFORM'."
   exit 1
 fi
 
 mkdir -p .maestro/debug-output
 
+testFiles=()
+for idx in "${!allTestFiles[@]}"; do
+  if [ -z "$SHARD_COUNT" ] || [ "$((idx % SHARD_COUNT))" -eq "$SHARD_INDEX" ]; then
+    testFiles+=("${allTestFiles[$idx]}")
+  fi
+done
+
+if [ ${#testFiles[@]} -eq 0 ]; then
+  printError "Shard $SHARD_INDEX/$SHARD_COUNT has no Maestro tests to run."
+  exit 1
+fi
+
 failedTests=()
-idx=0
+totalTests=${#testFiles[@]}
+runStartedAt=$(date +%s)
+retryCount=0
 
 runTest() {
   local file=$1
@@ -113,45 +156,106 @@ runTest() {
   "${maestroCommand[@]}"
 }
 
-# Run every test once before retrying. This prevents one flaky test from
-# delaying the first attempt of every test after it.
-for file in "${allTestFiles[@]}"; do
-  if [ -n "$SHARD_COUNT" ]; then
-    mod=$((idx % SHARD_COUNT))
-    if [ "$mod" -ne "$SHARD_INDEX" ]; then
-      idx=$((idx + 1))
-      continue
-    fi
+runAndReport() {
+  local file=$1
+  local attempt=$2
+  local position=$3
+  local testName
+  local startedAt
+  local finishedAt
+  local duration
+
+  testName=$(basename "${file%.*}")
+  startedAt=$(date +%s)
+
+  printf '\n%s▶%s %s[%d/%d]%s %s%s%s' \
+    "$BLUE$BOLD" "$RESET" "$DIM" "$position" "$totalTests" "$RESET" "$BOLD" "$testName" "$RESET"
+  if [ "$attempt" -gt 1 ]; then
+    printf ' %s(retry %d/%d)%s' "$YELLOW" "$((attempt - 1))" "$((MAX_ATTEMPTS - 1))" "$RESET"
   fi
+  printf '\n%s  %s%s\n' "$DIM" "$file" "$RESET"
 
-  if ! runTest "$file" 1; then
-    failedTests+=("$file")
+  if runTest "$file" "$attempt"; then
+    finishedAt=$(date +%s)
+    duration=$((finishedAt - startedAt))
+    printf '%s✓ PASS%s %s%s%s\n' "$GREEN$BOLD" "$RESET" "$DIM" "($(formatDuration "$duration"))" "$RESET"
+    return 0
   fi
 
-  idx=$((idx + 1))
+  finishedAt=$(date +%s)
+  duration=$((finishedAt - startedAt))
+  printf '%s✗ FAIL%s %s%s%s\n' "$RED$BOLD" "$RESET" "$DIM" "($(formatDuration "$duration"))" "$RESET"
+  return 1
+}
+
+printDivider
+printf '%sMAESTRO TEST RUN%s\n' "$BOLD" "$RESET"
+printf '  Platform  %s%s%s\n' "$BLUE" "$PLATFORM" "$RESET"
+printf '  Tests     %s%d%s' "$BOLD" "$totalTests" "$RESET"
+if [ -n "$SHARD_COUNT" ]; then
+  printf ' %s(shard %d/%d)%s' "$DIM" "$((SHARD_INDEX + 1))" "$SHARD_COUNT" "$RESET"
+fi
+printf '\n'
+printf '  Device    %s%s%s\n' "$DIM" "${DEVICE_ID:-default}" "$RESET"
+printf '  Retries   %s%s%s\n' "$DIM" "$([ "$RETRY_FAILED_TESTS" = true ] && printf '%d attempts' "$MAX_ATTEMPTS" || printf 'disabled')" "$RESET"
+printf '  Artifacts %s.maestro/debug-output%s\n' "$DIM" "$RESET"
+printDivider
+
+# Run every test once before retrying. This prevents one flaky test from
+# delaying the first attempt of every test after it.
+for position in "${!testFiles[@]}"; do
+  file=${testFiles[$position]}
+  if ! runAndReport "$file" 1 "$((position + 1))"; then
+    failedTests+=("$file")
+  fi
 done
 
 if [ "$RETRY_FAILED_TESTS" = true ]; then
   for ((attempt = 2; attempt <= MAX_ATTEMPTS && ${#failedTests[@]} > 0; attempt++)); do
     delay=${RETRY_DELAYS[$((attempt - 2))]:-120}
-    echo "${#failedTests[@]} test(s) failed. Retrying them in ${delay}s..."
+    retryCount=$((retryCount + ${#failedTests[@]}))
+    printf '\n%s↻ RETRY%s %d test(s) retrying in %ss (attempt %d/%d)\n' \
+      "$YELLOW$BOLD" "$RESET" "${#failedTests[@]}" "$delay" "$attempt" "$MAX_ATTEMPTS"
     sleep "$delay"
 
     retryTests=("${failedTests[@]}")
     failedTests=()
 
     for file in "${retryTests[@]}"; do
-      if ! runTest "$file" "$attempt"; then
+      for position in "${!testFiles[@]}"; do
+        [ "${testFiles[$position]}" = "$file" ] && break
+      done
+      if ! runAndReport "$file" "$attempt" "$((position + 1))"; then
         failedTests+=("$file")
       fi
     done
   done
 fi
 
+runFinishedAt=$(date +%s)
+runDuration=$((runFinishedAt - runStartedAt))
+passedTests=$((totalTests - ${#failedTests[@]}))
+printDivider
 if [ ${#failedTests[@]} -eq 0 ]; then
-    exit 0
+  printf '%s✓ ALL TESTS PASSED%s %d/%d tests in %s' \
+    "$GREEN$BOLD" "$RESET" "$passedTests" "$totalTests" "$(formatDuration "$runDuration")"
 else
-    echo "These tests failed:"
-    printf '%s\n' "${failedTests[@]}"
-    exit 1
+  printf '%s✗ TEST RUN FAILED%s %d passed, %d failed, %d total in %s' \
+    "$RED$BOLD" "$RESET" "$passedTests" "${#failedTests[@]}" "$totalTests" "$(formatDuration "$runDuration")"
+fi
+if [ "$retryCount" -gt 0 ]; then
+  printf ' %s(%d retried)%s' "$DIM" "$retryCount" "$RESET"
+fi
+printf '\n'
+
+if [ ${#failedTests[@]} -eq 0 ]; then
+  exit 0
+else
+  printf '%sFailed tests:%s\n' "$RED$BOLD" "$RESET"
+  for file in "${failedTests[@]}"; do
+    testName=$(basename "${file%.*}")
+    printf '  %s•%s %s %s(artifacts: .maestro/debug-output/%s)%s\n' \
+      "$RED" "$RESET" "$file" "$DIM" "$testName" "$RESET"
+  done
+  exit 1
 fi

From 6a49f715628dcc8a16f56946a101ca4bb1e15492 Mon Sep 17 00:00:00 2001
From: troZee <12766071+troZee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 22:39:26 +0200
Subject: [PATCH 8/8] fix #1098

---
 .../issue_1098_nested_pager_repro_setup.yaml  |  20 +++
 .../tests/issue_1098_nested_pager_repro.yaml  |  47 ++++++
 example/src/App.tsx                           |  35 ++++-
 example/src/Issue1098NestedPagerRepro.tsx     | 145 ++++++++++++++++++
 example/src/Issue1099SafeAreaRepro.tsx        | 145 ++++++++++++++++++
 ios/PagerViewProvider.swift                   |  36 +++++
 6 files changed, 426 insertions(+), 2 deletions(-)
 create mode 100644 .maestro/setup/issue_1098_nested_pager_repro_setup.yaml
 create mode 100644 .maestro/tests/issue_1098_nested_pager_repro.yaml
 create mode 100644 example/src/Issue1098NestedPagerRepro.tsx
 create mode 100644 example/src/Issue1099SafeAreaRepro.tsx

diff --git a/.maestro/setup/issue_1098_nested_pager_repro_setup.yaml b/.maestro/setup/issue_1098_nested_pager_repro_setup.yaml
new file mode 100644
index 00000000..9deeae23
--- /dev/null
+++ b/.maestro/setup/issue_1098_nested_pager_repro_setup.yaml
@@ -0,0 +1,20 @@
+appId: ${APP_ID}
+---
+- launchApp
+
+# The issue examples are below the fundamental examples on the home screen.
+- scrollUntilVisible:
+    element:
+      id: 'Issue #1098 Nested Pager Repro'
+    direction: DOWN
+
+- tapOn:
+    id: 'Issue #1098 Nested Pager Repro'
+
+- extendedWaitUntil:
+    visible:
+      id: 'issue-1098-outer-pager'
+    timeout: 10000
+
+- assertVisible:
+    id: 'issue-1098-refresh-outer-pages'
diff --git a/.maestro/tests/issue_1098_nested_pager_repro.yaml b/.maestro/tests/issue_1098_nested_pager_repro.yaml
new file mode 100644
index 00000000..52966488
--- /dev/null
+++ b/.maestro/tests/issue_1098_nested_pager_repro.yaml
@@ -0,0 +1,47 @@
+appId: com.pagerviewexample
+tags:
+  - ios
+  - regression
+---
+- runFlow: ../setup/issue_1098_nested_pager_repro_setup.yaml
+
+# Changing the outer page count remounts its SwiftUI page controllers while the
+# nested pager remains mounted. The app must remain responsive after each change.
+- tapOn:
+    id: 'issue-1098-refresh-outer-pages'
+
+- extendedWaitUntil:
+    visible: 'Refreshes: 1'
+    timeout: 5000
+
+- swipe:
+    from:
+      id: 'issue-1098-outer-pager'
+    # Percentages are screen-relative in Maestro. 40% is the outer page title,
+    # above the nested pager, so this gesture reaches the outer pager.
+    start: 90%, 40%
+    end: 10%, 40%
+    duration: 500
+
+- extendedWaitUntil:
+    visible: 'Outer page 2'
+    timeout: 5000
+
+- swipe:
+    from:
+      id: 'issue-1098-outer-pager'
+    start: 10%, 40%
+    end: 90%, 40%
+    duration: 500
+
+- extendedWaitUntil:
+    visible:
+      id: 'issue-1098-inner-pager'
+    timeout: 5000
+
+- tapOn:
+    id: 'issue-1098-refresh-outer-pages'
+
+- extendedWaitUntil:
+    visible: 'Refreshes: 2'
+    timeout: 5000
diff --git a/example/src/App.tsx b/example/src/App.tsx
index b3e8491d..87920525 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -34,6 +34,8 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { PagerHookExample } from './PagerHookExample';
 import { NestedHorizontalScrollViewExample } from './NestedHorizontalScrollViewExample';
+import { Issue1098NestedPagerRepro } from './Issue1098NestedPagerRepro';
+import { Issue1099SafeAreaRepro } from './Issue1099SafeAreaRepro';
 
 function BasicPagerViewExampleScreen() {
   return <BasicPagerViewExample isHorizontal={true} />;
@@ -81,7 +83,6 @@ const examples: Example[] = [
     component: ScrollViewInsideExample,
     name: 'ScrollView inside PagerView Example',
   },
-
   {
     component: TabViewInsideScrollViewExample,
     name: 'TabView inside ScrollView Example',
@@ -106,7 +107,23 @@ const additionalExamples: Example[] = [
   },
 ];
 
-const allExamples = [...examples, ...tabViewExamples, ...additionalExamples];
+const ghIssues: Example[] = [
+  {
+    component: Issue1098NestedPagerRepro,
+    name: 'Issue #1098 Nested Pager Repro',
+  },
+  {
+    component: Issue1099SafeAreaRepro,
+    name: 'Issue #1099 Safe Area Repro',
+  },
+];
+
+const allExamples = [
+  ...examples,
+  ...tabViewExamples,
+  ...additionalExamples,
+  ...ghIssues,
+];
 
 function App() {
   const navigation = useNavigation();
@@ -154,6 +171,20 @@ function App() {
           <Text style={styles.exampleText}>{example.name}</Text>
         </TouchableOpacity>
       ))}
+      <Text>Github Issues Examples</Text>
+      {ghIssues.map((example) => (
+        <TouchableOpacity
+          key={example.name}
+          testID={example.name}
+          style={styles.exampleTouchable}
+          onPress={() => {
+            //@ts-ignore
+            navigation.navigate(example.name);
+          }}
+        >
+          <Text style={styles.exampleText}>{example.name}</Text>
+        </TouchableOpacity>
+      ))}
     </ScrollView>
   );
 }
diff --git a/example/src/Issue1098NestedPagerRepro.tsx b/example/src/Issue1098NestedPagerRepro.tsx
new file mode 100644
index 00000000..10b859a4
--- /dev/null
+++ b/example/src/Issue1098NestedPagerRepro.tsx
@@ -0,0 +1,145 @@
+import React, { useState } from 'react';
+import { Button, StyleSheet, Text, View } from 'react-native';
+import PagerView from 'react-native-pager-view';
+
+/**
+ * Reproduces https://github.com/callstack/react-native-pager-view/issues/1098
+ *
+ * iOS only. The action changes the outer pager's child count, which rebuilds
+ * its SwiftUI TabView while the nested pagers' native views are retained. In
+ * affected builds this leaves an inner hosting controller parented to a stale
+ * PageChildViewController and UIKit later terminates with
+ * UIViewControllerHierarchyInconsistency.
+ */
+export function Issue1098NestedPagerRepro() {
+  const [hasExtraOuterPage, setHasExtraOuterPage] = useState(false);
+  const [refreshCount, setRefreshCount] = useState(0);
+
+  const refreshOuterPager = () => {
+    setHasExtraOuterPage((value) => !value);
+    setRefreshCount((count) => count + 1);
+  };
+
+  return (
+    <View style={styles.container}>
+      <View style={styles.controls}>
+        <Text style={styles.heading}>Issue #1098: nested pagers</Text>
+        <Text style={styles.description}>
+          Tap “Refresh outer pages”, then swipe between the outer pages. Repeat
+          a few times. On affected iOS builds, this eventually crashes with
+          UIViewControllerHierarchyInconsistency.
+        </Text>
+        <Button
+          title="Refresh outer pages"
+          testID="issue-1098-refresh-outer-pages"
+          onPress={refreshOuterPager}
+        />
+        <Text style={styles.counter}>Refreshes: {refreshCount}</Text>
+      </View>
+
+      <PagerView
+        initialPage={0}
+        style={styles.outerPager}
+        testID="issue-1098-outer-pager"
+      >
+        {[
+          <View key="nested-page" collapsable={false} style={styles.outerPage}>
+            <Text style={styles.pageTitle}>Outer page: nested pagers</Text>
+            <PagerView
+              initialPage={0}
+              style={styles.innerPager}
+              testID="issue-1098-inner-pager"
+            >
+              <InnerPage color="#ffb3ba" label="Inner page 1" />
+              <InnerPage color="#bae1ff" label="Inner page 2" />
+            </PagerView>
+          </View>,
+          <View key="second-page" collapsable={false} style={styles.secondPage}>
+            <Text style={styles.pageTitle}>Outer page 2</Text>
+            <Text>Swipe back to the nested page after each refresh.</Text>
+          </View>,
+          ...(hasExtraOuterPage
+            ? [
+                <View
+                  key="extra-page"
+                  collapsable={false}
+                  style={styles.extraPage}
+                >
+                  <Text style={styles.pageTitle}>Conditional outer page</Text>
+                  <Text>
+                    Its insertion/removal forces the outer SwiftUI TabView to
+                    rebuild.
+                  </Text>
+                </View>,
+              ]
+            : []),
+        ]}
+      </PagerView>
+    </View>
+  );
+}
+
+function InnerPage({ color, label }: { color: string; label: string }) {
+  return (
+    <View
+      collapsable={false}
+      style={[styles.innerPage, { backgroundColor: color }]}
+    >
+      <Text style={styles.pageTitle}>{label}</Text>
+      <Text>Swipe horizontally inside this nested PagerView.</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  controls: {
+    padding: 16,
+    gap: 8,
+  },
+  heading: {
+    fontSize: 20,
+    fontWeight: '600',
+  },
+  description: {
+    color: '#444',
+    lineHeight: 20,
+  },
+  counter: {
+    color: '#555',
+  },
+  outerPager: {
+    flex: 1,
+  },
+  outerPage: {
+    flex: 1,
+    padding: 16,
+    backgroundColor: '#f5f5f5',
+  },
+  secondPage: {
+    flex: 1,
+    padding: 16,
+    backgroundColor: '#d7f9e9',
+  },
+  extraPage: {
+    flex: 1,
+    padding: 16,
+    backgroundColor: '#fff2cc',
+  },
+  innerPager: {
+    flex: 1,
+    marginTop: 16,
+  },
+  innerPage: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: 16,
+  },
+  pageTitle: {
+    fontSize: 18,
+    fontWeight: '600',
+  },
+});
diff --git a/example/src/Issue1099SafeAreaRepro.tsx b/example/src/Issue1099SafeAreaRepro.tsx
new file mode 100644
index 00000000..7af682fa
--- /dev/null
+++ b/example/src/Issue1099SafeAreaRepro.tsx
@@ -0,0 +1,145 @@
+import React from 'react';
+import { ScrollView, StyleSheet, Text, View } from 'react-native';
+import PagerView from 'react-native-pager-view';
+
+import { IMAGE_URIS } from './utils';
+
+const CARD_HEIGHT = 500;
+
+/**
+ * Reproduces https://github.com/callstack/react-native-pager-view/issues/1099
+ *
+ * On iOS with Fabric and pager-view >= 8.0.4, scroll the first tab vertically.
+ * The image in the nested pager can appear pinned while the card border and page
+ * indicator continue moving. This happens because the page controller copies the
+ * outer ScrollView content view's changing safe-area inset.
+ */
+export function Issue1099SafeAreaRepro() {
+  return (
+    <PagerView style={styles.tabs} initialPage={0} testID="issue-1099-tabs">
+      <ScrollView
+        key="scrollable-tab"
+        style={styles.tab}
+        contentContainerStyle={styles.scrollContent}
+        testID="issue-1099-outer-scroll-view"
+      >
+        <Text style={styles.heading}>Issue #1099: nested pager safe area</Text>
+        <Text style={styles.description}>
+          Scroll this tab. On affected iOS Fabric builds, the image may stop
+          moving with its card temporarily while the card border and indicator
+          continue scrolling.
+        </Text>
+
+        <View style={styles.topSpacer} />
+
+        <View style={styles.card} testID="issue-1099-card">
+          <PagerView
+            style={styles.imagePager}
+            initialPage={0}
+            testID="issue-1099-image-pager"
+          >
+            {IMAGE_URIS.slice(0, 3).map((uri, index) => (
+              <View
+                key={uri}
+                collapsable={false}
+                style={styles.imagePage}
+                testID={`issue-1099-image-page-${index}`}
+              >
+                <View
+                  collapsable={false}
+                  style={{
+                    width: '100%',
+                    height: '100%',
+                    backgroundColor: 'red',
+                    justifyContent: 'space-between',
+                  }}
+                >
+                  <Text>TOP</Text>
+                  <Text>BOTTOM</Text>
+                </View>
+              </View>
+            ))}
+          </PagerView>
+          <View style={styles.indicator} testID="issue-1099-page-indicator">
+            <Text style={styles.indicatorText}>Swipe images horizontally</Text>
+          </View>
+        </View>
+
+        {Array.from({ length: 8 }, (_, index) => (
+          <View key={index} style={styles.row}>
+            <Text>Scrollable content {index + 1}</Text>
+          </View>
+        ))}
+      </ScrollView>
+
+      <View key="second-tab" style={styles.secondTab} collapsable={false}>
+        <Text>Second tab</Text>
+      </View>
+    </PagerView>
+  );
+}
+
+const styles = StyleSheet.create({
+  tabs: {
+    flex: 1,
+  },
+  tab: {
+    flex: 1,
+    backgroundColor: '#f5f5f5',
+  },
+  scrollContent: {
+    padding: 16,
+    paddingBottom: 48,
+  },
+  heading: {
+    fontSize: 20,
+    fontWeight: '600',
+  },
+  description: {
+    marginTop: 8,
+    color: '#444',
+    lineHeight: 20,
+  },
+  topSpacer: {
+    height: 180,
+  },
+  card: {
+    height: CARD_HEIGHT,
+
+    borderWidth: 3,
+    borderColor: '#5b5bd6',
+    backgroundColor: 'white',
+  },
+  imagePager: {
+    height: CARD_HEIGHT - 48,
+  },
+  imagePage: {
+    flex: 1,
+  },
+  image: {
+    width: '100%',
+    height: '100%',
+  },
+  indicator: {
+    height: 42,
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: '#e5e5ff',
+  },
+  indicatorText: {
+    fontWeight: '600',
+  },
+  row: {
+    height: 120,
+    marginTop: 16,
+    alignItems: 'center',
+    justifyContent: 'center',
+    borderRadius: 12,
+    backgroundColor: 'white',
+  },
+  secondTab: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+});
diff --git a/ios/PagerViewProvider.swift b/ios/PagerViewProvider.swift
index 6457b0a5..644a0575 100644
--- a/ios/PagerViewProvider.swift
+++ b/ios/PagerViewProvider.swift
@@ -91,6 +91,25 @@ import UIKit
     }
   }
 
+  override public func willMove(toWindow newWindow: UIWindow?) {
+    super.willMove(toWindow: newWindow)
+    if newWindow != nil {
+      syncParentViewController()
+    }
+  }
+
+  override public func willMove(toSuperview newSuperview: UIView?) {
+    if let parentViewController = newSuperview?.reactViewController() {
+      syncParentViewController(to: parentViewController)
+    }
+    super.willMove(toSuperview: newSuperview)
+  }
+
+  override public func didMoveToSuperview() {
+    super.didMoveToSuperview()
+    syncParentViewController()
+  }
+
   override public func layoutSubviews() {
     super.layoutSubviews()
     if window != nil {
@@ -110,6 +129,7 @@ import UIKit
 
   private func setupView() {
     if self.hostingController != nil {
+      syncParentViewController()
       return
     }
 
@@ -131,4 +151,20 @@ import UIKit
 
     hostingController.didMove(toParent: parentViewController)
   }
+
+  /// SwiftUI can recreate the page controller around this React view while
+  /// preserving the view itself. Keep the hosting controller attached to the
+  /// current page controller so UIKit's view-controller hierarchy stays valid.
+  private func syncParentViewController(to parentViewController: UIViewController? = nil) {
+    guard let hostingController,
+          let parentViewController = parentViewController ?? reactViewController(),
+          hostingController.parent !== parentViewController else {
+      return
+    }
+
+    hostingController.willMove(toParent: nil)
+    hostingController.removeFromParent()
+    parentViewController.addChild(hostingController)
+    hostingController.didMove(toParent: parentViewController)
+  }
 }