Addressed review comments.

Author: lizlooney

src/blocks/mrc_none.ts

@@ -22,8 +22,8 @@
 
 
 import * as Blockly from 'blockly';
+import { MRC_STYLE_NONE } from '../themes/styles'
 import { Order, PythonGenerator } from 'blockly/python';
-import { createFieldNonEditableText } from '../fields/FieldNonEditableText';
 
 export const BLOCK_NAME = 'mrc_none';
 
@@ -32,8 +32,8 @@ export function setup() {
     init: function() {
       this.setOutput(true); // no type for None
       this.appendDummyInput()
-          .appendField(createFieldNonEditableText(Blockly.Msg.NONE));
-      this.setStyle('logic_blocks');
+          .appendField(Blockly.Msg.NONE);
+      this.setStyle(MRC_STYLE_NONE);
       this.setTooltip(Blockly.Msg.NONE_TOOLTIP);
     },
   };
@@ -45,3 +45,11 @@ export function pythonFromBlock(
 ): [string, Order] {
   return ['None', Order.ATOMIC];
 }
+
+export function createNoneShadowValue(): any {
+  return {
+    'shadow': {
+      'type': 'mrc_none',
+    },
+  }
+}

src/blocks/utils/value.ts

@@ -21,6 +21,7 @@
 
 import { getAlias } from './python';
 import * as variable from './variable';
+import { createNoneShadowValue } from '../mrc_none';
 
 
 export function valueForFunctionArgInput(argType: string, argDefaultValue: string): any {
@@ -103,11 +104,3 @@ export function createBooleanShadowValue(boolValue: boolean): any {
     },
   }
 }
-
-export function createNoneShadowValue(): any {
-  return {
-    'shadow': {
-      'type': 'mrc_none',
-    },
-  }
-}

src/themes/styles.ts

@@ -26,6 +26,7 @@ export const MRC_STYLE_ENUM = 'mrc_style_enum';
 export const MRC_STYLE_VARIABLES = 'mrc_style_variables';
 export const MRC_STYLE_COMMENTS = 'mrc_style_comments';
 export const MRC_STYLE_MISC = 'mrc_style_misc';
+export const MRC_STYLE_NONE = 'mrc_style_none';
 export const MRC_STYLE_CLASS_BLOCKS = 'mrc_style_class_blocks';
 export const MRC_CATEGORY_STYLE_METHODS = 'mrc_category_style_methods';
 export const MRC_STYLE_MECHANISMS = 'mrc_style_mechanisms';
@@ -38,6 +39,7 @@ export const MRC_CATEGORY_STYLE_COMPONENTS = 'mrc_category_style_components';
 export const add_mrc_styles = function (theme: Blockly.Theme): Blockly.Theme {
     const procedureStyle = theme.blockStyles['procedure_blocks'];
     const variableStyle = theme.blockStyles['variable_blocks'];
+    const logicStyle = theme.blockStyles['logic_blocks'];
 
     theme.setBlockStyle(MRC_STYLE_FUNCTIONS, {
         ...procedureStyle
@@ -74,12 +76,14 @@ export const add_mrc_styles = function (theme: Blockly.Theme): Blockly.Theme {
         colourTertiary: "#494984",
         hat: ""
     });
+    theme.setBlockStyle(MRC_STYLE_NONE, {
+        ...logicStyle
+    });
     theme.setBlockStyle(MRC_STYLE_MECHANISMS, {
         colourPrimary: "#5b61a5",
         colourSecondary: "#dedfed",
         colourTertiary: "#494e84",
         hat: ""
-
     });
     theme.setBlockStyle(MRC_STYLE_COMPONENTS, {
         colourPrimary: "#5b80a5",