@visactor/vrender-core 0.22.0-vstory.12 → 0.22.0-vstory.14

package/dist/index.es.js

@@ -607,15 +607,17 @@ class Container {
                 serviceIdentifier: injectIdentifier,
                 constructorArgsMetadata
             };
-            const bindings = this._bindingDictionary.get(injectIdentifier).filter(b => {
+            const bindings = (this._bindingDictionary.get(injectIdentifier) || []).filter(b => {
                 return b.constraint(target);
             });
-            const request = {
-                injectIdentifier,
-                metadata: constructorArgsMetadata,
-                bindings
-            };
-            arr.push(request);
+            if (bindings.length) {
+                const request = {
+                    injectIdentifier,
+                    metadata: constructorArgsMetadata,
+                    bindings: bindings
+                };
+                arr.push(request);
+            }
         }
         return arr;
     }
@@ -3286,7 +3288,7 @@ const DefaultTextStyle = {
 const DefaultPickStyle = {
     pickStrokeBuffer: 0
 };
-const DefaultStyle = Object.assign(Object.assign(Object.assign(Object.assign({ forceBoundsWidth: undefined, forceBoundsHeight: undefined, opacity: 1, background: null, autoAnimateTexture: false, textureRatio: 0, textureOptions: null, backgroundOpacity: 1, backgroundCornerRadius: 0, texture: null, textureColor: 'black', textureSize: 10, texturePadding: 2, backgroundMode: 'no-repeat', backgroundFit: true, backgroundClip: true, backgroundScale: 1, backgroundOffsetX: 0, backgroundOffsetY: 0, blur: 0, filter: '', cursor: null, html: null, react: null }, DefaultFillStyle), DefaultStrokeStyle), DefaultLayout), DefaultPickStyle);
+const DefaultStyle = Object.assign(Object.assign(Object.assign(Object.assign({ forceBoundsWidth: undefined, forceBoundsHeight: undefined, opacity: 1, background: null, autoAnimateTexture: false, textureRatio: 0, textureOptions: null, backgroundOpacity: 1, backgroundCornerRadius: 0, texture: null, textureColor: 'black', textureSize: 10, texturePadding: 2, backgroundMode: 'no-repeat', backgroundFit: true, backgroundKeepAspectRatio: false, backgroundClip: true, backgroundScale: 1, backgroundOffsetX: 0, backgroundOffsetY: 0, blur: 0, filter: '', cursor: null, html: null, react: null }, DefaultFillStyle), DefaultStrokeStyle), DefaultLayout), DefaultPickStyle);
 const DefaultConnectAttribute = {
     connectedType: 'none',
     connectedStyle: {},
@@ -3981,6 +3983,9 @@ let ATextMeasure = class ATextMeasure {
             metrics.actualBoundingBoxDescent == null ||
             metrics.fontBoundingBoxAscent == null ||
             metrics.fontBoundingBoxDescent == null) {
+            metrics = {
+                width: metrics.width
+            };
             const { ascent, descent } = this.measureTextBoundADscentEstimate(options);
             metrics.actualBoundingBoxAscent = ascent;
             metrics.actualBoundingBoxDescent = descent;
@@ -3988,6 +3993,13 @@ let ATextMeasure = class ATextMeasure {
             metrics.fontBoundingBoxDescent = descent;
         }
         if (metrics.actualBoundingBoxLeft == null || metrics.actualBoundingBoxRight == null) {
+            metrics = {
+                width: metrics.width,
+                actualBoundingBoxAscent: metrics.actualBoundingBoxAscent,
+                actualBoundingBoxDescent: metrics.actualBoundingBoxDescent,
+                fontBoundingBoxAscent: metrics.fontBoundingBoxAscent,
+                fontBoundingBoxDescent: metrics.fontBoundingBoxDescent
+            };
             const { left, right } = this.measureTextBoundLeftRightEstimate(options);
             metrics.actualBoundingBoxLeft = left;
             metrics.actualBoundingBoxRight = right;
@@ -18618,6 +18630,13 @@ class Wrapper {
     }
 }
 
+let supportIntl = false;
+try {
+    supportIntl = Intl && typeof Intl.Segmenter === 'function';
+}
+catch (e) {
+    supportIntl = false;
+}
 const RICHTEXT_UPDATE_TAG_KEY = [
     'width',
     'height',
@@ -18778,6 +18797,14 @@ class RichText extends Graphic {
             !(item.text && isString(item.text) && RichText.splitText(item.text).length > 1));
     }
     static splitText(text) {
+        if (supportIntl) {
+            const segmenter = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+            const segments = [];
+            for (const { segment } of segmenter.segment(text)) {
+                segments.push(segment);
+            }
+            return segments;
+        }
         return Array.from(text);
     }
     static TransformTextConfig2SingleCharacter(textConfig) {
@@ -18797,8 +18824,8 @@ class RichText extends Graphic {
         return tc;
     }
     updateAABBBounds(attribute, richtextTheme, aabbBounds) {
-        var _a, _b;
-        const { width = richtextTheme.width, height = richtextTheme.height, maxWidth = richtextTheme.maxWidth, maxHeight = richtextTheme.maxHeight, textAlign = richtextTheme.textAlign, textBaseline = richtextTheme.textBaseline, editOptions } = attribute;
+        var _a, _b, _c, _d;
+        const { width = richtextTheme.width, height = richtextTheme.height, maxWidth = richtextTheme.maxWidth, maxHeight = richtextTheme.maxHeight, textAlign = richtextTheme.textAlign, verticalDirection = (_b = (_a = attribute.textBaseline) !== null && _a !== void 0 ? _a : richtextTheme.textBaseline) !== null && _b !== void 0 ? _b : richtextTheme.verticalDirection, editOptions } = attribute;
         if (width > 0 && height > 0) {
             aabbBounds.set(0, 0, width, height);
         }
@@ -18811,12 +18838,12 @@ class RichText extends Graphic {
             contentWidth = typeof maxWidth === 'number' && contentWidth > maxWidth ? maxWidth : contentWidth || 0;
             aabbBounds.set(0, 0, contentWidth, contentHeight);
         }
-        if (editOptions && editOptions.keepHeightWhileEmpty && !aabbBounds.height() && !((_a = attribute.textConfig) === null || _a === void 0 ? void 0 : _a.length)) {
-            aabbBounds.y2 = aabbBounds.y1 + ((_b = attribute.fontSize) !== null && _b !== void 0 ? _b : 12);
+        if (editOptions && editOptions.keepHeightWhileEmpty && !aabbBounds.height() && !((_c = attribute.textConfig) === null || _c === void 0 ? void 0 : _c.length)) {
+            aabbBounds.y2 = aabbBounds.y1 + ((_d = attribute.fontSize) !== null && _d !== void 0 ? _d : 12);
             aabbBounds.x2 = aabbBounds.x1 + 2;
         }
         let deltaY = 0;
-        switch (textBaseline) {
+        switch (verticalDirection) {
             case 'top':
                 deltaY = 0;
                 break;
@@ -20105,7 +20132,7 @@ class DefaultBaseBackgroundRenderContribution {
     }
     drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
         var _a;
-        const { background, backgroundOpacity = (_a = graphic.attribute.fillOpacity) !== null && _a !== void 0 ? _a : graphicAttribute.backgroundOpacity, opacity = graphicAttribute.opacity, backgroundMode = graphicAttribute.backgroundMode, backgroundFit = graphicAttribute.backgroundFit, backgroundScale = graphicAttribute.backgroundScale, backgroundOffsetX = graphicAttribute.backgroundOffsetX, backgroundOffsetY = graphicAttribute.backgroundOffsetY, backgroundClip = graphicAttribute.backgroundClip } = graphic.attribute;
+        const { background, backgroundOpacity = (_a = graphic.attribute.fillOpacity) !== null && _a !== void 0 ? _a : graphicAttribute.backgroundOpacity, opacity = graphicAttribute.opacity, backgroundMode = graphicAttribute.backgroundMode, backgroundFit = graphicAttribute.backgroundFit, backgroundKeepAspectRatio = graphicAttribute.backgroundKeepAspectRatio, backgroundScale = graphicAttribute.backgroundScale, backgroundOffsetX = graphicAttribute.backgroundOffsetX, backgroundOffsetY = graphicAttribute.backgroundOffsetY, backgroundClip = graphicAttribute.backgroundClip } = graphic.attribute;
         if (!background) {
             return;
         }
@@ -20128,6 +20155,7 @@ class DefaultBaseBackgroundRenderContribution {
             this.doDrawImage(context, res.data, b, {
                 backgroundMode,
                 backgroundFit,
+                backgroundKeepAspectRatio,
                 backgroundScale,
                 backgroundOffsetX,
                 backgroundOffsetY
@@ -20147,14 +20175,20 @@ class DefaultBaseBackgroundRenderContribution {
         }
     }
     doDrawImage(context, data, b, params) {
-        const { backgroundMode, backgroundFit, backgroundScale = 1, backgroundOffsetX = 0, backgroundOffsetY = 0 } = params;
+        const { backgroundMode, backgroundFit, backgroundKeepAspectRatio, backgroundScale = 1, backgroundOffsetX = 0, backgroundOffsetY = 0 } = params;
         const targetW = b.width();
         const targetH = b.height();
         let w = targetW;
         let h = targetH;
         if (backgroundMode === 'no-repeat') {
             if (backgroundFit) {
-                context.drawImage(data, b.x1, b.y1, b.width(), b.height());
+                if (!backgroundKeepAspectRatio) {
+                    context.drawImage(data, b.x1, b.y1, b.width(), b.height());
+                }
+                else {
+                    const maxScale = Math.max(targetW / data.width, targetH / data.height);
+                    context.drawImage(data, b.x1 + backgroundOffsetX, b.y1 + backgroundOffsetY, data.width * maxScale * backgroundScale, data.height * maxScale * backgroundScale);
+                }
             }
             else {
                 const resW = data.width * backgroundScale;
@@ -20523,7 +20557,7 @@ class DefaultGroupBackgroundRenderContribution extends DefaultBaseBackgroundRend
         this.time = BaseRenderContributionTime.beforeFillStroke;
     }
     drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
-        const { background, backgroundMode = graphicAttribute.backgroundMode, backgroundFit = graphicAttribute.backgroundFit, backgroundScale = graphicAttribute.backgroundScale, backgroundOffsetX = graphicAttribute.backgroundOffsetX, backgroundOffsetY = graphicAttribute.backgroundOffsetY } = graphic.attribute;
+        const { background, backgroundMode = graphicAttribute.backgroundMode, backgroundFit = graphicAttribute.backgroundFit, backgroundKeepAspectRatio = graphicAttribute.backgroundKeepAspectRatio, backgroundScale = graphicAttribute.backgroundScale, backgroundOffsetX = graphicAttribute.backgroundOffsetX, backgroundOffsetY = graphicAttribute.backgroundOffsetY } = graphic.attribute;
         if (!background) {
             return;
         }
@@ -20538,6 +20572,7 @@ class DefaultGroupBackgroundRenderContribution extends DefaultBaseBackgroundRend
             this.doDrawImage(context, res.data, b, {
                 backgroundMode,
                 backgroundFit,
+                backgroundKeepAspectRatio,
                 backgroundScale,
                 backgroundOffsetX,
                 backgroundOffsetY
@@ -22441,7 +22476,7 @@ class DefaultTextBackgroundRenderContribution extends DefaultBaseBackgroundRende
     }
     drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         var _a, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const { backgroundMode = graphicAttribute.backgroundMode, backgroundFit = graphicAttribute.backgroundFit } = graphic.attribute;
+        const { backgroundMode = graphicAttribute.backgroundMode, backgroundFit = graphicAttribute.backgroundFit, backgroundKeepAspectRatio = graphicAttribute.backgroundKeepAspectRatio } = graphic.attribute;
         let { background } = graphic.attribute;
         if (!background) {
             return;
@@ -22498,7 +22533,7 @@ class DefaultTextBackgroundRenderContribution extends DefaultBaseBackgroundRende
                 context.setTransformFromMatrix(graphic.parent.globalTransMatrix, true);
             }
             context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute);
-            this.doDrawImage(context, res.data, b, { backgroundMode, backgroundFit });
+            this.doDrawImage(context, res.data, b, { backgroundMode, backgroundFit, backgroundKeepAspectRatio });
             context.highPerformanceRestore();
             context.setTransformForCurrent();
         }
@@ -24096,6 +24131,9 @@ let DefaultDrawContribution = class DefaultDrawContribution {
         this.backupDirtyBounds = new Bounds();
         this.global = application.global;
         this.layerService = application.layerService;
+        if (!isArray(this.contributions)) {
+            this.contributions = [this.contributions];
+        }
         this.init();
     }
     init() {
@@ -27040,8 +27078,9 @@ class EditModule {
         application.global.addEventListener('keydown', this.handleKeyDown);
     }
     parseCompositionStr(configIdx) {
+        var _a;
         const { textConfig = [] } = this.currRt.attribute;
-        const lastConfig = textConfig[configIdx];
+        const lastConfig = (_a = textConfig[configIdx]) !== null && _a !== void 0 ? _a : {};
         textConfig.splice(configIdx, 1);
         const text = lastConfig.text;
         const textList = text ? Array.from(text.toString()) : [];
@@ -27121,18 +27160,23 @@ class Selection {
         }
         return (_a = config[Math.min(idx, config.length - 1)][key]) !== null && _a !== void 0 ? _a : this.rt.attribute[key];
     }
-    getFormat(key) {
-        return this.getAllFormat(key)[0];
+    getFormat(key, supportOutAttr = false) {
+        return this.getAllFormat(key, supportOutAttr)[0];
     }
-    getAllFormat(key) {
+    getAllFormat(key, supportOutAttr = false) {
+        var _a, _b, _c, _d;
         const valSet = new Set();
         const minCursorIdx = Math.min(this.selectionStartCursorIdx, this.curCursorIdx);
         const maxCursorIdx = Math.max(this.selectionStartCursorIdx, this.curCursorIdx);
         if (minCursorIdx === maxCursorIdx) {
-            return [this._getFormat(key, minCursorIdx)];
+            return supportOutAttr
+                ? [(_a = this._getFormat(key, minCursorIdx)) !== null && _a !== void 0 ? _a : ((_b = this.rt) === null || _b === void 0 ? void 0 : _b.attribute)[key]]
+                : [this._getFormat(key, minCursorIdx)];
         }
         for (let i = Math.ceil(minCursorIdx); i <= Math.floor(maxCursorIdx); i++) {
-            const val = this._getFormat(key, i);
+            const val = supportOutAttr
+                ? (_c = this._getFormat(key, i)) !== null && _c !== void 0 ? _c : ((_d = this.rt) === null || _d === void 0 ? void 0 : _d.attribute)[key]
+                : this._getFormat(key, i);
             val && valSet.add(val);
         }
         return Array.from(valSet.values());
@@ -27197,10 +27241,10 @@ class RichTextEditPlugin {
             if (this.copyToClipboard(e)) {
                 return;
             }
-            if (this.fullSelection(e)) {
+            if (this.fullSelectionKeyHandler(e)) {
                 return;
             }
-            if (this.directKey(e)) {
+            if (this.directKeyHandler(e)) {
                 return;
             }
         };
@@ -27238,7 +27282,7 @@ class RichTextEditPlugin {
             }
             this.currRt = e.target;
             this.handleEnter(e);
-            e.target.once('pointerleave', this.handleLeave);
+            e.target.once('pointerleave', this.handleLeave, { capture: true });
             this.tryShowSelection(e, false);
         };
         this.handleEnter = (e) => {
@@ -27332,11 +27376,11 @@ class RichTextEditPlugin {
     activate(context) {
         this.pluginService = context;
         this.editModule = new EditModule();
-        context.stage.on('pointermove', this.handleMove);
-        context.stage.on('pointerdown', this.handlePointerDown);
-        context.stage.on('pointerup', this.handlePointerUp);
-        context.stage.on('pointerleave', this.handlePointerUp);
-        context.stage.on('dblclick', this.handleDBLClick);
+        context.stage.on('pointermove', this.handleMove, { capture: true });
+        context.stage.on('pointerdown', this.handlePointerDown, { capture: true });
+        context.stage.on('pointerup', this.handlePointerUp, { capture: true });
+        context.stage.on('pointerleave', this.handlePointerUp, { capture: true });
+        context.stage.on('dblclick', this.handleDBLClick, { capture: true });
         application.global.addEventListener('keydown', this.handleKeyDown);
         this.editModule.onInput(this.handleInput);
         this.editModule.onChange(this.handleChange);
@@ -27380,26 +27424,32 @@ class RichTextEditPlugin {
         this.setCursorAndTextArea(pos.x, pos.y1, pos.y2, this.currRt);
         this._tryShowSelection(pos, cache);
     }
-    fullSelection(e) {
+    fullSelection() {
+        const currRt = this.currRt;
+        if (!currRt) {
+            return;
+        }
+        const cache = currRt.getFrameCache();
+        if (!cache) {
+            return;
+        }
+        const { lines } = cache;
+        if (!(lines.length && lines[0].paragraphs.length)) {
+            return;
+        }
+        const totalCursorCount = lines.reduce((total, line) => total + line.paragraphs.length, 0) - 1;
+        this.selectionRange(-0.1, totalCursorCount + 0.1);
+    }
+    fullSelectionKeyHandler(e) {
         if ((application.global.isMacOS() && e.metaKey && e.key === 'a') ||
             (!application.global.isMacOS() && e.ctrlKey && e.key === 'a')) {
-            const currRt = this.currRt;
-            if (!currRt) {
-                return;
-            }
-            const cache = currRt.getFrameCache();
-            if (!cache) {
-                return;
-            }
-            const { lines } = cache;
-            const totalCursorCount = lines.reduce((total, line) => total + line.paragraphs.length, 0) - 1;
-            this.selectionRange(-0.1, totalCursorCount + 0.1);
+            this.fullSelection();
             e.preventDefault();
             return true;
         }
         return false;
     }
-    directKey(e) {
+    directKeyHandler(e) {
         if (!(e.key === 'ArrowUp' || e.key === 'ArrowDown' || e.key === 'ArrowLeft' || e.key === 'ArrowRight')) {
             return false;
         }
@@ -27497,7 +27547,7 @@ class RichTextEditPlugin {
             const placeholder = shadowRoot.getElementsByType('richtext')[0];
             placeholder && shadowRoot.removeChild(placeholder);
         }
-        const { textConfig, editOptions } = this.currRt.attribute;
+        const { textConfig, editOptions = {} } = this.currRt.attribute;
         if (textConfig && textConfig.length) {
             return;
         }
@@ -27516,9 +27566,16 @@ class RichTextEditPlugin {
         if (placeholderFontSize) {
             textConfigItem.fontSize = placeholderFontSize;
         }
-        this.shadowPlaceHolder = createRichText(Object.assign(Object.assign({}, this.currRt.attribute), { x: 0, y: 0, angle: 0, _debug_bounds: false, textConfig: [textConfigItem] }));
+        this.shadowPlaceHolder = createRichText(Object.assign(Object.assign({}, this.currRt.attribute), { x: 0, y: 0, dx: -this.deltaX, dy: -this.deltaY, angle: 0, textConfig: [textConfigItem] }));
         shadow.add(this.shadowPlaceHolder);
     }
+    getRichTextAABBBounds(rt) {
+        const { attribute } = rt;
+        if (!attribute.textConfig.length) {
+            return getRichTextBounds(Object.assign(Object.assign({}, this.shadowPlaceHolder.attribute), { x: attribute.x, y: attribute.y, textAlign: attribute.textAlign, boundsMode: 'accurate' }));
+        }
+        return rt.AABBBounds;
+    }
     tryShowInputBounds() {
         if (!(this.currRt && this.focusing)) {
             return;
@@ -27528,19 +27585,15 @@ class RichTextEditPlugin {
         if (!editOptions || !boundsStrokeWhenInput) {
             return;
         }
-        const { attribute } = this.currRt;
-        const b = this.currRt.AABBBounds;
-        let h = b.height();
-        if (!attribute.textConfig.length && this.editLine) {
-            const { points } = this.editLine.attribute;
-            h = points[1].y - points[0].y;
-        }
+        const b = this.getRichTextAABBBounds(this.currRt);
+        const height = b.height();
+        const width = b.width();
         this.shadowBounds = this.shadowBounds || createRect({});
         this.shadowBounds.setAttributes({
             x: 0,
             y: 0,
-            width: b.width(),
-            height: h,
+            width,
+            height,
             fill: false,
             stroke: boundsStrokeWhenInput,
             lineWidth: 1,
@@ -27549,6 +27602,7 @@ class RichTextEditPlugin {
         const shadow = this.getShadow(this.currRt);
         shadow.add(this.shadowBounds);
         this.offsetLineBgAndShadowBounds();
+        this.offsetShadowRoot();
     }
     trySyncPlaceholderToTextConfig() {
         if (!this.currRt) {
@@ -27558,7 +27612,7 @@ class RichTextEditPlugin {
         if (textConfig && textConfig.length) {
             return;
         }
-        if (!(editOptions && editOptions.placeholder)) {
+        if (!(editOptions && editOptions.placeholder && editOptions.syncPlaceholderToTextConfig)) {
             return;
         }
         const { placeholder } = editOptions;
@@ -27569,13 +27623,16 @@ class RichTextEditPlugin {
         });
     }
     deactivate(context) {
-        context.stage.off('pointermove', this.handleMove);
-        context.stage.off('pointerdown', this.handlePointerDown);
-        context.stage.off('pointerup', this.handlePointerUp);
-        context.stage.off('pointerleave', this.handlePointerUp);
-        context.stage.off('dblclick', this.handleDBLClick);
+        context.stage.off('pointermove', this.handleMove, { capture: true });
+        context.stage.off('pointerdown', this.handlePointerDown, { capture: true });
+        context.stage.off('pointerup', this.handlePointerUp, { capture: true });
+        context.stage.off('pointerleave', this.handlePointerUp, { capture: true });
+        context.stage.off('dblclick', this.handleDBLClick, { capture: true });
         application.global.addEventListener('keydown', this.handleKeyDown);
     }
+    stopPropagation(e) {
+        e.stopPropagation();
+    }
     onFocus(e, data) {
         this.updateCbs && this.updateCbs.forEach(cb => cb('beforeOnfocus', this));
         this.deFocus(false);
@@ -27591,8 +27648,11 @@ class RichTextEditPlugin {
         if (!cache) {
             return;
         }
-        this.computeGlobalDelta(cache);
-        shadowRoot.setAttributes({ shadowRootIdx: 1, pickable: false, x: this.deltaX, y: this.deltaY });
+        const { editOptions = {} } = this.currRt.attribute;
+        if (editOptions.stopPropagation) {
+            target.addEventListener('*', this.stopPropagation);
+        }
+        this.offsetShadowRoot(target);
         if (!this.editLine) {
             const line = createLine({ x: 0, y: 0, lineWidth: 1, stroke: 'black' });
             this.addAnimateToLine(line);
@@ -27624,6 +27684,23 @@ class RichTextEditPlugin {
         this.tryShowInputBounds();
         this.currRt.addUpdateBoundTag();
     }
+    offsetShadowRoot(rt) {
+        rt = rt || this.currRt;
+        if (!rt) {
+            return;
+        }
+        const shadowRoot = this.getShadow(rt);
+        if (!shadowRoot) {
+            return;
+        }
+        const cache = rt.getFrameCache();
+        if (!cache) {
+            return;
+        }
+        this.computeGlobalDelta(cache);
+        shadowRoot.setAttributes({ shadowRootIdx: 1, pickable: false, x: this.deltaX, y: this.deltaY });
+        this.shadowPlaceHolder && this.shadowPlaceHolder.setAttributes({ dx: -this.deltaX, dy: -this.deltaY });
+    }
     offsetLineBgAndShadowBounds() {
         const rt = this.currRt;
         const { textBaseline } = rt.attribute;
@@ -27654,6 +27731,10 @@ class RichTextEditPlugin {
         if (!target) {
             return;
         }
+        const { editOptions = {} } = target.attribute;
+        if (editOptions.stopPropagation) {
+            target.removeEventListener('*', this.stopPropagation);
+        }
         if (trulyDeFocus) {
             this.trySyncPlaceholderToTextConfig();
             target.detachShadow();
@@ -27891,6 +27972,9 @@ class RichTextEditPlugin {
     computeGlobalDelta(cache) {
         this.deltaX = 0;
         this.deltaY = 0;
+        if (cache.lines.length === 0 && this.shadowPlaceHolder) {
+            cache = this.shadowPlaceHolder.getFrameCache();
+        }
         const height = cache.height;
         const actualHeight = cache.actualHeight;
         const width = cache.lines.reduce((w, item) => Math.max(w, item.actualWidth), 0);
@@ -27941,6 +28025,7 @@ class RichTextEditPlugin {
         out.x += left;
         out.y += top;
         this.offsetLineBgAndShadowBounds();
+        this.offsetShadowRoot();
         this.editModule.moveTo(out.x, out.y, rt, this.curCursorIdx, this.selectionStartCursorIdx);
     }
     computedCursorPosByEvent(e, cache) {

package/es/common/inversify/annotation/optional.d.ts

@@ -0,0 +1,2 @@
+declare function optional(): <T>(target: import("./inject_base").DecoratorTarget<unknown>, targetKey?: string | symbol, indexOrPropertyDescriptor?: number) => void;
+export { optional };

package/es/common/inversify/annotation/optional.js

@@ -0,0 +1,12 @@
+import { Metadata } from "../meta-data";
+
+import { OPTIONAL_TAG } from "../metadata_keys";
+
+import { createTaggedDecorator } from "./inject_base";
+
+function optional() {
+    return createTaggedDecorator(new Metadata(OPTIONAL_TAG, !0));
+}
+
+export { optional };
+//# sourceMappingURL=optional.js.map

package/es/common/inversify/annotation/optional.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/common/inversify/annotation/optional.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,SAAS,QAAQ;IACf,OAAO,qBAAqB,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC","file":"optional.js","sourcesContent":["import { Metadata } from '../meta-data';\nimport { OPTIONAL_TAG } from '../metadata_keys';\nimport { createTaggedDecorator } from './inject_base';\n\nfunction optional() {\n  return createTaggedDecorator(new Metadata(OPTIONAL_TAG, true));\n}\n\nexport { optional };\n"]}

package/es/common/inversify/container.js

@@ -102,12 +102,15 @@ export class Container {
             }, injectIdentifier = metadata.inject || metadata.multiInject, target = {
                 serviceIdentifier: injectIdentifier,
                 constructorArgsMetadata: constructorArgsMetadata
-            }, request = {
-                injectIdentifier: injectIdentifier,
-                metadata: constructorArgsMetadata,
-                bindings: this._bindingDictionary.get(injectIdentifier).filter((b => b.constraint(target)))
-            };
-            arr.push(request);
+            }, bindings = (this._bindingDictionary.get(injectIdentifier) || []).filter((b => b.constraint(target)));
+            if (bindings.length) {
+                const request = {
+                    injectIdentifier: injectIdentifier,
+                    metadata: constructorArgsMetadata,
+                    bindings: bindings
+                };
+                arr.push(request);
+            }
         }
         return arr;
     }

package/es/common/inversify/container.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/inversify/container.ts"],"names":[],"mappings":"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","file":"container.js","sourcesContent":["import { Generator } from '../generator';\nimport { Binding } from './binding';\nimport type { interfaces } from './interfaces';\nimport { BindingScopeEnum, BindingTypeEnum } from './literal_types';\nimport { Metadata } from './meta-data';\nimport { INJECT_TAG, MULTI_INJECT_TAG, NAMED_TAG } from './metadata_keys';\nimport { MetadataReader } from './metadata_reader';\nimport { BindingToSyntax } from './syntax/binding_to_syntax';\n\ninterface IChildRequest {\n  injectIdentifier: any;\n  metadata: interfaces.Metadata<unknown>[];\n  bindings: Binding<unknown>[];\n}\n\ninterface GetArgs<T> {\n  avoidConstraints: boolean;\n  isMultiInject: boolean;\n  serviceIdentifier: interfaces.ServiceIdentifier<T>;\n  key: string | symbol;\n  value: any;\n}\n\nexport class Container {\n  id: number;\n  readonly options: interfaces.ContainerOptions;\n  private _bindingDictionary: Map<any, Binding<unknown>[]>;\n  private _metadataReader: interfaces.MetadataReader;\n\n  constructor(containerOptions?: interfaces.ContainerOptions) {\n    const options = containerOptions || {};\n    options.defaultScope = options.defaultScope || BindingScopeEnum.Transient;\n    // console.log(this);\n    this.options = options;\n    this.id = Generator.GenAutoIncrementId();\n    this._bindingDictionary = new Map();\n    this._metadataReader = new MetadataReader();\n  }\n\n  load(module: interfaces.ContainerModule) {\n    const getHelpers = this._getContainerModuleHelpersFactory();\n\n    const containerModuleHelpers = getHelpers(module.id);\n\n    module.registry(\n      containerModuleHelpers.bindFunction as interfaces.Bind,\n      containerModuleHelpers.unbindFunction,\n      containerModuleHelpers.isboundFunction,\n      containerModuleHelpers.rebindFunction as interfaces.Rebind\n    );\n  }\n\n  get<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): T {\n    const getArgs = this._getNotAllArgs(serviceIdentifier, false);\n\n    return this._get<T>(getArgs) as T;\n  }\n\n  getAll<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): T[] {\n    const getArgs = this._getAllArgs(serviceIdentifier);\n\n    return this._get<T>(getArgs) as T[];\n  }\n\n  getTagged<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, key: string | number | symbol, value: unknown): T {\n    const getArgs = this._getNotAllArgs(serviceIdentifier, false, key, value);\n\n    return this._get<T>(getArgs) as T;\n  }\n\n  getNamed<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, named: string | number | symbol): T {\n    return this.getTagged<T>(serviceIdentifier, NAMED_TAG, named);\n  }\n\n  isBound(serviceIdentifier: interfaces.ServiceIdentifier<unknown>): boolean {\n    return this._bindingDictionary.has(serviceIdentifier);\n  }\n\n  // Registers a type binding\n  bind<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): interfaces.BindingToSyntax<T> {\n    const scope = this.options.defaultScope;\n    const binding = new Binding<T>(serviceIdentifier, scope);\n    const list = this._bindingDictionary.get(serviceIdentifier) || [];\n    list.push(binding);\n    this._bindingDictionary.set(serviceIdentifier, list);\n    return new BindingToSyntax<T>(binding);\n  }\n\n  unbind(serviceIdentifier: interfaces.ServiceIdentifier): void {\n    this._bindingDictionary.delete(serviceIdentifier);\n  }\n\n  rebind<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): interfaces.BindingToSyntax<T> {\n    this.unbind(serviceIdentifier);\n    return this.bind(serviceIdentifier);\n  }\n\n  private _getContainerModuleHelpersFactory() {\n    const setModuleId = (\n      bindingToSyntax: interfaces.BindingToSyntax<unknown>,\n      moduleId: interfaces.ContainerModuleBase['id']\n    ) => {\n      // TODO: Implement an internal type `_BindingToSyntax<T>` wherein this member\n      // can be public. Let `BindingToSyntax<T>` be the presentational type that\n      // depends on it, and does not expose this member as public.\n      (\n        bindingToSyntax as unknown as { _binding: { moduleId: interfaces.ContainerModuleBase['id'] } }\n      )._binding.moduleId = moduleId;\n    };\n\n    const getBindFunction =\n      <T>(moduleId: interfaces.ContainerModuleBase['id']) =>\n      (serviceIdentifier: interfaces.ServiceIdentifier) => {\n        const bindingToSyntax = this.bind(serviceIdentifier);\n        setModuleId(bindingToSyntax, moduleId);\n        return bindingToSyntax as BindingToSyntax<T>;\n      };\n\n    const getUnbindFunction = () => (serviceIdentifier: interfaces.ServiceIdentifier) => {\n      return this.unbind(serviceIdentifier);\n    };\n\n    const getUnbindAsyncFunction = () => (serviceIdentifier: interfaces.ServiceIdentifier) => {\n      return null as any;\n      // return this.unbindAsync(serviceIdentifier);\n    };\n\n    const getIsboundFunction = () => (serviceIdentifier: interfaces.ServiceIdentifier) => {\n      return this.isBound(serviceIdentifier);\n    };\n\n    const getRebindFunction =\n      <T = unknown>(moduleId: interfaces.ContainerModuleBase['id']) =>\n      (serviceIdentifier: interfaces.ServiceIdentifier) => {\n        const bindingToSyntax = this.rebind(serviceIdentifier);\n        setModuleId(bindingToSyntax, moduleId);\n        return bindingToSyntax as BindingToSyntax<T>;\n      };\n    return (mId: interfaces.ContainerModuleBase['id']) => ({\n      bindFunction: getBindFunction(mId),\n      isboundFunction: getIsboundFunction(),\n      rebindFunction: getRebindFunction(mId),\n      unbindFunction: getUnbindFunction(),\n      unbindAsyncFunction: getUnbindAsyncFunction()\n    });\n  }\n\n  private _getNotAllArgs<T>(\n    serviceIdentifier: interfaces.ServiceIdentifier<T>,\n    isMultiInject: boolean,\n    key?: string | number | symbol | undefined,\n    value?: unknown\n  ): any {\n    return {\n      avoidConstraints: false,\n      isMultiInject,\n      serviceIdentifier,\n      key,\n      value\n    };\n  }\n\n  private _getAllArgs<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): any {\n    return {\n      avoidConstraints: true,\n      isMultiInject: true,\n      serviceIdentifier\n    };\n  }\n\n  private _get<T>(getArgs: GetArgs<T>): T | T[] {\n    const result: T[] = [];\n    const bindings = this._bindingDictionary.get(getArgs.serviceIdentifier).filter(b => {\n      return b.constraint(getArgs as any);\n    }) as Binding<T>[];\n    bindings.forEach(binding => {\n      result.push(this._resolveFromBinding<T>(binding));\n    });\n\n    return !getArgs.isMultiInject && result.length === 1 ? result[0] : result;\n  }\n\n  private _getChildRequest(binding: Binding<unknown>) {\n    const constr = binding.implementationType;\n    const { userGeneratedMetadata } = this._metadataReader.getConstructorMetadata(constr as any);\n    const keys = Object.keys(userGeneratedMetadata);\n    const arr = [];\n    for (let i = 0; i < keys.length; i++) {\n      const constructorArgsMetadata = userGeneratedMetadata[i];\n      const targetMetadataMap = {};\n      constructorArgsMetadata.forEach(md => {\n        targetMetadataMap[md.key] = md.value;\n      });\n      const metadata = {\n        inject: targetMetadataMap[INJECT_TAG],\n        multiInject: targetMetadataMap[MULTI_INJECT_TAG]\n      };\n      const injectIdentifier = metadata.inject || metadata.multiInject;\n      const target = {\n        serviceIdentifier: injectIdentifier,\n        constructorArgsMetadata\n      };\n      const bindings = this._bindingDictionary.get(injectIdentifier).filter(b => {\n        return b.constraint(target as any);\n      });\n      const request = {\n        injectIdentifier,\n        metadata: constructorArgsMetadata,\n        bindings\n      };\n\n      arr.push(request);\n    }\n\n    return arr;\n  }\n\n  private _resolveFromBinding<T>(binding: Binding<T>): T {\n    const result = this._getResolvedFromBinding<T>(binding);\n\n    this._saveToScope(binding, result);\n\n    return result;\n  }\n\n  private _getResolvedFromBinding<T>(binding: Binding<T>) {\n    let result: T;\n    switch (binding.type) {\n      case BindingTypeEnum.ConstantValue:\n      case BindingTypeEnum.Function:\n        result = binding.cache as T;\n        break;\n      case BindingTypeEnum.Instance:\n        result = this._resolveInstance<T>(binding, binding.implementationType as interfaces.Newable<T>);\n        break;\n      default:\n        result = binding.dynamicValue({ container: this } as any);\n    }\n\n    return result;\n  }\n\n  private _resolveInstance<T>(binding: Binding<T>, constr: interfaces.Newable<T>): T {\n    if (binding.activated) {\n      return binding.cache;\n    }\n\n    const childRequests = this._getChildRequest(binding);\n    return this._createInstance(constr, childRequests);\n  }\n\n  private _createInstance<T>(constr: interfaces.Newable<T>, childRequests: IChildRequest[]) {\n    if (childRequests.length) {\n      const resolved = this._resolveRequests(childRequests);\n      const obj = new constr(...resolved);\n      return obj;\n    }\n    const obj = new constr();\n    return obj;\n  }\n\n  private _resolveRequests(childRequests: IChildRequest[]): any[] {\n    return childRequests.map(request => {\n      return request.bindings.length > 1\n        ? request.bindings.map(binding => this._resolveFromBinding(binding))\n        : this._resolveFromBinding(request.bindings[0]);\n    });\n  }\n\n  private _saveToScope(binding: Binding<unknown>, result: any) {\n    if (binding.scope === BindingScopeEnum.Singleton) {\n      binding.cache = result;\n      binding.activated = true;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/common/inversify/container.ts"],"names":[],"mappings":"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","file":"container.js","sourcesContent":["import { Generator } from '../generator';\nimport { Binding } from './binding';\nimport type { interfaces } from './interfaces';\nimport { BindingScopeEnum, BindingTypeEnum } from './literal_types';\nimport { Metadata } from './meta-data';\nimport { INJECT_TAG, MULTI_INJECT_TAG, NAMED_TAG } from './metadata_keys';\nimport { MetadataReader } from './metadata_reader';\nimport { BindingToSyntax } from './syntax/binding_to_syntax';\n\ninterface IChildRequest {\n  injectIdentifier: any;\n  metadata: interfaces.Metadata<unknown>[];\n  bindings: Binding<unknown>[];\n}\n\ninterface GetArgs<T> {\n  avoidConstraints: boolean;\n  isMultiInject: boolean;\n  serviceIdentifier: interfaces.ServiceIdentifier<T>;\n  key: string | symbol;\n  value: any;\n}\n\nexport class Container {\n  id: number;\n  readonly options: interfaces.ContainerOptions;\n  private _bindingDictionary: Map<any, Binding<unknown>[]>;\n  private _metadataReader: interfaces.MetadataReader;\n\n  constructor(containerOptions?: interfaces.ContainerOptions) {\n    const options = containerOptions || {};\n    options.defaultScope = options.defaultScope || BindingScopeEnum.Transient;\n    // console.log(this);\n    this.options = options;\n    this.id = Generator.GenAutoIncrementId();\n    this._bindingDictionary = new Map();\n    this._metadataReader = new MetadataReader();\n  }\n\n  load(module: interfaces.ContainerModule) {\n    const getHelpers = this._getContainerModuleHelpersFactory();\n\n    const containerModuleHelpers = getHelpers(module.id);\n\n    module.registry(\n      containerModuleHelpers.bindFunction as interfaces.Bind,\n      containerModuleHelpers.unbindFunction,\n      containerModuleHelpers.isboundFunction,\n      containerModuleHelpers.rebindFunction as interfaces.Rebind\n    );\n  }\n\n  get<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): T {\n    const getArgs = this._getNotAllArgs(serviceIdentifier, false);\n\n    return this._get<T>(getArgs) as T;\n  }\n\n  getAll<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): T[] {\n    const getArgs = this._getAllArgs(serviceIdentifier);\n\n    return this._get<T>(getArgs) as T[];\n  }\n\n  getTagged<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, key: string | number | symbol, value: unknown): T {\n    const getArgs = this._getNotAllArgs(serviceIdentifier, false, key, value);\n\n    return this._get<T>(getArgs) as T;\n  }\n\n  getNamed<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, named: string | number | symbol): T {\n    return this.getTagged<T>(serviceIdentifier, NAMED_TAG, named);\n  }\n\n  isBound(serviceIdentifier: interfaces.ServiceIdentifier<unknown>): boolean {\n    return this._bindingDictionary.has(serviceIdentifier);\n  }\n\n  // Registers a type binding\n  bind<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): interfaces.BindingToSyntax<T> {\n    const scope = this.options.defaultScope;\n    const binding = new Binding<T>(serviceIdentifier, scope);\n    const list = this._bindingDictionary.get(serviceIdentifier) || [];\n    list.push(binding);\n    this._bindingDictionary.set(serviceIdentifier, list);\n    return new BindingToSyntax<T>(binding);\n  }\n\n  unbind(serviceIdentifier: interfaces.ServiceIdentifier): void {\n    this._bindingDictionary.delete(serviceIdentifier);\n  }\n\n  rebind<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): interfaces.BindingToSyntax<T> {\n    this.unbind(serviceIdentifier);\n    return this.bind(serviceIdentifier);\n  }\n\n  private _getContainerModuleHelpersFactory() {\n    const setModuleId = (\n      bindingToSyntax: interfaces.BindingToSyntax<unknown>,\n      moduleId: interfaces.ContainerModuleBase['id']\n    ) => {\n      // TODO: Implement an internal type `_BindingToSyntax<T>` wherein this member\n      // can be public. Let `BindingToSyntax<T>` be the presentational type that\n      // depends on it, and does not expose this member as public.\n      (\n        bindingToSyntax as unknown as { _binding: { moduleId: interfaces.ContainerModuleBase['id'] } }\n      )._binding.moduleId = moduleId;\n    };\n\n    const getBindFunction =\n      <T>(moduleId: interfaces.ContainerModuleBase['id']) =>\n      (serviceIdentifier: interfaces.ServiceIdentifier) => {\n        const bindingToSyntax = this.bind(serviceIdentifier);\n        setModuleId(bindingToSyntax, moduleId);\n        return bindingToSyntax as BindingToSyntax<T>;\n      };\n\n    const getUnbindFunction = () => (serviceIdentifier: interfaces.ServiceIdentifier) => {\n      return this.unbind(serviceIdentifier);\n    };\n\n    const getUnbindAsyncFunction = () => (serviceIdentifier: interfaces.ServiceIdentifier) => {\n      return null as any;\n      // return this.unbindAsync(serviceIdentifier);\n    };\n\n    const getIsboundFunction = () => (serviceIdentifier: interfaces.ServiceIdentifier) => {\n      return this.isBound(serviceIdentifier);\n    };\n\n    const getRebindFunction =\n      <T = unknown>(moduleId: interfaces.ContainerModuleBase['id']) =>\n      (serviceIdentifier: interfaces.ServiceIdentifier) => {\n        const bindingToSyntax = this.rebind(serviceIdentifier);\n        setModuleId(bindingToSyntax, moduleId);\n        return bindingToSyntax as BindingToSyntax<T>;\n      };\n    return (mId: interfaces.ContainerModuleBase['id']) => ({\n      bindFunction: getBindFunction(mId),\n      isboundFunction: getIsboundFunction(),\n      rebindFunction: getRebindFunction(mId),\n      unbindFunction: getUnbindFunction(),\n      unbindAsyncFunction: getUnbindAsyncFunction()\n    });\n  }\n\n  private _getNotAllArgs<T>(\n    serviceIdentifier: interfaces.ServiceIdentifier<T>,\n    isMultiInject: boolean,\n    key?: string | number | symbol | undefined,\n    value?: unknown\n  ): any {\n    return {\n      avoidConstraints: false,\n      isMultiInject,\n      serviceIdentifier,\n      key,\n      value\n    };\n  }\n\n  private _getAllArgs<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>): any {\n    return {\n      avoidConstraints: true,\n      isMultiInject: true,\n      serviceIdentifier\n    };\n  }\n\n  private _get<T>(getArgs: GetArgs<T>): T | T[] {\n    const result: T[] = [];\n    const bindings = this._bindingDictionary.get(getArgs.serviceIdentifier).filter(b => {\n      return b.constraint(getArgs as any);\n    }) as Binding<T>[];\n    bindings.forEach(binding => {\n      result.push(this._resolveFromBinding<T>(binding));\n    });\n\n    return !getArgs.isMultiInject && result.length === 1 ? result[0] : result;\n  }\n\n  private _getChildRequest(binding: Binding<unknown>) {\n    const constr = binding.implementationType;\n    const { userGeneratedMetadata } = this._metadataReader.getConstructorMetadata(constr as any);\n    const keys = Object.keys(userGeneratedMetadata);\n    const arr = [];\n    for (let i = 0; i < keys.length; i++) {\n      const constructorArgsMetadata = userGeneratedMetadata[i];\n      const targetMetadataMap = {};\n      constructorArgsMetadata.forEach(md => {\n        targetMetadataMap[md.key] = md.value;\n      });\n      const metadata = {\n        inject: targetMetadataMap[INJECT_TAG],\n        multiInject: targetMetadataMap[MULTI_INJECT_TAG]\n      };\n      const injectIdentifier = metadata.inject || metadata.multiInject;\n      const target = {\n        serviceIdentifier: injectIdentifier,\n        constructorArgsMetadata\n      };\n      const bindings = (this._bindingDictionary.get(injectIdentifier) || []).filter(b => {\n        return b.constraint(target as any);\n      });\n      if (bindings.length) {\n        const request = {\n          injectIdentifier,\n          metadata: constructorArgsMetadata,\n          bindings: bindings\n        };\n\n        arr.push(request);\n      }\n    }\n\n    return arr;\n  }\n\n  private _resolveFromBinding<T>(binding: Binding<T>): T {\n    const result = this._getResolvedFromBinding<T>(binding);\n\n    this._saveToScope(binding, result);\n\n    return result;\n  }\n\n  private _getResolvedFromBinding<T>(binding: Binding<T>) {\n    let result: T;\n    switch (binding.type) {\n      case BindingTypeEnum.ConstantValue:\n      case BindingTypeEnum.Function:\n        result = binding.cache as T;\n        break;\n      case BindingTypeEnum.Instance:\n        result = this._resolveInstance<T>(binding, binding.implementationType as interfaces.Newable<T>);\n        break;\n      default:\n        result = binding.dynamicValue({ container: this } as any);\n    }\n\n    return result;\n  }\n\n  private _resolveInstance<T>(binding: Binding<T>, constr: interfaces.Newable<T>): T {\n    if (binding.activated) {\n      return binding.cache;\n    }\n\n    const childRequests = this._getChildRequest(binding);\n    return this._createInstance(constr, childRequests);\n  }\n\n  private _createInstance<T>(constr: interfaces.Newable<T>, childRequests: IChildRequest[]) {\n    if (childRequests.length) {\n      const resolved = this._resolveRequests(childRequests);\n      const obj = new constr(...resolved);\n      return obj;\n    }\n    const obj = new constr();\n    return obj;\n  }\n\n  private _resolveRequests(childRequests: IChildRequest[]): any[] {\n    return childRequests.map(request => {\n      return request.bindings.length > 1\n        ? request.bindings.map(binding => this._resolveFromBinding(binding))\n        : this._resolveFromBinding(request.bindings[0]);\n    });\n  }\n\n  private _saveToScope(binding: Binding<unknown>, result: any) {\n    if (binding.scope === BindingScopeEnum.Singleton) {\n      binding.cache = result;\n      binding.activated = true;\n    }\n  }\n}\n"]}

package/es/core/contributions/textMeasure/AtextMeasure.js

@@ -30,11 +30,21 @@ let ATextMeasure = class {
     }
     compatibleMetrics(metrics, options) {
         if (null == metrics.actualBoundingBoxAscent || null == metrics.actualBoundingBoxDescent || null == metrics.fontBoundingBoxAscent || null == metrics.fontBoundingBoxDescent) {
+            metrics = {
+                width: metrics.width
+            };
             const {ascent: ascent, descent: descent} = this.measureTextBoundADscentEstimate(options);
             metrics.actualBoundingBoxAscent = ascent, metrics.actualBoundingBoxDescent = descent, 
             metrics.fontBoundingBoxAscent = ascent, metrics.fontBoundingBoxDescent = descent;
         }
         if (null == metrics.actualBoundingBoxLeft || null == metrics.actualBoundingBoxRight) {
+            metrics = {
+                width: metrics.width,
+                actualBoundingBoxAscent: metrics.actualBoundingBoxAscent,
+                actualBoundingBoxDescent: metrics.actualBoundingBoxDescent,
+                fontBoundingBoxAscent: metrics.fontBoundingBoxAscent,
+                fontBoundingBoxDescent: metrics.fontBoundingBoxDescent
+            };
             const {left: left, right: right} = this.measureTextBoundLeftRightEstimate(options);
             metrics.actualBoundingBoxLeft = left, metrics.actualBoundingBoxRight = right;
         }