From 19360e6ee5c544ae82bf9b9914c66f2f544007a1 Mon Sep 17 00:00:00 2001 From: Gleidson Daniel Silva Date: Tue, 18 Apr 2023 09:46:53 -0300 Subject: [PATCH] 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 cf14ebea78ac5c1d52b31dca9c2585c599811e98. * bump version to 4.37.1 --- android/app/build.gradle | 2 +- app/containers/KeyboardView.tsx | 2 +- app/views/NewMessageView/index.tsx | 47 ++++++++++------------ app/views/RoomsListView/index.tsx | 23 +++++------ app/views/SearchMessagesView/index.tsx | 27 ++++++------- app/views/ThreadMessagesView/index.tsx | 23 +++++------ ios/RocketChatRN.xcodeproj/project.pbxproj | 4 +- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 10 files changed, 61 insertions(+), 73 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c4244912c..28962cfff 100644 --- 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 index 8bfd8ce93..99df6f923 100644 --- 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 index 6e91d3ae2..f393a9f91 100644 --- 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 ( - - - 0 ? search : chats} - keyExtractor={item => item._id || item.rid} - ListHeaderComponent={} - renderItem={({ item }) => { - const itemSearch = item as ISearch; - const itemModel = item as TSubscriptionModel; + + 0 ? search : chats} + keyExtractor={item => item._id || item.rid} + ListHeaderComponent={} + renderItem={({ item }) => { + const itemSearch = item as ISearch; + const itemModel = item as TSubscriptionModel; - return ( - goRoom(itemModel)} - testID={`new-message-view-item-${item.name}`} - /> - ); - }} - ItemSeparatorComponent={List.Separator} - ListFooterComponent={List.Separator} - contentContainerStyle={{ backgroundColor: colors.backgroundColor }} - keyboardShouldPersistTaps='always' - /> - + return ( + goRoom(itemModel)} + testID={`new-message-view-item-${item.name}`} + /> + ); + }} + ItemSeparatorComponent={List.Separator} + ListFooterComponent={List.Separator} + contentContainerStyle={{ backgroundColor: colors.backgroundColor }} + keyboardShouldPersistTaps='always' + /> ); }; diff --git a/app/views/RoomsListView/index.tsx b/app/views/RoomsListView/index.tsx index a40aaadcb..a204364b3 100644 --- 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, -CompositeNavigationProp, StackNavigationProp> + StackNavigationProp, + CompositeNavigationProp, StackNavigationProp> >; interface IRoomsListViewProps { @@ -480,11 +479,11 @@ class RoomsListView extends React.Component, - props: Readonly + | (( + prevState: Readonly, + props: Readonly ) => Pick | IRoomsListViewState | null) - | (Pick | IRoomsListViewState | null), + | (Pick | IRoomsListViewState | null), callback?: () => void ) => { if (this.animated) { @@ -908,7 +907,7 @@ class RoomsListView extends React.Component this.scroll = ref; + getScrollRef = (ref: FlatList) => (this.scroll = ref); renderListHeader = () => { const { searching } = this.state; @@ -1026,11 +1025,9 @@ class RoomsListView extends React.Component - - - {this.renderHeader()} - {this.renderScroll()} - + + {this.renderHeader()} + {this.renderScroll()} {/* TODO - this ts-ignore is here because the route props, on IBaseScreen*/} {/* @ts-ignore*/} {showServerDropdown ? : null} diff --git a/app/views/SearchMessagesView/index.tsx b/app/views/SearchMessagesView/index.tsx index 3bb5a97af..b83d07779 100644 --- 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 - - - - - - - {this.renderList()} - + + + + + + {this.renderList()} ); } diff --git a/app/views/ThreadMessagesView/index.tsx b/app/views/ThreadMessagesView/index.tsx index 8cfbecb6a..2769b3302 100644 --- 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 - - - {this.renderContent()} - {showFilterDropdown ? ( - - ) : null} - + + {this.renderContent()} + {showFilterDropdown ? ( + + ) : null} ); } diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index ac7593cb8..1a3d604ee 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1770,7 +1770,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"; @@ -1809,7 +1809,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 index dc7b8abc8..5428b1074 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.38.0 + 4.37.1 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index 47dfa6e18..d8420c5bf 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.38.0 + 4.37.1 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index 344ec0d4d..0454bad70 100644 --- 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",