@visactor/vchart 1.11.10-alpha.3 → 1.11.10

package/build/index.js

@@ -18641,21 +18641,23 @@
       }
       updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic) {
         const {
-            points = lineTheme.points
+            points = lineTheme.points,
+            connectedType: connectedType
           } = attribute,
           b = aabbBounds;
         return points.forEach(p => {
-          b.add(p.x, p.y);
+          !1 === p.defined && "zero" !== connectedType || b.add(p.x, p.y);
         }), b;
       }
       updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
         const {
-            segments = lineTheme.segments
+            segments = lineTheme.segments,
+            connectedType: connectedType
           } = attribute,
           b = aabbBounds;
         return segments.forEach(s => {
           s.points.forEach(p => {
-            b.add(p.x, p.y);
+            !1 === p.defined && "zero" !== connectedType || b.add(p.x, p.y);
           });
         }), b;
       }
@@ -31383,7 +31385,11 @@
               width: textShape.AABBBounds.width(),
               height: textShape.AABBBounds.height()
             }), "rect");
-            isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel), this._bgRect = bgRect;
+            if (isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel), backgroundStyle.customShape) {
+              const customShape = backgroundStyle.customShape;
+              bgRect.pathProxy = attrs => customShape(text, attrs, new CustomPath2D());
+            }
+            this._bgRect = bgRect;
           }
         } else {
           const textAttrs = Object.assign(Object.assign({
@@ -31467,7 +31473,11 @@
               width: tagWidth,
               height: tagHeight
             }), "rect");
-            isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel), this._bgRect = bgRect;
+            if (isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel), backgroundStyle.customShape) {
+              const customShape = backgroundStyle.customShape;
+              bgRect.pathProxy = attrs => customShape(text, attrs, new CustomPath2D());
+            }
+            this._bgRect = bgRect;
           }
         }
         this._textShape = textShape;
@@ -39760,7 +39770,8 @@
         this._targetItem && (this._targetItem.setAttributes(Object.assign({
           x: position.x,
           y: position.y,
-          visible: null !== (_a = targetItem.visible) && void 0 !== _a && _a
+          visible: null !== (_a = targetItem.visible) && void 0 !== _a && _a,
+          size: targetItem.size
         }, targetItem.style)), this._targetItem.states = merge$2({}, DEFAULT_STATES$2, null === (_b = this.attribute.state) || void 0 === _b ? void 0 : _b.targetItem));
       }
       setAllOfItemsAttr(newPosition, newItemPosition) {
@@ -39797,7 +39808,7 @@
         this.setTargetItemAttributes(targetSymbol, position), this.setItemLineAttr(itemLine, newPosition, newItemPosition), this.setItemAttributes(this._item, itemContent, newPosition, newItemPosition, type), this.setDecorativeLineAttr(itemLine, newItemPosition, null === (_a = itemLine.decorativeLine) || void 0 === _a ? void 0 : _a.visible);
       }
       computeNewPositionAfterTargetItem(position) {
-        var _a;
+        var _a, _b;
         const {
             itemContent = {},
             targetSymbol: targetSymbol
@@ -39812,7 +39823,7 @@
             visible: targetItemvisible = !1,
             size: targetSymbolSize
           } = targetSymbol,
-          targetSize = targetItemvisible ? targetSymbolSize || (null !== (_a = targetSymbolStyle.size) && void 0 !== _a ? _a : 10) : 0,
+          targetSize = targetItemvisible ? null !== (_b = null !== (_a = targetSymbolStyle.size) && void 0 !== _a ? _a : targetSymbolSize) && void 0 !== _b ? _b : 20 : 0,
           targetOffsetAngle = deltaXYToAngle(itemContentOffsetY, itemContentOffsetX);
         return {
           newPosition: {
@@ -40266,7 +40277,8 @@
             startX: startX,
             startY: startY,
             pages: pages
-          } = this._itemContext;
+          } = this._itemContext,
+          lastItemWidth = 0;
         for (let index = startIndex, len = legendItems.length; index < len && !(lazyload && pages > this._itemContext.currentPage * maxPages); index++) {
           lazyload && (this._itemContext.startIndex = index + 1), item = legendItems[index], item.id || (item.id = item.label), item.index = index;
           let isSelected = !0;
@@ -40277,10 +40289,10 @@
           this._itemHeight = Math.max(this._itemHeight, itemHeight), maxWidthInCol = Math.max(itemWidth, maxWidthInCol), this._itemMaxWidth = Math.max(itemWidth, this._itemMaxWidth), isHorizontal ? (isValid$1(maxWidth) && (isScrollbar && autoPage ? (pages = Math.ceil((startX + itemWidth) / maxWidth), doWrap = pages > 1) : startX + itemWidth > maxWidth && (doWrap = !0, startX > 0 && (pages += 1, startX = 0, startY += itemHeight + spaceRow))), 0 === startX && 0 === startY || itemGroup.setAttributes({
             x: startX,
             y: startY
-          }), startX += spaceCol + itemWidth) : (isValid$1(maxHeight) && (isScrollbar && autoPage ? (pages = Math.ceil((startY + itemHeight) / maxHeight), doWrap = pages > 1) : maxHeight < startY + itemHeight && (pages += 1, doWrap = !0, startY = 0, startX += maxWidthInCol + spaceCol, maxWidthInCol = 0)), 0 === startX && 0 === startY || itemGroup.setAttributes({
+          }), startX += spaceCol + itemWidth) : (isValid$1(maxHeight) && (isScrollbar && autoPage ? (pages = Math.ceil((startY + itemHeight) / maxHeight), doWrap = pages > 1) : maxHeight <= itemHeight ? (pages += 1, doWrap = !0, startY = 0, index > 0 && (startX += lastItemWidth + spaceCol)) : maxHeight < startY + itemHeight && (pages += 1, doWrap = !0, startY = 0, startX += maxWidthInCol + spaceCol, maxWidthInCol = 0)), 0 === startX && 0 === startY || itemGroup.setAttributes({
             x: startX,
             y: startY
-          }), startY += spaceRow + itemHeight), itemsContainer.add(itemGroup);
+          }), startY += spaceRow + itemHeight), itemsContainer.add(itemGroup), lastItemWidth = itemWidth;
         }
         return this._itemContext.doWrap = doWrap, this._itemContext.startX = startX, this._itemContext.startY = startY, this._itemContext.maxWidthInCol = maxWidthInCol, this._itemContext.pages = pages, this._itemContext.maxPages = maxPages, isScrollbar && (this._itemContext.totalPage = pages), lazyload || (this._itemContext.startIndex = legendItems.length), this._itemContext;
       }
