verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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 cf14ebea78.

* bump version to 4.37.1
This commit is contained in:
Gleidson Daniel Silva 2023-04-18 09:46:53 -03:00 committed by Diego Mello
parent 0b278f055d
commit fd81c4637c
10 changed files with 61 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -147,7 +147,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode VERSIONCODE as Integer versionCode VERSIONCODE as Integer
versionName "4.38.0" versionName "4.37.1"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
if (!isFoss) { if (!isFoss) {
manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

2
app/containers/KeyboardView.tsx
View File

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

47
app/views/NewMessageView/index.tsx
View File

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

23
app/views/RoomsListView/index.tsx
View File

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

27
app/views/SearchMessagesView/index.tsx
View File

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

23
app/views/ThreadMessagesView/index.tsx
View File

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

4
ios/RocketChatRN.xcodeproj/project.pbxproj
View File

@ -1793,7 +1793,7 @@
INFOPLIST_FILE = NotificationService/Info.plist; INFOPLIST_FILE = NotificationService/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; 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_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@ -1832,7 +1832,7 @@
INFOPLIST_FILE = NotificationService/Info.plist; INFOPLIST_FILE = NotificationService/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; 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; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;

2
ios/RocketChatRN/Info.plist
View File

@ -26,7 +26,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>4.38.0</string> <string>4.37.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>

2
ios/ShareRocketChatRN/Info.plist
View File

@ -26,7 +26,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XPC!</string> <string>XPC!</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>4.38.0</string> <string>4.37.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>1</string>
<key>KeychainGroup</key> <key>KeychainGroup</key>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "rocket-chat-reactnative", "name": "rocket-chat-reactnative",
"version": "4.38.0", "version": "4.37.1",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "react-native start", "start": "react-native start",