Skip to content

Merge master to release for 5.3.1 #892

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

Merged
Ovilia merged 5 commits into from
Feb 28, 2022
Merged

Merge master to release for 5.3.1 #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43eb093
Merge pull request #888 from ecomfe/release
pissang Jan 26, 2022
1ad0202
fix(svg): fix shared vnode in pattern brings render issue
pissang Feb 9, 2022
e25b110
Merge pull request #889 from ecomfe/fix-svg-pattern
pissang Feb 9, 2022
8e0e0d0
Update index.d.ts
lzxb Feb 14, 2022
4e721ed
Merge pull request #890 from lzxb/patch-4
pissang Feb 14, 2022
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 index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './src/zrender';
export * from './src/export';
export * from './lib/zrender';
export * from './lib/export';
4 changes: 2 additions & 2 deletions src/svg/graphic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import mapStyleToAttrs from './mapStyleToAttrs';
import { SVGVNodeAttrs, createVNode, SVGVNode, vNodeToString, BrushScope } from './core';
import { MatrixArray } from '../core/matrix';
import Displayable from '../graphic/Displayable';
import { assert, isFunction, isString, logError, map, retrieve2 } from '../core/util';
import { assert, clone, isFunction, isString, logError, map, retrieve2 } from '../core/util';
import Polyline from '../graphic/shape/Polyline';
import Polygon from '../graphic/shape/Polygon';
import { GradientObject } from '../graphic/Gradient';
Expand Down Expand Up @@ -538,7 +538,7 @@ function setPattern(
}
else if (val.svgElement) { // Only string supported in SSR.
// TODO it's not so good to use textContent as innerHTML
child = val.svgElement;
child = clone(val.svgElement);
patternAttrs.width = val.svgWidth;
patternAttrs.height = val.svgHeight;
}
Expand Down