Make MouseRegion as the child of GestureDetector to ensure that the gesture events can be detected correctly when the cursor has changed (e.g. click)

JamesChenX · JamesChenX · commit 9297ce645f4f · 2025-07-16T21:50:45.000+08:00
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/giphy/giphy_picker.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/giphy/giphy_picker.dart
@@ -116,10 +116,10 @@ class _GiphyPickerBodyState extends ConsumerState<GiphyPickerBody> {
     final url = image.url;
     return ClipRRect(
       borderRadius: Sizes.borderRadiusCircular8,
-      child: MouseRegion(
-        cursor: SystemMouseCursors.click,
-        child: GestureDetector(
-          onTap: () => widget.onSelected(gif),
+      child: GestureDetector(
+        onTap: () => widget.onSelected(gif),
+        child: MouseRegion(
+          cursor: SystemMouseCursors.click,
           child: RepaintBoundary(
             child: LayoutBuilder(
               builder: (context, constraints) {
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_accordion/t_accordion.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_accordion/t_accordion.dart
@@ -115,10 +115,10 @@ class _TAccordionState extends State<TAccordion>
   Widget build(BuildContext context) => Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      MouseRegion(
-        cursor: SystemMouseCursors.click,
-        child: GestureDetector(
-          onTap: _toggleCollapsed,
+      GestureDetector(
+        onTap: _toggleCollapsed,
+        child: MouseRegion(
+          cursor: SystemMouseCursors.click,
           child: DecoratedBox(
             decoration: BoxDecoration(
               borderRadius: widget.titleBorderRadius,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_button/t_button.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_button/t_button.dart
@@ -153,26 +153,26 @@ class _TButtonState extends State<TButton> {
       );
     }
     return RepaintBoundary(
-      child: MouseRegion(
-        cursor: widget.disabled
-            ? SystemMouseCursors.forbidden
-            : SystemMouseCursors.click,
-        onEnter: (_) {
-          _isHovered = true;
+      child: GestureDetector(
+        onTap: !widget.disabled && !widget.isLoading && widget.onTap != null
+            ? widget.onTap
+            : null,
+        onPanDown: (details) {
+          _isPressed = true;
+          widget.onPanDown?.call(details);
           setState(() {});
         },
-        onExit: (_) {
-          _isHovered = false;
-          _isPressed = false;
-          setState(() {});
-        },
-        child: GestureDetector(
-          onTap: !widget.disabled && !widget.isLoading && widget.onTap != null
-              ? widget.onTap
-              : null,
-          onPanDown: (details) {
-            _isPressed = true;
-            widget.onPanDown?.call(details);
+        child: MouseRegion(
+          cursor: widget.disabled
+              ? SystemMouseCursors.forbidden
+              : SystemMouseCursors.click,
+          onEnter: (_) {
+            _isHovered = true;
+            setState(() {});
+          },
+          onExit: (_) {
+            _isHovered = false;
+            _isPressed = false;
             setState(() {});
           },
           child: child,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_checkbox/t_checkbox.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_checkbox/t_checkbox.dart
@@ -27,14 +27,14 @@ class _TCheckboxState extends State<TCheckbox> {
     _isChecked ??= widget.initialValue;
     final isChecked = _isChecked!;
     final appThemeExtension = context.appThemeExtension;
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      child: GestureDetector(
-        onTap: () {
-          _isChecked = !isChecked;
-          widget.onCheckedChanged(isChecked);
-          setState(() {});
-        },
+    return GestureDetector(
+      onTap: () {
+        _isChecked = !isChecked;
+        widget.onCheckedChanged(isChecked);
+        setState(() {});
+      },
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
         child: Row(
           spacing: 4,
           mainAxisSize: MainAxisSize.min,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_checkbox/t_simple_checkbox.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_checkbox/t_simple_checkbox.dart
@@ -78,14 +78,11 @@ class _TSimpleCheckboxState extends State<TSimpleCheckbox> {
         children: [child, Text(label)],
       );
     }
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      child: GestureDetector(
-        onTap: () {
-          widget.onChanged(!widget.value);
-        },
-        child: child,
-      ),
+    return GestureDetector(
+      onTap: () {
+        widget.onChanged(!widget.value);
+      },
+      child: MouseRegion(cursor: SystemMouseCursors.click, child: child),
     );
   }
 }
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_date_picker/t_date_cell.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_date_picker/t_date_cell.dart
@@ -211,34 +211,34 @@ class _TDateCellState extends ConsumerState<TDateCell> {
         ],
       );
     }
-    return MouseRegion(
-      cursor: disabled
-          ? SystemMouseCursors.forbidden
-          : SystemMouseCursors.click,
-      onEnter: (event) {
+    return GestureDetector(
+      onTap: () {
         if (!disabled) {
-          setState(() {
-            _isHovered = true;
-          });
-          if (widget.inCurrentCalendarMonth) {
-            widget.onMouseRegionEntered?.call(widget.date);
-          }
+          widget.onTap(widget.date);
         }
       },
-      onExit: (event) {
-        if (!disabled) {
-          setState(() {
-            _isHovered = false;
-          });
-          if (widget.inCurrentCalendarMonth) {
-            widget.onMouseRegionExited?.call(widget.date);
+      child: MouseRegion(
+        cursor: disabled
+            ? SystemMouseCursors.forbidden
+            : SystemMouseCursors.click,
+        onEnter: (event) {
+          if (!disabled) {
+            setState(() {
+              _isHovered = true;
+            });
+            if (widget.inCurrentCalendarMonth) {
+              widget.onMouseRegionEntered?.call(widget.date);
+            }
           }
-        }
-      },
-      child: GestureDetector(
-        onTap: () {
+        },
+        onExit: (event) {
           if (!disabled) {
-            widget.onTap(widget.date);
+            setState(() {
+              _isHovered = false;
+            });
+            if (widget.inCurrentCalendarMonth) {
+              widget.onMouseRegionExited?.call(widget.date);
+            }
           }
         },
         child: TTooltip(
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_image_cropper/t_image_cropper.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_image_cropper/t_image_cropper.dart
@@ -436,11 +436,11 @@ extension _ImageCropperStateView on _ImageCropperState {
       Positioned(
         left: cropRect.left,
         top: cropRect.top,
-        child: MouseRegion(
-          cursor: SystemMouseCursors.move,
-          child: GestureDetector(
-            onPanUpdate: (details) =>
-                _updateCropRect(_data!.moveRect(details.delta)),
+        child: GestureDetector(
+          onPanUpdate: (details) =>
+              _updateCropRect(_data!.moveRect(details.delta)),
+          child: MouseRegion(
+            cursor: SystemMouseCursors.move,
             child: Container(
               width: cropRect.width,
               height: cropRect.height,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_list_tile/t_list_tile.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_list_tile/t_list_tile.dart
@@ -41,13 +41,13 @@ class _TListTileState extends State<TListTile> {
   @override
   Widget build(BuildContext context) {
     final appThemeExtension = context.appThemeExtension;
-    return MouseRegion(
-      cursor: widget.mouseCursor,
-      onEnter: (_) => setState(() => _isHovered = true),
-      onExit: (_) => setState(() => _isHovered = false),
-      child: GestureDetector(
-        onTap: widget.onTap,
-        onSecondaryTapUp: widget.onSecondaryTapUp,
+    return GestureDetector(
+      onTap: widget.onTap,
+      onSecondaryTapUp: widget.onSecondaryTapUp,
+      child: MouseRegion(
+        cursor: widget.mouseCursor,
+        onEnter: (_) => setState(() => _isHovered = true),
+        onExit: (_) => setState(() => _isHovered = false),
         child: AnimatedContainer(
           height: widget.height,
           alignment: Alignment.center,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_menu/t_menu.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_menu/t_menu.dart
@@ -161,21 +161,21 @@ class _TMenuState<T> extends State<TMenu<T>> {
       content = Row(spacing: 8, children: [prefix, content]);
     }
     content = Padding(padding: widget.padding, child: content);
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      onEnter: (event) => setState(() {
-        _hoveredEntryIndex = index;
-      }),
-      onExit: (event) => setState(() {
-        if (_hoveredEntryIndex == index) {
-          _hoveredEntryIndex = null;
-        }
-      }),
-      child: GestureDetector(
-        behavior: HitTestBehavior.translucent,
-        onTap: () {
-          _select(entry);
-        },
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTap: () {
+        _select(entry);
+      },
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
+        onEnter: (event) => setState(() {
+          _hoveredEntryIndex = index;
+        }),
+        onExit: (event) => setState(() {
+          if (_hoveredEntryIndex == index) {
+            _hoveredEntryIndex = null;
+          }
+        }),
         child: ColoredBox(
           color: _hoveredEntryIndex == index
               ? appThemeExtension.menuItemHoveredColor
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_popup/t_popup.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_popup/t_popup.dart
@@ -71,12 +71,12 @@ class _TPopupState extends State<TPopup> {
   }
 
   @override
-  Widget build(BuildContext context) => MouseRegion(
-    cursor: SystemMouseCursors.click,
-    child: GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      key: _targetKey,
-      onTap: _togglePopup,
+  Widget build(BuildContext context) => GestureDetector(
+    behavior: HitTestBehavior.opaque,
+    key: _targetKey,
+    onTap: _togglePopup,
+    child: MouseRegion(
+      cursor: SystemMouseCursors.click,
       child: CompositedTransformTarget(link: _layerLink, child: widget.target),
     ),
   );
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_radio/t_radio.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_radio/t_radio.dart
@@ -63,10 +63,10 @@ class _TRadioState<T> extends State<TRadio<T>> with TickerProviderStateMixin {
     _selected = widget.value == widget.groupValue;
     final label = widget.label;
     final size = widget.size;
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      child: GestureDetector(
-        onTap: onStatusChange,
+    return GestureDetector(
+      onTap: onStatusChange,
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
         child: Row(
           spacing: 8,
           mainAxisSize: MainAxisSize.min,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_table/t_table.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_table/t_table.dart
@@ -105,21 +105,21 @@ class _TTableRowViewState extends State<_TTableRowView> {
     final widths = widget.widths;
     final onTap = row.onTap;
     final onDoubleTap = row.onDoubleTap;
-    final child = MouseRegion(
-      cursor: onTap == null && onDoubleTap == null
-          ? SystemMouseCursors.basic
-          : SystemMouseCursors.click,
-      onEnter: (_) {
-        _isHovered = true;
-        setState(() {});
-      },
-      onExit: (_) {
-        _isHovered = false;
-        setState(() {});
-      },
-      child: GestureDetector(
-        onTap: () => onTap?.call(),
-        onDoubleTap: () => onDoubleTap?.call(),
+    final child = GestureDetector(
+      onTap: () => onTap?.call(),
+      onDoubleTap: () => onDoubleTap?.call(),
+      child: MouseRegion(
+        cursor: onTap == null && onDoubleTap == null
+            ? SystemMouseCursors.basic
+            : SystemMouseCursors.click,
+        onEnter: (_) {
+          _isHovered = true;
+          setState(() {});
+        },
+        onExit: (_) {
+          _isHovered = false;
+          setState(() {});
+        },
         child: Row(
           children: List.generate(
             widget.columnCount,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/components/t_tabs/t_tabs.dart b/turms-chat-demo-flutter/lib/ui/desktop/components/t_tabs/t_tabs.dart
@@ -31,19 +31,19 @@ class _TTabsState extends State<TTabs> {
   );
 
   Widget _buildTab(ThemeData theme, TTab tab, int index, bool isSelected) {
-    final child = MouseRegion(
-      cursor: SystemMouseCursors.click,
-      onEnter: (_) => setState(() => _hoveringTabId = tab.id),
-      onExit: (_) => setState(() {
-        if (_hoveringTabId == tab.id) {
-          _hoveringTabId = null;
-        }
-      }),
-      child: GestureDetector(
-        onTap: () {
-          widget.onTabSelected(index, tab);
-          setState(() {});
-        },
+    final child = GestureDetector(
+      onTap: () {
+        widget.onTabSelected(index, tab);
+        setState(() {});
+      },
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
+        onEnter: (_) => setState(() => _hoveringTabId = tab.id),
+        onExit: (_) => setState(() {
+          if (_hoveringTabId == tab.id) {
+            _hoveringTabId = null;
+          }
+        }),
         child: SizedBox(
           width: double.maxFinite,
           child: DecoratedBox(
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/attachment.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/attachment.dart
@@ -27,12 +27,12 @@ class _AttachmentState extends ConsumerState<Attachment> {
   @override
   Widget build(BuildContext context) {
     final appThemeExtension = context.appThemeExtension;
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      onEnter: (_) => setState(() => _isContainerHovered = true),
-      onExit: (_) => setState(() => _isContainerHovered = false),
-      child: GestureDetector(
-        onTap: () {},
+    return GestureDetector(
+      onTap: () {},
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
+        onEnter: (_) => setState(() => _isContainerHovered = true),
+        onExit: (_) => setState(() => _isContainerHovered = false),
         child: AnimatedContainer(
           width: 300,
           height: 48,
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/chat_session_details_drawer/chat_session_details_group_conversation.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/chat_session_details_drawer/chat_session_details_group_conversation.dart
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble.dart
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble_audio.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble_audio.dart
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble_image.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble_image.dart
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble_video.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/chat_page/chat_session_pane/message_bubble/message_bubble_video.dart
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/shared_components/user_profile/user_profile_image.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/shared_components/user_profile/user_profile_image.dart
diff --git a/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/shared_components/user_profile_popup.dart b/turms-chat-demo-flutter/lib/ui/desktop/pages/home_page/shared_components/user_profile_popup.dart
