Revert "Make large diffs open quickly and scroll as one surface (#3212)"

This reverts commit b599d38a77.

packages/app/src/review/surface.tsx

@@ -260,7 +260,6 @@ export function InlineReviewGutterCell({
   onStartComment,
   style,
   actionTestID,
-  testID,
 }: {
   children: ReactNode;
   reviewTarget: ReviewableDiffTarget | null | undefined;
@@ -271,7 +270,6 @@ export function InlineReviewGutterCell({
   onStartComment: (target: ReviewableDiffTarget) => void;
   style?: StyleProp<ViewStyle>;
   actionTestID?: string;
-  testID?: string;
 }) {
   const { t } = useTranslation();
   const canComment = Boolean(reviewTarget);
@@ -311,6 +309,7 @@ export function InlineReviewGutterCell({
     }
   }, [isInteractionActive]);
 
+  const pressableStyle = useCallback((): StyleProp<ViewStyle> => style, [style]);
   const lineHeightStyle = useMemo<StyleProp<ViewStyle>>(
     () =>
       lineHeight !== undefined
@@ -319,15 +318,13 @@ export function InlineReviewGutterCell({
     [lineHeight],
   );
 
-  const pressableStyle = useCallback(
-    (): StyleProp<ViewStyle> => [
-      style,
-      styles.gutterInner,
-      styles.gutterLabel,
-      lineHeightStyle,
-      hasComments && styles.gutterLabelActive,
-    ],
-    [hasComments, lineHeightStyle, style],
+  const labelStyle = useMemo<StyleProp<ViewStyle>>(
+    () => [styles.gutterLabel, lineHeightStyle, hasComments && styles.gutterLabelActive],
+    [hasComments, lineHeightStyle],
+  );
+  const innerStyle = useMemo<StyleProp<ViewStyle>>(
+    () => [styles.gutterInner, lineHeightStyle],
+    [lineHeightStyle],
   );
   const actionIconStyle = useMemo<StyleProp<ViewStyle>>(
     () => [
@@ -349,14 +346,17 @@ export function InlineReviewGutterCell({
       onPressIn={handlePressIn}
       onPressOut={handlePressOut}
       style={pressableStyle}
-      testID={testID}
     >
-      {children}
-      {showAction ? (
-        <View style={actionIconStyle} testID={actionTestID}>
-          <ThemedPlus size={16} strokeWidth={2.4} uniProps={accentForegroundIconColorMapping} />
+      <View style={innerStyle}>
+        <View style={labelStyle}>
+          {children}
+          {showAction ? (
+            <View style={actionIconStyle} testID={actionTestID}>
+              <ThemedPlus size={16} strokeWidth={2.4} uniProps={accentForegroundIconColorMapping} />
+            </View>
+          ) : null}
         </View>
-      ) : null}
+      </View>
     </Pressable>
   );
 }