chore: merge latest changes

Signed-off-by: xsahil03x <[email protected]>
This commit is contained in:
Sahil Kumar
2023-06-20 15:28:05 +05:30
committed by xsahil03x
parent ffeef9fc3e
commit 6c8c4b54fa
7 changed files with 81 additions and 33 deletions
@@ -129,6 +129,7 @@ class StreamMessageInput extends StatefulWidget {
this.customAutocompleteTriggers = const [],
this.mentionAllAppUsers = false,
this.sendButtonBuilder,
this.quotedMessageBuilder,
this.shouldKeepFocusAfterMessage,
this.validator = _defaultValidator,
this.restorationId,
@@ -266,6 +267,9 @@ class StreamMessageInput extends StatefulWidget {
/// Builder for creating send button
final MessageRelatedBuilder? sendButtonBuilder;
/// Builder for building quoted message
final Widget Function(BuildContext, Message)? quotedMessageBuilder;
/// Defines if the [StreamMessageInput] loses focuses after a message is sent.
/// The default behaviour keeps focus until a command is enabled.
final bool? shouldKeepFocusAfterMessage;
@@ -781,7 +785,6 @@ class StreamMessageInputState extends State<StreamMessageInput>
Future<void> _onAttachmentButtonPressed() async {
final attachments = await showStreamAttachmentPickerModalBottomSheet(
context: context,
useRootNavigator: true,
allowedTypes: widget.allowedAttachmentPickerTypes,
initialAttachments: _effectiveController.attachments,
);
@@ -1131,14 +1134,20 @@ class StreamMessageInputState extends State<StreamMessageInput>
if (!_hasQuotedMessage) return const Offstage();
final containsUrl = _effectiveController.message.quotedMessage!.attachments
.any((element) => element.titleLink != null);
return StreamQuotedMessageWidget(
reverse: true,
showBorder: !containsUrl,
message: _effectiveController.message.quotedMessage!,
messageTheme: _streamChatTheme.otherMessageTheme,
padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
onQuotedMessageClear: widget.onQuotedMessageCleared,
);
return widget.quotedMessageBuilder?.call(
context,
_effectiveController.message.quotedMessage!,
) ??
StreamQuotedMessageWidget(
reverse: true,
showBorder: !containsUrl,
message: _effectiveController.message.quotedMessage!,
messageTheme: _streamChatTheme.otherMessageTheme,
padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
onQuotedMessageClear: widget.onQuotedMessageCleared,
attachmentThumbnailBuilders: widget.attachmentThumbnailBuilders,
);
}
Widget _buildAttachments() {