@innovastudio/contentbuilder 1.0.56 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innovastudio/contentbuilder",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "",
   "main": "public/contentbuilder/contentbuilder.esm.js",
   "files": [

package/public/contentbuilder/contentbuilder.esm.js

@@ -52293,12 +52293,6 @@ class Preferences {
 
 }
 
-/*
-LATER:
-- Get/show current font size, line height & letter spacing
-- Click toggle button shows gray highlight
-- Image di luar domain gak bisa di-edit (kasih warning)
-*/
 const dom$5 = new Dom();
 
 class Rte {
@@ -54163,23 +54157,51 @@ class Rte {
         } // var text = dom.getSelected();
 
 
-        this.builder.uo.saveForUndo();
-        let currentLineHeight = Number(window.getComputedStyle(elm).getPropertyValue('line-height').match(/\d+/)[0]);
+        this.builder.uo.saveForUndo(); // let currentLineHeight = Number(window.getComputedStyle(elm).getPropertyValue('line-height').match(/\d+/)[0]);
+
+        let isInPx = false;
+        let currentLineHeight = elm.style.lineHeight;
+
+        if (currentLineHeight) {
+          if (currentLineHeight.indexOf('px') === -1) {
+            currentLineHeight = parseFloat(currentLineHeight);
+          } else {
+            isInPx = true;
+          }
+        } else {
+          isInPx = true;
+        }
+
+        if (isInPx) {
+          let fontSize = Number(window.getComputedStyle(elm).getPropertyValue('font-size').match(/\d+/)[0]);
+          currentLineHeight = Number(window.getComputedStyle(elm).getPropertyValue('line-height').match(/\d+/)[0]);
+
+          if (fontSize > currentLineHeight) {
+            currentLineHeight = fontSize / currentLineHeight;
+          } else if (fontSize < currentLineHeight) {
+            currentLineHeight = currentLineHeight / fontSize;
+          } else {
+            currentLineHeight = 1;
+          }
+        }
+
         let lineheight;
 
         if (num === '+') {
-          lineheight = currentLineHeight + 1 + 'px';
+          lineheight = currentLineHeight + 0.2;
         } else if (num === '-') {
-          lineheight = currentLineHeight - 1 + 'px';
+          lineheight = currentLineHeight - 0.2;
         } else if (num === '') {
           lineheight = '';
         } else {
           lineheight = num;
         }
+
+        if (lineheight < 0.2) lineheight = 0.2; // prevent very small number
+
         /** mod by Jack */
         //elm.style.lineHeight = lineheight;
 
-
         dom$5.doFunction(elm, function (theEl) {
           theEl.style.lineHeight = lineheight;
         }, true); //save selection