@visactor/vrender-core 0.20.0-alpha.4 → 0.20.0

package/dist/index.es.js

@@ -48,49 +48,12 @@ var Reflect$1 = (function (Reflect) {
             };
         }
     })(function (exporter) {
-        const hasOwn = Object.prototype.hasOwnProperty;
         const supportsSymbol = typeof Symbol === 'function';
         const toPrimitiveSymbol = supportsSymbol && typeof Symbol.toPrimitive !== 'undefined' ? Symbol.toPrimitive : '@@toPrimitive';
-        const iteratorSymbol = supportsSymbol && typeof Symbol.iterator !== 'undefined' ? Symbol.iterator : '@@iterator';
-        const supportsCreate = typeof Object.create === 'function';
-        const supportsProto = { __proto__: [] } instanceof Array;
-        const downLevel = !supportsCreate && !supportsProto;
-        const HashMap = {
-            create: supportsCreate
-                ? function () {
-                    return MakeDictionary(Object.create(null));
-                }
-                : supportsProto
-                    ? function () {
-                        return MakeDictionary({ __proto__: null });
-                    }
-                    : function () {
-                        return MakeDictionary({});
-                    },
-            has: downLevel
-                ? function (map, key) {
-                    return hasOwn.call(map, key);
-                }
-                : function (map, key) {
-                    return key in map;
-                },
-            get: downLevel
-                ? function (map, key) {
-                    return hasOwn.call(map, key) ? map[key] : undefined;
-                }
-                : function (map, key) {
-                    return map[key];
-                }
-        };
         const functionPrototype = Object.getPrototypeOf(Function);
-        const usePolyfill = typeof process === 'object' && process.env && process.env.REFLECT_METADATA_USE_MAP_POLYFILL === 'true';
-        const _Map = !usePolyfill && typeof Map === 'function' && typeof Map.prototype.entries === 'function'
-            ? Map
-            : CreateMapPolyfill();
-        !usePolyfill && typeof Set === 'function' && typeof Set.prototype.entries === 'function'
-            ? Set
-            : CreateSetPolyfill();
-        const _WeakMap = !usePolyfill && typeof WeakMap === 'function' ? WeakMap : CreateWeakMapPolyfill();
+        typeof process === 'object' && process.env && process.env.REFLECT_METADATA_USE_MAP_POLYFILL === 'true';
+        const _Map = Map;
+        const _WeakMap = WeakMap;
         const Metadata = new _WeakMap();
         function defineMetadata(metadataKey, metadataValue, target, propertyKey) {
             if (!IsObject(target)) {
@@ -330,271 +293,6 @@ var Reflect$1 = (function (Reflect) {
             }
             return constructor;
         }
-        function CreateMapPolyfill() {
-            const cacheSentinel = {};
-            const arraySentinel = [];
-            const MapIterator = (function () {
-                function MapIterator(keys, values, selector) {
-                    this._index = 0;
-                    this._keys = keys;
-                    this._values = values;
-                    this._selector = selector;
-                }
-                MapIterator.prototype['@@iterator'] = function () {
-                    return this;
-                };
-                MapIterator.prototype[iteratorSymbol] = function () {
-                    return this;
-                };
-                MapIterator.prototype.next = function () {
-                    const index = this._index;
-                    if (index >= 0 && index < this._keys.length) {
-                        const result = this._selector(this._keys[index], this._values[index]);
-                        if (index + 1 >= this._keys.length) {
-                            this._index = -1;
-                            this._keys = arraySentinel;
-                            this._values = arraySentinel;
-                        }
-                        else {
-                            this._index++;
-                        }
-                        return { value: result, done: false };
-                    }
-                    return { value: undefined, done: true };
-                };
-                MapIterator.prototype.throw = function (error) {
-                    if (this._index >= 0) {
-                        this._index = -1;
-                        this._keys = arraySentinel;
-                        this._values = arraySentinel;
-                    }
-                    throw error;
-                };
-                MapIterator.prototype.return = function (value) {
-                    if (this._index >= 0) {
-                        this._index = -1;
-                        this._keys = arraySentinel;
-                        this._values = arraySentinel;
-                    }
-                    return { value: value, done: true };
-                };
-                return MapIterator;
-            })();
-            return (function () {
-                function Map() {
-                    this._keys = [];
-                    this._values = [];
-                    this._cacheKey = cacheSentinel;
-                    this._cacheIndex = -2;
-                }
-                Object.defineProperty(Map.prototype, 'size', {
-                    get: function () {
-                        return this._keys.length;
-                    },
-                    enumerable: true,
-                    configurable: true
-                });
-                Map.prototype.has = function (key) {
-                    return this._find(key, false) >= 0;
-                };
-                Map.prototype.get = function (key) {
-                    const index = this._find(key, false);
-                    return index >= 0 ? this._values[index] : undefined;
-                };
-                Map.prototype.set = function (key, value) {
-                    const index = this._find(key, true);
-                    this._values[index] = value;
-                    return this;
-                };
-                Map.prototype.delete = function (key) {
-                    const index = this._find(key, false);
-                    if (index >= 0) {
-                        const size = this._keys.length;
-                        for (let i = index + 1; i < size; i++) {
-                            this._keys[i - 1] = this._keys[i];
-                            this._values[i - 1] = this._values[i];
-                        }
-                        this._keys.length--;
-                        this._values.length--;
-                        if (key === this._cacheKey) {
-                            this._cacheKey = cacheSentinel;
-                            this._cacheIndex = -2;
-                        }
-                        return true;
-                    }
-                    return false;
-                };
-                Map.prototype.clear = function () {
-                    this._keys.length = 0;
-                    this._values.length = 0;
-                    this._cacheKey = cacheSentinel;
-                    this._cacheIndex = -2;
-                };
-                Map.prototype.keys = function () {
-                    return new MapIterator(this._keys, this._values, getKey);
-                };
-                Map.prototype.values = function () {
-                    return new MapIterator(this._keys, this._values, getValue);
-                };
-                Map.prototype.entries = function () {
-                    return new MapIterator(this._keys, this._values, getEntry);
-                };
-                Map.prototype['@@iterator'] = function () {
-                    return this.entries();
-                };
-                Map.prototype[iteratorSymbol] = function () {
-                    return this.entries();
-                };
-                Map.prototype._find = function (key, insert) {
-                    if (this._cacheKey !== key) {
-                        this._cacheIndex = this._keys.indexOf((this._cacheKey = key));
-                    }
-                    if (this._cacheIndex < 0 && insert) {
-                        this._cacheIndex = this._keys.length;
-                        this._keys.push(key);
-                        this._values.push(undefined);
-                    }
-                    return this._cacheIndex;
-                };
-                return Map;
-            })();
-            function getKey(key, _) {
-                return key;
-            }
-            function getValue(_, value) {
-                return value;
-            }
-            function getEntry(key, value) {
-                return [key, value];
-            }
-        }
-        function CreateSetPolyfill() {
-            return (function () {
-                function Set() {
-                    this._map = new _Map();
-                }
-                Object.defineProperty(Set.prototype, 'size', {
-                    get: function () {
-                        return this._map.size;
-                    },
-                    enumerable: true,
-                    configurable: true
-                });
-                Set.prototype.has = function (value) {
-                    return this._map.has(value);
-                };
-                Set.prototype.add = function (value) {
-                    return this._map.set(value, value), this;
-                };
-                Set.prototype.delete = function (value) {
-                    return this._map.delete(value);
-                };
-                Set.prototype.clear = function () {
-                    this._map.clear();
-                };
-                Set.prototype.keys = function () {
-                    return this._map.keys();
-                };
-                Set.prototype.values = function () {
-                    return this._map.values();
-                };
-                Set.prototype.entries = function () {
-                    return this._map.entries();
-                };
-                Set.prototype['@@iterator'] = function () {
-                    return this.keys();
-                };
-                Set.prototype[iteratorSymbol] = function () {
-                    return this.keys();
-                };
-                return Set;
-            })();
-        }
-        function CreateWeakMapPolyfill() {
-            const UUID_SIZE = 16;
-            const keys = HashMap.create();
-            const rootKey = CreateUniqueKey();
-            return (function () {
-                function WeakMap() {
-                    this._key = CreateUniqueKey();
-                }
-                WeakMap.prototype.has = function (target) {
-                    const table = GetOrCreateWeakMapTable(target, false);
-                    return table !== undefined ? HashMap.has(table, this._key) : false;
-                };
-                WeakMap.prototype.get = function (target) {
-                    const table = GetOrCreateWeakMapTable(target, false);
-                    return table !== undefined ? HashMap.get(table, this._key) : undefined;
-                };
-                WeakMap.prototype.set = function (target, value) {
-                    const table = GetOrCreateWeakMapTable(target, true);
-                    table[this._key] = value;
-                    return this;
-                };
-                WeakMap.prototype.delete = function (target) {
-                    const table = GetOrCreateWeakMapTable(target, false);
-                    return table !== undefined ? delete table[this._key] : false;
-                };
-                WeakMap.prototype.clear = function () {
-                    this._key = CreateUniqueKey();
-                };
-                return WeakMap;
-            })();
-            function CreateUniqueKey() {
-                let key;
-                do {
-                    key = '@@WeakMap@@' + CreateUUID();
-                } while (HashMap.has(keys, key));
-                keys[key] = true;
-                return key;
-            }
-            function GetOrCreateWeakMapTable(target, create) {
-                if (!hasOwn.call(target, rootKey)) {
-                    if (!create) {
-                        return undefined;
-                    }
-                    Object.defineProperty(target, rootKey, { value: HashMap.create() });
-                }
-                return target[rootKey];
-            }
-            function FillRandomBytes(buffer, size) {
-                for (let i = 0; i < size; ++i) {
-                    buffer[i] = (Math.random() * 0xff) | 0;
-                }
-                return buffer;
-            }
-            function GenRandomBytes(size) {
-                if (typeof Uint8Array === 'function') {
-                    if (typeof crypto !== 'undefined') {
-                        return crypto.getRandomValues(new Uint8Array(size));
-                    }
-                    return FillRandomBytes(new Uint8Array(size), size);
-                }
-                return FillRandomBytes(new Array(size), size);
-            }
-            function CreateUUID() {
-                const data = GenRandomBytes(UUID_SIZE);
-                data[6] = (data[6] & 0x4f) | 0x40;
-                data[8] = (data[8] & 0xbf) | 0x80;
-                let result = '';
-                for (let offset = 0; offset < UUID_SIZE; ++offset) {
-                    const byte = data[offset];
-                    if (offset === 4 || offset === 6 || offset === 8) {
-                        result += '-';
-                    }
-                    if (byte < 16) {
-                        result += '0';
-                    }
-                    result += byte.toString(16).toLowerCase();
-                }
-                return result;
-            }
-        }
-        function MakeDictionary(obj) {
-            obj.__ = undefined;
-            delete obj.__;
-            return obj;
-        }
     });
     return Reflect;
 })({});
