From 140a24f5de683f602bb1e160af2fdfd042b75d2d Mon Sep 17 00:00:00 2001
From: Karen John <90653104+karenjohn35@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:09:17 -0700
Subject: [PATCH 1/3] fix: Update to use JSON tool definitions (#1968)

* fix: Update to use JSON tool definitions

Co-Authored-By: Cindy Ke <cindyko226@gmail.com>

* Update examples/rtl-demo/index.html

Co-authored-by: Beka Westberg <bwestberg@google.com>

* Update examples/rtl-demo/index.html

Co-authored-by: Beka Westberg <bwestberg@google.com>

* fix: delete xml

---------

Co-authored-by: Cindy Ke <cindyko226@gmail.com>
Co-authored-by: Beka Westberg <bwestberg@google.com>
---
 examples/rtl-demo/index.html | 491 +++++++++++++++++++++++++----------
 1 file changed, 357 insertions(+), 134 deletions(-)

diff --git a/examples/rtl-demo/index.html b/examples/rtl-demo/index.html
index 134d5ecd1f..82143efed4 100644
--- a/examples/rtl-demo/index.html
+++ b/examples/rtl-demo/index.html
@@ -23,147 +23,370 @@
   </style>
   <script>
     function init() {
-      var demoWorkspace = Blockly.inject('blocklyDiv',
-          {media: './node_modules/blockly/media/',
-           rtl: true,
-           toolbox: document.getElementById('toolbox')});
+      const toolbox = {
+        "kind": "categoryToolbox",
+        "contents": [
+          {
+            "kind": "category",
+            "name": "منطق",
+            "colour": "%{BKY_LOGIC_HUE}",
+            "contents": [
+              {
+                "kind": "block",
+                "type": "controls_if"
+              },
+              {
+                "kind": "block",
+                "type": "logic_compare"
+              },
+              {
+                "kind": "block",
+                "type": "logic_operation"
+              },
+              {
+                "kind": "block",
+                "type": "logic_negate"
+              },
+              {
+                "kind": "block",
+                "type": "logic_boolean"
+              },
+              {
+                "kind": "block",
+                "type": "logic_null"
+              },
+              {
+                "kind": "block",
+                "type": "logic_ternary"
+              },
+            ]
+          },
+          {
+            "kind": "category",
+            "name": "الحلقات",
+            "colour": "%{BKY_LOOPS_HUE}",
+            "contents": [
+              {
+                "kind": "block",
+                "type": "controls_repeat_ext",
+                "inputs": {
+                  "TIMES": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 10
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "kind": "block",
+                "type": "controls_whileUntil"
+              },
+              {
+                "kind": "block",
+                "type": "controls_for",
+                "inputs": {
+                  "FROM": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 1
+                      }
+                    }
+                  },
+                  "TO": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 10
+                      }
+                    }
+                  },
+                  "BY": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 1
+                      }
+                    }
+                  },
+                }
+              },
+              {
+                "kind": "block",
+                "type": "controls_forEach"
+              },
+              {
+                "kind": "block",
+                "type": "controls_flow_statements"
+              },
+            ]
+          },
+          {
+            "kind": "category",
+            "name": "رياضيات",
+            "colour": "%{BKY_MATH_HUE}",
+            "contents": [
+              {
+                "kind": "block",
+                "type": "math_number"
+              },
+              {
+                "kind": "block",
+                "type": "math_arithmetic"
+              },
+              {
+                "kind": "block",
+                "type": "math_single"
+              },
+              {
+                "kind": "block",
+                "type": "math_trig"
+              },
+              {
+                "kind": "block",
+                "type": "math_constant"
+              },
+              {
+                "kind": "block",
+                "type": "math_number_property"
+              },
+              {
+                "kind": "block",
+                "type": "math_round"
+              },
+              {
+                "kind": "block",
+                "type": "math_on_list"
+              },
+              {
+                "kind": "block",
+                "type": "math_modulo"
+              },
+              {
+                "kind": "block",
+                "type": "math_modulo"
+              },
+              {
+                "kind": "block",
+                "type": "math_constrain",
+                "inputs": {
+                  "LOW": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 1
+                      }
+                    }
+                  },
+                  "HIGH": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 100
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "kind": "block",
+                "type": "math_random_int",
+                "inputs": {
+                  "FROM": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 1
+                      }
+                    }
+                  },
+                  "TO": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 100
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "kind": "block",
+                "type": "math_random_float"
+              },
+              {
+                "kind": "block",
+                "type": "math_atan2"
+              },
+            ]
+          },
+          {
+            "kind": "category",
+            "name": "نص",
+            "colour": "%{BKY_TEXTS_HUE}",
+            "contents": [
+              {
+                "kind": "block",
+                "type": "text"
+              },
+              {
+                "kind": "block",
+                "type": "text_join"
+              },
+              {
+                "kind": "block",
+                "type": "text_append",
+                "inputs": {
+                  "TEXT": {
+                    "kind": "block",
+                     "type": "text"
+                  }
+                }
+              },
+              {
+                "kind": "block",
+                "type": "text_length"
+              },
+              {
+                "kind": "block",
+                "type": "text_isEmpty"
+              },
+              {
+                "kind": "block",
+                "type": "text_indexOf"
+              },
+              {
+                "kind": "block",
+                "type": "text_charAt"
+              },
+              {
+                "kind": "block",
+                "type": "text_changeCase"
+              },
+              {
+                "kind": "block",
+                "type": "text_trim"
+              },
+              {
+                "kind": "block",
+                "type": "text_print"
+              },
+              {
+                "kind": "block",
+                "type": "text_prompt_ext",
+                "inputs": {
+                  "TEXT": {
+                    "kind": "block",
+                     "type": "text"
+                  }
+                }
+              },
+            ]
+          },
+          {
+            "kind": "category",
+            "name": "قوائم",
+            "colour": "%{BKY_LISTS_HUE}",
+            "contents": [
+              {
+                "kind": "block",
+                "type": "lists_create_empty"
+              },
+              {
+                "kind": "block",
+                "type": "lists_create_with"
+              },
+              {
+                "kind": "block",
+                "type": "lists_repeat",
+                "inputs": {
+                  "NUM": {
+                    "block": {
+                      "type": "math_number",
+                      "fields": {
+                        "NUM": 5
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "kind": "block",
+                "type": "lists_length"
+              },
+              {
+                "kind": "block",
+                "type": "lists_isEmpty"
+              },
+              {
+                "kind": "block",
+                "type": "lists_indexOf"
+              },
+              {
+                "kind": "block",
+                "type": "lists_getIndex"
+              },
+              {
+                "kind": "block",
+                "type": "lists_setIndex"
+              },
+            ]
+          },
+          {
+            "kind": "category",
+            "name": "لون",
+            "colour": "%{BKY_COLOUR_HUE}",
+            "contents": [
+              {
+                "kind": "block",
+                "type": "colour_picker"
+              },
+              {
+                "kind": "block",
+                "type": "colour_rgb"
+              },
+              {
+                "kind": "block",
+                "type": "colour_blend"
+              },
+            ]
+          },
+          {
+              "kind": "sep",
+          },
+              {
+            "kind": "category",
+            "name": "متغيرات",
+            "custom": "VARIABLE",
+            "colour": "%{BKY_VARIABLES_HUE}",
+          },
+          {
+            "kind": "category",
+            "name": "إجراءات",
+            "custom": "PROCEDURE",
+            "colour": "%{BKY_PROCEDURES_HUE}",
+          },
+        ]
+      }
+  
+      const workspace = Blockly.inject('blocklyDiv', 
+          {media: './node_modules/blockly/media/', 
+           rtl: true, 
+           toolbox: toolbox});
       Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
-                                 demoWorkspace);
-      //window.onbeforeunload = function() {
-      //  return 'Leaving this page will result in the loss of your work.';
-      //};
+                                 workspace);
+    // window.onbeforeunload = function() {
+    //   return 'Leaving this page will result in the loss of your work.';
+    // };
     }
   </script>
 </head>
 <body onload="init()">
   <div id="blocklyDiv"></div>
 
