Преглед изворни кода

feat(chat/native) fixed scroll inside chat room

factor2
Calin Chitu пре 4 година
родитељ
комит
39d1ccff85

+ 1
- 3
react/features/chat/components/native/ChatMessageGroup.js Прегледај датотеку

@@ -6,7 +6,6 @@ import { FlatList } from 'react-native';
6 6
 import { MESSAGE_TYPE_LOCAL, MESSAGE_TYPE_REMOTE } from '../../constants';
7 7
 
8 8
 import ChatMessage from './ChatMessage';
9
-import styles from './styles';
10 9
 
11 10
 type Props = {
12 11
 
@@ -43,8 +42,7 @@ export default class ChatMessageGroup extends Component<Props> {
43 42
                 data = { this.props.messages }
44 43
                 inverted = { true }
45 44
                 keyExtractor = { this._keyExtractor }
46
-                renderItem = { this._renderMessage }
47
-                style = { styles.messageContainer } />
45
+                renderItem = { this._renderMessage } />
48 46
         );
49 47
     }
50 48
 

+ 8
- 3
react/features/chat/components/native/MessageContainer.js Прегледај датотеку

@@ -2,6 +2,7 @@
2 2
 
3 3
 import React from 'react';
4 4
 import { FlatList, Text, View } from 'react-native';
5
+import { ScrollView } from 'react-native-gesture-handler';
5 6
 
6 7
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
7 8
 import { translate } from '../../../base/i18n';
@@ -54,6 +55,7 @@ class MessageContainer extends AbstractMessageContainer<Props> {
54 55
         return (
55 56
             <FlatList
56 57
                 ListEmptyComponent = { this._renderListEmptyComponent }
58
+                bounces = { false }
57 59
                 data = { data }
58 60
 
59 61
                 // Workaround for RN bug:
@@ -61,8 +63,7 @@ class MessageContainer extends AbstractMessageContainer<Props> {
61 63
                 inverted = { Boolean(data.length) }
62 64
                 keyExtractor = { this._keyExtractor }
63 65
                 keyboardShouldPersistTaps = 'always'
64
-                renderItem = { this._renderMessageGroup }
65
-                style = { styles.messageContainer } />
66
+                renderItem = { this._renderMessageGroup } />
66 67
         );
67 68
     }
68 69
 
@@ -110,7 +111,11 @@ class MessageContainer extends AbstractMessageContainer<Props> {
110 111
      * @returns {React$Element<*>}
111 112
      */
112 113
     _renderMessageGroup({ item: messages }) {
113
-        return <ChatMessageGroup messages = { messages } />;
114
+        return (
115
+            <ScrollView>
116
+                <ChatMessageGroup messages = { messages } />
117
+            </ScrollView>
118
+        );
114 119
     }
115 120
 }
116 121
 

+ 0
- 4
react/features/chat/components/native/styles.js Прегледај датотеку

@@ -71,10 +71,6 @@ export default {
71 71
         flexDirection: 'row'
72 72
     },
73 73
 
74
-    messageContainer: {
75
-        flex: 1
76
-    },
77
-
78 74
     /**
79 75
      * Wrapper View for the entire block.
80 76
      */

Loading…
Откажи
Сачувај