Merge branch 'master' of https://github.com/Jamalianpour/easy_sidemenu

Jamalianpour · Sep 16, 2022 · 30c43f7 · 30c43f7
2 parents 193ac68 + 47076ef
commit 30c43f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/src/side_menu.dart b/lib/src/side_menu.dart
@@ -68,6 +68,7 @@ class _SideMenuState extends State<SideMenu> {
   late bool showToggle;
   late bool alwaysShowFooter;
   late int collapseWidth;
+  late SideMenuDisplayMode _mode;
 
   @override
   void initState() {
@@ -93,6 +94,7 @@ class _SideMenuState extends State<SideMenu> {
 
   /// Set [SideMenu] width according to displayMode and notify parent widget
   double _widthSize(SideMenuDisplayMode mode, BuildContext context) {
+    _mode = mode;
     if (mode == SideMenuDisplayMode.auto) {
       if (MediaQuery.of(context).size.width > collapseWidth &&
           Global.displayModeState.value != SideMenuDisplayMode.open) {
@@ -223,4 +225,10 @@ class _SideMenuState extends State<SideMenu> {
       ),
     );
   }
+
+  @override
+  void dispose() {
+    super.dispose();
+    Global.displayModeState.change(_mode);
+  }
 }
diff --git a/lib/src/side_menu_item.dart b/lib/src/side_menu_item.dart
@@ -92,7 +92,9 @@ class _SideMenuItemState extends State<SideMenuItem> {
   }
 
   void update() {
-    setState(() {});
+    if (mounted) {
+      setState(() {});
+    }
   }
 
   @override