@blario/react-native 0.1.2 → 0.1.4

package/src/snapshot/collect.ts

@@ -5,6 +5,7 @@ import { classify } from './classify.ts';
 import type { ElementKind } from './kinds.ts';
 import { isFocusedScreen, type ScreenRef, screenOf } from './navigation.ts';
 import { roleOf } from './properties.ts';
+import { isWheel } from './scroll.ts';
 
 export const AGENT_OVERLAY_TEST_ID = 'blar-agent-overlay';
 
@@ -14,10 +15,12 @@ export interface Candidate {
   host: Fiber;
   ancestors: Fiber[];
   scrollContainers: Fiber[];
+  wheelOption?: boolean;
 }
 
 const MODAL_COMPONENT_NAME = 'Modal';
 const TEXT_HOST_TYPE = 'RCTText';
+const WHEEL_OPTION_LIMIT = 24;
 const TEXT_BLOCK_LIMIT = 800;
 const HEADING_ROLES: readonly string[] = ['header', 'heading'];
 
@@ -75,6 +78,9 @@ export function collect(root: Fiber): Collected {
     const block = readTextBlock(fiber, ancestors, scrollContainers);
     if (block !== null) {
       textBlocks.push(block);
+      if (isWheelOption(block)) {
+        candidates.push({ kind: 'button', fiber, host: fiber, ancestors: block.ancestors, scrollContainers: block.scrollContainers, wheelOption: true });
+      }
     }
     ancestors.push(fiber);
     if (kind === 'scroll') {
@@ -118,6 +124,14 @@ function readTextBlock(fiber: Fiber, ancestors: Fiber[], scrollContainers: Fiber
   };
 }
 
+function isWheelOption(block: TextBlock): boolean {
+  const wheel = block.scrollContainers[block.scrollContainers.length - 1];
+  if (wheel === undefined || !isWheel(wheel) || block.text.length > WHEEL_OPTION_LIMIT) {
+    return false;
+  }
+  return !block.ancestors.slice(block.ancestors.lastIndexOf(wheel)).some((ancestor) => classify(ancestor) === 'button');
+}
+
 export function isOpenModal(fiber: Fiber): boolean {
   return componentName(fiber) === MODAL_COMPONENT_NAME && fiber.child !== null && propsOf(fiber).visible !== false;
 }

package/src/snapshot/modals.ts

@@ -2,13 +2,9 @@ import { childrenOf, propsOf } from '../fiber/reader.ts';
 import type { Fiber } from '../fiber/types.ts';
 import { AGENT_OVERLAY_TEST_ID, isOpenModal } from './collect.ts';
 
-const NATIVE_SCREEN = 'RNSScreen';
-
-// A native-stack screen presented as a modal or sheet is a UIKit presentation too, which covers the agent layer.
-function isPresentedScreen(fiber: Fiber): boolean {
-  const presentation = propsOf(fiber).stackPresentation;
-  return fiber.type === NATIVE_SCREEN && typeof presentation === 'string' && presentation !== 'push';
-}
+// react-native-screens renders an iOS screen presented as a modal or sheet as RNSModalScreen: a UIKit presentation
+// too, which covers the agent layer.
+const PRESENTED_SCREEN = 'RNSModalScreen';
 
 export function countOpenModals(fiber: Fiber): number {
   const pending = [fiber];
@@ -18,7 +14,7 @@ export function countOpenModals(fiber: Fiber): number {
     if (current === undefined || propsOf(current).testID === AGENT_OVERLAY_TEST_ID) {
       continue;
     }
-    if (isOpenModal(current) || isPresentedScreen(current)) {
+    if (isOpenModal(current) || current.type === PRESENTED_SCREEN) {
       count += 1;
     }
     for (const child of childrenOf(current)) {

package/src/snapshot/scroll.ts

@@ -43,6 +43,12 @@ export function isHorizontal(fiber: Fiber): boolean {
   return propsOf(fiber).horizontal === true;
 }
 
+// A wheel picker: a snapping list whose rows are plain text, where scrolling a row into the center is what selects it.
+export function isWheel(fiber: Fiber): boolean {
+  const { snapToInterval, snapToOffsets } = propsOf(fiber);
+  return typeof snapToInterval === 'number' || Array.isArray(snapToOffsets);
+}
+
 export async function measureScrollGeometry(scrollFiber: Fiber): Promise<ScrollGeometry | null> {
   const scrollHost = findScrollHost(scrollFiber);
   if (scrollHost === null) {
@@ -73,6 +79,12 @@ export function viewportExtentOf(geometry: ScrollGeometry): number {
   return geometry.horizontal ? geometry.viewport.width : geometry.viewport.height;
 }
 
+export function offsetCentering(rect: Rect, geometry: ScrollGeometry): number {
+  const { viewport, horizontal } = geometry;
+  const delta = horizontal ? rect.x + rect.width / 2 - (viewport.x + viewport.width / 2) : rect.y + rect.height / 2 - (viewport.y + viewport.height / 2);
+  return Math.min(Math.max(scrollOffsetOf(geometry) + delta, 0), maxScrollOffsetOf(geometry));
+}
+
 export function scrollDirectionsOf(geometry: ScrollGeometry): ScrollDirection[] {
   const offset = scrollOffsetOf(geometry);
   const canBackward = offset > SCROLL_TOLERANCE;

package/src/snapshot/wrappers.ts

@@ -60,7 +60,8 @@ export function dropWrapperDuplicates(measured: MeasuredCandidate[]): MeasuredCa
 const OFFSCREEN_LIMIT = 30;
 
 export function limitOffscreen(measured: MeasuredCandidate[]): MeasuredCandidate[] {
-  const hidden = measured.filter((entry) => entry.offscreen !== null && entry.candidate.kind !== 'scroll');
+  // Every option of a wheel stays listed: one dropped here could never be selected.
+  const hidden = measured.filter((entry) => entry.offscreen !== null && entry.candidate.kind !== 'scroll' && entry.candidate.wheelOption !== true);
   if (hidden.length <= OFFSCREEN_LIMIT) {
     return measured;
   }

package/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '0.1.2';
+export const SDK_VERSION = '0.1.4';