scratch-blocks 2.1.4 → 2.1.6

package/src/fields/field_textinput_removable.ts

@@ -35,19 +35,28 @@ export class FieldTextInputRemovable extends Blockly.FieldTextInput {
   showEditor_() {
     // Wait for our parent block to render so we can examine its metrics to
     // calculate rounded corners on the editor as needed.
-    Blockly.renderManagement.finishQueuedRenders().then(() => {
+    void Blockly.renderManagement.finishQueuedRenders().then(() => {
       super.showEditor_()
 
-      const div = Blockly.WidgetDiv.getDiv()!
+      const div = Blockly.WidgetDiv.getDiv()
+      if (!div) {
+        console.error('[field_textinput_removable] Missing WidgetDiv for removable text input')
+        return
+      }
+      if (!this.sourceBlock_) {
+        console.error('[field_textinput_removable] Missing source block for removable text input')
+        return
+      }
+
       div.className += ' removableTextInput'
       const removeButton = document.createElement('img')
       removeButton.className = 'blocklyTextRemoveIcon'
-      removeButton.setAttribute('src', this.sourceBlock_!.workspace.options.pathToMedia + 'icons/remove.svg')
+      removeButton.setAttribute('src', this.sourceBlock_.workspace.options.pathToMedia + 'icons/remove.svg')
       this.removeButtonMouseWrapper_ = Blockly.browserEvents.bind(
         removeButton,
         'mousedown',
         this,
-        this.removeCallback_,
+        this.removeCallback_.bind(this),
       )
       div.appendChild(removeButton)
     })

package/src/fields/field_variable_getter.ts

@@ -70,8 +70,13 @@ class FieldVariableGetter extends Blockly.FieldLabel {
    */
   doValueUpdate_(newVariableId: string) {
     super.doValueUpdate_(newVariableId)
-    const workspace = this.getSourceBlock()!.workspace
-    this.variable = Blockly.Variables.getVariable(workspace, newVariableId)
+    const sourceBlock = this.getSourceBlock()
+    if (!sourceBlock) {
+      console.error('[field_variable_getter] Missing source block in doValueUpdate_')
+      this.variable = null
+      return
+    }
+    this.variable = Blockly.Variables.getVariable(sourceBlock.workspace, newVariableId)
   }
 
   /**
@@ -92,13 +97,22 @@ class FieldVariableGetter extends Blockly.FieldLabel {
   }
 
   fromXml(element: Element) {
-    this.setValue(element.getAttribute('id')!)
+    const id = element.getAttribute('id')
+    if (!id) {
+      console.error('[field_variable_getter] Missing variable id in XML')
+      return
+    }
+    this.setValue(id)
   }
 
   toXml(element: Element): Element {
-    element.setAttribute('id', this.variable!.getId())
-    element.setAttribute('variabletype', this.variable!.getType())
-    element.textContent = this.variable!.getName()
+    if (!this.variable) {
+      console.error('[field_variable_getter] Missing variable in toXml')
+      return element
+    }
+    element.setAttribute('id', this.variable.getId())
+    element.setAttribute('variabletype', this.variable.getType())
+    element.textContent = this.variable.getName()
     return element
   }
 }

package/src/fields/field_vertical_separator.ts

@@ -73,7 +73,11 @@ class FieldVerticalSeparator extends Blockly.Field {
    * @package
    */
   setLineHeight(newHeight: number) {
-    this.lineElement!.setAttribute('y2', `${newHeight}`)
+    if (!this.lineElement) {
+      console.error('[field_vertical_separator] Missing lineElement in setLineHeight')
+      return
+    }
+    this.lineElement.setAttribute('y2', `${newHeight}`)
   }
 
   /**

package/src/fields/scratch_field_angle.ts

@@ -47,17 +47,17 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
   /**
    * Opaque identifier used to unbind event listener in dispose().
    */
-  private mouseDownWrapper_!: Blockly.browserEvents.Data
+  private mouseDownWrapper_?: Blockly.browserEvents.Data
 
   /**
    * Opaque identifier used to unbind event listener in dispose().
    */
-  private mouseMoveWrapper!: Blockly.browserEvents.Data
+  private mouseMoveWrapper?: Blockly.browserEvents.Data
 
   /**
    * Opaque identifier used to unbind event listener in dispose().
    */
-  private mouseUpWrapper!: Blockly.browserEvents.Data
+  private mouseUpWrapper?: Blockly.browserEvents.Data
 
   /**
    * Round angles to the nearest 15 degrees when using mouse.
@@ -164,6 +164,14 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
     Blockly.DropDownDiv.hideWithoutAnimation()
     Blockly.DropDownDiv.clearContent()
     const div = Blockly.DropDownDiv.getContentDiv()
+    const sourceBlock = this.getSourceBlock()
+    if (!(sourceBlock instanceof Blockly.BlockSvg)) {
+      throw new Error('[scratch_field_angle] Missing source BlockSvg for showEditor_')
+    }
+    const parentBlock = sourceBlock.getParent()
+    if (!parentBlock) {
+      throw new Error('[scratch_field_angle] Missing parent block for showEditor_')
+    }
     // Build the SVG DOM.
     const svg = Blockly.utils.dom.createSvgElement(
       'svg',
@@ -183,8 +191,8 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
         cx: this.HALF,
         cy: this.HALF,
         r: this.RADIUS,
-        fill: (this.getSourceBlock()!.getParent() as Blockly.BlockSvg).getColourSecondary(),
-        stroke: (this.getSourceBlock()!.getParent() as Blockly.BlockSvg).getColourTertiary(),
+        fill: parentBlock.getColourSecondary(),
+        stroke: parentBlock.getColourTertiary(),
         class: 'blocklyAngleCircle',
       },
       svg,
@@ -268,13 +276,10 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
       Blockly.getMainWorkspace().options.pathToMedia + this.ARROW_SVG_PATH,
     )
 
-    Blockly.DropDownDiv.setColour(
-      (this.getSourceBlock()!.getParent() as Blockly.BlockSvg).getColour(),
-      (this.getSourceBlock()!.getParent() as Blockly.BlockSvg).getColourTertiary(),
-    )
-    Blockly.DropDownDiv.showPositionedByBlock(this, this.getSourceBlock() as Blockly.BlockSvg)
+    Blockly.DropDownDiv.setColour(parentBlock.getColour(), parentBlock.getColourTertiary())
+    Blockly.DropDownDiv.showPositionedByBlock(this as Blockly.Field<string | number | null>, sourceBlock)
 
-    this.mouseDownWrapper_ = Blockly.browserEvents.bind(this.handle, 'mousedown', this, this.onMouseDown)
+    this.mouseDownWrapper_ = Blockly.browserEvents.bind(this.handle, 'mousedown', this, this.onMouseDown.bind(this))
 
     this.updateGraph()
   }
@@ -283,16 +288,20 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
    * Set the angle to match the mouse's position.
    */
   onMouseDown() {
-    this.mouseMoveWrapper = Blockly.browserEvents.bind(document.body, 'mousemove', this, this.onMouseMove)
-    this.mouseUpWrapper = Blockly.browserEvents.bind(document.body, 'mouseup', this, this.onMouseUp)
+    this.mouseMoveWrapper = Blockly.browserEvents.bind(document.body, 'mousemove', this, this.onMouseMove.bind(this))
+    this.mouseUpWrapper = Blockly.browserEvents.bind(document.body, 'mouseup', this, this.onMouseUp.bind(this))
   }
 
   /**
    * Set the angle to match the mouse's position.
    */
   onMouseUp() {
-    Blockly.browserEvents.unbind(this.mouseMoveWrapper)
-    Blockly.browserEvents.unbind(this.mouseUpWrapper)
+    if (this.mouseMoveWrapper) {
+      Blockly.browserEvents.unbind(this.mouseMoveWrapper)
+    }
+    if (this.mouseUpWrapper) {
+      Blockly.browserEvents.unbind(this.mouseUpWrapper)
+    }
   }
 
   /**
@@ -301,7 +310,9 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
    */
   onMouseMove(e: PointerEvent) {
     e.preventDefault()
-    const bBox = this.gauge!.ownerSVGElement!.getBoundingClientRect()
+    const ownerSvg = this.gauge?.ownerSVGElement
+    if (!ownerSvg) return
+    const bBox = ownerSvg.getBoundingClientRect()
     const dx = e.clientX - bBox.left - this.HALF
     const dy = e.clientY - bBox.top - this.HALF
     let angle = Math.atan(-dy / dx)
@@ -383,12 +394,12 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
       } else {
         imageRotation = -angleDegrees
       }
-      this.arrow!.setAttribute('transform', 'rotate(' + imageRotation + ')')
+      this.arrow?.setAttribute('transform', 'rotate(' + imageRotation + ')')
     }
     this.gauge.setAttribute('d', path.join(''))
-    this.line!.setAttribute('x2', `${x2}`)
-    this.line!.setAttribute('y2', `${y2}`)
-    this.handle!.setAttribute('transform', 'translate(' + x2 + ',' + y2 + ')')
+    this.line?.setAttribute('x2', `${x2}`)
+    this.line?.setAttribute('y2', `${y2}`)
+    this.handle?.setAttribute('transform', 'translate(' + x2 + ',' + y2 + ')')
   }
 
   /**
@@ -396,7 +407,7 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
    * @param text The user's text.
    * @returns A string representing a valid angle, or null if invalid.
    */
-  doClassValidation_(text: string): number | null {
+  doClassValidation_(text: string | null): number | null {
     if (text === null) {
       return null
     }

package/src/fields/scratch_field_dropdown.ts

@@ -17,14 +17,18 @@ class ScratchFieldDropdown extends Blockly.FieldDropdown {
     } else if (this.borderRect_) {
       this.borderRect_.setAttribute(
         'fill',
-        'colourQuaternary' in style ? `${style.colourQuaternary}` : style.colourTertiary,
+        'colourQuaternary' in style ? String(style.colourQuaternary) : style.colourTertiary,
       )
     }
   }
 
   dropdownDispose_() {
     super.dropdownDispose_()
-    const sourceBlock = this.getSourceBlock()!
+    const sourceBlock = this.getSourceBlock()
+    if (!sourceBlock) {
+      console.error('[scratch_field_dropdown] Missing source block in dropdownDispose_')
+      return
+    }
     if (sourceBlock.isShadow()) {
       sourceBlock.setStyle(this.originalStyle)
     }

package/src/fields/scratch_field_number.ts

@@ -110,14 +110,14 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
    * appropriate.
    * @param e The triggering pointer event.
    */
-  showEditor_(e: PointerEvent) {
+  showEditor_(e?: PointerEvent) {
     // Do not focus on mobile devices so we can show the num-pad
     const showNumPad = e?.pointerType === 'touch'
     super.showEditor_(e, showNumPad)
 
     // Show a numeric keypad in the drop-down on touch
     if (showNumPad) {
-      this.htmlInput_!.select()
+      this.htmlInput_?.select()
       this.showNumPad_()
     }
   }
@@ -148,7 +148,10 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
 
     // Set colour and size of drop-down
     const sourceBlock = this.getSourceBlock() as Blockly.BlockSvg
-    Blockly.DropDownDiv.setColour(sourceBlock.getParent()!.getColour(), sourceBlock.getColourTertiary())
+    const parentBlock = sourceBlock.getParent()
+    if (parentBlock) {
+      Blockly.DropDownDiv.setColour(parentBlock.getColour(), sourceBlock.getColourTertiary())
+    }
     contentDiv.style.width = ScratchFieldNumber.DROPDOWN_WIDTH + 'px'
 
     this.position_()
@@ -176,7 +179,7 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
     Blockly.DropDownDiv.setBoundsElement(sourceBlock.workspace.getParentSvg().parentElement)
     Blockly.DropDownDiv.show(
       this,
-      this.getSourceBlock()!.RTL,
+      sourceBlock.RTL,
       primaryX,
       primaryY,
       secondaryX,
@@ -193,8 +196,9 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
    */
   private addButtons_(contentDiv: Element) {
     const sourceBlock = this.getSourceBlock() as Blockly.BlockSvg
-    const buttonColour = sourceBlock.getParent()!.getColour()
-    const buttonBorderColour = sourceBlock.getParent()!.getColourTertiary()
+    const parent = sourceBlock.getParent()
+    const buttonColour = parent?.getColour() ?? sourceBlock.getColour()
+    const buttonBorderColour = parent?.getColourTertiary() ?? sourceBlock.getColourTertiary()
 
     // Add numeric keypad buttons
     const buttons = ScratchFieldNumber.NUMPAD_BUTTONS
@@ -248,10 +252,12 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
     // String of the button (e.g., '7')
     const spliceValue = (e.target as HTMLElement).innerText
     // Old value of the text field
-    const oldValue = this.htmlInput_!.value
+    const htmlInput = this.htmlInput_
+    if (!htmlInput) return
+    const oldValue = htmlInput.value
     // Determine the selected portion of the text field
-    const selectionStart = this.htmlInput_!.selectionStart ?? 0
-    const selectionEnd = this.htmlInput_!.selectionEnd ?? 0
+    const selectionStart = htmlInput.selectionStart ?? 0
+    const selectionEnd = htmlInput.selectionEnd ?? 0
 
     // Splice in the new value
     const newValue = oldValue.slice(0, selectionStart) + spliceValue + oldValue.slice(selectionEnd)
@@ -273,10 +279,12 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
    */
   numPadEraseButtonTouch(e: PointerEvent) {
     // Old value of the text field
-    const oldValue = this.htmlInput_!.value
+    const htmlInput = this.htmlInput_
+    if (!htmlInput) return
+    const oldValue = htmlInput.value
     // Determine what is selected to erase (if anything)
-    let selectionStart = this.htmlInput_!.selectionStart ?? 0
-    const selectionEnd = this.htmlInput_!.selectionEnd ?? 0
+    let selectionStart = htmlInput.selectionStart ?? 0
+    const selectionEnd = htmlInput.selectionEnd ?? 0
 
     // If selection is zero-length, shift start to the left 1 character
     if (selectionStart == selectionEnd) {
@@ -303,7 +311,8 @@ class ScratchFieldNumber extends Blockly.FieldTextInput {
   private updateDisplay_(newValue: string, newSelection: number) {
     this.setEditorValue_(newValue)
     // Resize and scroll the text field appropriately
-    const htmlInput = this.htmlInput_!
+    const htmlInput = this.htmlInput_
+    if (!htmlInput) return
     htmlInput.setSelectionRange(newSelection, newSelection)
     htmlInput.scrollLeft = htmlInput.scrollWidth
   }

package/src/fields/scratch_field_variable.ts

@@ -29,6 +29,13 @@ import { createVariable, renameVariable } from '../variables'
 export class ScratchFieldVariable extends Blockly.FieldVariable {
   private originalStyle!: string
 
+  private getSourceWorkspaceSvg_(sourceBlock: Blockly.Block): Blockly.WorkspaceSvg {
+    if (!(sourceBlock.workspace instanceof Blockly.WorkspaceSvg)) {
+      throw new Error('[scratch_field_variable] Expected source block workspace to be a WorkspaceSvg')
+    }
+    return sourceBlock.workspace
+  }
+
   constructor(
     varName: string | null | typeof Blockly.Field.SKIP_SETUP,
     validator?: Blockly.FieldVariableValidator,
@@ -40,14 +47,15 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
     // dropdownCreate returns MenuOption[] rather than Blockly.MenuGenerator's
     // MenuOption[][] variant; the cast is needed to satisfy FieldVariable's
     // menuGenerator_ type while the actual runtime shape is compatible.
-    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate as unknown as Blockly.MenuGenerator
+    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this) as unknown as Blockly.MenuGenerator
   }
 
   initModel() {
     if (!this.getVariable()) {
       const sourceBlock = this.getSourceBlock()
       if (sourceBlock) {
-        const broadcastVariable = this.initFlyoutBroadcast(sourceBlock.workspace as Blockly.WorkspaceSvg)
+        const sourceWorkspace = this.getSourceWorkspaceSvg_(sourceBlock)
+        const broadcastVariable = this.initFlyoutBroadcast(sourceWorkspace)
         if (broadcastVariable) {
           this.doValueUpdate_(broadcastVariable.getId())
           return
@@ -96,7 +104,8 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
         if (option[1] === Blockly.RENAME_VARIABLE_ID) {
           return [ScratchMsgs.translate('RENAME_LIST'), option[1]]
         } else if (option[1] === Blockly.DELETE_VARIABLE_ID) {
-          return [ScratchMsgs.translate('DELETE_LIST').replace('%1', this.getText()), option[1]]
+          const fieldText = (this as Blockly.FieldVariable).getText()
+          return [String(ScratchMsgs.translate('DELETE_LIST')).replace('%1', fieldText), option[1]]
         }
         return option
       })
@@ -118,8 +127,9 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
     if (sourceBlock && !sourceBlock.isDeadOrDying()) {
       const selectedItem = menuItem.getValue()
       if (selectedItem === Constants.NEW_BROADCAST_MESSAGE_ID) {
+        const sourceWorkspace = this.getSourceWorkspaceSvg_(sourceBlock)
         createVariable(
-          sourceBlock.workspace as Blockly.WorkspaceSvg,
+          sourceWorkspace,
           (varId) => {
             if (varId) {
               this.setValue(varId)
@@ -129,7 +139,7 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
         )
         return
       } else if (selectedItem === Blockly.RENAME_VARIABLE_ID) {
-        renameVariable(sourceBlock.workspace as Blockly.WorkspaceSvg, this.getVariable() as ScratchVariableModel)
+        renameVariable(sourceBlock.workspace, this.getVariable() as ScratchVariableModel)
         return
       }
     }
@@ -138,26 +148,30 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
 
   showEditor_(event: PointerEvent) {
     super.showEditor_(event)
-    const sourceBlock = this.getSourceBlock()!
+    const sourceBlock = this.getSourceBlock()
+    if (!sourceBlock) {
+      throw new Error('[scratch_field_variable] Missing source block in showEditor_')
+    }
+    const sourceWorkspace = this.getSourceWorkspaceSvg_(sourceBlock)
     const styleName = sourceBlock.getStyleName()
-    const style = (sourceBlock.workspace as Blockly.WorkspaceSvg)
-      .getRenderer()
-      .getConstants()
-      .getBlockStyle(styleName)
+    const style = sourceWorkspace.getRenderer().getConstants().getBlockStyle(styleName)
     if (sourceBlock.isShadow()) {
       this.originalStyle = styleName
       sourceBlock.setStyle(`${this.originalStyle}_selected`)
     } else if (this.borderRect_) {
       this.borderRect_.setAttribute(
         'fill',
-        'colourQuaternary' in style ? `${style.colourQuaternary}` : style.colourTertiary,
+        'colourQuaternary' in style ? String(style.colourQuaternary) : style.colourTertiary,
       )
     }
   }
 
   dropdownDispose_() {
     super.dropdownDispose_()
-    const sourceBlock = this.getSourceBlock()!
+    const sourceBlock = this.getSourceBlock()
+    if (!sourceBlock) {
+      throw new Error('[scratch_field_variable] Missing source block in dropdownDispose_')
+    }
     if (sourceBlock.isShadow()) {
       sourceBlock.setStyle(this.originalStyle)
     }

package/src/flyout_checkbox_icon.ts

@@ -9,7 +9,7 @@ import { CheckboxBubble } from './checkbox_bubble'
  * Invisible icon that exists solely to host the corresponding checkbox bubble.
  */
 export class FlyoutCheckboxIcon extends Blockly.icons.Icon implements Blockly.IHasBubble {
-  private checkboxBubble!: CheckboxBubble
+  private checkboxBubble?: CheckboxBubble
   private type = new Blockly.icons.IconType('checkbox')
 
   constructor(protected override sourceBlock: Blockly.BlockSvg) {
@@ -36,7 +36,7 @@ export class FlyoutCheckboxIcon extends Blockly.icons.Icon implements Blockly.IH
     return this.sourceBlock.workspace.isFlyout
   }
 
-  onLocationChange(blockOrigin: Blockly.utils.Coordinate) {
+  onLocationChange(_blockOrigin: Blockly.utils.Coordinate) {
     this.checkboxBubble?.updateLocation()
   }
 
@@ -52,16 +52,20 @@ export class FlyoutCheckboxIcon extends Blockly.icons.Icon implements Blockly.IH
   // These methods are required by the interfaces, but intentionally have no
   // implementation, largely because this icon has no visual representation.
 
-  async setBubbleVisible(visible: boolean) {}
+  setBubbleVisible(_visible: boolean): Promise<void> {
+    return Promise.resolve()
+  }
 
-  initView(pointerDownListener: (e: PointerEvent) => void) {}
+  initView(_pointerDownListener: (e: PointerEvent) => void) {
+    return
+  }
 
   canBeFocused() {
     return false
   }
 
   getBubble() {
-    return this.checkboxBubble
+    return this.checkboxBubble ?? null
   }
 }
 

package/src/glows.ts

@@ -4,6 +4,7 @@
  */
 import * as Blockly from 'blockly/core'
 import { Colours } from './colours'
+import { getBlockSvgById, getRequiredMainWorkspaceSvg } from './workspace_block_lookup'
 
 /**
  * Glow/unglow a stack in the workspace.
@@ -11,11 +12,10 @@ import { Colours } from './colours'
  * @param isGlowingStack Whether to glow the stack.
  */
 export function glowStack(id: string, isGlowingStack: boolean) {
-  const block = (Blockly.getMainWorkspace().getBlockById(id) ||
-    (Blockly.getMainWorkspace() as Blockly.WorkspaceSvg)
-      .getFlyout()
-      ?.getWorkspace()
-      ?.getBlockById(id)) as Blockly.BlockSvg
+  const mainWorkspace = getRequiredMainWorkspaceSvg()
+  const flyout = mainWorkspace.getFlyout()
+  const flyoutBlock = flyout ? getBlockSvgById(flyout.getWorkspace(), id) : null
+  const block = getBlockSvgById(mainWorkspace, id) ?? flyoutBlock
   if (!block) {
     throw new Error('Tried to glow block that does not exist.')
   }

package/src/index.ts

@@ -47,6 +47,7 @@ import './renderer/cat/renderer'
 import './renderer/renderer'
 import { registerScratchBlockPaster } from './scratch_block_paster'
 import * as scratchBlocksUtils from './scratch_blocks_utils'
+import './scratch_c_block_wrap'
 import './scratch_comment_icon'
 import './scratch_connection_checker'
 import { registerScratchContinuousCategory } from './scratch_continuous_category'
@@ -158,7 +159,7 @@ export function isContentNodeFocused(): boolean {
   return Blockly.getFocusManager().getFocusedNode() !== null
 }
 
-registerContinuousToolbox()
+;(registerContinuousToolbox as () => void)()
 Blockly.Scrollbar.scrollbarThickness = Blockly.Touch.TOUCH_ENABLED ? 14 : 11
 Blockly.FlyoutButton.TEXT_MARGIN_X = 40
 Blockly.FlyoutButton.TEXT_MARGIN_Y = 10
@@ -168,12 +169,23 @@ Blockly.ContextMenuItems.registerCommentOptions()
 // Blockly hides "Add Comment" for simple reporters because comments can't be
 // read in the default renderer. In Scratch they're shown differently, so
 // remove that restriction by dropping the isFullBlockField check.
-Blockly.ContextMenuRegistry.registry.getItem('blockComment')!.preconditionFn = (scope) => {
-  const block = scope.block
-  if (block && !block.isInFlyout && block.workspace.options.comments && !block.isCollapsed() && block.isEditable()) {
-    return 'enabled'
+const blockCommentMenuItem = Blockly.ContextMenuRegistry.registry.getItem('blockComment')
+if (!blockCommentMenuItem) {
+  console.error('[index] Missing context menu item: blockComment')
+} else {
+  blockCommentMenuItem.preconditionFn = (scope) => {
+    const block = scope.block
+    if (
+      block &&
+      !block.isInFlyout &&
+      block.workspace.options.comments &&
+      !block.isCollapsed() &&
+      block.isEditable()
+    ) {
+      return 'enabled'
+    }
+    return 'hidden'
   }
-  return 'hidden'
 }
 Blockly.ContextMenuRegistry.registry.unregister('blockDelete')
 contextMenuItems.registerDeleteBlock()
@@ -190,11 +202,9 @@ Blockly.comments.CommentView.defaultCommentSize = new Blockly.utils.Size(200, 20
 // to the workspace itself (whose onNodeFocus is a no-op) rather than to a
 // specific block, so deleting a block doesn't reset the scroll position.
 // We may need to re-evaluate this when we explicitly work on keyboard navigation.
-const originalGetRestoredFocusableNode =
-  Blockly.WorkspaceSvg.prototype.getRestoredFocusableNode
-Blockly.WorkspaceSvg.prototype.getRestoredFocusableNode = function (
-  previousNode,
-) {
+// eslint-disable-next-line @typescript-eslint/unbound-method -- preserve original prototype method for patched wrapper
+const originalGetRestoredFocusableNode = Blockly.WorkspaceSvg.prototype.getRestoredFocusableNode
+Blockly.WorkspaceSvg.prototype.getRestoredFocusableNode = function (previousNode) {
   if (!previousNode && !this.isFlyout) return null
   return originalGetRestoredFocusableNode.call(this, previousNode)
 }