fix: zelos full block fields rendering badly #7490
Merged
Conversation
This file contains 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
|
Broke something with colour fields, will reopen in a sec. |
maribethb
reviewed
Sep 14, 2023
| @@ -797,7 +809,7 @@ export abstract class Field<T = any> | |||
| const xOffset = | |||
| margin !== undefined | |||
| ? margin | |||
| : this.borderRect_ | |||
| : !this.isFullBlockField() | |||
| ? this.getConstants()!.FIELD_BORDER_RECT_X_PADDING | |||
There was a problem hiding this comment.
no action required, but i wish the formatter would scooch these lines over because this stacked ternary operator makes me sad :(
There was a problem hiding this comment.
I guess the question is: do you want your stacked ternary formatted as if it is:
if (cond1) {
consequent1;
} else if (cond2) {
consequent2;
} else {
consequent3;
}or as if it is:
if (cond1) {
consequent1;
} else
if (cond2) {
consequent2;
} else {
consequent3;
}I would not say the latter style is particularly popular.
1 task
maribethb
approved these changes
Sep 14, 2023
core/block.ts
Outdated
| let nFields = 0; | ||
| for (const input of this.inputList) { | ||
| if (input.connection) return false; | ||
| // TODO: This comment is innacurate. Not sure what we want the spec to be. |
There was a problem hiding this comment.
I think you could just fix the comment. i assume by "text" it means "label" but it doesn't actually make sense to exclude those? like the full block rendering wouldn't make sense if there was a label. so i'd just update the comment.
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.
The basics
The details
Resolves
Fixes #7442
Proposed Changes
Makes it so that input fields (and subclasses) and colour fields properly switch back and forth between full block fields and normal fields when their blocks are modified.
Reason for Changes
Before they didn't have the ability to switch, so mutated blocks would break.
Test Coverage
Manually tested the following behaviors using the browser console for number inputs and colour fields:
I think this would be a good candidate for screen shot testing. The code is so jank and I don't think unit testing is worthwhile.
Documentation
N/A
Additional Information
I disagree with most of how full block fields were implemented, so I've added inline docs discouraging people from using these parts of the API. But they should now approximately work under most circumstances.
Also need to update the colour field in samples, working on that now.