Fix staccato/slur listener name collision on nested blocks (#5771)

Include block ID in listener name so nesting staccato inside
slur (or vice versa) no longer destroys the outer cleanup listener.

Signed-off-by: Ady0333 <adityashinde1525@gmail.com>

Author: Ady0333

js/turtleactions/OrnamentActions.js

@@ -47,7 +47,7 @@ function setupOrnamentActions(activity) {
 
             tur.singer.staccato.push(1 / value);
 
-            const listenerName = "_staccato_" + turtle;
+            const listenerName = "_staccato_" + turtle + "_" + blk;
             if (blk !== undefined && blk in activity.blocks.blockList) {
                 activity.logo.setDispatchBlock(blk, turtle, listenerName);
             } else if (MusicBlocks.isRun) {
@@ -77,7 +77,7 @@ function setupOrnamentActions(activity) {
                 activity.logo.notation.notationBeginSlur(turtle);
             }
 
-            const listenerName = "_staccato_" + turtle;
+            const listenerName = "_staccato_" + turtle + "_" + blk;
             if (blk !== undefined && blk in activity.blocks.blockList) {
                 activity.logo.setDispatchBlock(blk, turtle, listenerName);
             } else if (MusicBlocks.isRun) {

js/turtleactions/__tests__/OrnamentActions.test.js

@@ -109,12 +109,13 @@ describe("OrnamentActions", () => {
                     global.MusicBlocks.isRun = isRun;
                     if (nullMouse) global.Mouse.getMouseFromTurtle = () => null;
                     Singer.OrnamentActions.setStaccato(2, 0, blk);
+                    const expectedName = "_staccato_0_" + blk;
                     expect(turtle.singer.staccato).toEqual([0.5]);
                     expect(dispatchCalls.length).toBe(expectDispatch ? 1 : 0);
                     expect(listenerCalls.length).toBe(1);
-                    if (expectMouseListener) expect(mouseMB.listeners).toContain("_staccato_0");
-                    else expect(mouseMB.listeners).not.toContain("_staccato_0");
-                    listenerFunctions["_staccato_0"]();
+                    if (expectMouseListener) expect(mouseMB.listeners).toContain(expectedName);
+                    else expect(mouseMB.listeners).not.toContain(expectedName);
+                    listenerFunctions[expectedName]();
                     expect(turtle.singer.staccato).toEqual([]);
                 });
             }
@@ -195,9 +196,10 @@ describe("OrnamentActions", () => {
                     expect(beginSlurCalls.length).toBe(expectBeginSlur ? 1 : 0);
                     expect(dispatchCalls.length).toBe(expectDispatch ? 1 : 0);
                     expect(listenerCalls.length).toBe(1);
-                    if (expectMouseListener) expect(mouseMB.listeners).toContain("_staccato_0");
-                    else expect(mouseMB.listeners).not.toContain("_staccato_0");
-                    listenerFunctions["_staccato_0"]();
+                    const expectedName = "_staccato_0_" + blk;
+                    if (expectMouseListener) expect(mouseMB.listeners).toContain(expectedName);
+                    else expect(mouseMB.listeners).not.toContain(expectedName);
+                    listenerFunctions[expectedName]();
                     expect(turtle.singer.staccato).toEqual([]);
                     expect(endSlurCalls.length).toBe(expectBeginSlur ? 1 : 0);
                 });