@@ -43827,6 +43839,7 @@
       immediatelyApply: !0
     };
     const DefaultAnimationParameters = "VGRAMMAR_ANIMATION_PARAMETERS";
+    const MARK_OVERLAP_HIDE_KEY = "_mo_hide_";
 
     function parseReference(dependency, view) {
       return array(dependency).reduce((refs, dep) => {
@@ -44354,9 +44367,20 @@
     }
     function parseCollectionMarkAttributes(itemNextAttrs) {
       const result = {};
-      return itemNextAttrs ? (Object.keys(itemNextAttrs).forEach(key => {
-        "x" !== key && "y" !== key && "x1" !== key && "y1" !== key && "defined" !== key && "size" !== key && "width" !== key && "height" !== key && "context" !== key && (result[key] = itemNextAttrs[key]);
-      }), result) : result;
+      if (!itemNextAttrs) return result;
+      const skipKeys = ["x", "y", "x1", "y1", "defined", "size", "width", "height", "context"];
+      return Object.keys(itemNextAttrs).forEach(key => {
+        skipKeys.includes(key) || (result[key] = itemNextAttrs[key]);
+      }), result;
+    }
+    function removeSegmentAttrs(itemNextAttrs, element) {
+      var _a;
+      if (!itemNextAttrs || !itemNextAttrs.segments || !itemNextAttrs.segments.length) return itemNextAttrs;
+      const segmentKeys = "area" === (null === (_a = null == element ? void 0 : element.mark) || void 0 === _a ? void 0 : _a.markType) ? ["fillOpacity", "strokeOpacity"] : ["strokeOpacity"],
+        result = {};
+      return Object.keys(itemNextAttrs).forEach(key => {
+        segmentKeys.includes(key) || (result[key] = itemNextAttrs[key]);
+      }), result;
     }
 
     let Element$1 = class Element {
@@ -44442,7 +44466,7 @@
       encodeGraphic(attrs) {
         this.coordinateTransformEncode(this.items);
         const graphicAttributes = this.transformElementItems(this.items, this.mark.markType);
-        attrs && Object.assign(graphicAttributes, attrs), this.graphicItem ? (this.graphicItem.clearStates(), this.graphicItem.states = {}, this.graphicItem.stateProxy = null, this.applyGraphicAttributes(graphicAttributes)) : this.initGraphicItem(graphicAttributes), this.diffState !== DiffState.enter && this.diffState !== DiffState.update || !this.states.length || this.useStates(this.states), this.mark.markType === GrammarMarkType.shape && (this.graphicItem.datum = this.items[0].datum), this.items.forEach(item => {
+        attrs && Object.assign(graphicAttributes, attrs), this.graphicItem ? (this.graphicItem.clearStates(), this.graphicItem.states = {}, this.graphicItem.stateProxy = null, MARK_OVERLAP_HIDE_KEY in this.graphicItem.attribute && "visible" in graphicAttributes && delete this.graphicItem.attribute[MARK_OVERLAP_HIDE_KEY], this.applyGraphicAttributes(graphicAttributes)) : this.initGraphicItem(graphicAttributes), this.diffState !== DiffState.enter && this.diffState !== DiffState.update || !this.states.length || this.useStates(this.states), this.mark.markType === GrammarMarkType.shape && (this.graphicItem.datum = this.items[0].datum), this.items.forEach(item => {
           item.nextAttrs = {};
         }), this._setCustomizedShape();
       }
@@ -44564,7 +44588,7 @@
             } else if (enableSegments) {
               const points = linePoints && 0 !== linePoints.length ? linePoints : getLinePointsFromSegments(lastSegments),
                 segments = getLineSegmentConfigs(itemNextAttrs, points, this);
-              segments ? (nextAttrs.segments = segments, nextAttrs.points = null) : (nextAttrs.segments = null, nextAttrs.points = points);
+              segments ? (nextAttrs.segments = segments, nextAttrs.points = null) : (nextAttrs.segments = null, nextAttrs.points = points), nextAttrs = removeSegmentAttrs(nextAttrs, this);
             } else nextAttrs.points = linePoints, nextAttrs.segments = null;
           } else markType === GrammarMarkType.largeRects ? nextAttrs.points = getLargeRectsPoints(items, !0, lastPoints) : markType === GrammarMarkType.largeSymbols && (nextAttrs.points = getLargeSymbolsPoints(items, !0, lastPoints));
         }
@@ -46218,8 +46242,9 @@
       }
       encodeGraphic() {
         this.coordinateTransformEncode(this.items);
-        const graphicAttributes = this.transformElementItems(this.items, this.mark.markType);
-        this.graphicItem || this.initGraphicItem(), this.diffState === DiffState.enter ? (this.graphicItem.onBeforeAttributeUpdate = this._onGlyphAttributeUpdate(!0), this.applyGraphicAttributes(graphicAttributes), this.graphicItem.onBeforeAttributeUpdate = this._onGlyphAttributeUpdate(!1)) : this.applyGraphicAttributes(graphicAttributes), this.diffState !== DiffState.enter && this.diffState !== DiffState.update || !this.states.length || (Object.values(this.glyphGraphicItems).forEach(graphicItem => {
+        const graphicAttributes = this.transformElementItems(this.items, this.mark.markType),
+          isGraphicInit = !this.graphicItem;
+        this.graphicItem || this.initGraphicItem(), this.diffState === DiffState.enter || isGraphicInit ? (this.graphicItem.onBeforeAttributeUpdate = this._onGlyphAttributeUpdate(!0), this.applyGraphicAttributes(graphicAttributes), this.graphicItem.onBeforeAttributeUpdate = this._onGlyphAttributeUpdate(!1)) : this.applyGraphicAttributes(graphicAttributes), this.diffState !== DiffState.enter && this.diffState !== DiffState.update || !this.states.length || (Object.values(this.glyphGraphicItems).forEach(graphicItem => {
           graphicItem.states = {};
         }), this.useStates(this.states)), this.items.map(item => {
           item.nextAttrs = {};
@@ -46248,7 +46273,7 @@
       }
       encodeDefault() {
         const defaultEncodeValues = {};
-        if (this.diffState === DiffState.enter && this.glyphMeta.getDefaultEncoder()) {
+        if (this.glyphMeta.getDefaultEncoder()) {
           const defaultEncodeResult = this.glyphMeta.getDefaultEncoder().call(null, this.getDatum(), this, this.mark.getGlyphConfig());
           Object.assign(defaultEncodeValues, defaultEncodeResult);
         }
@@ -46604,7 +46629,12 @@
 
     Animate$1.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;
     let GlobalAnimatorId = 0;
-    const isCustomAnimateCtor = custom => !isNil$1(custom) && !isNil$1(custom.prototype) && (custom.prototype instanceof ACustomAnimate || "onBind" in custom.prototype && "onStart" in custom.prototype && "onEnd" in custom.prototype && "onUpdate" in custom.prototype);
+    const isCustomAnimateCtor = custom => {
+      var _a;
+      if (isNil$1(custom) || isNil$1(custom.prototype)) return !1;
+      const prototype = null !== (_a = custom.prototype) && void 0 !== _a ? _a : {};
+      return prototype instanceof ACustomAnimate || "onBind" in prototype && "onStart" in prototype && "onEnd" in prototype && "onUpdate" in prototype;
+    };
     class Animator {
       constructor(element, unit, animationOptions) {
         this.id = GlobalAnimatorId++, this.isAnimating = !1, this.runnings = [], this.element = element, this.animationOptions = animationOptions, this.unit = unit;
@@ -48121,8 +48151,7 @@
           const mark = grammar,
             currentNode = this._markNodes.find(node => node.mark === mark);
           this._markNodes.forEach(node => {
-            const targetMark = node.mark;
-            targetMark.markType === GrammarMarkType.group && targetMark.includesChild(mark, !1) ? (node.children = node.children.filter(n => n !== currentNode), currentNode.parent = null) : mark.markType === GrammarMarkType.group && mark.includesChild(targetMark, !1) && (currentNode.children = currentNode.children.filter(n => n !== node), node.parent = null);
+            node.mark.markType === GrammarMarkType.group && node.children.includes(currentNode) ? (node.children = node.children.filter(n => n !== currentNode), currentNode.parent = null) : mark.markType === GrammarMarkType.group && currentNode.children.includes(node) && (currentNode.children = currentNode.children.filter(n => n !== node), node.parent = null);
           }), this._markNodes = this._markNodes.filter(n => n !== currentNode);
         }
         return this;
@@ -50942,10 +50971,9 @@
       return [];
     };
 
-    const HIDE_KEY = "_mo_hide_";
     function reset(elements) {
       return elements.forEach(element => {
-        element.getGraphicAttribute(HIDE_KEY) && (element.setGraphicAttribute("visible", !0), element.setGraphicAttribute(HIDE_KEY, !1));
+        element.getGraphicAttribute(MARK_OVERLAP_HIDE_KEY) && (element.setGraphicAttribute("visible", !0), element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !1));
       }), elements;
     }
     function overlapX(elements, delta, deltaMul, useRadius) {
@@ -50958,7 +50986,7 @@
           if (!1 === element.getGraphicAttribute("visible")) return;
           const r = element.getGraphicAttribute("size") / 2,
             currentX = element.getGraphicAttribute("x");
-          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastX = currentX, lastR = r;
+          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastX = currentX, lastR = r;
         });
       }
     }
@@ -50972,7 +51000,7 @@
           if (!1 === element.getGraphicAttribute("visible")) return;
           const r = element.getGraphicAttribute("size") / 2,
             currentY = element.getGraphicAttribute("y");
-          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
+          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         });
       }
     }