@@ -15708,7 +15406,7 @@ class DefaultGroupBackgroundRenderContribution extends DefaultBaseBackgroundRend
 const defaultGroupBackgroundRenderContribution = new DefaultGroupBackgroundRenderContribution();
 
 const halfPi = pi / 2;
-function createRectPath(path, x, y, width, height, rectCornerRadius) {
+function createRectPath(path, x, y, width, height, rectCornerRadius, edgeCb) {
     if (width < 0) {
         x += width;
         width = -width;
@@ -15782,31 +15480,43 @@ function createRectPath(path, x, y, width, height, rectCornerRadius) {
     const leftBottomPoint1 = [leftBottom[0] + _cornerRadius[3], leftBottom[1]];
     const leftBottomPoint2 = [leftBottom[0], leftBottom[1] - _cornerRadius[3]];
     path.moveTo(leftTopPoint1[0], leftTopPoint1[1]);
-    path.lineTo(rightTopPoint1[0], rightTopPoint1[1]);
+    edgeCb && edgeCb[0]
+        ? edgeCb[0](leftTopPoint1[0], leftTopPoint1[1], rightTopPoint1[0], rightTopPoint1[1])
+        : path.lineTo(rightTopPoint1[0], rightTopPoint1[1]);
     if (!arrayEqual(rightTopPoint1, rightTopPoint2)) {
+        edgeCb && edgeCb[0] && path.moveTo(rightTopPoint1[0], rightTopPoint1[1]);
         const centerX = rightTopPoint1[0];
         const centerY = rightTopPoint1[1] + _cornerRadius[1];
         path.arc(centerX, centerY, _cornerRadius[1], -halfPi, 0, false);
     }
-    path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]);
+    edgeCb && edgeCb[1]
+        ? edgeCb[1](rightTopPoint2[0], rightTopPoint2[1], rightBottomPoint2[0], rightBottomPoint2[1])
+        : path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]);
     if (!arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
         const centerX = rightBottomPoint2[0] - _cornerRadius[2];
         const centerY = rightBottomPoint2[1];
+        edgeCb && edgeCb[1] && path.moveTo(rightBottomPoint2[0], rightBottomPoint2[1]);
         path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, false);
     }
