@visactor/vrender 0.14.0-alpha.9 → 0.14.1-alpha.0

package/dist/index.js

@@ -129,7 +129,7 @@
 	};
 
 	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-	var global$e =
+	var global$d =
 	// eslint-disable-next-line es/no-global-this -- safe
 	check((typeof globalThis === "undefined" ? "undefined" : _typeof(globalThis)) == 'object' && globalThis) || check((typeof window === "undefined" ? "undefined" : _typeof(window)) == 'object' && window) ||
 	// eslint-disable-next-line no-restricted-globals -- safe
@@ -287,13 +287,13 @@
 	  return _typeof(it) == 'object' ? it !== null : isCallable$h(it);
 	};
 
-	var global$d = global$e;
+	var global$c = global$d;
 	var isCallable$g = isCallable$i;
 	var aFunction = function aFunction(argument) {
 	  return isCallable$g(argument) ? argument : undefined;
 	};
 	var getBuiltIn$6 = function getBuiltIn(namespace, method) {
-	  return arguments.length < 2 ? aFunction(global$d[namespace]) : global$d[namespace] && global$d[namespace][method];
+	  return arguments.length < 2 ? aFunction(global$c[namespace]) : global$c[namespace] && global$c[namespace][method];
 	};
 
 	var uncurryThis$k = functionUncurryThis;
@@ -301,10 +301,10 @@
 
 	var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
 
-	var global$c = global$e;
+	var global$b = global$d;
 	var userAgent = engineUserAgent;
-	var process = global$c.process;
-	var Deno = global$c.Deno;
+	var process = global$b.process;
+	var Deno = global$b.Deno;
 	var versions = process && process.versions || Deno && Deno.version;
 	var v8 = versions && versions.v8;
 	var match, version$1;
@@ -329,8 +329,8 @@
 	/* eslint-disable es/no-symbol -- required for testing */
 	var V8_VERSION = engineV8Version;
 	var fails$c = fails$g;
