Merge pull request #488 from GetStream/hotfix/messageInput

fix: message input
This commit is contained in:
Salvatore Giordano
2021-06-21 14:36:05 +02:00
committed by GitHub
2 changed files with 44 additions and 50 deletions
@@ -625,7 +625,9 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
topRight: Radius.circular(16), topRight: Radius.circular(16),
), ),
), ),
builder: (context) => StreamChannel( builder: (context) => Padding(
padding: MediaQuery.of(context).viewInsets,
child: StreamChannel(
channel: channel, channel: channel,
child: Flex( child: Flex(
direction: Axis.vertical, direction: Axis.vertical,
@@ -669,6 +671,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
], ],
), ),
), ),
),
); );
} }
@@ -251,7 +251,6 @@ class MessageInputState extends State<MessageInput> {
late final FocusNode _focusNode; late final FocusNode _focusNode;
bool _inputEnabled = true; bool _inputEnabled = true;
bool _messageIsPresent = false; bool _messageIsPresent = false;
bool _animateContainer = true;
bool _commandEnabled = false; bool _commandEnabled = false;
OverlayEntry? _commandsOverlay, _mentionsOverlay, _emojiOverlay; OverlayEntry? _commandsOverlay, _mentionsOverlay, _emojiOverlay;
late Iterable<String> _emojiNames; late Iterable<String> _emojiNames;
@@ -939,10 +938,6 @@ class MessageInputState extends State<MessageInput> {
} }
Widget _buildFilePickerSection() { Widget _buildFilePickerSection() {
if (!_openFilePickerSection) {
return const Offstage();
}
final _attachmentContainsFile = final _attachmentContainsFile =
_attachments.values.any((it) => it.type == 'file'); _attachments.values.any((it) => it.type == 'file');
@@ -975,8 +970,7 @@ class MessageInputState extends State<MessageInput> {
} }
return AnimatedContainer( return AnimatedContainer(
duration: duration: const Duration(milliseconds: 300),
_animateContainer ? const Duration(milliseconds: 300) : Duration.zero,
height: _openFilePickerSection ? _filePickerSize : 0, height: _openFilePickerSection ? _filePickerSize : 0,
child: Material( child: Material(
color: _streamChatTheme.colorTheme.whiteSmoke, color: _streamChatTheme.colorTheme.whiteSmoke,
@@ -1034,7 +1028,6 @@ class MessageInputState extends State<MessageInput> {
GestureDetector( GestureDetector(
onVerticalDragUpdate: (update) { onVerticalDragUpdate: (update) {
setState(() { setState(() {
_animateContainer = false;
_filePickerSize = (_filePickerSize - update.delta.dy).clamp( _filePickerSize = (_filePickerSize - update.delta.dy).clamp(
_kMinMediaPickerSize, _kMinMediaPickerSize,
MediaQuery.of(context).size.height / 1.7, MediaQuery.of(context).size.height / 1.7,
@@ -1672,7 +1665,6 @@ class MessageInputState extends State<MessageInput> {
onPressed: () async { onPressed: () async {
if (_openFilePickerSection) { if (_openFilePickerSection) {
setState(() { setState(() {
_animateContainer = false;
_openFilePickerSection = false; _openFilePickerSection = false;
_filePickerSize = _kMinMediaPickerSize; _filePickerSize = _kMinMediaPickerSize;
}); });
@@ -1718,7 +1710,6 @@ class MessageInputState extends State<MessageInput> {
if (_openFilePickerSection) { if (_openFilePickerSection) {
setState(() { setState(() {
_animateContainer = true;
_openFilePickerSection = false; _openFilePickerSection = false;
_filePickerSize = _kMinMediaPickerSize; _filePickerSize = _kMinMediaPickerSize;
}); });