From f2232bc47ccb4fa2e677eb15f48c7ccb70064a42 Mon Sep 17 00:00:00 2001 From: John Nesky Date: Fri, 28 Jun 2024 20:14:00 -0700 Subject: [PATCH 1/3] fix: Hide content highlight on comment drag, update on resize. --- plugins/content-highlight/src/index.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/content-highlight/src/index.ts b/plugins/content-highlight/src/index.ts index bdb047562..3fd6551d4 100644 --- a/plugins/content-highlight/src/index.ts +++ b/plugins/content-highlight/src/index.ts @@ -19,6 +19,7 @@ const contentChangeEvents: string[] = [ Blockly.Events.BLOCK_MOVE, Blockly.Events.BLOCK_DELETE, Blockly.Events.COMMENT_MOVE, + Blockly.Events.COMMENT_RESIZE, Blockly.Events.COMMENT_CREATE, Blockly.Events.COMMENT_DELETE, ]; @@ -197,7 +198,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(); @@ -212,7 +215,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); } From a8db7781b1faec74a1bf3d48d54a82c4e75820f5 Mon Sep 17 00:00:00 2001 From: John Nesky Date: Fri, 31 Jan 2025 11:57:26 -0800 Subject: [PATCH 2/3] Built against newer version of Blockly. --- plugins/content-highlight/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/content-highlight/src/index.ts b/plugins/content-highlight/src/index.ts index 3fd6551d4..0c80a1070 100644 --- a/plugins/content-highlight/src/index.ts +++ b/plugins/content-highlight/src/index.ts @@ -186,7 +186,7 @@ export class ContentHighlight { private onChange(event: Blockly.Events.Abstract) { if (event.type === Blockly.Events.THEME_CHANGE) { this.applyColor(); - } else if (contentChangeEvents.indexOf(event.type) !== -1) { + } else if ((contentChangeEvents as string[]).indexOf(event.type) !== -1) { const metricsManager = this.workspace.getMetricsManager(); if (event.type !== Blockly.Events.VIEWPORT_CHANGE) { // The content metrics change when it's not a viewport change event. From 40b564dcd34065c3b7ab79041923ac4f791cc6b2 Mon Sep 17 00:00:00 2001 From: Maribeth Moffatt Date: Fri, 19 Dec 2025 16:35:38 -0500 Subject: [PATCH 3/3] fix: remove cast --- plugins/content-highlight/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/content-highlight/src/index.ts b/plugins/content-highlight/src/index.ts index 0c80a1070..3fd6551d4 100644 --- a/plugins/content-highlight/src/index.ts +++ b/plugins/content-highlight/src/index.ts @@ -186,7 +186,7 @@ export class ContentHighlight { private onChange(event: Blockly.Events.Abstract) { if (event.type === Blockly.Events.THEME_CHANGE) { this.applyColor(); - } else if ((contentChangeEvents as string[]).indexOf(event.type) !== -1) { + } else if (contentChangeEvents.indexOf(event.type) !== -1) { const metricsManager = this.workspace.getMetricsManager(); if (event.type !== Blockly.Events.VIEWPORT_CHANGE) { // The content metrics change when it's not a viewport change event.