Added reason parameter to mrcOnLoad methods.

In mrc_mechanism_component_holder.ts:
Removed code that uses change framework.
Replaced function setName with method MechanismComponentHolderBlock.setNameOfChildBlock.
Replaced function updateToolboxAfterDelay with method MechanismComponentHolderBlock.updateToolboxAfterDelay.
Added function mrcDescenantsMayHaveChanged, which calls method MechanismComponentHolderBlock.mrcDescenantsMayHaveChanged.
MechanismComponentHolderBlock.mrcDescenantsMayHaveChanged collects the ids of mechanisms, components, private components, and events and if they have changed, calls updateToolboxAfterDelay.

Updated mrc_mechanism, mrc_component, and mrc_event to call MechanismComponentHolderBlock.setNameOfChildBlock when they are connected to the holder.

Update mrc_mechanism, mrc_component, and mrc_event to call mrcDescendantsMayHaveChanged when they are moved.

Author: lizlooney

src/App.tsx

@@ -45,7 +45,6 @@ import * as clientSideStorage from './storage/client_side_storage';
 import * as CustomBlocks from './blocks/setup_custom_blocks';
 
 import { initialize as initializePythonBlocks } from './blocks/utils/python';
-import * as ChangeFramework from './blocks/utils/change_framework'
 import { registerToolboxButton } from './blocks/mrc_event_handler'
 import { mutatorOpenListener } from './blocks/mrc_param_container'
 import { TOOLBOX_UPDATE_EVENT } from './blocks/mrc_mechanism_component_holder';
@@ -487,7 +486,6 @@ const AppContent: React.FC<AppContentProps> = ({ project, setProject }): React.J
       return;
     }
 
-    ChangeFramework.setup(newWorkspace);
     newWorkspace.addChangeListener(mutatorOpenListener);
     newWorkspace.addChangeListener(handleBlocksChanged);
 

src/blocks/mrc_component.ts

@@ -30,7 +30,10 @@ import { getAllowedTypesForSetCheck, getClassData, getSubclassNames } from './ut
 import * as toolboxItems from '../toolbox/items';
 import * as storageModule from '../storage/module';
 import * as storageModuleContent from '../storage/module_content';
-import { BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER } from './mrc_mechanism_component_holder';
+import {
+    BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER,
+    MechanismComponentHolderBlock,
+    mrcDescendantsMayHaveChanged } from './mrc_mechanism_component_holder';
 import { createPort } from './mrc_port';
 import { ClassData, FunctionData } from './utils/python_json_types';
 import { renameMethodCallers } from './mrc_call_python_function'
@@ -164,6 +167,9 @@ const COMPONENT = {
     }
     return legalName;
   },