-    path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]);
+    edgeCb && edgeCb[2]
+        ? edgeCb[2](rightBottomPoint1[0], rightBottomPoint1[1], leftBottomPoint1[0], leftBottomPoint1[1])
+        : path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]);
     if (!arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
         const centerX = leftBottomPoint1[0];
         const centerY = leftBottomPoint1[1] - _cornerRadius[3];
+        edgeCb && edgeCb[2] && path.moveTo(leftBottomPoint1[0], leftBottomPoint1[1]);
         path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, false);
     }
-    path.lineTo(leftTopPoint2[0], leftTopPoint2[1]);
+    edgeCb && edgeCb[3]
+        ? edgeCb[3](leftBottomPoint2[0], leftBottomPoint2[1], leftTopPoint2[0], leftTopPoint2[1])
+        : path.lineTo(leftTopPoint2[0], leftTopPoint2[1]);
     if (!arrayEqual(leftTopPoint1, leftTopPoint2)) {
         const centerX = leftTopPoint1[0];
         const centerY = leftTopPoint1[1] + _cornerRadius[0];
+        edgeCb && edgeCb[3] && path.moveTo(leftTopPoint2[0], leftTopPoint2[1]);
         path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, false);
     }
-    path.closePath();
+    !edgeCb && path.closePath();
     return path;
 }
 
