Merge pull request #15 from priyanjitdey94/develop

Updated test cases, added caveats
fusioncharts · Jul 11, 2019 · 2920da7 · 2920da7
2 parents f35012c + 5b85fb9
commit 2920da7
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -157,7 +157,7 @@ To get the size of a given text
  *                  }
  *                  If detailedCalculationFlag is set to false the returned object wont have the detailObj prop.
  */
-size = sl.getOriSize(text, detailedCalculationFlag);
+size = sl.getSize(text, detailedCalculationFlag);
 ```
 
 To dispose the components

diff --git a/dist/fusioncharts-smartlabel.js b/dist/fusioncharts-smartlabel.js
diff --git a/dist/fusioncharts-smartlabel.min.js b/dist/fusioncharts-smartlabel.min.js
diff --git a/es/SmartlabelManager.js b/es/SmartlabelManager.js
diff --git a/es/lib.js b/es/lib.js
diff --git a/src/SmartlabelManager.js b/src/SmartlabelManager.js
@@ -466,7 +466,7 @@ SmartLabelManager.prototype.getSmartText = function (text, maxWidth, maxHeight,
                 tmpText = text = text.replace(slLib.ltgtRegex, function (match) {
                     return match === '&lt;' ? '<' : '>';
                 });
-                getOriSizeImproveObj = this.getOriSize(tmpText, true, {
+                getOriSizeImproveObj = this.getSize(tmpText, true, {
                     hasHTMLTag: hasHTMLTag,
                     hasOnlyBrTag: hasOnlyBrTag,
                     cleanText: true
@@ -913,7 +913,7 @@ SmartLabelManager.prototype.getSmartText = function (text, maxWidth, maxHeight,
  *                  }
  *                  If detailedCalculationFlag is set to false the returned object wont have the detailObj prop.
  */
-SmartLabelManager.prototype.getOriSize = function (text = '', detailedCalculationFlag = true, config = {}) {
+SmartLabelManager.prototype.getSize = function (text = '', detailedCalculationFlag = true, config = {}) {
     if (!this._init) {
         return false;
     }
@@ -951,35 +951,39 @@ SmartLabelManager.prototype.getOriSize = function (text = '', detailedCalculatio
     }
     this._updateStyle();
     container = this._container;
-    // If text has br tag, return the width and height with proper calculations
-    if (hasOnlyBrTag) {
-        return slLib._getDimentionOfMultiLineText(text, this);
-    }
 
     // When text is normal text
     if (!detailedCalculationFlag) {
         return this._calCharDimWithCache(text);
+    } else {
+        // Calculate the width of every letter with an approximation
+        textArr = text.split('');
+        for (i = 0, l = textArr.length; i < l; i++) {
+            letter = textArr[i];
+            lSize = this._calCharDimWithCache(letter, false, textArr.length);
+            height = max(height, lSize.height);
+            cumulativeSize += lSize.width;
+            indiSizeStore[letter] = lSize.width;
+        }
+    }
+    // If text has br tag, return the width and height with proper calculations
+    if (hasOnlyBrTag) {
+        return {
+            ...slLib._getDimentionOfMultiLineText(text, this),
+            detailObj: indiSizeStore
+        };
     }
 
     // text contains html tags other than br
     if (hasHTMLTag) {
         container.innerHTML = text;
         return {
             width: container.offsetWidth,
-            height: container.offsetHeight
+            height: container.offsetHeight,
+            detailObj: indiSizeStore
         };
     }
 
-    // Calculate the width of every letter with an approximation
-    textArr = text.split('');
-    for (i = 0, l = textArr.length; i < l; i++) {
-        letter = textArr[i];
-        lSize = this._calCharDimWithCache(letter, false, textArr.length);
-        height = max(height, lSize.height);
-        cumulativeSize += lSize.width;
-        indiSizeStore[letter] = lSize.width;
-    }
-
     return {
         width: round(cumulativeSize),
         height: height,
@@ -991,12 +995,8 @@ SmartLabelManager.prototype.getOriSize = function (text = '', detailedCalculatio
  * getOriSize API will eventually be deprecated and will be renamed to getSize API. For the next two versions,
  * both getOriSize and getSize API will be supported.
  */
-SmartLabelManager.prototype.getSize = function (text = '', detailedCalculationFlag = true, config = {}) {
-    if (!this._init) {
-        return false;
-    }
-
-    return this.getOriSize(text, detailedCalculationFlag, config);
+SmartLabelManager.prototype.getOriSize = function (text = '', detailedCalculationFlag = true, config = {}) {
+    return this.getSize(text, detailedCalculationFlag, config);
 };
 /*
  * Dispose the container and object allocated by the smartlabel

diff --git a/test/smartlabel-manager.js b/test/smartlabel-manager.js
@@ -16,6 +16,7 @@ describe('SmartLabel', function () {
 					'useEllipsesOnOverflow',
 					'getSmartText',
 					'getOriSize',
+					'getSize',
 					'dispose'
 				],
 				dirty = false;
@@ -85,10 +86,10 @@ describe('SmartLabel', function () {
 
 	it('sets the style properly',
 		function () {
-			var sizeWOStyle = sl.getOriSize('A quick brown fox'),
+			var sizeWOStyle = sl.getSize('A quick brown fox'),
 				sizeWithStyle = sl
 					.setStyle({fontSize: '30px'})
-					.getOriSize('A quick brown fox');
+					.getSize('A quick brown fox');
 
 
 			expect(sizeWOStyle).to.not.deep.equal(sizeWithStyle);
@@ -102,7 +103,7 @@ describe('SmartLabel', function () {
 						fontSize: '20px',
 						fontFamily: 'Verdana'
 					})
-					.getOriSize('a quick brown fox');
+					.getSize('a quick brown fox');
 
 			expect(size.height).to.be.equal(24);
 			// Error value: +-2px
@@ -222,6 +223,17 @@ describe('SmartLabel', function () {
 			expect(smarttext.lines.length).to.equal(6);
 		});
 
+	it('getSize API should always return detailObj', function () {
+		var smarttext,
+			present;
+
+		smarttext = sl.getSize('AAAA');
+		expect(smarttext.hasOwnProperty('detailObj')).to.equal(true);
+		smarttext = sl.getSize('AAA <br> AAA');
+		expect(smarttext.hasOwnProperty('detailObj')).to.equal(true);
+		smarttext = sl.getSize('AAA <div></div> AAA');
+		expect(smarttext.hasOwnProperty('detailObj')).to.equal(true);
+	})
 
 	it('removes the div when disposed',
 		function () {