Skip to content

Commit 399d96d

Browse files
fix(mobile): review file navigation respects reduced motion (#23348)
Co-authored-by: maria-rcks <[email protected]>
1 parent 5882ccd commit 399d96d

3 files changed

Lines changed: 30 additions & 1 deletion

File tree

‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
483483
)
484484
postInvalidateOnAnimation()
485485
} else {
486+
verticalScroller.forceFinished(true)
486487
canvasView.setVerticalOffset(target)
487488
}
488489
}

‎apps/mobile/modules/t3-review-diff/tests/android/src/test/kotlin/expo/modules/t3reviewdiff/ReviewDiffViewportTest.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,30 @@ import org.robolectric.annotation.Config
2222
@RunWith(RobolectricTestRunner::class)
2323
@Config(sdk = [35], manifest = Config.NONE)
2424
class ReviewDiffViewportTest {
25+
@Test
26+
fun immediateNavigationStopsAnActiveFling() {
27+
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
28+
val view = T3ReviewDiffView(activity, AppContext())
29+
val scroller = view.javaClass.getDeclaredField("verticalScroller").apply {
30+
isAccessible = true
31+
}.get(view) as android.widget.OverScroller
32+
try {
33+
scroller.fling(0, 100, 0, 2000, 0, 0, 0, 10000)
34+
assertTrue(!scroller.isFinished)
35+
view.scrollToTop(false)
36+
view.computeScroll()
37+
val canvas = view.getChildAt(0)
38+
val offset = canvas.javaClass.getDeclaredMethod("verticalOffset").apply {
39+
isAccessible = true
40+
}.invoke(canvas)
41+
assertEquals(0, offset)
42+
assertTrue(scroller.isFinished)
43+
} finally {
44+
view.cleanup()
45+
activity.finish()
46+
}
47+
}
48+
2549
@Test
2650
fun resetDiscardsOldRowsAndPendingDecodeBeforePublishingTheNewDestination() {
2751
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()

‎apps/mobile/src/features/review/ReviewSheet.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
View,
2323
} from "react-native";
2424
import { useSafeAreaInsets } from "react-native-safe-area-context";
25+
import { useReduceMotionEnabled } from "../../lib/appState";
2526
import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
2627
import { NativeInspectorContent } from "../../native/NativeInspectorContent";
2728

@@ -423,6 +424,7 @@ type ReviewSheetProps = StaticScreenProps<{
423424
}>;
424425

425426
export function ReviewSheet(props: ReviewSheetProps) {
427+
const reduceMotion = useReduceMotionEnabled();
426428
const { nativeReviewDiffStyle } = useAppearanceCodeSurface();
427429
useAdaptiveWorkspacePaneRole("inspector");
428430
const { panes } = useAdaptiveWorkspaceLayout();
@@ -553,7 +555,9 @@ export function ReviewSheet(props: ReviewSheetProps) {
553555
const nativeView = nativeReviewDiffViewRef.current;
554556
if (!nativeView) return;
555557
const result = await settlePromise(() =>
556-
fileId === null ? nativeView.scrollToTop(true) : nativeView.scrollToFile(fileId, true),
558+
fileId === null
559+
? nativeView.scrollToTop(!reduceMotion)
560+
: nativeView.scrollToFile(fileId, !reduceMotion),
557561
);
558562
if (AsyncResult.isFailure(result)) {
559563
console.error("[review] Failed to navigate to diff file", squashAtomCommandFailure(result));

0 commit comments

Comments
 (0)