Fix buts with chord changes and text menu

AaronDavidNewman · Sep 22, 2024 · a5031da · a5031da
1 parent 3e18c0f
commit a5031da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/common/vex.ts b/src/common/vex.ts
@@ -439,13 +439,13 @@ export const ChordSymbolGlyphs: Record<string, { code: string }> = {
     code: 'csymMajorSeventh',
   },
   csymMinor: {
-    code: 'minor',
+    code: 'csymMinor',
   },
   minor: {
-    code: 'minor',
+    code: 'csymMinor',
   },
   '-': {
-    code: 'minor',
+    code: 'csymMinor',
   },
   '(': {
     code: 'csymParensLeftTall',

diff --git a/src/ui/menus/text.ts b/src/ui/menus/text.ts
@@ -33,7 +33,7 @@ const textBlockDialogMenuOption: SuiConfiguredMenuOption = {
       id: 'textDialog',
       ctor: 'SuiTextBlockDialog',
       tracker: menu.view.tracker,
-      startPromise: null,
+      startPromise: menu.closePromise,
       modifier: null
     });
   }, display: (menu: SuiMenuBase) => true,
@@ -60,7 +60,7 @@ const chordChangeDialogMenuOption: SuiConfiguredMenuOption = {
         id: 'chordDialog',
         ctor: 'SuiChordChangeDialog',
         tracker: menu.view.tracker,
-        startPromise: null,
+        startPromise: menu.closePromise,
         modifier: lyric
       }
     );
@@ -73,6 +73,9 @@ const chordChangeDialogMenuOption: SuiConfiguredMenuOption = {
 }
 const lyricsDialogMenuOption: SuiConfiguredMenuOption = {  
   handler: async (menu: SuiMenuBase) => {
+    if (menu.closePromise) {
+      await menu.closePromise;
+    }
     const sel = menu.view.tracker.selections[0];
     const note = sel.note;
     if (!note) {
@@ -89,7 +92,7 @@ const lyricsDialogMenuOption: SuiConfiguredMenuOption = {
         id: 'lyricDialog',
         ctor: 'SuiLyricDialog',
         tracker: menu.view.tracker,
-        startPromise: null,
+        startPromise: menu.closePromise,
         modifier: lyric
       });
   }, display: (menu: SuiMenuBase) => true,
@@ -120,7 +123,7 @@ const dynamicsDialogMenuOption: SuiConfiguredMenuOption = {
       id: 'dynamicsDialog',
       ctor: 'SuiDynamicModifierDialog',
       tracker: menu.view.tracker,
-      startPromise: null,
+      startPromise: menu.closePromise,
       modifier
     });
   }, display: (menu: SuiMenuBase) => true,