chore: merge latest changes

Signed-off-by: xsahil03x <[email protected]>
2023-06-20 15:28:05 +05:30
parent ffeef9fc3e
commit 6c8c4b54fa
7 changed files with 81 additions and 33 deletions
@@ -61,6 +61,7 @@ class StreamMessageWidget extends StatefulWidget {
    this.showInChannelIndicator = false,
    this.onReplyTap,
    this.onThreadTap,
+    this.onConfirmDeleteTap,
    this.showUsername = true,
    this.showTimestamp = true,
    this.showReactions = true,
@@ -78,6 +79,7 @@ class StreamMessageWidget extends StatefulWidget {
    this.onMessageActions,
    this.onShowMessage,
    this.userAvatarBuilder,
+    this.quotedMessageBuilder,
    this.editMessageInputBuilder,
    this.textBuilder,
    @Deprecated('''
@@ -307,6 +309,11 @@ class StreamMessageWidget extends StatefulWidget {
  /// {@endtemplate}
  final void Function(Message)? onReplyTap;

+  /// {@template onDeleteTap}
+  /// The function called when delete confirmation button is tapped.
+  /// {@endtemplate}
+  final Future<void> Function(Message)? onConfirmDeleteTap;
+
  /// {@template editMessageInputBuilder}
  /// Widget builder for edit message layout
  /// {@endtemplate}
@@ -348,6 +355,11 @@ class StreamMessageWidget extends StatefulWidget {
  /// {@endtemplate}
  final Widget Function(BuildContext, User)? userAvatarBuilder;

+  /// {@template quotedMessageBuilder}
+  /// Widget builder for building quoted message
+  /// {@endtemplate}
+  final Widget Function(BuildContext, Message)? quotedMessageBuilder;
+
  /// {@template message}
  /// The message to display.
  /// {@endtemplate}
@@ -568,8 +580,10 @@ class StreamMessageWidget extends StatefulWidget {
    void Function(User)? onMentionTap,
    void Function(Message)? onThreadTap,
    void Function(Message)? onReplyTap,
+    Future<void> Function(Message)? onConfirmDeleteTap,
    Widget Function(BuildContext, Message)? editMessageInputBuilder,
    Widget Function(BuildContext, Message)? textBuilder,
+    Widget Function(BuildContext, Message)? quotedMessageBuilder,
    @Deprecated('''
    Use [bottomRowBuilderWithDefaultWidget] instead.
    Will be removed in the next major version.
@@ -659,9 +673,11 @@ class StreamMessageWidget extends StatefulWidget {
      onMentionTap: onMentionTap ?? this.onMentionTap,
      onThreadTap: onThreadTap ?? this.onThreadTap,
      onReplyTap: onReplyTap ?? this.onReplyTap,
+      onConfirmDeleteTap: onConfirmDeleteTap ?? this.onConfirmDeleteTap,
      editMessageInputBuilder:
          editMessageInputBuilder ?? this.editMessageInputBuilder,
      textBuilder: textBuilder ?? this.textBuilder,
+      quotedMessageBuilder: quotedMessageBuilder ?? this.quotedMessageBuilder,
      bottomRowBuilderWithDefaultWidget: _bottomRowBuilderWithDefaultWidget,
      onMessageActions: onMessageActions ?? this.onMessageActions,
      message: message ?? this.message,
@@ -955,6 +971,7 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
                      borderSide: widget.borderSide,
                      borderRadiusGeometry: widget.borderRadiusGeometry,
                      textBuilder: widget.textBuilder,
+                      quotedMessageBuilder: widget.quotedMessageBuilder,
                      onLinkTap: widget.onLinkTap,
                      onMentionTap: widget.onMentionTap,
                      onQuotedMessageTap: widget.onQuotedMessageTap,
@@ -1094,16 +1111,21 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
          ),
          onClick: () async {
            Navigator.of(context, rootNavigator: true).pop();
-            final deleted = await showDialog(
+            final deleted = await showDialog<bool?>(
              context: context,
              barrierDismissible: false,
              builder: (_) => const DeleteMessageDialog(),
            );
-            if (deleted) {
+            if (deleted == true) {
              try {
-                await StreamChannel.of(context)
-                    .channel
-                    .deleteMessage(widget.message);
+                final onConfirmDeleteTap = widget.onConfirmDeleteTap;
+                if (onConfirmDeleteTap != null) {
+                  await onConfirmDeleteTap(widget.message);
+                } else {
+                  await StreamChannel.of(context)
+                      .channel
+                      .deleteMessage(widget.message);
+                }
              } catch (e) {
                showDialog(
                  context: context,
@@ -1175,6 +1197,7 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
          messageTheme: widget.messageTheme,
          reverse: widget.reverse,
          showDeleteMessage: shouldShowDeleteAction,
+          onConfirmDeleteTap: widget.onConfirmDeleteTap,
          message: widget.message,
          editMessageInputBuilder: widget.editMessageInputBuilder,
          onReplyTap: widget.onReplyTap,
@@ -63,6 +63,7 @@ class MessageWidgetContent extends StatelessWidget {
    this.onMentionTap,
    this.onLinkTap,
    this.textBuilder,
+    this.quotedMessageBuilder,
    @Deprecated('''
    Use [bottomRowBuilderWithDefaultWidget] instead.
    Will be removed in the next major version.
@@ -170,6 +171,9 @@ class MessageWidgetContent extends StatelessWidget {
  /// {@macro textBuilder}
  final Widget Function(BuildContext, Message)? textBuilder;

+  /// {@macro quotedMessageBuilder}
+  final Widget Function(BuildContext, Message)? quotedMessageBuilder;
+
  /// {@macro showReactionPickerIndicator}
  final bool showReactionPickerIndicator;

@@ -351,6 +355,8 @@ class MessageWidgetContent extends StatelessWidget {
                                        onMentionTap: onMentionTap,
                                        onLinkTap: onLinkTap,
                                        textBuilder: textBuilder,
+                                        quotedMessageBuilder:
+                                            quotedMessageBuilder,
                                        borderRadiusGeometry:
                                            borderRadiusGeometry,
                                        borderSide: borderSide,