@syncfusion/ej2-treemap 32.1.19 → 32.1.24

package/dist/es6/ej2-treemap.es2015.js

@@ -957,24 +957,31 @@ function convertElement(element, labelId, data) {
  * @param {Size} labelSize - Specifies the label size.
  * @param {string} type - Specifies the type.
  * @param {TreeMap} treemap - Specifies the treemap instance.
+ * @param {number} textCount - Specifies the number of text.
  * @returns {Location} - Returns the text location.
  */
-function findLabelLocation(rect, position, labelSize, type, treemap) {
+function findLabelLocation(rect, position, labelSize, type, treemap, textCount = 0) {
     const location = new Location(0, 0);
     const padding = 5;
     const paddings = 2;
     const x = (type === 'Template') ? treemap.areaRect.x : 0;
     const y = (type === 'Template') ? treemap.areaRect.y : 0;
+    const isTopLabel = (treemap.leafItemSettings.labelPosition === 'TopCenter' ||
+        treemap.leafItemSettings.labelPosition === 'TopLeft' ||
+        treemap.leafItemSettings.labelPosition === 'TopRight');
+    const textHeight = (textCount > 1 && !isTopLabel &&
+        (treemap.renderDirection === 'BottomLeftTopRight' ||
+            treemap.renderDirection === 'BottomRightTopLeft')) ? (labelSize.height * textCount) : labelSize.height;
     location.x = (Math.abs(x - ((position.indexOf('Left') > -1) ? rect.x + padding : !(position.indexOf('Right') > -1) ?
         rect.x + ((rect.width / 2) - (labelSize.width / 2)) : (rect.x + rect.width) - labelSize.width))) - paddings;
     if (treemap.enableDrillDown && (treemap.renderDirection === 'BottomLeftTopRight'
         || treemap.renderDirection === 'BottomRightTopLeft')) {
-        location.y = Math.abs((rect.y + rect.height) - labelSize.height + padding);
+        location.y = Math.abs((rect.y + rect.height) - textHeight + padding);
     }
     else {
-        location.y = Math.abs(y - ((position.indexOf('Top') > -1) ? (type === 'Template' ? rect.y : rect.y + labelSize.height) :
-            !(position.indexOf('Bottom') > -1) ? type === 'Template' ? (rect.y + ((rect.height / 2) - (labelSize.height / 2))) :
-                (rect.y + (rect.height / 2) + labelSize.height / 4) : (rect.y + rect.height) - labelSize.height));
+        location.y = Math.abs(y - ((position.indexOf('Top') > -1) ? (type === 'Template' ? rect.y : rect.y + textHeight) :
+            !(position.indexOf('Bottom') > -1) ? type === 'Template' ? (rect.y + ((rect.height / 2) - (textHeight / 2))) :
+                (rect.y + (rect.height / 2) + textHeight / 4) : (rect.y + rect.height) - textHeight));
     }
     return location;
 }
@@ -2473,7 +2480,18 @@ class LayoutPanel {
         let textName;
         textCollection = ((text.indexOf('<br>')) !== -1) ? text.split('<br>') : null;
         customText = this.labelInterSectAction(rect, text, textStyle, interSectAction);
-        textSize = measureText(textCollection && textCollection[0] || customText[0], textStyle);
+        let largerText = '';
+        let largerTextWidth = 0;
+        if (!isNullOrUndefined(textCollection) && textCollection.length > 0) {
+            for (let i = 0; i < textCollection.length; i++) {
+                const currentTextWidth = measureText(textCollection[i], textStyle).width;
+                if (currentTextWidth > largerTextWidth) {
+                    largerTextWidth = currentTextWidth;
+                    largerText = textCollection[i];
+                }
+            }
+        }
+        textSize = measureText(textCollection && largerText || customText[0], textStyle);
         if (this.treemap.enableRtl) {
             const labelSize = measureText(text, textStyle);
             const drillSymbolCount = text.search('[+]') || text.search('[-]');
@@ -2484,7 +2502,8 @@ class LayoutPanel {
                 customText['0'] = textTrim(rect.width - drillSymbolSize.width - padding, customText[0], textStyle) + label;
             }
         }
-        const textLocation = findLabelLocation(rect, position, textSize, 'Text', this.treemap);
+        const textCount = (!isNullOrUndefined(textCollection) && textCollection.length > 1) ? textCollection.length : 0;
+        const textLocation = findLabelLocation(rect, position, textSize, 'Text', this.treemap, textCount);
         if (!isNullOrUndefined(textCollection)) {
             const collection = [];
             let texts = null;