-  <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox" style="display: none">
-    <category name="منطق" colour="%{BKY_LOGIC_HUE}">
-      <block type="controls_if"></block>
-      <block type="logic_compare"></block>
-      <block type="logic_operation"></block>
-      <block type="logic_negate"></block>
-      <block type="logic_boolean"></block>
-      <block type="logic_null"></block>
-      <block type="logic_ternary"></block>
-    </category>
-    <category name="الحلقات" colour="%{BKY_LOOPS_HUE}">
-      <block type="controls_repeat_ext">
-        <value name="TIMES">
-          <block type="math_number">
-            <field name="NUM">10</field>
-          </block>
-        </value>
-      </block>
-      <block type="controls_whileUntil"></block>
-      <block type="controls_for">
-        <value name="FROM">
-          <block type="math_number">
-            <field name="NUM">1</field>
-          </block>
-        </value>
-        <value name="TO">
-          <block type="math_number">
-            <field name="NUM">10</field>
-          </block>
-        </value>
-        <value name="BY">
-          <block type="math_number">
-            <field name="NUM">1</field>
-          </block>
-        </value>
-      </block>
-      <block type="controls_forEach"></block>
-      <block type="controls_flow_statements"></block>
-    </category>
-    <category name="رياضيات" colour="%{BKY_MATH_HUE}">
-      <block type="math_number">
-        <field name="NUM">123</field>
-      </block>
-      <block type="math_arithmetic"></block>
-      <block type="math_single"></block>
-      <block type="math_trig"></block>
-      <block type="math_constant"></block>
-      <block type="math_number_property"></block>
-      <block type="math_round"></block>
-      <block type="math_on_list"></block>
-      <block type="math_modulo"></block>
-      <block type="math_constrain">
-        <value name="LOW">
-          <block type="math_number">
-            <field name="NUM">1</field>
-          </block>
-        </value>
-        <value name="HIGH">
-          <block type="math_number">
-            <field name="NUM">100</field>
-          </block>
-        </value>
-      </block>
-      <block type="math_random_int">
-        <value name="FROM">
-          <block type="math_number">
-            <field name="NUM">1</field>
-          </block>
-        </value>
-        <value name="TO">
-          <block type="math_number">
-            <field name="NUM">100</field>
-          </block>
-        </value>
-      </block>
-      <block type="math_random_float"></block>
-      <block type="math_atan2"></block>
-    </category>
-    <category name="نص" colour="%{BKY_TEXTS_HUE}">
-      <block type="text"></block>
-      <block type="text_join"></block>
-      <block type="text_append">
-        <value name="TEXT">
-          <block type="text"></block>
-        </value>
-      </block>
-      <block type="text_length"></block>
-      <block type="text_isEmpty"></block>
-      <block type="text_indexOf"></block>
-      <block type="text_charAt"></block>
-      <block type="text_changeCase"></block>
-      <block type="text_trim"></block>
-      <block type="text_print"></block>
-      <block type="text_prompt_ext">
-        <value name="TEXT">
-          <block type="text"></block>
-        </value>
-      </block>
-    </category>
-    <category name="قوائم" colour="%{BKY_LISTS_HUE}">
-      <block type="lists_create_empty"></block>
-      <block type="lists_create_with"></block>
-      <block type="lists_repeat">
-        <value name="NUM">
-          <block type="math_number">
-            <field name="NUM">5</field>
-          </block>
-        </value>
-      </block>
-      <block type="lists_length"></block>
-      <block type="lists_isEmpty"></block>
-      <block type="lists_indexOf"></block>
-      <block type="lists_getIndex"></block>
-      <block type="lists_setIndex"></block>
-    </category>
-    <category name="لون" colour="%{BKY_COLOUR_HUE}">
-      <block type="colour_picker"></block>
-      <block type="colour_rgb"></block>
-      <block type="colour_blend"></block>
-    </category>
-    <sep></sep>
-    <category name="متغيرات" custom="VARIABLE" colour="%{BKY_VARIABLES_HUE}">
-    </category>
-    <category name="إجراءات" custom="PROCEDURE" colour="%{BKY_PROCEDURES_HUE}">
-    </category>
-  </xml>
 
   <xml xmlns="https://developers.google.com/blockly/xml" id="startBlocks" style="display: none">
     <block type="controls_if" inline="false" x="50" y="50">

