Skip to content
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.

Sign up for GitHub

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

fix(core): fix potential NPE when reading default init options from global object in dev environment #19217

Merged
merged 3 commits into from
Oct 18, 2023
Merged

fix(core): fix potential NPE when reading default init options from global object in dev environment #19217

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9671901
fix: '__ECHARTS__DEFAULT__RENDERER__' of undefined
sunpm Oct 17, 2023
a7ff9ff
fix: Reduce converted code size
sunpm Oct 18, 2023
d709d28
fix: Remove ternary operations
sunpm Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/echarts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,11 @@ class ECharts extends Eventful<ECEventDefinition> {
env.hasGlobalWindow ? window : global
) as any;

defaultRenderer = root.__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
defaultRenderer = root?.__ECHARTS__DEFAULT__RENDERER__ ?? defaultRenderer;
Copy link
Member

@plainheart plainheart Oct 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the build target of ECharts is currently still ES3, to reduce the transpiled code size as possible, instead of ?. and ??, just fallback root to {} when it is not defined or simply surround the block (line 421- line 428) with if (root) {}.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. I overlooked that. I'll revise it.


defaultCoarsePointer = retrieve2(root.__ECHARTS__DEFAULT__COARSE_POINTER, defaultCoarsePointer);

const devUseDirtyRect = root.__ECHARTS__DEFAULT__USE_DIRTY_RECT__;
const devUseDirtyRect = root?.__ECHARTS__DEFAULT__USE_DIRTY_RECT__ ?? null;
defaultUseDirtyRect = devUseDirtyRect == null
? defaultUseDirtyRect
: devUseDirtyRect;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this three lines.

Expand Down