From bb769a0bb9db43caeb184d3197c5204a5f05f4b9 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Wed, 2 Oct 2024 08:07:30 +0100
Subject: [PATCH] promenu: don't modify the menu object

This fixes hadash, which uses `menu[""]` after calling `showMenu`
---
 apps/promenu/ChangeLog     | 1 +
 apps/promenu/bootb2.js     | 4 +---
 apps/promenu/bootb2.ts     | 3 +--
 apps/promenu/metadata.json | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/promenu/ChangeLog b/apps/promenu/ChangeLog
index 159f0a9e2..21a5cd354 100644
--- a/apps/promenu/ChangeLog
+++ b/apps/promenu/ChangeLog
@@ -9,3 +9,4 @@
       handling of E.showMenu() with no arguments
 0.06: Fix lower bounding of numeric values
 0.07: Fix bug with alarms app (scroller) and correctly show images
+0.08: Fix bug with modifying menu - allows hadash to save scroll positions
diff --git a/apps/promenu/bootb2.js b/apps/promenu/bootb2.js
index c066cae35..2f4be2b92 100644
--- a/apps/promenu/bootb2.js
+++ b/apps/promenu/bootb2.js
@@ -13,9 +13,7 @@ E.showMenu = function (items) {
         g.setColor(255, 255, 255);
     };
     var options = items && items[""] || {};
-    if (items)
-        delete items[""];
-    var menuItems = Object.keys(items);
+    var menuItems = Object.keys(items).filter(function (x) { return x.length; });
     var fontHeight = options.fontHeight || 25;
     var selected = options.scroll || options.selected || 0;
     var ar = Bangle.appRect;
diff --git a/apps/promenu/bootb2.ts b/apps/promenu/bootb2.ts
index 269bbdffa..e1677b6a5 100644
--- a/apps/promenu/bootb2.ts
+++ b/apps/promenu/bootb2.ts
@@ -15,8 +15,7 @@ E.showMenu = (items?: Menu): MenuInstance => {
     g.setColor(255, 255, 255);
   };
   let options = items && items[""] || {};
-  if (items) delete items[""];
-  const menuItems = Object.keys(items);
+  const menuItems = Object.keys(items).filter(x => x.length);
 
   const fontHeight = options.fontHeight||25;
 
diff --git a/apps/promenu/metadata.json b/apps/promenu/metadata.json
index 4ed605bd4..dc1adafbc 100644
--- a/apps/promenu/metadata.json
+++ b/apps/promenu/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "promenu",
   "name": "Pro Menu",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Replace the built in menu function. Supports Bangle.js 1 and Bangle.js 2.",
   "icon": "icon.png",
   "type": "bootloader",