-	var global$b = global$e;
-	var $String$4 = global$b.String;
+	var global$a = global$d;
+	var $String$4 = global$a.String;
 
 	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
 	var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$c(function () {
@@ -405,27 +405,27 @@
 
 	var shared$4 = {exports: {}};
 
-	var global$a = global$e;
+	var global$9 = global$d;
 
 	// eslint-disable-next-line es/no-object-defineproperty -- safe
 	var defineProperty$4 = Object.defineProperty;
 	var defineGlobalProperty$3 = function defineGlobalProperty(key, value) {
 	  try {
-	    defineProperty$4(global$a, key, {
+	    defineProperty$4(global$9, key, {
 	      value: value,
 	      configurable: true,
 	      writable: true
 	    });
 	  } catch (error) {
-	    global$a[key] = value;
+	    global$9[key] = value;
 	  }
 	  return value;
 	};
 
-	var global$9 = global$e;
+	var global$8 = global$d;
 	var defineGlobalProperty$2 = defineGlobalProperty$3;
 	var SHARED = '__core-js_shared__';
-	var store$5 = global$9[SHARED] || defineGlobalProperty$2(SHARED, {});
+	var store$5 = global$8[SHARED] || defineGlobalProperty$2(SHARED, {});
 	var sharedStore = store$5;
 
 	var store$4 = sharedStore;
@@ -468,13 +468,13 @@
 	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id$3 + postfix, 36);
 	};
 
-	var global$8 = global$e;
+	var global$7 = global$d;
 	var shared$3 = sharedExports;
 	var hasOwn$a = hasOwnProperty_1;
 	var uid$2 = uid$3;
 	var NATIVE_SYMBOL = symbolConstructorDetection;
 	var USE_SYMBOL_AS_UID = useSymbolAsUid;
-	var _Symbol = global$8.Symbol;
+	var _Symbol = global$7.Symbol;
 	var WellKnownSymbolsStore = shared$3('wks');
 	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? _Symbol['for'] || _Symbol : _Symbol && _Symbol.withoutSetter || uid$2;
 	var wellKnownSymbol$b = function wellKnownSymbol(name) {
@@ -519,9 +519,9 @@
 	  return isSymbol(key) ? key : key + '';
 	};
 
-	var global$7 = global$e;
+	var global$6 = global$d;
 	var isObject$b = isObject$e;
-	var document$1 = global$7.document;
+	var document$1 = global$6.document;
 	// typeof document.createElement is 'object' in old IE
 	var EXISTS$1 = isObject$b(document$1) && isObject$b(document$1.createElement);
 	var documentCreateElement$1 = function documentCreateElement(it) {
@@ -674,9 +674,9 @@
 	}
 	var inspectSource$2 = store$3.inspectSource;
 
-	var global$6 = global$e;
+	var global$5 = global$d;
 	var isCallable$b = isCallable$i;
-	var WeakMap$2 = global$6.WeakMap;
+	var WeakMap$2 = global$5.WeakMap;
 	var weakMapBasicDetection = isCallable$b(WeakMap$2) && /native code/.test(String(WeakMap$2));
 
 	var shared$2 = sharedExports;
@@ -689,7 +689,7 @@
 	var hiddenKeys$5 = {};
 
 	var NATIVE_WEAK_MAP$1 = weakMapBasicDetection;
-	var global$5 = global$e;
+	var global$4 = global$d;
 	var isObject$9 = isObject$e;
 	var createNonEnumerableProperty$2 = createNonEnumerableProperty$3;
 	var hasOwn$7 = hasOwnProperty_1;
@@ -697,8 +697,8 @@
 	var sharedKey$2 = sharedKey$3;
 	var hiddenKeys$4 = hiddenKeys$5;
 	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-	var TypeError$1 = global$5.TypeError;
-	var WeakMap$1 = global$5.WeakMap;
+	var TypeError$1 = global$4.TypeError;
+	var WeakMap$1 = global$4.WeakMap;
 	var set, get$1, has$1;
 	var enforce = function enforce(it) {
 	  return has$1(it) ? get$1(it) : set(it, {});
@@ -1009,7 +1009,7 @@
 	var POLYFILL = isForced$2.POLYFILL = 'P';
 	var isForced_1 = isForced$2;
 
-	var global$4 = global$e;
+	var global$3 = global$d;
 	var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
 	var createNonEnumerableProperty$1 = createNonEnumerableProperty$3;
 	var defineBuiltIn$4 = defineBuiltIn$5;
@@ -1038,11 +1038,11 @@
 	  var STATIC = options.stat;
 	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
 	  if (GLOBAL) {
-	    target = global$4;
+	    target = global$3;
 	  } else if (STATIC) {
-	    target = global$4[TARGET] || defineGlobalProperty(TARGET, {});
+	    target = global$3[TARGET] || defineGlobalProperty(TARGET, {});
 	  } else {
-	    target = (global$4[TARGET] || {}).prototype;
+	    target = (global$3[TARGET] || {}).prototype;
 	  }
 	  if (target) for (key in source) {
 	    sourceProperty = source[key];
@@ -1543,7 +1543,7 @@
 	};
 
 	var $$a = _export;
-	var global$3 = global$e;
+	var global$2 = global$d;
 	var uncurryThis$9 = functionUncurryThis;
 	var isForced = isForced_1;
 	var defineBuiltIn$3 = defineBuiltIn$5;
@@ -1561,7 +1561,7 @@
 	  var IS_MAP = CONSTRUCTOR_NAME.indexOf('Map') !== -1;
 	  var IS_WEAK = CONSTRUCTOR_NAME.indexOf('Weak') !== -1;
 	  var ADDER = IS_MAP ? 'set' : 'add';
-	  var NativeConstructor = global$3[CONSTRUCTOR_NAME];
+	  var NativeConstructor = global$2[CONSTRUCTOR_NAME];
 	  var NativePrototype = NativeConstructor && NativeConstructor.prototype;
 	  var Constructor = NativeConstructor;
 	  var exported = {};
@@ -2507,7 +2507,7 @@
 	};
 
 	var FREEZING = freezing;
-	var global$2 = global$e;
+	var global$1 = global$d;
 	var uncurryThis$5 = functionUncurryThis;
 	var defineBuiltIns = defineBuiltIns$3;
 	var InternalMetadataModule = internalMetadataExports;
@@ -2532,7 +2532,7 @@
 	var seal = $Object.seal;
 	var FROZEN = {};
 	var SEALED = {};
-	var IS_IE11 = !global$2.ActiveXObject && 'ActiveXObject' in global$2;
+	var IS_IE11 = !global$1.ActiveXObject && 'ActiveXObject' in global$1;
 	var InternalWeakMap;
 	var wrapper = function wrapper(init) {
 	  return function WeakMap() {
@@ -6021,7 +6021,7 @@
 	}
 
 	const EnvContribution = Symbol.for('EnvContribution');
-	const Global = Symbol.for('Global');
+	const VGlobal = Symbol.for('VGlobal');
 
 	const defaultEnv = 'browser';
 	exports.DefaultGlobal = class DefaultGlobal {
@@ -6239,6 +6239,18 @@
 	        }
 	        return this.envContribution.loadBlob(url);
 	    }
+	    isChrome() {
+	        if (!this._env) {
+	            this.setEnv('browser');
+	        }
+	        return this._env === 'browser' && navigator.userAgent.indexOf('Chrome') > -1;
+	    }
+	    isSafari() {
+	        if (!this._env) {
+	            this.setEnv('browser');
+	        }
+	        return this._env === 'browser' && /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent);
+	    }
 	};
 	exports.DefaultGlobal = __decorate([
 	    injectable(),
@@ -10659,7 +10671,7 @@
 	    injectable(),
 	    __param(0, inject(ContributionProvider)),
 	    __param(0, named(TextMeasureContribution)),
-	    __param(1, inject(Global)),
+	    __param(1, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object, Object])
 	], exports.DefaultGraphicUtil);
 	var TransformMode;