@@ -50989,7 +51017,7 @@
           const r = element.getGraphicAttribute("size") / 2,
             currentX = element.getGraphicAttribute("x"),
             currentY = element.getGraphicAttribute("y");
-          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
+          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         });
       }
     }
@@ -66543,7 +66571,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerComponentPlugin(CanvasTooltipHandler);
     };
 
-    const version = "1.11.10-alpha.3";
+    const version = "1.11.10";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -72608,12 +72636,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                             const { axis, value, data } = d;
                             const isY = axis.getOrient() === 'left' || axis.getOrient() === 'right';
                             data.forEach(d => {
-                                if (isY) {
-                                    dataFilter[d.series.fieldY[0]] = value;
-                                }
-                                else {
-                                    dataFilter[d.series.fieldX[0]] = value;
-                                }
+                                var _a, _b, _c;
+                                const field = isY ? d.series.fieldY[0] : d.series.fieldX[0];
+                                dataFilter[field] = (_c = (_b = (_a = d.datum) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b[field]) !== null && _c !== void 0 ? _c : value;
                             });
                         });
                         tooltip.showTooltip(dataFilter, opt.showTooltipOption);
@@ -86540,11 +86565,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           return Math.min(val, (this._viewBox.height - sumGapY) / sumValue);
         }, 1 / 0);else {
           const maxRowCount = columns.reduce((cnt, column) => Math.max(cnt, column.length), 0),
-            gapY = Math.min(minNodeHeight > 0 ? Math.max(this.options.nodeGap, minNodeHeight) : this.options.nodeGap, this._viewBox.height / maxRowCount);
-          getGapY = () => gapY, this._gapY = gapY, this.options.equalNodeHeight ? forceNodeHeight = this._viewBox.height / maxRowCount - gapY : ky = columns.reduce((val, column) => {
-            const sumValue = column.reduce((sum, node) => sum + node.value, 0);
-            return Math.min(val, (this._viewBox.height - (column.length - 1) * gapY) / sumValue);
-          }, 1 / 0);
+            maxStepHeight = this._viewBox.height / maxRowCount,
+            gapY = Math.min(this.options.nodeGap, maxStepHeight);
+          if (getGapY = () => gapY, this._gapY = gapY, (minNodeHeight + gapY) * maxRowCount > this._viewBox.height && (minNodeHeight = maxStepHeight - gapY), this.options.equalNodeHeight) forceNodeHeight = this._viewBox.height / maxRowCount - gapY;else {
+            const calGapY = minNodeHeight > 0 ? Math.max(gapY, minNodeHeight) : gapY;
+            ky = columns.reduce((val, column) => {
+              const sumValue = column.reduce((sum, node) => sum + node.value, 0);
+              return Math.min(val, (this._viewBox.height - ((column.length - 1) * calGapY + minNodeHeight)) / sumValue);
+            }, 1 / 0);
+          }
         }
         const isStartGap = "start" === this.options.gapPosition,
           isMiddleGap = !isStartGap && "end" !== this.options.gapPosition,
