Merge branch 'google:develop' into devesh

google · Jul 17, 2024 · 9056dc7 · 9056dc7
2 parents 1faa502 + 4cdca28
commit 9056dc7
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 163 deletions.
diff --git a/core/block_svg.ts b/core/block_svg.ts
@@ -457,7 +457,7 @@ export class BlockSvg
   getBoundingRectangleWithoutChildren(): Rect {
     return this.getBoundingRectangleWithDimensions({
       height: this.height,
-      width: this.width,
+      width: this.childlessWidth,
     });
   }
 

diff --git a/core/comments/comment_view.ts b/core/comments/comment_view.ts
@@ -104,7 +104,7 @@ export class CommentView implements IRenderedElement {
 
   constructor(private readonly workspace: WorkspaceSvg) {
     this.svgRoot = dom.createSvgElement(Svg.G, {
-      'class': 'blocklyComment blocklyEditable',
+      'class': 'blocklyComment blocklyEditable blocklyDraggable',
     });
 
     this.highlightRect = this.createHighlightRect(this.svgRoot);

diff --git a/core/comments/rendered_workspace_comment.ts b/core/comments/rendered_workspace_comment.ts
@@ -57,6 +57,7 @@ export class RenderedWorkspaceComment
     // Set the size to the default size as defined in the superclass.
     this.view.setSize(this.getSize());
     this.view.setEditable(this.isEditable());
+    this.view.getSvgRoot().setAttribute('data-id', this.id);
 
     this.addModelUpdateBindings();
 

diff --git a/core/workspace.ts b/core/workspace.ts
@@ -748,7 +748,6 @@ export class Workspace implements IASTNodeLocation {
    *
    * @param id ID of comment to find.
    * @returns The sought after comment, or null if not found.
-   * @internal
    */
   getCommentById(id: string): WorkspaceComment | null {
     return this.commentDB.get(id) ?? null;