fix: enable and style workspace comments (#82)

* fix: show workspace comment menu items * fix: mostly match Scratch's styling of workspace comments * fix: register workspace comment menu items only once
scratchfoundation · Jun 12, 2024 · 98ccb62 · 98ccb62
1 parent 9e01bc5
commit 98ccb62
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 0 deletions.
diff --git a/core/css.js b/core/css.js
@@ -1287,6 +1287,57 @@ const styles = `
     width: 1.25rem;
     height: 1.25rem;
   }
+
+  .blocklyCommentTopbar {
+    height: 32px;
+    --commentBorderColour: #e2db96;
+  }
+
+  .blocklyCommentTopbarBackground {
+    height: 32px;
+  }
+
+  .blocklyFoldoutIcon {
+    width: 32px;
+    height: 32px;
+    transform-origin: 16px 16px;
+  }
+
+  .blocklyComment:not(.blocklyCollapsed) .blocklyCommentHighlight,
+  .blocklySelected .blocklyCommentHighlight,
+  .blocklyCollapsed .blocklyCommentTopbarBackground,
+  .blocklyCollapsed.blocklySelected .blocklyCommentTopbarBackground {
+    stroke: #bcA903;
+    stroke-width: 1px;
+  }
+
+  .blocklyCollapsed.blocklyComment .blocklyFoldoutIcon {
+    transform: rotate(-180deg);
+  }
+
+  .zelos-renderer.scratch-theme .blocklyComment .blocklyTextarea {
+    border: none;
+    --commentFillColour: #fef49c;
+    font-size: 12pt;
+    font-weight: 400;
+    padding: 12px;
+    color: #575e75;
+  }
+
+  .zelos-renderer.scratch-theme .blocklyCommentText.blocklyText {
+    font-weight: 400;
+  }
+
+  .blocklyDeleteIcon {
+    display: block;
+    width: 32px;
+    height: 32px;
+  }
+
+  .blocklyResizeHandle {
+    height: 20px;
+    width: 20px;
+  }
 `;
 
 Blockly.Css.register(styles);
diff --git a/media/delete-icon.svg b/media/delete-icon.svg
diff --git a/media/comment-arrow-down.svg → media/foldout-icon.svg b/media/comment-arrow-down.svg → media/foldout-icon.svg
diff --git a/media/resize-handle.svg b/media/resize-handle.svg
diff --git a/src/index.js b/src/index.js
@@ -83,3 +83,4 @@ Blockly.FlyoutButton.TEXT_MARGIN_X = 40;
 Blockly.FlyoutButton.TEXT_MARGIN_Y = 10;
 Blockly.ContextMenuRegistry.registry.unregister('blockDisable');
 Blockly.ContextMenuRegistry.registry.unregister('blockInline');
+Blockly.ContextMenuItems.registerCommentOptions();