From 7050875971ebb038702232c5bb642a0393592ab7 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 6 Oct 2023 14:55:18 -0700
Subject: [PATCH 2/3] fix: progress for Have field-bitmap fire intermediate
 change events (#2012)

* trying fix issue

* changes by following the steps 1 to 7

* clear out all console log

* Refactor field-bitmap to use intermediate change events.

* fix comment and value.

* adjust the sePixel_

* replace field setValue with newValue in randomizePixels_, clearPixels_, and setPixel_.

---------

Co-authored-by: Eva Liu <80660172+wich229@users.noreply.github.com>
---
 plugins/field-bitmap/src/field-bitmap.js | 67 ++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/plugins/field-bitmap/src/field-bitmap.js b/plugins/field-bitmap/src/field-bitmap.js
index 72067e01e0..39cd77996b 100644
--- a/plugins/field-bitmap/src/field-bitmap.js
+++ b/plugins/field-bitmap/src/field-bitmap.js
@@ -19,6 +19,7 @@ const PIXEL_SIZE = 15;
 const FILLED_PIXEL_COLOR = '#363d80';
 const EMPTY_PIXEL_COLOR = '#fff';
 
+
 /**
  * Field for inputting a small bitmap image.
  * Includes a grid of clickable pixels that's exported as a bitmap.
@@ -36,6 +37,7 @@ export class FieldBitmap extends Blockly.Field {
 
     this.SERIALIZABLE = true;
     this.CURSOR = 'default';
+    this.initialValue_ = null;
 
     // Configure value, height, and width
     if (this.getValue() !== null) {
@@ -296,6 +298,9 @@ export class FieldBitmap extends Blockly.Field {
       });
     }
 
+    // Store the initial value at the start of the edit.
+    this.initialValue_ = this.getValue();
+
     return dropdownEditor;
   }
 
@@ -365,13 +370,30 @@ export class FieldBitmap extends Blockly.Field {
    * @private
    */
   dropdownDispose_() {
+    if (this.getSourceBlock() &&
+        this.initialValue_ !== null &&
+        this.initialValue_ !== this.getValue()) {
+      Blockly.Events.fire(
+          new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+              this.sourceBlock_,
+              'field',
+              this.name || null,
+              this.initialValue_,
+              this.getValue()
+          )
+      );
+    }
+
     for (const event of this.boundEvents_) {
       Blockly.browserEvents.unbind(event);
     }
     this.boundEvents_.length = 0;
     this.editorPixels_ = null;
+    // Set this.initialValue_ back to null.
+    this.initialValue_ = null;
   }
 
