Fix submenu position bug.

bosskmk · Oct 14, 2022 · bce752d · bce752d
1 parent 89d0338
commit bce752d
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [2.0.1] - 2022. 10. 15
+
+* Fix submenu position bug.
+
 ## [2.0.0] - 2022. 10. 13
 
 * Add hover-open mode.

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## PlutoMenuBar for flutter - v2.0.0
+## PlutoMenuBar for flutter - v2.0.1
 
 PlutoMenuBar is a horizontal menu bar for flutter.
 
@@ -264,6 +264,7 @@ enum _RadioItems {
 > develop packages that make it easy to develop admin pages or CMS with Flutter.
 * [PlutoGrid](https://github.com/bosskmk/pluto_grid)
 * [PlutoMenuBar](https://github.com/bosskmk/pluto_menu_bar)
+* [PlutoLayout](https://github.com/bosskmk/pluto_layout)
 
 <br>
 

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -187,44 +187,47 @@ class PlutoMenuBarDemo extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: [
-        const SizedBox(height: 30),
-        const Text('Hover-open Menu', style: TextStyle(fontSize: 30)),
-        const SizedBox(height: 30),
-        PlutoMenuBar(
-          mode: PlutoMenuBarMode.hover,
-          menus: getMenus(context),
-        ),
-        const SizedBox(height: 30),
-        PlutoMenuBar(
-          mode: PlutoMenuBarMode.hover,
-          backgroundColor: Colors.deepOrange,
-          activatedColor: Colors.white,
-          indicatorColor: Colors.deepOrange,
-          textStyle: const TextStyle(color: Colors.white),
-          menuIconColor: Colors.white,
-          moreIconColor: Colors.white,
-          menus: getMenus(context),
-        ),
-        const SizedBox(height: 30),
-        const Text('Tap-open Menu', style: TextStyle(fontSize: 30)),
-        const SizedBox(height: 30),
-        PlutoMenuBar(
-          mode: PlutoMenuBarMode.tap,
-          menus: getMenus(context),
-        ),
-        const SizedBox(height: 30),
-        PlutoMenuBar(
-          backgroundColor: Colors.deepOrange,
-          activatedColor: Colors.white,
-          indicatorColor: Colors.deepOrange,
-          textStyle: const TextStyle(color: Colors.white),
-          menuIconColor: Colors.white,
-          moreIconColor: Colors.white,
-          menus: getMenus(context),
-        ),
-      ],
+    return SingleChildScrollView(
+      child: Column(
+        children: [
+          const SizedBox(height: 30),
+          const Text('Hover-open Menu', style: TextStyle(fontSize: 30)),
+          const Text('Works normally in an environment with a mouse.'),
+          const SizedBox(height: 30),
+          PlutoMenuBar(
+            mode: PlutoMenuBarMode.hover,
+            menus: getMenus(context),
+          ),
+          const SizedBox(height: 30),
+          PlutoMenuBar(
+            mode: PlutoMenuBarMode.hover,
+            backgroundColor: Colors.deepOrange,
+            activatedColor: Colors.white,
+            indicatorColor: Colors.deepOrange,
+            textStyle: const TextStyle(color: Colors.white),
+            menuIconColor: Colors.white,
+            moreIconColor: Colors.white,
+            menus: getMenus(context),
+          ),
+          const SizedBox(height: 30),
+          const Text('Tap-open Menu', style: TextStyle(fontSize: 30)),
+          const SizedBox(height: 30),
+          PlutoMenuBar(
+            mode: PlutoMenuBarMode.tap,
+            menus: getMenus(context),
+          ),
+          const SizedBox(height: 30),
+          PlutoMenuBar(
+            backgroundColor: Colors.deepOrange,
+            activatedColor: Colors.white,
+            indicatorColor: Colors.deepOrange,
+            textStyle: const TextStyle(color: Colors.white),
+            menuIconColor: Colors.white,
+            moreIconColor: Colors.white,
+            menus: getMenus(context),
+          ),
+        ],
+      ),
     );
   }
 }

diff --git a/lib/src/menu_widget.dart b/lib/src/menu_widget.dart
@@ -106,6 +106,7 @@ class _MenuWidgetState extends State<_MenuWidget> {
   ) {
     if (_disposed) return;
     if (_popups.containsKey(menu._key.toString())) return;
+    if (!menu._hasContext) return;
 
     final RenderBox overlay =
         Overlay.of(context)!.context.findRenderObject() as RenderBox;
@@ -189,7 +190,12 @@ class _MenuWidgetState extends State<_MenuWidget> {
 
           menuItemWidget = TextButton(
             onPressed: item.onTap,
-            style: TextButton.styleFrom(textStyle: widget.textStyle),
+            style: TextButton.styleFrom(
+              textStyle: widget.textStyle,
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.zero,
+              ),
+            ),
             child: Padding(padding: padding, child: menuItemWidget),
           );
 
@@ -257,9 +263,8 @@ class _MenuWidgetState extends State<_MenuWidget> {
     BuildContext context,
     List<PlutoMenuItem> menuItems,
   ) {
-    if (_disposed) {
-      return;
-    }
+    if (_disposed) return;
+    if (!menu._hasContext) return;
 
     final items = [...menuItems];
 

diff --git a/lib/src/pluto_menu_item.dart b/lib/src/pluto_menu_item.dart
@@ -109,6 +109,8 @@ class PlutoMenuItem {
 
   bool _isBack = false;
 
+  bool get _hasContext => _key.currentContext != null;
+
   Offset get _position {
     if (_key.currentContext == null) return Offset.zero;
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: pluto_menu_bar
 description: A menu bar for flutter. You can add as many submenus as you want, and you can change the default style.
-version: 2.0.0
+version: 2.0.1
 homepage: https://pluto.weblaze.dev
 repository: https://github.com/bosskmk/pluto_menu_bar