@@ -14587,7 +14599,7 @@
 	        if (this.durations.length > this.durationsListThreshold) {
 	            this.durations.shift();
 	        }
-	        this.timeout = Math.max(this.durations.reduce((a, b) => a + b, 0) / this.durations.length, 1000 / 60);
+	        this.timeout = Math.min(Math.max(this.durations.reduce((a, b) => a + b, 0) / this.durations.length, 1000 / 60), 1000 / 30);
 	    }
 	}
 	const rafBasedSto = new RafBasedSTO();
@@ -18738,11 +18750,11 @@
 	};
 	exports.DefaultLayerService = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], exports.DefaultLayerService);
 
-	const Window = Symbol.for('Window');
+	const VWindow = Symbol.for('VWindow');
 	const WindowHandlerContribution = Symbol.for('WindowHandlerContribution');
 	exports.DefaultWindow = class DefaultWindow {
 	    global;
@@ -18856,7 +18868,7 @@
 	], exports.DefaultWindow.prototype, "postInit", null);
 	exports.DefaultWindow = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], exports.DefaultWindow);
 
@@ -18866,9 +18878,9 @@
 
 	var coreModule = new ContainerModule(bind => {
 	    bind(exports.DefaultGlobal).toSelf().inSingletonScope();
-	    bind(Global).toService(exports.DefaultGlobal);
+	    bind(VGlobal).toService(exports.DefaultGlobal);
 	    bind(exports.DefaultWindow).to(exports.DefaultWindow);
-	    bind(Window).toService(exports.DefaultWindow);
+	    bind(VWindow).toService(exports.DefaultWindow);
 	    bind(exports.DefaultGraphicUtil).toSelf().inSingletonScope();
 	    bind(GraphicUtil).toService(exports.DefaultGraphicUtil);
 	    bind(exports.DefaultTransformUtil).toSelf().inSingletonScope();
@@ -19852,7 +19864,7 @@
 	    }
 	    return 0;
 	}
-	function textLayoutOffsetY(baseline, lineHeight, fontSize) {
+	function textLayoutOffsetY(baseline, lineHeight, fontSize, buf = 0) {
 	    if (baseline === 'middle') {
 	        return -lineHeight / 2;
 	    }
@@ -19860,7 +19872,7 @@
 	        return 0;
 	    }
 	    if (baseline === 'bottom') {
-	        return -lineHeight;
+	        return buf - lineHeight;
 	    }
 	    if (!baseline || baseline === 'alphabetic') {
 	        if (!fontSize) {
@@ -20123,9 +20135,10 @@
 	        const textMeasure = application.graphicUtil.textMeasure;
 	        let width;
 	        let str;
-	        const buf = 2;
 	        const attribute = this.attribute;
-	        const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, stroke = textTheme.stroke, lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak } = attribute;
+	        const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak } = attribute;
+	        const buf = Math.max(2, fontSize * 0.075);
+	        const { lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf } = attribute;
 	        if (!this.shouldUpdateShape() && this.cache) {
 	            width = this.cache.clipedWidth;
 	            const dx = textDrawOffsetX(textAlign, width);
@@ -20158,8 +20171,12 @@
 	        }
 	        this.clearUpdateShapeTag();
 	        const dx = textDrawOffsetX(textAlign, width);
-	        const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-	        this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);
+	        let lh = lineHeight;
+	        if (vglobal.isSafari()) {
+	            lh += fontSize * 0.2;
+	        }
+	        const dy = textLayoutOffsetY(textBaseline, lh, fontSize, buf);
+	        this._AABBBounds.set(dx, dy, dx + width, dy + lh);
 	        if (stroke) {
 	            this._AABBBounds.expand(lineWidth / 2);
 	        }
@@ -28010,7 +28027,7 @@
 	};
 	exports.DefaultPickService = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __param(1, inject(ContributionProvider)),
 	    __param(1, named(PickItemInterceptor)),
 	    __metadata("design:paramtypes", [Object, Object])
@@ -28106,7 +28123,7 @@
 	};
 	exports.DefaultGlobalPickerService = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], exports.DefaultGlobalPickerService);
 
@@ -29451,7 +29468,7 @@
 	    __param(10, inject(CanvasPolygonPicker)),
 	    __param(11, inject(CanvasRichTextPicker)),
 	    __param(12, inject(DrawContribution)),