+  getComponentId: function (this: ComponentBlock): string {
+   return this.mrcComponentId;
+  },
   getComponent: function (this: ComponentBlock): storageModuleContent.Component | null {
     const componentName = this.getFieldValue(FIELD_NAME);
     const componentType = this.getFieldValue(FIELD_TYPE);
@@ -195,8 +201,15 @@ const COMPONENT = {
   /**
    * mrcOnMove is called when a ComponentBlock is moved.
    */
-  mrcOnMove: function(this: ComponentBlock): void {
+  mrcOnMove: function(this: ComponentBlock, reason: string[]): void {
     this.checkBlockIsInHolder();
+    if (reason.includes('connect')) {
+      const rootBlock: Blockly.Block | null = this.getRootBlock();
+      if (rootBlock && rootBlock.type === MRC_MECHANISM_COMPONENT_HOLDER) {
+        (rootBlock as MechanismComponentHolderBlock).setNameOfChildBlock(this);
+      }
+    }
+    mrcDescendantsMayHaveChanged(this.workspace);
   },
   checkBlockIsInHolder: function(this: ComponentBlock): void {
     const rootBlock: Blockly.Block | null = this.getRootBlock();

src/blocks/mrc_event.ts

@@ -25,7 +25,10 @@ import { MRC_STYLE_EVENTS } from '../themes/styles'
 import { Parameter } from './mrc_class_method_def';
 import { ExtendedPythonGenerator } from '../editor/extended_python_generator';
 import { MUTATOR_BLOCK_NAME, PARAM_CONTAINER_BLOCK_NAME, MethodMutatorArgBlock } from './mrc_param_container'
-import { BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER } from './mrc_mechanism_component_holder';
+import {
+    BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER,
+    MechanismComponentHolderBlock,
+    mrcDescendantsMayHaveChanged } from './mrc_mechanism_component_holder';
 import * as toolboxItems from '../toolbox/items';
 import * as storageModuleContent from '../storage/module_content';
 import { renameMethodCallers, mutateMethodCallers } from './mrc_call_python_function'
@@ -211,8 +214,15 @@ const EVENT = {
   /**
    * mrcOnMove is called when an EventBlock is moved.
    */
-  mrcOnMove: function(this: EventBlock): void {
+  mrcOnMove: function(this: EventBlock, reason: string[]): void {
     this.checkBlockIsInHolder();
+    if (reason.includes('connect')) {
+      const rootBlock: Blockly.Block | null = this.getRootBlock();
+      if (rootBlock && rootBlock.type === MRC_MECHANISM_COMPONENT_HOLDER) {
+        (rootBlock as MechanismComponentHolderBlock).setNameOfChildBlock(this);
+      }
+    }
+    mrcDescendantsMayHaveChanged(this.workspace);
   },
   checkBlockIsInHolder: function(this: EventBlock): void {
     const rootBlock: Blockly.Block | null = this.getRootBlock();
@@ -234,6 +244,9 @@ const EVENT = {
       }
     }
   },
+  getEventId: function (this: EventBlock): string {
+   return this.mrcEventId;
+  },
   getEvent: function (this: EventBlock): storageModuleContent.Event {
     const event: storageModuleContent.Event = {
       eventId: this.mrcEventId,

src/blocks/mrc_get_parameter.ts

@@ -82,7 +82,7 @@ const GET_PARAMETER_BLOCK = {
   /**
    * mrcOnMove is called when an EventBlock is moved.
    */
-  mrcOnMove: function(this: GetParameterBlock): void {
+  mrcOnMove: function(this: GetParameterBlock, _reason: string[]): void {
     this.checkBlockPlacement();
   },
   mrcOnAncestorMove: function(this: GetParameterBlock): void {
@@ -91,7 +91,7 @@ const GET_PARAMETER_BLOCK = {
   checkBlockPlacement: function(this: GetParameterBlock): void {
     const legalParameterNames: string[] = [];
 
-    const rootBlock: Blockly.Block = this.getRootBlock();
+    const rootBlock: Blockly.Block | null = this.getRootBlock();
     if (rootBlock.type === MRC_CLASS_METHOD_DEF) {
       // This block is within a class method definition.
       const classMethodDefBlock = rootBlock as ClassMethodDefBlock;

src/blocks/mrc_mechanism.ts

@@ -31,7 +31,10 @@ import * as toolboxItems from '../toolbox/items';
 import * as storageModule from '../storage/module';
 import * as storageModuleContent from '../storage/module_content';
 import * as storageNames from '../storage/names';
-import { BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER } from './mrc_mechanism_component_holder';
+import {
+    BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER,
+    MechanismComponentHolderBlock,
+    mrcDescendantsMayHaveChanged } from './mrc_mechanism_component_holder';
 import { renameMethodCallers } from './mrc_call_python_function'
 import { renameMechanismName as renameMechanismNameInEventHandlers } from './mrc_event_handler'
 import { createPort } from './mrc_port';
@@ -176,6 +179,9 @@ const MECHANISM = {
     }
     return legalName;
   },
+  getMechanismId: function (this: MechanismBlock): string {
+   return this.mrcMechanismId;
+  },
   getMechanism: function (this: MechanismBlock): storageModuleContent.MechanismInRobot | null {
     const mechanismName = this.getFieldValue(FIELD_NAME);
     const mechanismType = this.mrcImportModule + '.' + this.getFieldValue(FIELD_TYPE);
@@ -204,8 +210,15 @@ const MECHANISM = {
   /**
    * mrcOnMove is called when a MechanismBlock is moved.
    */
-  mrcOnMove: function(this: MechanismBlock): void {
+  mrcOnMove: function(this: MechanismBlock, reason: string[]): void {
     this.checkBlockIsInHolder();
+    if (reason.includes('connect')) {
+      const rootBlock: Blockly.Block | null = this.getRootBlock();
+      if (rootBlock && rootBlock.type === MRC_MECHANISM_COMPONENT_HOLDER) {
+        (rootBlock as MechanismComponentHolderBlock).setNameOfChildBlock(this);
+      }
+    }
+    mrcDescendantsMayHaveChanged(this.workspace);
   },
   checkBlockIsInHolder: function(this: MechanismBlock): void {
     const rootBlock: Blockly.Block | null = this.getRootBlock();