@@ -15882,7 +15592,7 @@ let SplitRectAfterRenderContribution = class SplitRectAfterRenderContribution {
         this.order = 0;
     }
     drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
-        const { x1, y1, x: originX = groupAttribute.x, y: originY = groupAttribute.y, stroke = groupAttribute.stroke } = rect.attribute;
+        const { x1, y1, x: originX = groupAttribute.x, y: originY = groupAttribute.y, stroke = groupAttribute.stroke, cornerRadius = groupAttribute.cornerRadius } = rect.attribute;
         let { width, height } = rect.attribute;
         width = (width !== null && width !== void 0 ? width : x1 - originX) || 0;
         height = (height !== null && height !== void 0 ? height : y1 - originY) || 0;
@@ -15890,6 +15600,28 @@ let SplitRectAfterRenderContribution = class SplitRectAfterRenderContribution {
             return;
         }
         context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);
+        if (!(cornerRadius === 0 || (isArray(cornerRadius) && cornerRadius.every(num => num === 0)))) {
+            let lastStrokeI = 0;
+            let lastStroke;
+            createRectPath(context, x, y, width, height, cornerRadius, new Array(4).fill(0).map((_, i) => (x1, y1, x2, y2) => {
+                if (stroke[i]) {
+                    if (!(lastStrokeI === i - 1 && stroke[i] === lastStroke)) {
+                        context.setStrokeStyle(rect, Object.assign(Object.assign({}, rect.attribute), { stroke: stroke[i] }), x, y, groupAttribute);
+                        context.beginPath();
+                        context.moveTo(x1, y1);
+                        lastStroke = stroke[i];
+                    }
+                    lastStrokeI = i;
+                    context.lineTo(x2, y2);
+                    context.stroke();
+                    if (i === 3) {
+                        context.beginPath();
+                    }
+                }
+            }));
+            context.stroke();
+            return;
+        }
         context.beginPath();
         context.moveTo(x, y);
         if (stroke[0]) {
@@ -17154,7 +16886,8 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
         if (!data) {
             return;
         }
-        const { doFill, doStroke } = data;
+        const { doFill } = data;
+        const doStroke = data.doStroke && data.sVisible;
         const { clipRange = areaAttribute.clipRange, closePath, points, segments } = area.attribute;
         let { curveType = areaAttribute.curveType } = area.attribute;
         if (closePath && curveType === 'linear') {
@@ -18322,6 +18055,7 @@ let DefaultCanvasGroupRender = class DefaultCanvasGroupRender {
         else {
             context.highPerformanceSave();
         }
+        const baseGlobalAlpha = context.baseGlobalAlpha;
         context.baseGlobalAlpha *= baseOpacity;
         const groupAttribute = getTheme(group, params === null || params === void 0 ? void 0 : params.theme).group;
         const lastModelMatrix = context.modelMatrix;
@@ -18362,7 +18096,7 @@ let DefaultCanvasGroupRender = class DefaultCanvasGroupRender {
             mat4Allocate.free(context.modelMatrix);
         }
         context.modelMatrix = lastModelMatrix;
-        context.baseGlobalAlpha /= baseOpacity;
+        context.baseGlobalAlpha = baseGlobalAlpha;
         if (p && p.then) {
             p.then(() => {
                 if (clip) {
@@ -18655,7 +18389,7 @@ class ShadowRootDrawItemInterceptorContribution {
             drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m);
             drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
         }
-        drawContribution.renderGroup(graphic.shadowRoot, drawContext, graphic.parent.globalTransMatrix);
+        drawContribution.renderGroup(graphic.shadowRoot, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0));
         context.highPerformanceRestore();
         if (drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
             drawContribution.dirtyBounds.copy(tempDirtyBounds);
@@ -21987,7 +21721,7 @@ class Wrapper {
         this.lineBuffer.length = 0;
         this.lineWidth = this.maxAscent = this.maxDescent = this.maxAscentForBlank = this.maxDescentForBlank = 0;
     }
-    deal(paragraph) {
+    deal(paragraph, singleLine = false) {
         if (paragraph instanceof RichTextIcon) {
             if ((this.direction === 'horizontal' && this.width === 0) ||
                 (this.direction === 'vertical' && this.height === 0)) {
@@ -22029,18 +21763,23 @@ class Wrapper {
                 this.deal(paragraph);
             }
             else {
-                this.cut(paragraph);
+                this.cut(paragraph, singleLine);
             }
         }
     }
-    cut(paragraph) {
+    cut(paragraph, singleLine) {
         const availableWidth = this[this.directionKey.width] - this.lineWidth || 0;
         const guessIndex = Math.ceil((availableWidth / paragraph[this.directionKey.width]) * paragraph.length) || 0;
         const index = getStrByWithCanvas(paragraph.text, availableWidth, paragraph.character, guessIndex, this.frame.wordBreak === 'break-word');
         if (index !== 0) {
             const [p1, p2] = seperateParagraph(paragraph, index);
             this.store(p1);
-            this.deal(p2);
+            if (singleLine) {
+                this.send();
+            }
+            else {
+                this.deal(p2);
+            }
         }
         else if (this.lineBuffer.length !== 0) {
             this.send();
@@ -22061,6 +21800,9 @@ const RICHTEXT_UPDATE_TAG_KEY = [
     'textBaseline',
     'textConfig',
     'layoutDirection',
+    'fill',
+    'stroke',
+    'fontSize',
     ...GRAPHIC_UPDATE_TAG_KEY
 ];
 class RichText extends Graphic {
@@ -22318,7 +22060,7 @@ class RichText extends Graphic {
                     !p.newLine && frame.lines[frame.lines.length - 1].paragraphs.push(p);
                 }
                 else {
-                    wrapper.deal(p);
+                    wrapper.deal(p, true);
                 }
                 if (frame.lines.length !== lineCount) {
                     lineCount = frame.lines.length;
@@ -22333,6 +22075,7 @@ class RichText extends Graphic {
                     skip = false;
                     wrapper.lineWidth = 0;
                 }
+                wrapper.send();
             }
         }
         else {
@@ -22399,10 +22142,12 @@ class RichText extends Graphic {
         let pickIcon;
         frameCache.icons.forEach(icon => {
             var _a, _b;
-            if (icon.AABBBounds.containsPoint({ x: point.x - x, y: point.y - y })) {
+            const bounds = icon.AABBBounds.clone();
+            bounds.translate(icon._marginArray[3], icon._marginArray[0]);
+            if (bounds.containsPoint({ x: point.x - x, y: point.y - y })) {
                 pickIcon = icon;
-                pickIcon.globalX = ((_a = pickIcon.attribute.x) !== null && _a !== void 0 ? _a : 0) + x;
-                pickIcon.globalY = ((_b = pickIcon.attribute.y) !== null && _b !== void 0 ? _b : 0) + y;
+                pickIcon.globalX = ((_a = pickIcon.attribute.x) !== null && _a !== void 0 ? _a : 0) + x + icon._marginArray[3];
+                pickIcon.globalY = ((_b = pickIcon.attribute.y) !== null && _b !== void 0 ? _b : 0) + y + icon._marginArray[0];
             }
         });
         return pickIcon;