Revert "fix: scroll the pages New Message, Search for Rooms, Messages…

… and Threads (#4952)" (#5038) * Revert "fix: scroll the pages New Message, Search for Rooms, Messages and Threads (#4952)" This reverts commit cf14ebe. * bump version to 4.37.1
RocketChat · Apr 18, 2023 · fd81c46 · fd81c46
1 parent 0b278f0
commit fd81c46
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 73 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -147,7 +147,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.38.0"
+        versionName "4.37.1"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

diff --git a/app/containers/KeyboardView.tsx b/app/containers/KeyboardView.tsx
@@ -6,7 +6,7 @@ import scrollPersistTaps from '../lib/methods/helpers/scrollPersistTaps';
 interface IKeyboardViewProps extends KeyboardAwareScrollViewProps {
 	keyboardVerticalOffset?: number;
 	scrollEnabled?: boolean;
-	children: React.ReactElement[] | React.ReactElement | null | (React.ReactElement | null)[];
+	children: React.ReactElement[] | React.ReactElement;
 }
 
 const KeyboardView = ({ style, contentContainerStyle, scrollEnabled, keyboardVerticalOffset, children }: IKeyboardViewProps) => (

diff --git a/app/views/NewMessageView/index.tsx b/app/views/NewMessageView/index.tsx
@@ -5,7 +5,6 @@ import { FlatList } from 'react-native';
 import { shallowEqual } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 
-import KeyboardView from '../../containers/KeyboardView';
 import * as HeaderButton from '../../containers/HeaderButton';
 import * as List from '../../containers/List';
 import SafeAreaView from '../../containers/SafeAreaView';
@@ -83,31 +82,29 @@ const NewMessageView = () => {
 
 	return (
 		<SafeAreaView testID='new-message-view'>
-			<KeyboardView>
-				<StatusBar />
-				<FlatList
-					data={search.length > 0 ? search : chats}
-					keyExtractor={item => item._id || item.rid}
-					ListHeaderComponent={<HeaderNewMessage maxUsers={maxUsers} onChangeText={handleSearch} />}
-					renderItem={({ item }) => {
-						const itemSearch = item as ISearch;
-						const itemModel = item as TSubscriptionModel;
+			<StatusBar />
+			<FlatList
+				data={search.length > 0 ? search : chats}
+				keyExtractor={item => item._id || item.rid}
+				ListHeaderComponent={<HeaderNewMessage maxUsers={maxUsers} onChangeText={handleSearch} />}
+				renderItem={({ item }) => {
+					const itemSearch = item as ISearch;
+					const itemModel = item as TSubscriptionModel;
 
-						return (
-							<UserItem
-								name={useRealName && itemSearch.fname ? itemSearch.fname : itemModel.name}
-								username={itemSearch.search ? itemSearch.username : itemModel.name}
-								onPress={() => goRoom(itemModel)}
-								testID={`new-message-view-item-${item.name}`}
-							/>
-						);
-					}}
-					ItemSeparatorComponent={List.Separator}
-					ListFooterComponent={List.Separator}
-					contentContainerStyle={{ backgroundColor: colors.backgroundColor }}
-					keyboardShouldPersistTaps='always'
-				/>
-			</KeyboardView>
+					return (
+						<UserItem
+							name={useRealName && itemSearch.fname ? itemSearch.fname : itemModel.name}
+							username={itemSearch.search ? itemSearch.username : itemModel.name}
+							onPress={() => goRoom(itemModel)}
+							testID={`new-message-view-item-${item.name}`}
+						/>
+					);
+				}}
+				ItemSeparatorComponent={List.Separator}
+				ListFooterComponent={List.Separator}
+				contentContainerStyle={{ backgroundColor: colors.backgroundColor }}
+				keyboardShouldPersistTaps='always'
+			/>
 		</SafeAreaView>
 	);
 };

diff --git a/app/views/RoomsListView/index.tsx b/app/views/RoomsListView/index.tsx
@@ -11,7 +11,6 @@ import { Header } from '@react-navigation/elements';
 import { CompositeNavigationProp, RouteProp } from '@react-navigation/native';
 import { Dispatch } from 'redux';
 
-import KeyboardView from '../../containers/KeyboardView';
 import database from '../../lib/database';
 import RoomItem, { ROW_HEIGHT, ROW_HEIGHT_CONDENSED } from '../../containers/RoomItem';
 import log, { logEvent, events } from '../../lib/methods/helpers/log';
@@ -63,8 +62,8 @@ import { E2E_BANNER_TYPE, DisplayMode, SortBy, MAX_SIDEBAR_WIDTH, themes } from
 import { Services } from '../../lib/services';
 
 type TNavigation = CompositeNavigationProp<
-StackNavigationProp<ChatsStackParamList, 'RoomsListView'>,
-CompositeNavigationProp<StackNavigationProp<ChatsStackParamList>, StackNavigationProp<DrawerParamList>>
+	StackNavigationProp<ChatsStackParamList, 'RoomsListView'>,
+	CompositeNavigationProp<StackNavigationProp<ChatsStackParamList>, StackNavigationProp<DrawerParamList>>
 >;
 
 interface IRoomsListViewProps {
@@ -480,11 +479,11 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 
 	internalSetState = (
 		state:
-		| ((
-			prevState: Readonly<IRoomsListViewState>,
-			props: Readonly<IRoomsListViewProps>
+			| ((
+					prevState: Readonly<IRoomsListViewState>,
+					props: Readonly<IRoomsListViewProps>
 			  ) => Pick<IRoomsListViewState, keyof IRoomsListViewState> | IRoomsListViewState | null)
-		| (Pick<IRoomsListViewState, keyof IRoomsListViewState> | IRoomsListViewState | null),
+			| (Pick<IRoomsListViewState, keyof IRoomsListViewState> | IRoomsListViewState | null),
 		callback?: () => void
 	) => {
 		if (this.animated) {
@@ -908,7 +907,7 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 		}
 	};
 
-	getScrollRef = (ref: FlatList) => this.scroll = ref;
+	getScrollRef = (ref: FlatList) => (this.scroll = ref);
 
 	renderListHeader = () => {
 		const { searching } = this.state;
@@ -1026,11 +1025,9 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 
 		return (
 			<SafeAreaView testID='rooms-list-view' style={{ backgroundColor: themes[theme].backgroundColor }}>
-				<KeyboardView>
-					<StatusBar />
-					{this.renderHeader()}
-					{this.renderScroll()}
-				</KeyboardView>
+				<StatusBar />
+				{this.renderHeader()}
+				{this.renderScroll()}
 				{/* TODO - this ts-ignore is here because the route props, on IBaseScreen*/}
 				{/* @ts-ignore*/}
 				{showServerDropdown ? <ServerDropdown navigation={navigation} theme={theme} /> : null}

diff --git a/app/views/SearchMessagesView/index.tsx b/app/views/SearchMessagesView/index.tsx
@@ -39,7 +39,6 @@ import {
 	ICustomEmoji
 } from '../../definitions';
 import { Services } from '../../lib/services';
-import KeyboardView from '../../containers/KeyboardView';
 
 const QUERY_SIZE = 50;
 
@@ -328,20 +327,18 @@ class SearchMessagesView extends React.Component<ISearchMessagesViewProps, ISear
 		return (
 			<SafeAreaView style={{ backgroundColor: themes[theme].backgroundColor }} testID='search-messages-view'>
 				<StatusBar />
-				<KeyboardView>
-					<View style={styles.searchContainer}>
-						<FormTextInput
-							autoFocus
-							label={I18n.t('Search')}
-							onChangeText={this.search}
-							placeholder={I18n.t('Search_Messages')}
-							testID='search-message-view-input'
-						/>
-						<Markdown msg={I18n.t('You_can_search_using_RegExp_eg')} theme={theme} />
-						<View style={[styles.divider, { backgroundColor: themes[theme].separatorColor }]} />
-					</View>
-					{this.renderList()}
-				</KeyboardView>
+				<View style={styles.searchContainer}>
+					<FormTextInput
+						autoFocus
+						label={I18n.t('Search')}
+						onChangeText={this.search}
+						placeholder={I18n.t('Search_Messages')}
+						testID='search-message-view-input'
+					/>
+					<Markdown msg={I18n.t('You_can_search_using_RegExp_eg')} theme={theme} />
+					<View style={[styles.divider, { backgroundColor: themes[theme].separatorColor }]} />
+				</View>
+				{this.renderList()}
 			</SafeAreaView>
 		);
 	}

diff --git a/app/views/ThreadMessagesView/index.tsx b/app/views/ThreadMessagesView/index.tsx
@@ -35,7 +35,6 @@ import styles from './styles';
 import { IApplicationState, IBaseScreen, IMessage, SubscriptionType, TSubscriptionModel, TThreadModel } from '../../definitions';
 import { getUidDirectMessage, debounce, isIOS } from '../../lib/methods/helpers';
 import { Services } from '../../lib/services';
-import KeyboardView from '../../containers/KeyboardView';
 
 const API_FETCH_COUNT = 50;
 
@@ -517,18 +516,16 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 
 		return (
 			<SafeAreaView testID='thread-messages-view'>
-				<KeyboardView>
-					<StatusBar />
-					{this.renderContent()}
-					{showFilterDropdown ? (
-						<Dropdown
-							currentFilter={currentFilter}
-							onFilterSelected={this.onFilterSelected}
-							onClose={this.closeFilterDropdown}
-							theme={theme}
-						/>
-					) : null}
-				</KeyboardView>
+				<StatusBar />
+				{this.renderContent()}
+				{showFilterDropdown ? (
+					<Dropdown
+						currentFilter={currentFilter}
+						onFilterSelected={this.onFilterSelected}
+						onClose={this.closeFilterDropdown}
+						theme={theme}
+					/>
+				) : null}
 			</SafeAreaView>
 		);
 	}

diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -1793,7 +1793,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.38.0;
+				MARKETING_VERSION = 4.37.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1832,7 +1832,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.38.0;
+				MARKETING_VERSION = 4.37.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;

diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.38.0</string>
+	<string>4.37.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.38.0</string>
+	<string>4.37.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.38.0",
+	"version": "4.37.1",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",