Skip to content

Commit

Permalink
Revert "compose box: Make it scroll when very tall, so it all stays r…
Browse files Browse the repository at this point in the history
…eachable."

This reverts commit 3574b12.

This was not a right fix, it introduced zulip#3614.
So reverting it. Also see futher commit for right fix.
  • Loading branch information
jainkuniya committed Jan 1, 2020
1 parent 9f2e1be commit bc112b0
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/compose/ComposeBox.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* @flow strict-local */
import React, { PureComponent } from 'react';
import { Platform, View, TextInput, findNodeHandle, ScrollView } from 'react-native';
import { Platform, View, TextInput, findNodeHandle } from 'react-native';
import type { LayoutEvent } from 'react-native/Libraries/Types/CoreEventTypes';
import TextInputReset from 'react-native-text-input-reset';

Expand Down Expand Up @@ -292,6 +292,7 @@ class ComposeBox extends PureComponent<Props, State> {
alignItems: 'flex-end',
},
composeText: {
flex: 1,
paddingVertical: 8,
},
composeSendButton: {
Expand Down Expand Up @@ -360,7 +361,7 @@ class ComposeBox extends PureComponent<Props, State> {
expanded={isMenuExpanded}
onExpandContract={this.handleComposeMenuToggle}
/>
<ScrollView contentContainerStyle={this.styles.composeText}>
<View style={this.styles.composeText}>
{this.getCanSelectTopic() && (
<Input
style={this.styles.topicInput}
Expand Down Expand Up @@ -392,7 +393,7 @@ class ComposeBox extends PureComponent<Props, State> {
onSelectionChange={this.handleMessageSelectionChange}
onTouchStart={this.handleInputTouchStart}
/>
</ScrollView>
</View>
<FloatingActionButton
style={this.styles.composeSendButton}
Icon={editMessage === null ? IconSend : IconDone}
Expand Down

0 comments on commit bc112b0

Please sign in to comment.