Comparing version 5.0.0 to 5.0.1
@@ -454,3 +454,3 @@ import Clip from './Clip'; | ||
this._loop = loop; | ||
if (loop) { | ||
if (loop && additiveTo) { | ||
logError('Can\' use additive animation on looped animation.'); | ||
@@ -457,0 +457,0 @@ return; |
@@ -7,3 +7,3 @@ import { Dictionary, ArrayLike, KeyOfDistributive } from './types'; | ||
export declare function guid(): number; | ||
export declare function logError(...args: string[]): void; | ||
export declare function logError(...args: any[]): void; | ||
export declare function clone<T extends any>(source: T): T; | ||
@@ -10,0 +10,0 @@ export declare function merge<T extends Dictionary<any>, S extends Dictionary<any>>(target: T, source: S, overwrite?: boolean): T & S; |
@@ -44,3 +44,3 @@ var BUILTIN_OBJECT = { | ||
if (typeof console !== 'undefined') { | ||
console.error.apply(args); | ||
console.error.apply(console, args); | ||
} | ||
@@ -47,0 +47,0 @@ } |
@@ -95,3 +95,3 @@ import { TextAlign, TextVerticalAlign, ImageLike, Dictionary, MapToType } from '../core/types'; | ||
constructor(opts?: TextProps); | ||
childrenRef(): (TSpan | ZRImage | Rect)[]; | ||
childrenRef(): (ZRImage | Rect | TSpan)[]; | ||
update(): void; | ||
@@ -98,0 +98,0 @@ getComputedTransform(): MatrixArray; |
@@ -8,5 +8,5 @@ import Definable from './Definable'; | ||
add(gradient: GradientObject): SVGElement; | ||
update(gradient: GradientObject): void; | ||
update(gradient: GradientObject | string): void; | ||
updateDom(gradient: GradientObject, dom: SVGElement): void; | ||
markUsed(displayable: Displayable): void; | ||
} |
@@ -11,2 +11,6 @@ import { __extends } from "tslib"; | ||
} | ||
function isGradient(value) { | ||
return value && (value.type === 'linear' | ||
|| value.type === 'radial'); | ||
} | ||
var GradientManager = (function (_super) { | ||
@@ -22,5 +26,3 @@ __extends(GradientManager, _super); | ||
var value = displayable.style[fillOrStroke]; | ||
if (value | ||
&& (value.type === 'linear' | ||
|| value.type === 'radial')) { | ||
if (isGradient(value)) { | ||
var gradient = value; | ||
@@ -65,2 +67,5 @@ var defs = that_1.getDefs(true); | ||
GradientManager.prototype.update = function (gradient) { | ||
if (!isGradient(gradient)) { | ||
return; | ||
} | ||
var that = this; | ||
@@ -67,0 +72,0 @@ this.doUpdate(gradient, function () { |
@@ -8,5 +8,5 @@ import Definable from './Definable'; | ||
add(pattern: PatternObject): SVGElement; | ||
update(pattern: PatternObject): void; | ||
update(pattern: PatternObject | string): void; | ||
updateDom(pattern: PatternObject, patternDom: SVGElement): void; | ||
markUsed(displayable: Displayable): void; | ||
} |
@@ -6,2 +6,3 @@ import { __extends } from "tslib"; | ||
import { createOrUpdateImage } from '../../graphic/helper/image'; | ||
import WeakMap from '../../core/WeakMap'; | ||
function isPattern(value) { | ||
@@ -134,3 +135,3 @@ return value && (!!value.image || !!value.svgElement); | ||
if (isPattern(displayable.style.stroke)) { | ||
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill)); | ||
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke)); | ||
} | ||
@@ -137,0 +138,0 @@ } |
@@ -91,5 +91,5 @@ /*! | ||
export declare function registerPainter(name: string, Ctor: PainterBaseCtor): void; | ||
export declare const version = "5.0.0"; | ||
export declare const version = "5.0.1"; | ||
export interface ZRenderType extends ZRender { | ||
} | ||
export {}; |
@@ -184,3 +184,3 @@ /*! | ||
this._needsRefreshHover = false; | ||
if (this.painter.refreshHover) { | ||
if (this.painter.refreshHover && this.painter.getType() === 'canvas') { | ||
this.painter.refreshHover(); | ||
@@ -270,3 +270,3 @@ } | ||
} | ||
export var version = '5.0.0'; | ||
export var version = '5.0.1'; | ||
; |
@@ -461,3 +461,3 @@ "use strict"; | ||
this._loop = loop; | ||
if (loop) { | ||
if (loop && additiveTo) { | ||
util_1.logError('Can\' use additive animation on looped animation.'); | ||
@@ -464,0 +464,0 @@ return; |
@@ -7,3 +7,3 @@ import { Dictionary, ArrayLike, KeyOfDistributive } from './types'; | ||
export declare function guid(): number; | ||
export declare function logError(...args: string[]): void; | ||
export declare function logError(...args: any[]): void; | ||
export declare function clone<T extends any>(source: T): T; | ||
@@ -10,0 +10,0 @@ export declare function merge<T extends Dictionary<any>, S extends Dictionary<any>>(target: T, source: S, overwrite?: boolean): T & S; |
@@ -48,3 +48,3 @@ "use strict"; | ||
if (typeof console !== 'undefined') { | ||
console.error.apply(args); | ||
console.error.apply(console, args); | ||
} | ||
@@ -51,0 +51,0 @@ } |
@@ -95,3 +95,3 @@ import { TextAlign, TextVerticalAlign, ImageLike, Dictionary, MapToType } from '../core/types'; | ||
constructor(opts?: TextProps); | ||
childrenRef(): (TSpan | ZRImage | Rect)[]; | ||
childrenRef(): (ZRImage | Rect | TSpan)[]; | ||
update(): void; | ||
@@ -98,0 +98,0 @@ getComputedTransform(): MatrixArray; |
@@ -8,5 +8,5 @@ import Definable from './Definable'; | ||
add(gradient: GradientObject): SVGElement; | ||
update(gradient: GradientObject): void; | ||
update(gradient: GradientObject | string): void; | ||
updateDom(gradient: GradientObject, dom: SVGElement): void; | ||
markUsed(displayable: Displayable): void; | ||
} |
@@ -13,2 +13,6 @@ "use strict"; | ||
} | ||
function isGradient(value) { | ||
return value && (value.type === 'linear' | ||
|| value.type === 'radial'); | ||
} | ||
var GradientManager = (function (_super) { | ||
@@ -24,5 +28,3 @@ tslib_1.__extends(GradientManager, _super); | ||
var value = displayable.style[fillOrStroke]; | ||
if (value | ||
&& (value.type === 'linear' | ||
|| value.type === 'radial')) { | ||
if (isGradient(value)) { | ||
var gradient = value; | ||
@@ -67,2 +69,5 @@ var defs = that_1.getDefs(true); | ||
GradientManager.prototype.update = function (gradient) { | ||
if (!isGradient(gradient)) { | ||
return; | ||
} | ||
var that = this; | ||
@@ -69,0 +74,0 @@ this.doUpdate(gradient, function () { |
@@ -8,5 +8,5 @@ import Definable from './Definable'; | ||
add(pattern: PatternObject): SVGElement; | ||
update(pattern: PatternObject): void; | ||
update(pattern: PatternObject | string): void; | ||
updateDom(pattern: PatternObject, patternDom: SVGElement): void; | ||
markUsed(displayable: Displayable): void; | ||
} |
@@ -8,6 +8,7 @@ "use strict"; | ||
var image_1 = require("../../graphic/helper/image"); | ||
var WeakMap_1 = require("../../core/WeakMap"); | ||
function isPattern(value) { | ||
return value && (!!value.image || !!value.svgElement); | ||
} | ||
var patternDomMap = new WeakMap(); | ||
var patternDomMap = new WeakMap_1["default"](); | ||
var PatternManager = (function (_super) { | ||
@@ -136,3 +137,3 @@ tslib_1.__extends(PatternManager, _super); | ||
if (isPattern(displayable.style.stroke)) { | ||
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill)); | ||
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke)); | ||
} | ||
@@ -139,0 +140,0 @@ } |
@@ -91,5 +91,5 @@ /*! | ||
export declare function registerPainter(name: string, Ctor: PainterBaseCtor): void; | ||
export declare const version = "5.0.0"; | ||
export declare const version = "5.0.1"; | ||
export interface ZRenderType extends ZRender { | ||
} | ||
export {}; |
@@ -186,3 +186,3 @@ "use strict"; | ||
this._needsRefreshHover = false; | ||
if (this.painter.refreshHover) { | ||
if (this.painter.refreshHover && this.painter.getType() === 'canvas') { | ||
this.painter.refreshHover(); | ||
@@ -277,3 +277,3 @@ } | ||
exports.registerPainter = registerPainter; | ||
exports.version = '5.0.0'; | ||
exports.version = '5.0.1'; | ||
; |
{ | ||
"name": "zrender", | ||
"version": "5.0.0", | ||
"version": "5.0.1", | ||
"description": "A lightweight canvas library.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -719,3 +719,3 @@ /** | ||
this._loop = loop; | ||
if (loop) { | ||
if (loop && additiveTo) { | ||
logError('Can\' use additive animation on looped animation.'); | ||
@@ -722,0 +722,0 @@ return; |
@@ -57,5 +57,5 @@ import { Dictionary, ArrayLike, KeyOfDistributive } from './types'; | ||
export function logError(...args: string[]) { | ||
export function logError(...args: any[]) { | ||
if (typeof console !== 'undefined') { | ||
console.error.apply(args); | ||
console.error.apply(console, args); | ||
} | ||
@@ -62,0 +62,0 @@ } |
import Path from './graphic/Path'; | ||
import TSpan from './graphic/TSpan'; | ||
import ZRImage from './graphic/Image'; | ||
@@ -7,3 +6,2 @@ import { GradientObject } from './graphic/Gradient'; | ||
import { Dictionary } from './core/types'; | ||
import Displayable from './graphic/Displayable'; | ||
@@ -10,0 +8,0 @@ interface PainterOption { |
@@ -22,2 +22,10 @@ /** | ||
function isGradient(value: GradientObject | string): value is GradientObject { | ||
return value && ( | ||
(value as GradientObject).type === 'linear' | ||
|| (value as GradientObject).type === 'radial' | ||
); | ||
} | ||
type GradientObjectExtended = GradientObject & { | ||
@@ -55,6 +63,3 @@ __dom: SVGElement | ||
let value = displayable.style[fillOrStroke] as GradientObject; | ||
if (value | ||
&& (value.type === 'linear' | ||
|| value.type === 'radial') | ||
) { | ||
if (isGradient(value)) { | ||
const gradient = value as GradientObjectExtended; | ||
@@ -125,5 +130,9 @@ const defs = that.getDefs(true); | ||
* | ||
* @param {Gradient} gradient zr gradient instance | ||
* @param gradient zr gradient instance or color string | ||
*/ | ||
update(gradient: GradientObject) { | ||
update(gradient: GradientObject | string) { | ||
if (!isGradient(gradient)) { | ||
return; | ||
} | ||
const that = this; | ||
@@ -130,0 +139,0 @@ this.doUpdate(gradient, function () { |
@@ -12,5 +12,6 @@ /** | ||
import {createOrUpdateImage} from '../../graphic/helper/image'; | ||
import WeakMap from '../../core/WeakMap'; | ||
function isPattern(value: PatternObject): value is PatternObject { | ||
return value && (!!value.image || !!value.svgElement); | ||
function isPattern(value: PatternObject | string): value is PatternObject { | ||
return value && (!!(value as PatternObject).image || !!(value as PatternObject).svgElement); | ||
} | ||
@@ -105,5 +106,5 @@ | ||
* | ||
* @param {Pattern} pattern zr pattern instance | ||
* @param pattern zr pattern instance or color string | ||
*/ | ||
update(pattern: PatternObject) { | ||
update(pattern: PatternObject | string) { | ||
if (!isPattern(pattern)) { | ||
@@ -215,3 +216,3 @@ return; | ||
if (isPattern(displayable.style.stroke)) { | ||
super.markDomUsed(patternDomMap.get(displayable.style.fill)); | ||
super.markDomUsed(patternDomMap.get(displayable.style.stroke)); | ||
} | ||
@@ -218,0 +219,0 @@ } |
@@ -239,6 +239,6 @@ /** | ||
if (svgElement && displayable.style) { | ||
gradientManager.update(displayable.style.fill as GradientObject); | ||
gradientManager.update(displayable.style.stroke as GradientObject); | ||
patternManager.update(displayable.style.fill as PatternObject); | ||
patternManager.update(displayable.style.stroke as PatternObject); | ||
gradientManager.update(displayable.style.fill); | ||
gradientManager.update(displayable.style.stroke); | ||
patternManager.update(displayable.style.fill); | ||
patternManager.update(displayable.style.stroke); | ||
shadowManager.update(svgElement, displayable); | ||
@@ -245,0 +245,0 @@ } |
@@ -327,3 +327,3 @@ /*! | ||
this._needsRefreshHover = false; | ||
if (this.painter.refreshHover) { | ||
if (this.painter.refreshHover && this.painter.getType() === 'canvas') { | ||
this.painter.refreshHover(); | ||
@@ -524,5 +524,5 @@ } | ||
*/ | ||
export const version = '5.0.0'; | ||
export const version = '5.0.1'; | ||
export interface ZRenderType extends ZRender {}; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
5226809
84439