From 35e437aef89abbf43bd2ad0735fca41fc91d9fbd Mon Sep 17 00:00:00 2001 From: lee <58846244+a1017480401@users.noreply.github.com> Date: Wed, 22 Dec 2021 11:02:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96radio=5Fbutton=E7=9A=84?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/components/radio/brn_checkbox.dart | 5 +++++ lib/src/components/radio/brn_radio_button.dart | 5 +++++ lib/src/components/radio/brn_radio_core.dart | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/src/components/radio/brn_checkbox.dart b/lib/src/components/radio/brn_checkbox.dart index 0f067a9e..6ac22fb9 100644 --- a/lib/src/components/radio/brn_checkbox.dart +++ b/lib/src/components/radio/brn_checkbox.dart @@ -40,6 +40,9 @@ class BrnCheckbox extends StatefulWidget { /// 默认值MainAxisSize.min final MainAxisSize mainAxisSize; + /// 默认值HitTestBehavior.deferToChild控制widget.onRadioItemClick触发的点击范围 + final HitTestBehavior behavior; + const BrnCheckbox({ Key key, @required this.radioIndex, @@ -51,6 +54,7 @@ class BrnCheckbox extends StatefulWidget { this.childOnRight = true, this.mainAxisAlignment = MainAxisAlignment.start, this.mainAxisSize = MainAxisSize.min, + this.behavior=HitTestBehavior.deferToChild }); @override @@ -92,6 +96,7 @@ class BrnCheckboxState extends State { }); widget.onValueChangedAtIndex(widget.radioIndex, _isSelected); }, + behavior: widget.behavior, ); } } diff --git a/lib/src/components/radio/brn_radio_button.dart b/lib/src/components/radio/brn_radio_button.dart index b15306f9..99920f73 100644 --- a/lib/src/components/radio/brn_radio_button.dart +++ b/lib/src/components/radio/brn_radio_button.dart @@ -40,6 +40,9 @@ class BrnRadioButton extends StatelessWidget { /// 默认值MainAxisSize.min final MainAxisSize mainAxisSize; + /// 默认值HitTestBehavior.deferToChild控制widget.onRadioItemClick触发的点击范围 + final HitTestBehavior behavior; + const BrnRadioButton({ Key key, @required this.radioIndex, @@ -51,6 +54,7 @@ class BrnRadioButton extends StatelessWidget { this.childOnRight = true, this.mainAxisAlignment = MainAxisAlignment.start, this.mainAxisSize = MainAxisSize.min, + this.behavior=HitTestBehavior.deferToChild }); @override @@ -74,6 +78,7 @@ class BrnRadioButton extends StatelessWidget { onRadioItemClick: () { onValueChangedAtIndex(radioIndex, true); }, + behavior: behavior, ); } } diff --git a/lib/src/components/radio/brn_radio_core.dart b/lib/src/components/radio/brn_radio_core.dart index 05fc52b0..c74db95c 100644 --- a/lib/src/components/radio/brn_radio_core.dart +++ b/lib/src/components/radio/brn_radio_core.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -49,6 +50,9 @@ class BrnRadioCore extends StatefulWidget { final VoidCallback onRadioItemClick; + /// 默认值HitTestBehavior.deferToChild控制widget.onRadioItemClick触发的点击范围 + final HitTestBehavior behavior; + const BrnRadioCore( {Key key, @required this.radioIndex, @@ -63,7 +67,8 @@ class BrnRadioCore extends StatefulWidget { this.unselectedImage, this.disSelectedImage, this.disUnselectedImage, - this.onRadioItemClick}) + this.onRadioItemClick, + this.behavior=HitTestBehavior.deferToChild}) : super(key: key); @override @@ -131,7 +136,7 @@ class _BrnRadioCoreState extends State { return GestureDetector( child: radioWidget, - behavior: HitTestBehavior.translucent, + behavior: widget.behavior, onTap: () { if (widget.disable == true) return; widget.onRadioItemClick(); From dab468baa8ca7edd4c202d4f5ab3ae2e712636e3 Mon Sep 17 00:00:00 2001 From: lee <58846244+a1017480401@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:38:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9BrnRadioCore=E7=9A=84beha?= =?UTF-8?q?vior=E5=B1=9E=E6=80=A7=E9=BB=98=E8=AE=A4=E4=B8=BAHitTestBehavio?= =?UTF-8?q?r.translucent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/components/radio/brn_checkbox.dart | 4 ++-- lib/src/components/radio/brn_radio_button.dart | 4 ++-- lib/src/components/radio/brn_radio_core.dart | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/components/radio/brn_checkbox.dart b/lib/src/components/radio/brn_checkbox.dart index 6ac22fb9..851c5255 100644 --- a/lib/src/components/radio/brn_checkbox.dart +++ b/lib/src/components/radio/brn_checkbox.dart @@ -40,7 +40,7 @@ class BrnCheckbox extends StatefulWidget { /// 默认值MainAxisSize.min final MainAxisSize mainAxisSize; - /// 默认值HitTestBehavior.deferToChild控制widget.onRadioItemClick触发的点击范围 + /// 默认值HitTestBehavior.translucent控制widget.onRadioItemClick触发的点击范围 final HitTestBehavior behavior; const BrnCheckbox({ @@ -54,7 +54,7 @@ class BrnCheckbox extends StatefulWidget { this.childOnRight = true, this.mainAxisAlignment = MainAxisAlignment.start, this.mainAxisSize = MainAxisSize.min, - this.behavior=HitTestBehavior.deferToChild + this.behavior=HitTestBehavior.translucent }); @override diff --git a/lib/src/components/radio/brn_radio_button.dart b/lib/src/components/radio/brn_radio_button.dart index 99920f73..fe6533fb 100644 --- a/lib/src/components/radio/brn_radio_button.dart +++ b/lib/src/components/radio/brn_radio_button.dart @@ -40,7 +40,7 @@ class BrnRadioButton extends StatelessWidget { /// 默认值MainAxisSize.min final MainAxisSize mainAxisSize; - /// 默认值HitTestBehavior.deferToChild控制widget.onRadioItemClick触发的点击范围 + /// 默认值HitTestBehavior.translucent控制widget.onRadioItemClick触发的点击范围 final HitTestBehavior behavior; const BrnRadioButton({ @@ -54,7 +54,7 @@ class BrnRadioButton extends StatelessWidget { this.childOnRight = true, this.mainAxisAlignment = MainAxisAlignment.start, this.mainAxisSize = MainAxisSize.min, - this.behavior=HitTestBehavior.deferToChild + this.behavior=HitTestBehavior.translucent }); @override diff --git a/lib/src/components/radio/brn_radio_core.dart b/lib/src/components/radio/brn_radio_core.dart index c74db95c..027ac88d 100644 --- a/lib/src/components/radio/brn_radio_core.dart +++ b/lib/src/components/radio/brn_radio_core.dart @@ -50,7 +50,7 @@ class BrnRadioCore extends StatefulWidget { final VoidCallback onRadioItemClick; - /// 默认值HitTestBehavior.deferToChild控制widget.onRadioItemClick触发的点击范围 + /// 默认值HitTestBehavior.translucent控制widget.onRadioItemClick触发的点击范围 final HitTestBehavior behavior; const BrnRadioCore( @@ -68,7 +68,7 @@ class BrnRadioCore extends StatefulWidget { this.disSelectedImage, this.disUnselectedImage, this.onRadioItemClick, - this.behavior=HitTestBehavior.deferToChild}) + this.behavior=HitTestBehavior.translucent}) : super(key: key); @override From 9e5f6f0e19451ddcb4909014064bc43981a690c3 Mon Sep 17 00:00:00 2001 From: lee <58846244+a1017480401@users.noreply.github.com> Date: Wed, 22 Dec 2021 15:45:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=88AS?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/components/radio/brn_checkbox.dart | 25 +++++++++---------- .../components/radio/brn_radio_button.dart | 25 +++++++++---------- lib/src/components/radio/brn_radio_core.dart | 2 +- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/lib/src/components/radio/brn_checkbox.dart b/lib/src/components/radio/brn_checkbox.dart index 851c5255..73d3f7e5 100644 --- a/lib/src/components/radio/brn_checkbox.dart +++ b/lib/src/components/radio/brn_checkbox.dart @@ -43,19 +43,18 @@ class BrnCheckbox extends StatefulWidget { /// 默认值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 - }); + 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 createState() { diff --git a/lib/src/components/radio/brn_radio_button.dart b/lib/src/components/radio/brn_radio_button.dart index fe6533fb..257bf65a 100644 --- a/lib/src/components/radio/brn_radio_button.dart +++ b/lib/src/components/radio/brn_radio_button.dart @@ -43,19 +43,18 @@ class BrnRadioButton extends StatelessWidget { /// 默认值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 - }); + 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) { diff --git a/lib/src/components/radio/brn_radio_core.dart b/lib/src/components/radio/brn_radio_core.dart index 027ac88d..8f5c027a 100644 --- a/lib/src/components/radio/brn_radio_core.dart +++ b/lib/src/components/radio/brn_radio_core.dart @@ -68,7 +68,7 @@ class BrnRadioCore extends StatefulWidget { this.disSelectedImage, this.disUnselectedImage, this.onRadioItemClick, - this.behavior=HitTestBehavior.translucent}) + this.behavior = HitTestBehavior.translucent}) : super(key: key); @override