@applicaster/zapp-react-native-ui-components 15.0.0-alpha.2463014505 → 15.0.0-rc.2

package/Components/River/ComponentsMap/ComponentsMap.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as R from "ramda";
-import { FlatList, StyleSheet, View } from "react-native";
+import { View, StyleSheet, FlatList } from "react-native";
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { RiverItem } from "../RiverItem";
 import { RiverFooter } from "../RiverFooter";
@@ -9,8 +9,8 @@ import { useScreenConfiguration } from "../useScreenConfiguration";
 import { RefreshControl } from "../RefreshControl";
 import { ifEmptyUseFallback } from "@applicaster/zapp-react-native-utils/cellUtils";
 import {
-  usePipesCacheReset,
   useProfilerLogging,
+  usePipesCacheReset,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { useLoadingState } from "./hooks/useLoadingState";
 import { ViewportTracker } from "../../Viewport";
@@ -25,8 +25,6 @@ import { useScreenContextV2 } from "@applicaster/zapp-react-native-utils/reactHo
 import { useShallow } from "zustand/react/shallow";
 
 import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { ComponentsMapHeightContext } from "./ContextProviders/ComponentsMapHeightContext";
-import { ComponentsMapRefContext } from "./ContextProviders/ComponentsMapRefContext";
 
 const isAndroid = isAndroidPlatform();
 
@@ -72,7 +70,6 @@ function ComponentsMapComponent(props: Props) {
   } = props;
 
   const flatListRef = React.useRef<FlatList | null>(null);
-  const flatListWrapperRef = React.useRef<View | null>(null);
   const screenConfig = useScreenConfiguration(riverId);
   const screenData = useScreenData(riverId);
   const pullToRefreshEnabled = screenData?.rules?.pull_to_refresh_enabled;
@@ -268,51 +265,47 @@ function ComponentsMapComponent(props: Props) {
   // The Screen Picker in Mobile is completly different than the TV
   // so the various offsets / margins in TV do not apply here.
   return (
-    <View style={styles.container} ref={flatListWrapperRef}>
-      <ComponentsMapHeightContext.Provider value={flatListHeight}>
-        <ComponentsMapRefContext.Provider value={flatListWrapperRef}>
-          <ScreenLoadingMeasurements
-            riverId={riverId}
-            numberOfComponents={riverComponents.length}
-          >
-            <ViewportTracker>
-              <FlatList
-                ref={(ref) => {
-                  flatListRef.current = ref;
-                }}
-                // Fix for WebView rerender crashes on Android API 28+
-                // https://github.com/react-native-webview/react-native-webview/issues/1915#issuecomment-964035468
-                overScrollMode={isAndroid ? "never" : "auto"}
-                scrollIndicatorInsets={scrollIndicatorInsets}
-                extraData={feed}
-                stickyHeaderIndices={stickyHeaderIndices}
-                removeClippedSubviews={isAndroid}
-                onLayout={handleOnLayout}
-                initialNumToRender={3}
-                maxToRenderPerBatch={10}
-                windowSize={12}
-                keyExtractor={keyExtractor}
-                renderItem={renderRiverItem}
-                data={riverComponents}
-                contentContainerStyle={contentContainerStyle}
-                ListFooterComponent={
-                  <RiverFooter
-                    flatListHeight={flatListHeight}
-                    loadingState={loadingState}
-                  />
-                }
-                refreshControl={refreshControl}
-                onScrollBeginDrag={onScrollBeginDrag}
-                onScroll={onScroll}
-                onMomentumScrollEnd={_onMomentumScrollEnd}
-                onScrollEndDrag={_onScrollEndDrag}
-                scrollEventThrottle={16}
-                {...scrollViewExtraProps}
+    <View style={styles.container}>
+      <ScreenLoadingMeasurements
+        riverId={riverId}
+        numberOfComponents={riverComponents.length}
+      >
+        <ViewportTracker>
+          <FlatList
+            ref={(ref) => {
+              flatListRef.current = ref;
+            }}
+            // Fix for WebView rerender crashes on Android API 28+
+            // https://github.com/react-native-webview/react-native-webview/issues/1915#issuecomment-964035468
+            overScrollMode={isAndroid ? "never" : "auto"}
+            scrollIndicatorInsets={scrollIndicatorInsets}
+            extraData={feed}
+            stickyHeaderIndices={stickyHeaderIndices}
+            removeClippedSubviews={isAndroid}
+            onLayout={handleOnLayout}
+            initialNumToRender={3}
+            maxToRenderPerBatch={10}
+            windowSize={12}
+            keyExtractor={keyExtractor}
+            renderItem={renderRiverItem}
+            data={riverComponents}
+            contentContainerStyle={contentContainerStyle}
+            ListFooterComponent={
+              <RiverFooter
+                flatListHeight={flatListHeight}
+                loadingState={loadingState}
               />
-            </ViewportTracker>
-          </ScreenLoadingMeasurements>
-        </ComponentsMapRefContext.Provider>
-      </ComponentsMapHeightContext.Provider>
+            }
+            refreshControl={refreshControl}
+            onScrollBeginDrag={onScrollBeginDrag}
+            onScroll={onScroll}
+            onMomentumScrollEnd={_onMomentumScrollEnd}
+            onScrollEndDrag={_onScrollEndDrag}
+            scrollEventThrottle={16}
+            {...scrollViewExtraProps}
+          />
+        </ViewportTracker>
+      </ScreenLoadingMeasurements>
     </View>
   );
 }

package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx

@@ -42,8 +42,6 @@ type Props = {
   children: React.ReactNode;
 };
 
-const activeOffsetY = [-5, 5] as [number, number];
-
 export const AnimatedScrollModalComponent = ({ children }: Props) => {
   const {
     isActiveGesture,
@@ -374,9 +372,9 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
             ref={panHandlerRef}
             simultaneousHandlers={[scrollRef, tapHandlerRef]}
             shouldCancelWhenOutside={isMaximizedModal}
-            activeOffsetY={activeOffsetY}
             onGestureEvent={onGestureEvent}
             onHandlerStateChange={onHandlerStateChange}
+            activeOffsetY={[-5, 5]}
           >
             <Animated.View>
               <NativeViewGestureHandler

package/Components/VideoModal/PlayerDetails.tsx

@@ -4,8 +4,8 @@ import {
   Dimensions,
   Easing,
   StyleProp,
-  StyleSheet,
   ViewStyle,
+  StyleSheet,
 } from "react-native";
 import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 import { ComponentsMap } from "@applicaster/zapp-react-native-ui-components/Components/River/ComponentsMap";
@@ -69,10 +69,11 @@ export const PlayerDetails = ({
   const screenData = useTargetScreenData(entry);
   const insets = useSafeAreaInsets();
 
-  const extraTabletStyles =
-    !isAudioPlayer && isTabletLandscape
+  const extraTabletStyles = !isAudioPlayer
+    ? isTabletLandscape
       ? { marginTop: -insets.top, paddingTop: insets.top + 20 }
-      : null;
+      : { marginTop: -8, paddingTop: -8 }
+    : {};
 
   // Animation setup
   const translateY = useRef(new Animated.Value(50)).current;
@@ -128,7 +129,6 @@ export const PlayerDetails = ({
           riverId={screenData.id}
           feed={screenData?.data?.source}
           riverComponents={screenData.ui_components}
-          isScreenWrappedInContainer
         />
       ) : null}
     </Animated.View>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "15.0.0-alpha.2463014505",
+  "version": "15.0.0-rc.2",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.0.0-alpha.2463014505",
-    "@applicaster/zapp-react-native-bridge": "15.0.0-alpha.2463014505",
-    "@applicaster/zapp-react-native-redux": "15.0.0-alpha.2463014505",
-    "@applicaster/zapp-react-native-utils": "15.0.0-alpha.2463014505",
+    "@applicaster/applicaster-types": "15.0.0-rc.2",
+    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.2",
+    "@applicaster/zapp-react-native-redux": "15.0.0-rc.2",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.2",
     "promise": "^8.3.0",
     "url": "^0.11.0",
     "uuid": "^3.3.2"

package/Components/River/ComponentsMap/ContextProviders/ComponentsMapHeightContext.ts

@@ -1,8 +0,0 @@
-import * as React from "react";
-
-export const ComponentsMapHeightContext = React.createContext<number | null>(
-  null
-);
-
-export const useComponentsMapHeight = () =>
-  React.useContext(ComponentsMapHeightContext);

package/Components/River/ComponentsMap/ContextProviders/ComponentsMapRefContext.ts

@@ -1,8 +0,0 @@
-import * as React from "react";
-import { View } from "react-native";
-
-export const ComponentsMapRefContext =
-  React.createContext<React.RefObject<View | null> | null>(null);
-
-export const useComponentsMapRef = () =>
-  React.useContext(ComponentsMapRefContext);