-	    __param(13, inject(Global)),
+	    __param(13, inject(VGlobal)),
 	    __param(14, inject(ContributionProvider)),
 	    __param(14, named(PickItemInterceptor)),
 	    __metadata("design:paramtypes", [Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
@@ -29776,7 +29793,7 @@
 	    injectable(),
 	    __param(0, inject(ContributionProvider)),
 	    __param(0, named(MathPickerContribution)),
-	    __param(1, inject(Global)),
+	    __param(1, inject(VGlobal)),
 	    __param(2, inject(ContributionProvider)),
 	    __param(2, named(PickItemInterceptor)),
 	    __metadata("design:paramtypes", [Object, Object, Object])
@@ -31014,7 +31031,7 @@
 	};
 	BrowserWindowHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], BrowserWindowHandlerContribution);
 
@@ -31380,7 +31397,7 @@
 	};
 	FeishuWindowHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], FeishuWindowHandlerContribution);
 
@@ -31793,7 +31810,7 @@
 	};
 	TaroWindowHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], TaroWindowHandlerContribution);
 
@@ -32169,7 +32186,7 @@
 	};
 	LynxWindowHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], LynxWindowHandlerContribution);
 
@@ -32438,7 +32455,7 @@
 	};
 	NodeWindowHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], NodeWindowHandlerContribution);
 
@@ -32771,7 +32788,7 @@
 	};
 	WxWindowHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], WxWindowHandlerContribution);
 
@@ -32912,7 +32929,7 @@
 	};
 	CanvasLayerHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], CanvasLayerHandlerContribution);
 
@@ -32987,7 +33004,7 @@
 	};
 	OffscreenLayerHandlerContribution = __decorate([
 	    injectable(),
-	    __param(0, inject(Global)),
+	    __param(0, inject(VGlobal)),
 	    __metadata("design:paramtypes", [Object])
 	], OffscreenLayerHandlerContribution);
 
@@ -33922,7 +33939,7 @@
 	    }
 	};
 	__decorate([
-	    inject(Global),
+	    inject(VGlobal),
 	    __metadata("design:type", Object)
 	], DefaultIncrementalDrawContribution.prototype, "global", void 0);
 	DefaultIncrementalDrawContribution = __decorate([
@@ -36266,8 +36283,8 @@
 	load$2(container);
 	load$1(container);
 	load(container);
-	const global$1 = container.get(Global);
-	application.global = global$1;
+	const vglobal = container.get(VGlobal);
+	application.global = vglobal;
 	const graphicUtil = container.get(GraphicUtil);
 	application.graphicUtil = graphicUtil;
 	const transformUtil = container.get(TransformUtil);
@@ -36902,8 +36919,8 @@
 	            beforeRender: new SyncHook(['stage']),
 	            afterRender: new SyncHook(['stage'])
 	        };
-	        this.global = container.get(Global);
-	        this.window = container.get(Window);
+	        this.global = container.get(VGlobal);
+	        this.window = container.get(VWindow);
 	        this.renderService = container.get(RenderService);
 	        this.pickerService = container.get(PickerService);
 	        this.pluginService = container.get(PluginService);
@@ -37333,7 +37350,7 @@
 	        });
 	    }
 	    renderToNewWindow(fullImage = true) {
-	        const window = container.get(Window);
+	        const window = container.get(VWindow);
 	        if (fullImage) {
 	            window.create({
 	                width: this.viewWidth,
@@ -37402,7 +37419,7 @@
 	    'rect'
 	];
 
-	const version = "0.14.0-alpha.9";
+	const version = "0.14.1-alpha.0";
 
 	exports.ACustomAnimate = ACustomAnimate;
 	exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;
@@ -37575,7 +37592,7 @@
 	exports.Theme = Theme;
 	exports.TimeOutTickHandler = TimeOutTickHandler;
 	exports.TransformUtil = TransformUtil;
-	exports.Window = Window;
+	exports.VWindow = VWindow;
 	exports.WindowHandlerContribution = WindowHandlerContribution;
 	exports.addArcToBezierPath = addArcToBezierPath$1;
 	exports.addAttributeToPrototype = addAttributeToPrototype;
@@ -37659,7 +37676,6 @@
 	exports.getTextBounds = getTextBounds;
 	exports.getTheme = getTheme;
 	exports.getThemeFromGroup = getThemeFromGroup;
-	exports.global = global$1;
 	exports.globalTheme = globalTheme;
 	exports.graphicCreator = graphicCreator;
 	exports.graphicService = graphicService;
@@ -37720,6 +37736,7 @@
 	exports.translate = translate;
 	exports.version = version;
 	exports.verticalLayout = verticalLayout;
+	exports.vglobal = vglobal;
 	exports.waitForAllSubLayers = waitForAllSubLayers;
 	exports.wrapCanvas = wrapCanvas;
 	exports.wrapContext = wrapContext;