Merge pull request #8252 from google/develop

chore: merge develop into v12

Author: gonfunko

.github/workflows/appengine_deploy.yml

@@ -42,7 +42,7 @@ jobs:
           path: _deploy/
 
       - name: Deploy to App Engine
-        uses: google-github-actions/deploy-appengine@v2.1.0
+        uses: google-github-actions/deploy-appengine@v2.1.2
         # For parameters see:
         # https://github.com/google-github-actions/deploy-appengine#inputs
         with:

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
         # TODO (#2114): re-enable osx build.
         # os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
         # See supported Node.js release schedule at
         # https://nodejs.org/en/about/releases/
 

core/comments/comment_view.ts

@@ -99,6 +99,9 @@ export class CommentView implements IRenderedElement {
   /** Whether this comment view has been disposed or not. */
   private disposed = false;
 
+  /** Size of this comment when the resize drag was initiated. */
+  private preResizeSize?: Size;
+
   constructor(private readonly workspace: WorkspaceSvg) {
     this.svgRoot = dom.createSvgElement(Svg.G, {
       'class': 'blocklyComment blocklyEditable',
@@ -334,7 +337,7 @@ export class CommentView implements IRenderedElement {
    * elements to reflect the new size, and triggers size change listeners.
    */
   setSize(size: Size) {
-    const oldSize = this.size;
+    const oldSize = this.preResizeSize || this.size;
     this.setSizeWithoutFiringEvents(size);
     this.onSizeChange(oldSize, this.size);
   }
@@ -519,6 +522,8 @@ export class CommentView implements IRenderedElement {
       return;
     }
 
+    this.preResizeSize = this.getSize();
+
     // TODO(#7926): Move this into a utils file.
     this.workspace.startDrag(
       e,
@@ -559,6 +564,7 @@ export class CommentView implements IRenderedElement {
     }
     // When ending a resize drag, notify size change listeners to fire an event.
     this.setSize(this.size);
+    this.preResizeSize = undefined;
   }
 
   /** Resizes the comment in response to a drag on the resize handle. */

core/events/events_abstract.ts

@@ -108,7 +108,6 @@ export abstract class Abstract {
    *
    * @returns The workspace the event belongs to.
    * @throws {Error} if workspace is null.
-   * @internal
    */
   getEventWorkspace_(): Workspace {
     let workspace;

demos/blockfactory/app_controller.js

@@ -507,7 +507,7 @@ AppController.prototype.assignBlockFactoryClickHandlers = function() {
 
   document.getElementById('helpButton').addEventListener('click',
       function() {
-        open('https://developers.google.com/blockly/custom-blocks/block-factory',
+        open('https://developers.google.com/blockly/guides/create-custom-blocks/legacy-blockly-developer-tools',
              'BlockFactoryHelp');
       });
 

demos/blockfactory/factory.css

@@ -127,6 +127,13 @@ button, .buttonStyle {
   float: right;
 }
 
+#legacyBanner {
+  border: #ccc 1px solid;
+  background-color: #FFCDD2;
+  margin: 4px;
+  padding: 4px;
+}
+
 #blockFactoryContent {
   height: 85%;
   width: 100%;

demos/blockfactory/index.html

@@ -53,6 +53,9 @@ <h1><a href="https://developers.google.com/blockly/">Blockly</a> &gt;
     <button class="privacyButton" title="Open Google privacy policy"><a class="privacyLink" href="https://policies.google.com/privacy">Privacy</a>
     </button>
   </h1>
+  <div id="legacyBanner">
+    This version of Developer Tools is only compatible with Blockly version 10 and earlier. Try the <a target="_blank" href="https://google.github.io/blockly-samples/examples/developer-tools/index.html">new Block Factory</a> and <a target="_blank" href="https://developers.google.com/blockly/guides/create-custom-blocks/blockly-developer-tools#import_from_legacy_block_factory">learn how to migrate your blocks</a>.
+  </div>
   <div id="tabContainer">
     <div id="blockFactory_tab" class="tab tabon">Block Factory</div>
     <div id="blocklibraryExporter_tab" class="tab taboff">Block Exporter</div>