[LG-5137]: refactor option updates and improve memory usage #2861
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
🦋 Changeset detectedLatest commit: f420e61 The changes in this PR will be included in the next version bump. This PR includes changesets to release 2 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
Size Change: -9 B (0%) Total Size: 1.51 MB
ℹ️ View Unchanged
|
tsck
approved these changes
May 20, 2025
Comment on lines
52
to
60
| if (!ready) { | ||
| return; | ||
| } | ||
|
|
||
| return () => { | ||
| removeFromGroup(); | ||
| }; | ||
| if (!groupId) { | ||
| return; | ||
| } | ||
|
|
||
| addToGroup(groupId); |
There was a problem hiding this comment.
Nit: I'm totally ok with the early return pattern used here, but this could be simplified to one boolean if you want
if (!ready || !groupId) {
return;
}
addToGroup(groupId);Or just simply:
if (ready && groupId) {
addToGroup(groupId);
}There was a problem hiding this comment.
oops I should have cleaned these up. I previously had them broken up for debugging purposes. will consolidate / abstract into readable variables where appropriate :)
charts/core/src/Echart/useEchart.ts
Outdated
Comment on lines
87
to
102
| if (!echartsCoreRef.current) { | ||
| return; | ||
| } | ||
|
|
||
| const echartsInstance = getEchartsInstance(); | ||
| const echartsInstance = echartsInstanceRef.current; | ||
|
|
||
| if ((echartsInstance as EChartsType).group !== groupId) { | ||
| (echartsInstance as EChartsType).group = groupId; | ||
| echartsCoreRef.current.connect(groupId); | ||
| if (!echartsInstance) { | ||
| return; | ||
| } | ||
|
|
||
| if (echartsInstance.group === groupId) { | ||
| return; | ||
| } | ||
| }, | ||
| ); | ||
|
|
||
| const removeFromGroup: EChartsInstance['removeFromGroup'] = withInstanceCheck( | ||
| () => { | ||
| const echartsInstance = getEchartsInstance(); | ||
| (echartsInstance as EChartsType).group = ''; | ||
| echartsInstance.group = groupId; | ||
| echartsCoreRef.current.connect(groupId); |
There was a problem hiding this comment.
Nit: Same thought regarding this code being a bit longer than necessary. Feel free to leave be but just wanted to throw out a more condensed alternative.
Suggested change
| if (!echartsCoreRef.current) { | |
| return; | |
| } | |
| const echartsInstance = getEchartsInstance(); | |
| const echartsInstance = echartsInstanceRef.current; | |
| if ((echartsInstance as EChartsType).group !== groupId) { | |
| (echartsInstance as EChartsType).group = groupId; | |
| echartsCoreRef.current.connect(groupId); | |
| if (!echartsInstance) { | |
| return; | |
| } | |
| if (echartsInstance.group === groupId) { | |
| return; | |
| } | |
| }, | |
| ); | |
| const removeFromGroup: EChartsInstance['removeFromGroup'] = withInstanceCheck( | |
| () => { | |
| const echartsInstance = getEchartsInstance(); | |
| (echartsInstance as EChartsType).group = ''; | |
| echartsInstance.group = groupId; | |
| echartsCoreRef.current.connect(groupId); | |
| if (echartsCoreRef.current | |
| && echartsInstanceRef.current | |
| && echartsInstance.group !== groupId) { | |
| echartsInstance.group = groupId; | |
| echartsCoreRef.current.connect(groupId); | |
| } |
charts/core/src/Echart/useEchart.ts
Outdated
Comment on lines
278
to
288
| if (!container) { | ||
| return; | ||
| } | ||
|
|
||
| if ( | ||
| echartsInstanceRef.current && | ||
| echartsInstanceRef.current.getDom() === container && | ||
| !echartsInstanceRef.current.isDisposed() | ||
| ) { | ||
| return; | ||
| } |
There was a problem hiding this comment.
Nit: Since these conditionals do the same things (return), they could be combined. If it feels too verbose the ref checks can be added to a named variable to make it more readable:
Suggested change
| if (!container) { | |
| return; | |
| } | |
| if ( | |
| echartsInstanceRef.current && | |
| echartsInstanceRef.current.getDom() === container && | |
| !echartsInstanceRef.current.isDisposed() | |
| ) { | |
| return; | |
| } | |
| const isChartRendered = echartsInstanceRef.current && | |
| echartsInstanceRef.current.getDom() === container && | |
| !echartsInstanceRef.current.isDisposed(); | |
| if (!container || isChartRendered) { | |
| return; | |
| } |
charts/core/src/Echart/useEchart.ts
Outdated
Comment on lines
321
to
331
| if (!echartsInstance) { | ||
| return; | ||
| } | ||
|
|
||
| if (echartsInstance.isDisposed()) { | ||
| return; | ||
| } | ||
|
|
||
| if (echartsInstance) { | ||
| (echartsInstance as EChartsType).dispose(); | ||
| if (echartsInstance.getDom() !== container) { | ||
| return; | ||
| } |
There was a problem hiding this comment.
Nit: I keep nitpicking these but again, it's really just a stylistic opinion so feel free to leave be if you prefer what's already there.
if (!echartsInstance ||
echartsInstance.isDisposed() ||
echartsInstance.getDom() !== container
) {
return;
}Or simply:
if (echartsInstance &&
!echartsInstance.isDisposed() &&
echartsInstance.getDom() === container
) {
activeHandlersMap.clear();
echartsInstance.dispose();
echartsInstanceRef.current = null;
}
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.
✍️ Proposed changes
🎟 Jira ticket: LG-5137
✅ Checklist
For bug fixes, new features & breaking changes
pnpm changesetand documented my changes🧪 How to test changes