fix(blockfactory): replace hardcoded slot size with dynamic calculation#5103
Open
WillyEverGreen wants to merge 3 commits intosugarlabs:masterfrom
Open
fix(blockfactory): replace hardcoded slot size with dynamic calculation#5103WillyEverGreen wants to merge 3 commits intosugarlabs:masterfrom
WillyEverGreen wants to merge 3 commits intosugarlabs:masterfrom
Conversation
Replace hardcoded _slotSize = 21 with dynamic calculation based on block dimensions. The formula (2 * radius + innieY2 + strokeWidth) ensures clamp blocks scale properly with theme changes. Changes: - Update SVG constructor to compute _slotSize dynamically - Update setstrokeWidth() to recalculate dependent values - Add test case to verify dynamic calculation and updates This makes the codebase more maintainable and future-proof for theming support where block sizes may vary. Fixes the TODO comment in blockfactory.js line 77.
Contributor
|
❌ Some Jest tests failed. Please check the logs and fix the issues before merging. Failed Tests: |
Contributor
|
✅ All Jest tests passed! This PR is ready to merge. |
Contributor
|
✅ All Jest tests passed! This PR is ready to merge. |
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
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.
Summary
Replaces the hardcoded
_slotSize = 21injs/blockfactory.jswith a dynamic calculation derived from block geometry. This resolves the existing TODO and makes the layout logic more maintainable and theme-friendly.Problem
The slot size (the vertical spacing used in clamp blocks) was hardcoded to
21, which caused several issues:21Solution
The slot size is now computed dynamically using the formula:
This formula reflects the actual block geometry:
2 * _radius→ vertical space for rounded corners_innieY2→ innie connector height_strokeWidth→ border widthWith the current defaults:
The visual output remains unchanged while eliminating the hardcoded dependency.
Changes
1.
js/blockfactory.js(SVG constructor)_slotSizevalue with a derived calculation2.
js/blockfactory.js(setstrokeWidth)_innieY2and_slotSizewhenstrokeWidthchanges3.
js/__tests__/blockfactory.test.jsstrokeWidthchanges (e.g., 19.5)Testing
Benefits
Fixes
Resolves the TODO in
js/blockfactory.js(slot size computation).