Last selected Grid is re-applied after expanding from collapse state (sugarlabs#4347)

Author: subhas-pramanik-09

js/piemenus.js

@@ -3582,12 +3582,15 @@ const piemenuGrid = (activity) => {
     activity.turtles.gridWheel.clockwise = false;
     activity.turtles.gridWheel.initWheel(grids);
     activity.turtles.gridWheel.createWheel();
-    activity.turtles.gridWheel.navigateWheel(
-        activity.turtles.currentGrid ? activity.turtles.currentGrid : 0
-    );
-
+    const storedGrid = activity.turtles.currentGrid ?? 0;
+    activity.turtles.gridWheel.navigateWheel(storedGrid);
+      
     for (let i = 0; i < gridLabels.length; i++) {
-        activity.turtles.gridWheel.navItems[i].navigateFunction = activity.turtles.doGrid;
+        activity.turtles.gridWheel.navItems[i].navigateFunction = function () {
+            activity.hideGrids();
+            activity.turtles.currentGrid = i;
+            activity.turtles.doGrid(i);
+        };
         activity.turtles.gridWheel.navItems[i].setTooltip(gridLabels[i]);
     }
 

js/turtles.js

@@ -960,6 +960,10 @@ Turtles.TurtlesView = class {
                 menuIcon.innerHTML = "menu";
                 docById("toggleAuxBtn").className -= "blue darken-1";
             }
+            // Store the currently selected grid
+            if (this.activity.turtles.currentGrid !== undefined) {
+                this.selectedGrid = this.activity.turtles.currentGrid;
+            }
             this._expandButton.style.visibility = "visible";
             this._collapseButton.style.visibility = "hidden";
             this.gridButton.style.visibility = "hidden";
@@ -1049,6 +1053,15 @@ Turtles.TurtlesView = class {
                     this.gridButton.visible = true;
                 }
 
+                // Restore the previously selected grid
+                if (this.selectedGrid !== undefined) {
+                    this.activity.turtles.currentGrid = this.selectedGrid;
+                    this.activity.turtles.doGrid(this.selectedGrid);
+                } else {
+                    this.activity.turtles.currentGrid = 0;
+                    this.activity.turtles.doGrid(0);
+                }
+
                 // remove the stage and add it back in position 0
                 this.masterStage.removeChild(turtlesStage);
                 this.masterStage.addChildAt(turtlesStage, 0);