Update DevTools extension

Author: scratchaddons-bot[bot]

_locales/tr/messages.json

@@ -1 +1 @@
-{"extensionName":{"message":"Scratch 3 Geliştirici Araçları"}}
+{"extensionName":{"message":"Scratch 3 Geliştirici Araçları"},"extensionDescription":{"message":"https://scratch.mit.edu' da Scratch Düzenleme Deneyiminizi geliştirmek için Scratch 3 Geliştirici Araçları"}}

addon/DevTools.js

@@ -38,7 +38,15 @@ export default class DevTools {
   async init() {
     this.addContextMenus();
     while (true) {
-      const root = await this.addon.tab.waitForElement("ul[class*=gui_tab-list_]", { markAsSeen: true });
+      const root = await this.addon.tab.waitForElement("ul[class*=gui_tab-list_]", {
+        markAsSeen: true,
+        reduxEvents: [
+          "scratch-gui/mode/SET_PLAYER",
+          "fontsLoaded/SET_FONTS_LOADED",
+          "scratch-gui/locales/SELECT_LOCALE",
+        ],
+        reduxCondition: (state) => !state.scratchGui.mode.isPlayerOnly,
+      });
       this.initInner(root);
     }
   }
@@ -231,7 +239,7 @@ export default class DevTools {
     let myBlocks = [];
     let myBlocksByProcCode = {};
 
-    // todo - get blockyly from an svg???
+    // todo - get blockly from an svg???
 
     let wksp = this.utils.getWorkspace();
     let topBlocks = wksp.getTopBlocks();
@@ -272,14 +280,18 @@ export default class DevTools {
 
     for (const root of topBlocks) {
       if (root.type === "procedures_definition") {
-        let fields = root.inputList[0];
-        let typeDesc = fields.fieldRow[0].getText();
-        let label = root.getChildren()[0];
-        let procCode = label.getProcCode();
+        const label = root.getChildren()[0];
+        const procCode = label.getProcCode();
         if (!procCode) {
           continue;
         }
-        addBlock("define", typeDesc + " " + procCode, root);
+        const indexOfLabel = root.inputList.findIndex((i) => i.fieldRow.length > 0);
+        if (indexOfLabel === -1) {
+          continue;
+        }
+        const translatedDefine = root.inputList[indexOfLabel].fieldRow[0].getText();
+        const message = indexOfLabel === 0 ? `${translatedDefine} ${procCode}` : `${procCode} ${translatedDefine}`;
+        addBlock("define", message, root);
         continue;
       }
 
@@ -618,7 +630,7 @@ export default class DevTools {
   }
 
   /**
-   * Badly Ophaned - might want to delete these!
+   * Badly Orphaned - might want to delete these!
    * @param topBlock
    * @returns {boolean}
    */
@@ -808,7 +820,7 @@ export default class DevTools {
   }
 
   /**
-   * Find all the evern broadcasters.
+   * Find all the event broadcasters.
    * @return {[{eventName:string, block:Block}]} Array of event names and blocks.
    */
   getCallsToEvents() {
@@ -1501,8 +1513,18 @@ export default class DevTools {
     }
 
     if (this.floatInp && !e.target.closest("#s3devIDDOut")) {
-      // If we click outside the dropdown, then instigate the hide code...
-      this.hideFloatDropDown();
+      if (
+        !e.shiftKey ||
+        // Clicking on the code area should always make multi-inject work
+        (!document.getElementsByClassName("injectionDiv")[0].contains(e.target) &&
+          // Focused inputs are not part of the injectionDiv, but to the user they are part of the code area so make multi-inject work there
+          !e.target.classList.contains("blocklyHtmlInput")) ||
+        // This selector targets workspace buttons (Make a Block etc.) and the extension (!) buttons, which most commonly trigger a popup window so always close the dropdown
+        e.target.matches(".blocklyFlyoutButton, .blocklyFlyoutButton *, .blocklyTouchTargetBackground")
+      ) {
+        // If we click outside the dropdown, then instigate the hide code...
+        this.hideFloatDropDown();
+      }
     }
 
     if (e.button === 1 || e.shiftKey) {
@@ -2033,13 +2055,20 @@ export default class DevTools {
       } else {
         field.innerText = option.option[1]; // griffpatch - oops! option.option[1] not 0?
       }
+
+      // Handle "stop other scripts in sprite"
+      if (option.option[1] === "other scripts in sprite") {
+        option.dom.querySelector("mutation").setAttribute("hasnext", "true");
+      }
     }
 
     x.appendChild(option.dom);
 
     let ids = Blockly.Xml.domToWorkspace(x, wksp);
 
-    this.reallyHideFloatDropDown(true);
+    if (!e.shiftKey) {
+      this.reallyHideFloatDropDown(true);
+    }
 
     let block = wksp.getBlockById(ids[0]);
 
@@ -2053,7 +2082,11 @@ export default class DevTools {
       }
     }
 
-    this.domHelpers.triggerDragAndDrop(block.svgPath_, null, { x: this.mouseXY.x, y: this.mouseXY.y });
+    this.domHelpers.triggerDragAndDrop(block.svgPath_, null, { x: this.mouseXY.x, y: this.mouseXY.y }, e.shiftKey);
+
+    if (e.shiftKey) {
+      document.getElementById("s3devIInp").focus();
+    }
 
     this.blockCursor = block;
   }

addon/DomHelpers.js

@@ -13,13 +13,15 @@ export default class DomHelpers {
    * @param selectorDrag
    * @param selectorDrop
    * @param mouseXY
+   * @param [shiftKey=false]
    * @returns {boolean}
    */
-  triggerDragAndDrop(selectorDrag, selectorDrop, mouseXY) {
+  triggerDragAndDrop(selectorDrag, selectorDrop, mouseXY, shiftKey) {
     // function for triggering mouse events
+    shiftKey = shiftKey || false;
     let fireMouseEvent = function (type, elem, centerX, centerY) {
       let evt = document.createEvent("MouseEvents");
-      evt.initMouseEvent(type, true, true, window, 1, 1, 1, centerX, centerY, false, false, false, false, 0, elem);
+      evt.initMouseEvent(type, true, true, window, 1, 1, 1, centerX, centerY, shiftKey, false, false, false, 0, elem);
       elem.dispatchEvent(evt);
     };
 

addon/blockly/Utils.js

@@ -6,6 +6,9 @@ import BlockFlasher from "./BlockFlasher.js";
 export default class Utils {
   constructor(addon) {
     this.addon = addon;
+    this.addon.tab.traps.getBlockly().then((blockly) => {
+      this.blockly = blockly;
+    });
     /**
      * Scratch Virtual Machine
      * @type {null|*}
@@ -56,9 +59,8 @@ export default class Utils {
   /**
    * Based on wksp.centerOnBlock(li.data.labelID);
    * @param blockOrId {Blockly.Block|{id}|BlockInstance} A Blockly Block, a block id, or a BlockInstance
-   * @param [force] {boolean} if true, the view always moves, otherwise only move if the selected element is not entirely visible
    */
-  scrollBlockIntoView(blockOrId, force) {
+  scrollBlockIntoView(blockOrId) {
     let workspace = this.getWorkspace();
     /** @type {Blockly.Block} */
     let block; // or is it really a Blockly.BlockSvg?
@@ -106,6 +108,7 @@ export default class Utils {
       workspace.scrollbar.set(sx, sy);
       this.navigationHistory.storeView({ left: sx, top: sy }, 64);
     }
+    this.blockly?.hideChaff();
     BlockFlasher.flash(block);
   }
 

addon/show-broadcast.js

@@ -71,7 +71,7 @@ export default class ShowBroadcast {
         elem = document.querySelector('div[class*="stage-selector_header"]');
       } else if (target.isOriginal) {
         // This is one of the most ridiculous code I've ever written.
-        // This essentially comparses sprite names to textContent so that we can add CSS.
+        // This essentially compares sprite names to textContent so that we can add CSS.
         const possibleElements = document.querySelectorAll('div[class*="sprite-selector-item_sprite-name"]');
         const spriteNameElem = Array.prototype.find.call(
           possibleElements,

addon/userscript.css

@@ -440,7 +440,7 @@ div.s3devDDOut.vis ul.s3devDD {
   border-radius: 4px;
   box-shadow: rgba(0, 0, 0, 0.3) 0 0 3px, rgba(0, 0, 0, 0.2) 0 3px 10px;
 
-  z-index: 1000001;
+  z-index: 999;
 }
 
 #s3devInsertLabel {

addon/userscript.js

@@ -4,6 +4,8 @@ export default async function ({ addon, global, console, msg, safeMsg: m }) {
   // noinspection JSUnresolvedVariable
   if (!addon.self._isDevtoolsExtension && window.initGUI) {
     console.log("Extension running, stopping addon");
+    window._devtoolsAddonEnabled = true;
+    window.dispatchEvent(new CustomEvent("scratchAddonsDevtoolsAddonStopped"));
     return;
   }
 

l10n/de/_general.json

@@ -1 +1 @@
-{"_locale":"de","_locale_name":"Deutsch","thumb-success":"Thumbnail hochgeladen.","thumb-error":"Fehler beim Hochladen des Thumbnails.","thumb-error-413":"Die Datei ist zu groß.","thumb-error-503":"Der Thumbnail-Server hat ein Problem. Bitte versuche es später erneut."}
+{"_locale":"de","_locale_name":"Deutsch"}