Split layout and draw for slots #524
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
webfiltered
reviewed
Feb 14, 2025
src/utils/layout.ts
Outdated
Comment on lines
1
to
26
| import { Point, ReadOnlyRect } from "@/interfaces" | ||
|
|
||
| export class LayoutElement<T> { | ||
| public readonly value: T | ||
| public readonly boundingRect: ReadOnlyRect | ||
| public readonly highlight?: boolean | ||
| public readonly invalid?: boolean | ||
|
|
||
| constructor(o: { | ||
| value: T | ||
| boundingRect: ReadOnlyRect | ||
| highlight?: boolean | ||
| invalid?: boolean | ||
| }) { | ||
| Object.assign(this, o) | ||
| this.value = o.value | ||
| this.boundingRect = o.boundingRect | ||
| } | ||
|
|
||
| get center(): Point { | ||
| return [ | ||
| this.boundingRect[0] + this.boundingRect[2] / 2, | ||
| this.boundingRect[1] + this.boundingRect[3] / 2, | ||
| ] | ||
| } | ||
| } |
There was a problem hiding this comment.
I am a bit confused by this class - on every layout:
- Convert slot to class if necessary
- Create new instance of LayoutElement
- Copy all properties of slot to layout element
- Copy original slot itself to layout element
If we want to create layout objects and attach them to data objects, we should probably do this once - during data object construction or lazy loaded. When updates are needed, update their values.
The benefit of replacing immutable structs in layout code doesn't really apply to JS (yet). As far as I know there's not actually proper tooling for handling this kind of thing (records are stage 2 apparently?).
There was a problem hiding this comment.
It probably won't happen in this PR but the plan is to only update layout object when actual layout happens, i.e. when node is getting resized
huchenlei
force-pushed
the
slots_layout
branch
from
13bcdfa to
f74774b
Compare
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.
Replaces #510
This PR handles a smaller scope that only rewrites the layout/draw of node slots.
Layout objects are stored directly on original slot refs as
_layoutElement.