@contrail/documents 1.1.22 → 1.1.24

package/lib/util/dynamic-text/dynamic-text-util.js

@@ -98,7 +98,7 @@ class DynamicTextUtil {
                         property = null;
                     }
                     const frameMemberValues = [];
-                    componentModels.forEach((elementModel) => {
+                    componentModels.forEach(elementModel => {
                         frameMemberValues.push(util_1.ObjectUtil.getByPath(elementModel, bindingProperty));
                     });
                     if (frameMemberValues.length > 0) {
@@ -133,13 +133,16 @@ class DynamicTextUtil {
         var _a, _b, _c, _d;
         let size = dynamicTextElement.size;
         const fontFamily = (_a = document_util_1.DocumentStyleUtil.getFirstFontFamily(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text)) !== null && _a !== void 0 ? _a : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
-        const fontSize = document_util_1.DocumentStyleUtil.toPx((_d = (_c = (_b = dynamicTextElement.style) === null || _b === void 0 ? void 0 : _b.font) === null || _c === void 0 ? void 0 : _c.size) !== null && _d !== void 0 ? _d : document_util_1.DEFAULT_TEXT_FONT_SIZE, 4);
+        const fontSize = (_d = (dynamicTextElement.isTextTool
+            ? (_c = (_b = dynamicTextElement.style) === null || _b === void 0 ? void 0 : _b.font) === null || _c === void 0 ? void 0 : _c.size
+            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _d !== void 0 ? _d : document_util_1.DEFAULT_TEXT_FONT_SIZE;
+        const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
         const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
         const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
         const italic = document_util_1.DocumentStyleUtil.isItalic(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text);
         const measureTextSettings = {
             fontFamily,
-            fontSize,
+            fontSize: fontSizePx,
             fallbackFontFamily: document_util_1.DEFAULT_TEXT_FONT_FAMILY,
             letterSpacing: document_util_1.DEFAULT_LETTER_SPACING,
             bold,
@@ -176,9 +179,9 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.UNIQUE_ARRAY) {
             text = Array.from(new Set(memberValues
-                .filter((e) => e !== null && e !== undefined)
+                .filter(e => e !== null && e !== undefined)
                 .flat()
-                .map((e) => formatter.formatValueForProperty(e, property))))
+                .map(e => formatter.formatValueForProperty(e, property))))
                 .sort()
                 .join(', ');
         }
@@ -190,31 +193,31 @@ class DynamicTextUtil {
             text = formatter.formatValueForProperty(memberValues[memberValues.length - 1], property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.MIN) {
-            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
+            memberValues = memberValues.filter(e => e !== null && e !== undefined);
             text = formatter.formatValueForProperty(Math.min(...memberValues), property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.MAX) {
-            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
+            memberValues = memberValues.filter(e => e !== null && e !== undefined);
             text = formatter.formatValueForProperty(Math.max(...memberValues), property);
         }
         return text;
     }
     static getItemCount(countType, componentModels) {
-        const elementModels = componentModels.map((elementModel) => {
+        const elementModels = componentModels.map(elementModel => {
             return elementModel.item || elementModel.color;
         });
         let count = 0;
         if (countType === 'itemFamilyCount') {
-            count = new Set(elementModels.filter((model) => model.entityType === 'item').map((model) => model === null || model === void 0 ? void 0 : model.itemFamilyId))
+            count = new Set(elementModels.filter(model => model.entityType === 'item').map(model => model === null || model === void 0 ? void 0 : model.itemFamilyId))
                 .size;
         }
         else if (countType === 'itemOptionCount') {
             count = new Set(elementModels
-                .filter((model) => model.entityType === 'item' && model.roles.includes('option'))
-                .map((model) => model === null || model === void 0 ? void 0 : model.id)).size;
+                .filter(model => model.entityType === 'item' && model.roles.includes('option'))
+                .map(model => model === null || model === void 0 ? void 0 : model.id)).size;
         }
         else if (countType === 'colorCount') {
-            count = new Set(elementModels.filter((model) => model.entityType === 'color').map((model) => model === null || model === void 0 ? void 0 : model.id)).size;
+            count = new Set(elementModels.filter(model => model.entityType === 'color').map(model => model === null || model === void 0 ? void 0 : model.id)).size;
         }
         return count.toString();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/documents",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",