fix: iPad landscape mode broke the height reactions list (#2226)

* fix: iPad landscape mode broke the height reactions list * chore: enable ipad support
GetStream · Sep 4, 2023 · 4449c1d · 4449c1d
1 parent 0e84191
commit 4449c1d
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 27 deletions.
diff --git a/examples/TypeScriptMessaging/ios/TypeScriptMessaging.xcodeproj/project.pbxproj b/examples/TypeScriptMessaging/ios/TypeScriptMessaging.xcodeproj/project.pbxproj
@@ -500,8 +500,12 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = TypeScriptMessaging;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -526,7 +530,11 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = TypeScriptMessaging;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

diff --git a/package/src/components/MessageOverlay/OverlayReactions.tsx b/package/src/components/MessageOverlay/OverlayReactions.tsx
@@ -69,6 +69,10 @@ const styles = StyleSheet.create({
     fontWeight: '700',
     paddingTop: 16,
   },
+  unseenItemContainer: {
+    opacity: 0,
+    position: 'absolute',
+  },
 });
 
 const reactionData: ReactionData[] = [
@@ -138,6 +142,8 @@ export const OverlayReactions: React.FC<OverlayReactionsProps> = (props) => {
   const layoutHeight = useSharedValue(0);
   const layoutWidth = useSharedValue(0);
 
+  const [itemHeight, setItemHeight] = React.useState(0);
+
   const {
     theme: {
       colors: { accent_blue, black, grey_gainsboro, white },
@@ -159,7 +165,6 @@ export const OverlayReactions: React.FC<OverlayReactionsProps> = (props) => {
   } = useTheme();
 
   const width = useWindowDimensions().width;
-  const height = useWindowDimensions().height;
 
   const supportedReactionTypes = supportedReactions.map(
     (supportedReaction) => supportedReaction.type,
@@ -179,15 +184,6 @@ export const OverlayReactions: React.FC<OverlayReactionsProps> = (props) => {
       (avatarSize + (Number(avatarContainer.padding || 0) || styles.avatarContainer.padding) * 2),
   );
 
-  const maxHeight = Math.floor(
-    height -
-      overlayPadding * 2 -
-      ((Number(flatListContainer.paddingVertical || 0) ||
-        styles.flatListContainer.paddingVertical) +
-        (Number(avatarContainer.padding || 0) || styles.avatarContainer.padding)) *
-        2,
-  );
-
   const renderItem = ({ item }: { item: Reaction }) => {
     const { alignment = 'left', name, type } = item;
     const x = avatarSize / 2 - (avatarSize / (radius * 4)) * (alignment === 'left' ? 1 : -1);
@@ -305,23 +301,48 @@ export const OverlayReactions: React.FC<OverlayReactionsProps> = (props) => {
   );
 
   return (
-    <Animated.View
-      onLayout={({ nativeEvent: { layout } }) => {
-        layoutWidth.value = layout.width;
-        layoutHeight.value = layout.height;
-      }}
-      style={[styles.container, { backgroundColor: white }, container, showScreenStyle]}
-    >
-      <Text style={[styles.title, { color: black }, titleStyle]}>{title}</Text>
-      <FlatList
-        contentContainerStyle={styles.flatListContentContainer}
-        data={filteredReactions}
-        keyExtractor={({ name }, index) => `${name}_${index}`}
-        numColumns={numColumns}
-        renderItem={renderItem}
-        style={[styles.flatListContainer, flatListContainer, { maxHeight: maxHeight / numColumns }]}
-      />
-    </Animated.View>
+    <>
+      <Animated.View
+        onLayout={({ nativeEvent: { layout } }) => {
+          layoutWidth.value = layout.width;
+          layoutHeight.value = layout.height;
+        }}
+        style={[
+          styles.container,
+          { backgroundColor: white, opacity: itemHeight ? 1 : 0 },
+          container,
+          showScreenStyle,
+        ]}
+      >
+        <Text style={[styles.title, { color: black }, titleStyle]}>{title}</Text>
+        <FlatList
+          contentContainerStyle={styles.flatListContentContainer}
+          data={filteredReactions}
+          key={numColumns}
+          keyExtractor={({ name }, index) => `${name}_${index}`}
+          numColumns={numColumns}
+          renderItem={renderItem}
+          style={[
+            styles.flatListContainer,
+            flatListContainer,
+            {
+              // we show the item height plus a little extra to tease for scrolling if there are more than one row
+              maxHeight:
+                itemHeight + (filteredReactions.length / numColumns > 1 ? itemHeight / 8 : 0),
+            },
+          ]}
+        />
+        {/* The below view is unseen by the user, we use it to compute the height that the item must be */}
+        <View
+          onLayout={({ nativeEvent: { layout } }) => {
+            setItemHeight(layout.height);
+          }}
+          style={[styles.unseenItemContainer, styles.flatListContentContainer]}
+        >
+          {renderItem({ item: filteredReactions[0] })}
+        </View>
+      </Animated.View>
+    </>
   );
 };