@@ -86577,7 +86606,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 node.y0 += deltaY * (j + 1), node.y1 += deltaY * (j + 1);
               }
             }
-          } else if (deltaY < 0 && nodes.length > 1 && (deltaY /= nodes.length - 1, gapY + deltaY > 0)) {
+          } else if (deltaY < 0 && nodes.length > 1 && (deltaY /= nodes.length - 1, gapY + deltaY >= 0)) {
             gapY += deltaY, this._gapY = Math.min(gapY);
             for (let j = 1, len = nodes.length; j < len; ++j) {
               const node = nodes[j];
@@ -89529,7 +89558,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             channel: {
                 wave: { from: 0, to: 1 },
                 height: params.height,
-                y: params.y
+                dy: params.dy
             }
         };
     };
@@ -89539,7 +89568,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             channel: {
                 wave: { from: 0, to: 1 },
                 height: params.height,
-                y: params.y
+                dy: params.dy
             }
         };
     };
@@ -89815,16 +89844,24 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         initAnimation() {
             var _a, _b, _c;
             const animationParams = {
-                y: {
-                    from: () => {
-                        const { y: liquidBackY, size: liquidBackSize } = this._getLiquidBackPosAndSize();
-                        return liquidBackY + liquidBackSize / 2;
-                    },
-                    to: this._getLiquidPosY
-                },
                 height: {
                     from: 0,
-                    to: this._getLiquidHeight
+                    to: () => {
+                        return this._getLiquidHeight();
+                    }
+                },
+                dy: {
+                    from: () => {
+                        let liquidY = 0;
+                        const { startY: liquidBackStartY, size: liquidBackSize } = this._getLiquidBackPosAndSize();
+                        if (this._reverse) {
+                            liquidY = liquidBackStartY;
+                        }
+                        else {
+                            liquidY = liquidBackSize + liquidBackStartY;
+                        }
+                        return liquidY;
+                    }
                 }
             };
             const appearPreset = (_b = (_a = this._spec) === null || _a === void 0 ? void 0 : _a.animationAppear) === null || _b === void 0 ? void 0 : _b.preset;
@@ -97255,7 +97292,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 };
             }
             if (labelBackground.visible !== false) {
-                labelAttrs.panel = Object.assign({ visible: true }, transformStyle(transformToGraphic(labelBackground.style), markerData));
+                labelAttrs.panel = Object.assign({ visible: true, customShape: labelBackground.customShape }, transformStyle(transformToGraphic(labelBackground.style), markerData));
                 if (isValid$1(labelBackground.padding)) {
                     labelAttrs.padding = normalizePadding$1(labelBackground.padding);
                 }