-
Notifications
You must be signed in to change notification settings - Fork 9
Use a separate BlocklyComponent for each module #224
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
lizlooney
merged 10 commits into
wpilibsuite:main
from
lizlooney:pr_separate_blockly_workspaces
Sep 15, 2025
Merged
Use a separate BlocklyComponent for each module #224
lizlooney
merged 10 commits into
wpilibsuite:main
from
lizlooney:pr_separate_blockly_workspaces
Sep 15, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Renamed field currentModule to module. Renamed field currentProject to project. Renamed method getCurrentModuleType to getModuleType. Updated places where getCurrentModuleType was called.
…kspace is not known. Updated callers to explicitly call editor.getCurrentEditor only if appropriate.
…ted rather than via ref=.
…project from storage and put them in modulePathToContentText object. App passes modulePathToContentText to editor during loadModuleBlocks. When a module is saved, App updates modulePathToContentText. Modified editor to use modulePathToContentText instead of fetching module content from storage. Renamed saveBlocks to saveModule.
Replaced blocksEditor and blocklyComponent with modulePaths, modulePathToBocklyComponent and modulePathToEditor. modulePaths controls how BlocklyComponents are created. Changed code that used blocksEditor and blocklyComponent. Added activeEditor function that is called when currentModule changes. Added setupBlocklyComponent, a callback that is a called when a new BlocklyComponent is created. In BlocklyComponent.tsx: Renamed onWorkspaceRecreated to onWorkspaceCreated Added modulePath to BlocklyComponentProps. Pass modulePath to onBlocklyComponentCreated and onWorkspaceCreated callbacks. Added fields for parentDiv and savedScrollX/Y. Only call Blockly.svgResize if the workspace is visible and is the main workspace. Added setActive function and include it in BlocklyComponentType. In setActive, handle either the BlocklyComponenent becoming inactive or active by hiding or showing the blockly workspace. Update scroll position if necessary when going from inactive to active. In editor.ts: Make many fields readonly since an editor is no longer reused for different modules. Check whether the blockly workspace has been abandoned in many places.
…tor. Change mrcWorkspaceToCode to take a Module instead of GeneratorContext. Change mrcWorkspaceToCode to call context.setModule and this.init(workspace).
alan412
approved these changes
Sep 15, 2025
Collaborator
alan412
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I love how much faster this makes switching between tabs. Overall I think this is great. Just a couple of minor suggestions for improvement. They are minor enough suggestions that I went ahead and approved.
This was referenced Sep 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use a separate BlocklyComponent for each module