更改了onTap事件

CHANGELOG.md

+## [0.1.4] - TODO:修改了onTap事件
+* TODO: CupertionPopoverButton添加了onTap事件,返回True不打开Popover
+* TODO: CupertinoPopoverMenuItem修改了onTap事件,返回True不关闭Popover
+
 ## [0.1.1] - TODO:添加了WeuiToast效果,完善了文档信息
 * TODO: 添加了WeuiToast效果
 * TODO: 完善了文档信息

README.md

@@ -6,7 +6,7 @@ Usage
 Add this to your package's pubspec.yaml file:
 ``` yaml
 dependencies:
-  cool_ui: "^0.1.1"
+  cool_ui: "^0.1.4"
 ```
 
 # 控件
@@ -30,6 +30,7 @@ CupertinoPopoverButton({
     this.popoverColor=Colors.white,
     @required this.popoverWidth,
     @required this.popoverHeight,
+    this.onTap,
     this.transitionDuration=const Duration(milliseconds: 200),
     this.radius=8.0});
 ```
@@ -41,6 +42,7 @@ CupertinoPopoverButton({
 | popoverBuild | <code>WidgetBuilder</code> |  | 生成弹出框的内容 |
 | popoverWidth | <code>double</code> |  | 弹出框的宽度 |
 | popoverHeight | <code>double</code> |  | 弹出框的高度 |
+| [onTap] | <code>BoolCallback</code> |  | 按钮点击事件,返回true取消默认反应(不打开Popover) |
 | [popoverColor] | <code>Color</code> | 白色 | 弹出框的背景颜色 |
 | [transitionDuration] | <code>Duration</code> | 0.2s  | 过度动画时间 |
 | [radius] | <code>double</code> |  8.0 | 弹出框的圆角弧度 |
@@ -99,7 +101,7 @@ const CupertinoPopoverMenuItem({
 | --- | --- | --- |
 | [leading] | <code>Widget<Widget></code>  | 菜单左边,一般放图标 |
 | [child] | <code>Widget<Widget></code>  | 菜单内容 |
-| [onTap] | <code>VoidCallback<Widget></code>   |菜单点击事件 |
+| [onTap] | <code>BoolCallback</code> |  | 按钮点击事件,返回true取消默认反应(不关闭Popover) |
 | [isTapClosePopover] | <code>bool<Widget></code>  | 是否点击关闭 |
 
 #### 案例核心代码

lib/widgets/popover/cupertino_popover.dart

 part of cool_ui;
 
+typedef BoolCallback = bool Function();
 class CupertinoPopoverButton extends StatelessWidget{
   final Widget child;
   final Widget popoverBody;
@@ -9,9 +10,9 @@ class CupertinoPopoverButton extends StatelessWidget{
   final Color popoverColor;
   final double radius;
   final Duration transitionDuration;
+  final BoolCallback onTap;
   const CupertinoPopoverButton({
     @required this.child,
-
     @Deprecated(
         '建议不要直接使用popoverBody,而是使用popoverBuild.'
     )
@@ -20,6 +21,7 @@ class CupertinoPopoverButton extends StatelessWidget{
     this.popoverColor=Colors.white,
     @required this.popoverWidth,
     @required this.popoverHeight,
+    this.onTap,
     this.transitionDuration=const Duration(milliseconds: 200),
     this.radius=8.0}):
         assert(popoverBody != null || popoverBuild != null),
@@ -32,6 +34,9 @@ class CupertinoPopoverButton extends StatelessWidget{
     return GestureDetector(
       behavior: HitTestBehavior.translucent,
       onTap: (){
+        if(onTap != null && onTap()){
+          return;
+        }
         var offset = WidgetUtil.getWidgetLocalToGlobal(context);
         var bounds = WidgetUtil.getWidgetBounds(context);
         var body = popoverBody;
@@ -122,15 +127,6 @@ class CupertinoPopoverState extends State<CupertinoPopover>  with TickerProvider
     isArrowUp = ScreenUtil.screenHeight > widget.attachRect.bottom + widget.height + _arrowWidth;
     super.initState();
     calcRect();
-//    animation = new AnimationController(
-//        duration: widget.transitionDuration,
-//        vsync: this
-//    );
-//    // Tween({T begin, T end })：创建tween（补间）
-//    doubleAnimation = new Tween<double>(begin: 0.0, end: 1.0).animate(animation)..addListener((){
-//      setState((){});
-//    });
-//    animation.forward(from: 0.0);
   }
 
   @override

lib/widgets/popover/cupertino_popover_menu_item.dart

@@ -27,7 +27,7 @@ class CupertinoPopoverMenuList extends StatelessWidget{
 class CupertinoPopoverMenuItem extends StatefulWidget{
   final Widget leading;
   final Widget child;
-  final VoidCallback onTap;
+  final BoolCallback onTap;
   final bool isTapClosePopover;
 
   const CupertinoPopoverMenuItem({
@@ -73,8 +73,8 @@ class CupertinoPopoverMenuItemState extends State<CupertinoPopoverMenuItem>{
           setState(() {
             isDown = false;
           });
-          if(widget.onTap != null){
-            widget.onTap();
+          if(widget.onTap != null && widget.onTap()){
+            return;
           }
           if(widget.isTapClosePopover){
             Navigator.of(context).pop();

pubspec.yaml

 name: cool_ui
 description: 用flutter实现一些我认为好看的UI控件,目前暂时只有Popover,Weui，不过有什么觉得好看的可以提Issue
-version: 0.1.3
+version: 0.1.4
 author: Kevin <liangkaikevin@gmail.com>
 homepage: https://github.com/Im-Kevin/cool_ui