@skrillex1224/android-toolkit 1.0.7 → 1.0.8

package/dist/index.cjs

@@ -1037,7 +1037,10 @@ async function pressEnter2(ctx) {
 }
 async function scroll(ctx, selector, direction, options = {}) {
   const node = await DeviceView.find(ctx, selector, options);
-  const box = node.bounds;
+  await scrollBounds(ctx, node.bounds, direction, options);
+}
+async function scrollBounds(ctx, bounds2, direction, options = {}) {
+  const box = bounds2;
   const ratio = Number(options.swipeRatio || 0.72);
   const durationMs = Number(options.durationMs || 360);
   const x = box.centerX;
@@ -1064,6 +1067,9 @@ async function scrollUntilStable(ctx, selector, direction, options = {}) {
   const maxSwipes = Math.max(1, Number(options.maxSwipes || 20));
   const stableRoundsTarget = Math.max(1, Number(options.stableRounds || 2));
   const hashSource = String(options.stability || options.hashSource || "view");
+  if (hashSource === "screenshot") {
+    return scrollUntilScreenshotStable(ctx, selector, direction, options, maxSwipes, stableRoundsTarget, hashSource);
+  }
   let lastHash = "";
   let stableRounds = 0;
   for (let index = 0; index < maxSwipes; index += 1) {
@@ -1071,7 +1077,7 @@ async function scrollUntilStable(ctx, selector, direction, options = {}) {
     if (currentHash === lastHash) {
       stableRounds += 1;
       if (stableRounds >= stableRoundsTarget) {
-        return { swipes: index, stableRounds, hash: currentHash, hashSource };
+        return { swipes: index, stableRounds, hash: currentHash, hashSource, capped: false };
       }
     } else {
       stableRounds = 0;
@@ -1079,7 +1085,27 @@ async function scrollUntilStable(ctx, selector, direction, options = {}) {
     }
     await scroll(ctx, selector, direction, options);
   }
-  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource };
+  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource, capped: true };
+}
+async function scrollUntilScreenshotStable(ctx, selector, direction, options, maxSwipes, stableRoundsTarget, hashSource) {
+  const node = await DeviceView.find(ctx, selector, options);
+  const bounds2 = node.bounds;
+  let lastHash = await scrollStateHash(ctx, selector, options, hashSource);
+  let stableRounds = 0;
+  for (let index = 0; index < maxSwipes; index += 1) {
+    await scrollBounds(ctx, bounds2, direction, options);
+    const currentHash = await scrollStateHash(ctx, selector, options, hashSource);
+    if (currentHash === lastHash) {
+      stableRounds += 1;
+      if (stableRounds >= stableRoundsTarget) {
+        return { swipes: index + 1, stableRounds, hash: currentHash, hashSource, capped: false };
+      }
+    } else {
+      stableRounds = 0;
+      lastHash = currentHash;
+    }
+  }
+  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource, capped: true };
 }
 async function scrollStateHash(ctx, selector, options, hashSource) {
   if (hashSource === "screenshot") {