Fix cloning of Icon style when IconImage is not cached
This commit is contained in:
+11
-9
@@ -140,9 +140,10 @@ class Icon extends ImageStyle {
|
|||||||
const image = options.img !== undefined ? options.img : null;
|
const image = options.img !== undefined ? options.img : null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {import("../size.js").Size}
|
* @private
|
||||||
|
* @type {import("../size.js").Size|undefined}
|
||||||
*/
|
*/
|
||||||
const imgSize = options.imgSize !== undefined ? options.imgSize : null;
|
this.imgSize_ = options.imgSize;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {string|undefined}
|
* @type {string|undefined}
|
||||||
@@ -150,7 +151,7 @@ class Icon extends ImageStyle {
|
|||||||
let src = options.src;
|
let src = options.src;
|
||||||
|
|
||||||
assert(!(src !== undefined && image), 4); // `image` and `src` cannot be provided at the same time
|
assert(!(src !== undefined && image), 4); // `image` and `src` cannot be provided at the same time
|
||||||
assert(!image || (image && imgSize), 5); // `imgSize` must be set when `image` is provided
|
assert(!image || (image && this.imgSize_), 5); // `imgSize` must be set when `image` is provided
|
||||||
|
|
||||||
if ((src === undefined || src.length === 0) && image) {
|
if ((src === undefined || src.length === 0) && image) {
|
||||||
src = /** @type {HTMLImageElement} */ (image).src || getUid(image);
|
src = /** @type {HTMLImageElement} */ (image).src || getUid(image);
|
||||||
@@ -176,7 +177,7 @@ class Icon extends ImageStyle {
|
|||||||
this.iconImage_ = getIconImage(
|
this.iconImage_ = getIconImage(
|
||||||
image,
|
image,
|
||||||
/** @type {string} */ (src),
|
/** @type {string} */ (src),
|
||||||
imgSize,
|
this.imgSize_ !== undefined ? this.imgSize_ : null,
|
||||||
this.crossOrigin_,
|
this.crossOrigin_,
|
||||||
imageState,
|
imageState,
|
||||||
this.color_
|
this.color_
|
||||||
@@ -221,19 +222,20 @@ class Icon extends ImageStyle {
|
|||||||
anchorOrigin: this.anchorOrigin_,
|
anchorOrigin: this.anchorOrigin_,
|
||||||
anchorXUnits: this.anchorXUnits_,
|
anchorXUnits: this.anchorXUnits_,
|
||||||
anchorYUnits: this.anchorYUnits_,
|
anchorYUnits: this.anchorYUnits_,
|
||||||
crossOrigin: this.crossOrigin_,
|
|
||||||
color:
|
color:
|
||||||
this.color_ && this.color_.slice
|
this.color_ && this.color_.slice
|
||||||
? this.color_.slice()
|
? this.color_.slice()
|
||||||
: this.color_ || undefined,
|
: this.color_ || undefined,
|
||||||
src: this.getSrc(),
|
crossOrigin: this.crossOrigin_,
|
||||||
|
imgSize: this.imgSize_,
|
||||||
offset: this.offset_.slice(),
|
offset: this.offset_.slice(),
|
||||||
offsetOrigin: this.offsetOrigin_,
|
offsetOrigin: this.offsetOrigin_,
|
||||||
size: this.size_ !== null ? this.size_.slice() : undefined,
|
|
||||||
opacity: this.getOpacity(),
|
opacity: this.getOpacity(),
|
||||||
scale: Array.isArray(scale) ? scale.slice() : scale,
|
|
||||||
rotation: this.getRotation(),
|
|
||||||
rotateWithView: this.getRotateWithView(),
|
rotateWithView: this.getRotateWithView(),
|
||||||
|
rotation: this.getRotation(),
|
||||||
|
scale: Array.isArray(scale) ? scale.slice() : scale,
|
||||||
|
size: this.size_ !== null ? this.size_.slice() : undefined,
|
||||||
|
src: this.getSrc(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user