Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

优化radio_button的点击范围 #31

Merged
merged 3 commits into from
Dec 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions lib/src/components/radio/brn_checkbox.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,21 @@ class BrnCheckbox extends StatefulWidget {
/// 默认值MainAxisSize.min
final MainAxisSize mainAxisSize;

const BrnCheckbox({
Key key,
@required this.radioIndex,
@required this.onValueChangedAtIndex,
this.disable = false,
this.isSelected = false,
this.iconPadding,
this.child,
this.childOnRight = true,
this.mainAxisAlignment = MainAxisAlignment.start,
this.mainAxisSize = MainAxisSize.min,
});
/// 默认值HitTestBehavior.translucent控制widget.onRadioItemClick触发的点击范围
final HitTestBehavior behavior;

const BrnCheckbox(
{Key key,
@required this.radioIndex,
@required this.onValueChangedAtIndex,
this.disable = false,
this.isSelected = false,
this.iconPadding,
this.child,
this.childOnRight = true,
this.mainAxisAlignment = MainAxisAlignment.start,
this.mainAxisSize = MainAxisSize.min,
this.behavior = HitTestBehavior.translucent});

@override
State<StatefulWidget> createState() {
Expand Down Expand Up @@ -92,6 +95,7 @@ class BrnCheckboxState extends State<BrnCheckbox> {
});
widget.onValueChangedAtIndex(widget.radioIndex, _isSelected);
},
behavior: widget.behavior,
);
}
}
28 changes: 16 additions & 12 deletions lib/src/components/radio/brn_radio_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,21 @@ class BrnRadioButton extends StatelessWidget {
/// 默认值MainAxisSize.min
final MainAxisSize mainAxisSize;

const BrnRadioButton({
Key key,
@required this.radioIndex,
@required this.onValueChangedAtIndex,
this.disable = false,
this.isSelected = false,
this.iconPadding,
this.child,
this.childOnRight = true,
this.mainAxisAlignment = MainAxisAlignment.start,
this.mainAxisSize = MainAxisSize.min,
});
/// 默认值HitTestBehavior.translucent控制widget.onRadioItemClick触发的点击范围
final HitTestBehavior behavior;

const BrnRadioButton(
{Key key,
@required this.radioIndex,
@required this.onValueChangedAtIndex,
this.disable = false,
this.isSelected = false,
this.iconPadding,
this.child,
this.childOnRight = true,
this.mainAxisAlignment = MainAxisAlignment.start,
this.mainAxisSize = MainAxisSize.min,
this.behavior = HitTestBehavior.translucent});

@override
Widget build(BuildContext context) {
Expand All @@ -74,6 +77,7 @@ class BrnRadioButton extends StatelessWidget {
onRadioItemClick: () {
onValueChangedAtIndex(radioIndex, true);
},
behavior: behavior,
);
}
}
9 changes: 7 additions & 2 deletions lib/src/components/radio/brn_radio_core.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';

Expand Down Expand Up @@ -49,6 +50,9 @@ class BrnRadioCore extends StatefulWidget {

final VoidCallback onRadioItemClick;

/// 默认值HitTestBehavior.translucent控制widget.onRadioItemClick触发的点击范围
final HitTestBehavior behavior;

const BrnRadioCore(
{Key key,
@required this.radioIndex,
Expand All @@ -63,7 +67,8 @@ class BrnRadioCore extends StatefulWidget {
this.unselectedImage,
this.disSelectedImage,
this.disUnselectedImage,
this.onRadioItemClick})
this.onRadioItemClick,
this.behavior = HitTestBehavior.translucent})
: super(key: key);

@override
Expand Down Expand Up @@ -131,7 +136,7 @@ class _BrnRadioCoreState extends State<BrnRadioCore> {

return GestureDetector(
child: radioWidget,
behavior: HitTestBehavior.translucent,
behavior: widget.behavior,
onTap: () {
if (widget.disable == true) return;
widget.onRadioItemClick();
Expand Down