RaspberryPiFoundation
diff --git a/‎packages/blockly/core/comments/collapse_comment_bar_button.ts‎
Lines changed: 11 additions & 6 deletions b/‎packages/blockly/core/comments/collapse_comment_bar_button.ts‎
Lines changed: 11 additions & 6 deletions
diff --git a/‎packages/blockly/core/comments/comment_bar_button.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/blockly/core/comments/comment_bar_button.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/blockly/core/comments/delete_comment_bar_button.ts‎
Lines changed: 11 additions & 6 deletions b/‎packages/blockly/core/comments/delete_comment_bar_button.ts‎
Lines changed: 11 additions & 6 deletions
diff --git a/‎packages/blockly/core/workspace_svg.ts‎
Lines changed: 1 addition & 2 deletions b/‎packages/blockly/core/workspace_svg.ts‎
Lines changed: 1 addition & 2 deletions
@@ -41,19 +41,24 @@ export class CollapseCommentBarButton extends CommentBarButton {
    * @param container An SVG group that this button should be a child of.
    */
   constructor(
-    protected readonly id: string,
-    protected readonly workspace: WorkspaceSvg,
-    protected readonly container: SVGGElement,
-    protected readonly commentView: CommentView,
+    id: string,
+    workspace: WorkspaceSvg,
+    container: SVGGElement,
+    commentView: CommentView,
   ) {
-    super(id, workspace, container, commentView);
+    super(
+      `${id}${COMMENT_COLLAPSE_BAR_BUTTON_FOCUS_IDENTIFIER}`,
+      workspace,
+      container,
+      commentView,
+    );
 
     this.icon = dom.createSvgElement(
       Svg.IMAGE,
       {
         'class': 'blocklyFoldoutIcon',
         'href': `${this.workspace.options.pathToMedia}foldout-icon.svg`,
-        'id': `${this.id}${COMMENT_COLLAPSE_BAR_BUTTON_FOCUS_IDENTIFIER}`,
+        'id': this.id,
       },
       this.container,
     );
 
@@ -28,7 +28,7 @@ export abstract class CommentBarButton implements IFocusableNode {
    * @param container An SVG group that this button should be a child of.
    */
   constructor(
-    protected readonly id: string,
+    readonly id: string,
     protected readonly workspace: WorkspaceSvg,
     protected readonly container: SVGGElement,
     protected readonly commentView: CommentView,
 
@@ -41,19 +41,24 @@ export class DeleteCommentBarButton extends CommentBarButton {
    * @param container An SVG group that this button should be a child of.
    */
   constructor(
-    protected readonly id: string,
-    protected readonly workspace: WorkspaceSvg,
-    protected readonly container: SVGGElement,
-    protected readonly commentView: CommentView,
+    id: string,
+    workspace: WorkspaceSvg,
+    container: SVGGElement,
+    commentView: CommentView,
   ) {
-    super(id, workspace, container, commentView);
+    super(
+      `${id}${COMMENT_DELETE_BAR_BUTTON_FOCUS_IDENTIFIER}`,
+      workspace,
+      container,
+      commentView,
+    );
 
     this.icon = dom.createSvgElement(
       Svg.IMAGE,
       {
         'class': 'blocklyDeleteIcon',
         'href': `${this.workspace.options.pathToMedia}delete-icon.svg`,
-        'id': `${this.id}${COMMENT_DELETE_BAR_BUTTON_FOCUS_IDENTIFIER}`,
+        'id': this.id,
       },
       container,
     );
 
@@ -2977,8 +2977,7 @@ export class WorkspaceSvg
           return (
             comment.view
               .getCommentBarButtons()
-              .find((button) => button.getFocusableElement().id.includes(id)) ??
-            null
+              .find((button) => button.id.includes(id)) ?? null
           );
         }
       }
Original file line number	Diff line number	Diff line change
`@@ -2977,8 +2977,7 @@ export class WorkspaceSvg`
`2977`	`2977`	`return (`
`2978`	`2978`	`comment.view`
`2979`	`2979`	`.getCommentBarButtons()`
`2980`		`- .find((button) => button.getFocusableElement().id.includes(id)) ??`
`2981`		`- null`
	`2980`	`+ .find((button) => button.id.includes(id)) ?? null`
`2982`	`2981`	`);`
`2983`	`2982`	`}`
`2984`	`2983`	`}`