+
   /**
    * Constructs an array of zeros with the specified width and height.
    * @returns {!Array<!Array<number>>}The new value.
@@ -436,7 +458,20 @@ export class FieldBitmap extends Blockly.Field {
     this.forAllCells_((r, c) => {
       newVal[r][c] = getRandBinary();
     });
-    this.setValue(newVal);
+
+    if (this.getSourceBlock()) {
+      Blockly.Events.fire(
+          new (Blockly.Events.get(
+              Blockly.Events.BLOCK_FIELD_INTERMEDIATE_CHANGE))(
+              this.sourceBlock_,
+              this.name || null,
+              this.getValue(),
+              newVal
+          )
+      );
+    }
+
+    this.setValue(newVal, false);
   }
 
   /**
@@ -448,7 +483,20 @@ export class FieldBitmap extends Blockly.Field {
     this.forAllCells_((r, c) => {
       newVal[r][c] = 0;
     });
-    this.setValue(newVal);
+
+    if (this.getSourceBlock()) {
+      Blockly.Events.fire(
+          new (Blockly.Events.get(
+              Blockly.Events.BLOCK_FIELD_INTERMEDIATE_CHANGE))(
+              this.sourceBlock_,
+              this.name || null,
+              this.getValue(),
+              newVal
+          )
+      );
+    }
+
+    this.setValue(newVal, false);
   }
 
   /**
@@ -461,7 +509,20 @@ export class FieldBitmap extends Blockly.Field {
   setPixel_(r, c, newValue) {
     const newGrid = JSON.parse(JSON.stringify(this.getValue()));
     newGrid[r][c] = newValue;
-    this.setValue(newGrid);
+
+    if (this.getSourceBlock()) {
+      Blockly.Events.fire(
+          new (Blockly.Events.get(
+              Blockly.Events.BLOCK_FIELD_INTERMEDIATE_CHANGE))(
+              this.sourceBlock_,
+              this.name || null,
+              this.getValue(),
+              newGrid
+          )
+      );
+    }
+
+    this.setValue(newGrid, false);
   }
 
   /**

From 75739e424e3151f91e81fae74a36f8d2dc012daa Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Mon, 16 Oct 2023 09:19:03 -0700
Subject: [PATCH 3/3] chore: fix using JSON in advanced playground (#1996)

---
 plugins/dev-tools/src/playground/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dev-tools/src/playground/index.js b/plugins/dev-tools/src/playground/index.js
index 91ac589fca..12a6f4d9a8 100644
--- a/plugins/dev-tools/src/playground/index.js
+++ b/plugins/dev-tools/src/playground/index.js
@@ -126,7 +126,7 @@ export function createPlayground(
           activeTab: 'JSON',
           playgroundOpen: true,
           autoGenerate: config && config.auto != undefined ? config.auto : true,
-          workspaceJson: {},
+          workspaceJson: '',
         });
         playgroundState.load();
 
@@ -314,7 +314,7 @@ export function createPlayground(
 
 
         // Initialized saved JSON and bind change listener.
-        const initialWorkspaceJson = playgroundState.get('workspaceJson') || {};
+        const initialWorkspaceJson = playgroundState.get('workspaceJson') || '';
         const jsonTab = tabs['JSON'];
         const jsonModel = jsonTab.state.model;
         let isFirstLoad = true;