fix: fix bug that prevented modal dialogs from appearing on mobile (#183

)
scratchfoundation · Oct 2, 2024 · 37e0f10 · 37e0f10
1 parent 6d14530
commit 37e0f10
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/data_category.js b/src/data_category.js
@@ -426,7 +426,16 @@ function addCreateButton(xmlList, workspace, type) {
   }
   button.setAttribute("text", msg);
   button.setAttribute("callbackKey", callbackKey);
-  workspace.registerButtonCallback(callbackKey, callback);
+  workspace.registerButtonCallback(callbackKey, (b) => {
+    // Run the callback after a delay to avoid it getting captured by the React
+    // modal in scratch-gui and being registered as a click on the scrim that
+    // dismisses the dialog.
+    requestAnimationFrame(() => {
+      setTimeout(() => {
+        callback(b);
+      });
+    });
+  });
   xmlList.push(button);
 }
 

diff --git a/src/procedures.js b/src/procedures.js
@@ -105,7 +105,14 @@ function addCreateButton_(workspace, xmlList) {
   var msg = Blockly.Msg.NEW_PROCEDURE;
   var callbackKey = "CREATE_PROCEDURE";
   var callback = function () {
-    createProcedureDefCallback(workspace);
+    // Run the callback after a delay to avoid it getting captured by the React
+    // modal in scratch-gui and being registered as a click on the scrim that
+    // dismisses the dialog.
+    requestAnimationFrame(() => {
+      setTimeout(() => {
+        createProcedureDefCallback(workspace);
+      });
+    });
   };
   button.setAttribute("text", msg);
   button.setAttribute("callbackKey", callbackKey);