Merge 8f5d0247bb into a3f184979e

apps/expo/src/app/(tabs)/search.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Keyboard } from "react-native";
+import { Keyboard, ScrollView } from "react-native";
 import Animated, {
   Easing,
   useAnimatedStyle,
@@ -7,7 +7,7 @@ import Animated, {
   withTiming,
 } from "react-native-reanimated";
 import { useQuery } from "@tanstack/react-query";
-import { View, ZStack } from "tamagui";
+import { View, XStack } from "tamagui";
 
 import { getMediaPoster, searchTitle } from "@movie-web/tmdb";
 
@@ -98,8 +98,9 @@ export default function SearchScreen() {
   };
 
   return (
-    <ZStack flex={1}>
+    <ScreenLayout>
-      <ScreenLayout
+      <XStack flex={1}>
+        <ScrollView
           onScrollBeginDrag={handleScrollBegin}
           onMomentumScrollEnd={handleScrollEnd}
           scrollEnabled={searchResultsLoaded ? true : false}
@@ -123,12 +124,12 @@ export default function SearchScreen() {
               </View>
             </Animated.View>
           </View>
-      </ScreenLayout>
+        </ScrollView>
         <Animated.View
           style={[
             {
               position: "absolute",
-            bottom: 5,
+              bottom: 0,
               left: 0,
               right: 0,
             },
@@ -137,7 +138,8 @@ export default function SearchScreen() {
         >
           <SearchBar onSearchChange={setQuery} />
         </Animated.View>
-    </ZStack>
+      </XStack>
+    </ScreenLayout>
   );
 }
 

apps/expo/src/components/layout/ScreenLayout.tsx

@@ -5,23 +5,9 @@ import { Header } from "./Header";
 
 interface Props {
   children?: React.ReactNode;
-  onScrollBeginDrag?: () => void;
-  onMomentumScrollEnd?: () => void;
-  scrollEnabled?: boolean;
-  keyboardDismissMode?: "none" | "on-drag" | "interactive";
-  keyboardShouldPersistTaps?: "always" | "never" | "handled";
-  contentContainerStyle?: Record<string, unknown>;
 }
 
-export default function ScreenLayout({
+export default function ScreenLayout({ children }: Props) {
-  children,
-  onScrollBeginDrag,
-  onMomentumScrollEnd,
-  scrollEnabled,
-  keyboardDismissMode,
-  keyboardShouldPersistTaps,
-  contentContainerStyle,
-}: Props) {
   return (
     <LinearGradient
       flex={1}
@@ -41,12 +27,6 @@ export default function ScreenLayout({
     >
       <Header />
       <ScrollView
-        onScrollBeginDrag={onScrollBeginDrag}
-        onMomentumScrollEnd={onMomentumScrollEnd}
-        scrollEnabled={scrollEnabled}
-        keyboardDismissMode={keyboardDismissMode}
-        keyboardShouldPersistTaps={keyboardShouldPersistTaps}
-        contentContainerStyle={contentContainerStyle}
         marginTop="$4"
         flexGrow={1}
         showsVerticalScrollIndicator={false}