From 8a24ec797be5a36efda1d5faf7a3d77a849249e6 Mon Sep 17 00:00:00 2001 From: John Nesky Date: Fri, 28 Jun 2024 20:14:00 -0700 Subject: [PATCH] fix: Hide content highlight on comment drag, update on resize. --- plugins/content-highlight/package.json | 2 +- plugins/content-highlight/src/index.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/content-highlight/package.json b/plugins/content-highlight/package.json index 940ff9b90..6de89b430 100644 --- a/plugins/content-highlight/package.json +++ b/plugins/content-highlight/package.json @@ -48,7 +48,7 @@ "typescript": "^5.4.5" }, "peerDependencies": { - "blockly": "^11.0.0" + "blockly": "^11.1.2" }, "publishConfig": { "access": "public", diff --git a/plugins/content-highlight/src/index.ts b/plugins/content-highlight/src/index.ts index 4ec5a2d23..7e9247bc1 100644 --- a/plugins/content-highlight/src/index.ts +++ b/plugins/content-highlight/src/index.ts @@ -18,6 +18,7 @@ const contentChangeEvents = [ Blockly.Events.BLOCK_MOVE, Blockly.Events.BLOCK_DELETE, Blockly.Events.COMMENT_MOVE, + Blockly.Events.COMMENT_RESIZE, Blockly.Events.COMMENT_CREATE, Blockly.Events.COMMENT_DELETE, ]; @@ -196,7 +197,9 @@ export class ContentHighlight { this.position(this.cachedContentMetrics, absoluteMetrics); } } else if (event.type === Blockly.Events.BLOCK_DRAG) { - this.handleBlockDrag(event as Blockly.Events.BlockDrag); + this.handleDragEvent(event as Blockly.Events.BlockDrag); + } else if (event.type === Blockly.Events.COMMENT_DRAG) { + this.handleDragEvent(event as Blockly.Events.CommentDrag); } else if (event.type === Blockly.Events.BLOCK_CHANGE) { // Resizes the content highlight when it is a block change event const metricsManager = this.workspace.getMetricsManager(); @@ -211,7 +214,9 @@ export class ContentHighlight { * * @param event The BlockDrag event. */ - private handleBlockDrag(event: Blockly.Events.BlockDrag) { + private handleDragEvent( + event: Blockly.Events.BlockDrag | Blockly.Events.CommentDrag, + ) { const opacity = event.isStart ? '0' : '1'; this.svgGroup?.setAttribute('opacity', opacity); }