Hotfix after callback processing.

Modify: Execute onFocus when returning from callback function.
Modify: MenuItemSD Supports SD card insertion and removal

Author: lovyan03

library.json

@@ -14,7 +14,7 @@
   "dependencies": {
   	"name": "M5Stack"
   },
-  "version": "0.2.3",
+  "version": "0.2.5",
   "framework": "arduino",
   "platforms": "espressif32",
   "build": {

library.properties

@@ -1,5 +1,5 @@
-name=M5TreeView
-version=0.2.3
+name=M5Stack_TreeView
+version=0.2.5
 author=lovyan03
 maintainer=Lovyan <[email protected]>
 sentence=TreeView Menu UI for M5Stack

src/M5TreeView.cpp

@@ -157,7 +157,7 @@ MenuItem* M5TreeView::update(bool redraw) {
       if (_redraw) {
         updateDest();
         erase(true);
-        focusItem->onEnter();
+        focusItem->onFocus();
       }
     }
     break;

src/MenuItem.cpp

@@ -215,9 +215,8 @@ bool MenuItem::focusEnter() {
     if (mi->callback) {
       mi->callback(focusItem);
       _btnDrawer.draw(true);
-      focusItem->onFocus();
+      return true;
     }
-    return true;
   }
   return false;
 }

src/MenuItemSD.cpp

@@ -7,6 +7,9 @@ MenuItemFS* MenuItemSD::newMenuItemFS(const String& title, const String& path, b
 }
 
 fs::FS& MenuItemSD::getFS() const {
-  if (0 == path.length()) SD.begin();
+  if (0 == path.length()) {
+    SD.end();
+    SD.begin(TFCARD_CS_PIN);
+  }
   return SD;
 }

src/MenuItemSPIFFS.cpp

@@ -7,6 +7,8 @@ MenuItemFS* MenuItemSPIFFS::newMenuItemFS(const String& title, const String& pat
 }
 
 fs::FS& MenuItemSPIFFS::getFS() const {
-  if (0 == path.length()) SPIFFS.begin();
+  if (0 == path.length()) {
+    SPIFFS.begin();
+  }
   return SPIFFS;
 }