@contrail/documents 1.1.16 → 1.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/util/dynamic-text/dynamic-text-util.js +24 -26
  2. package/package.json +1 -1
package/lib/util/dynamic-text/dynamic-text-util.js CHANGED
@@ -130,34 +130,32 @@ class DynamicTextUtil {
130
130
  static calculateSize(dynamicTextElement, entityType, text) {
131
131
  var _a, _b, _c, _d;
132
132
  let size = dynamicTextElement.size;
133
- if (entityType !== DYNAMIC_TEXT_DATA_SOURCE.FRAME) {
134
- 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;
135
- 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);
136
- const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
137
- const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
138
- const italic = document_util_1.DocumentStyleUtil.isItalic(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text);
139
- const measureTextSettings = {
140
- fontFamily,
141
- fontSize,
142
- fallbackFontFamily: document_util_1.DEFAULT_TEXT_FONT_FAMILY,
143
- letterSpacing: document_util_1.DEFAULT_LETTER_SPACING,
144
- bold,
145
- italic,
133
+ 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;
134
+ 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);
135
+ const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
136
+ const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
137
+ const italic = document_util_1.DocumentStyleUtil.isItalic(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text);
138
+ const measureTextSettings = {
139
+ fontFamily,
140
+ fontSize,
141
+ fallbackFontFamily: document_util_1.DEFAULT_TEXT_FONT_FAMILY,
142
+ letterSpacing: document_util_1.DEFAULT_LETTER_SPACING,
143
+ bold,
144
+ italic,
145
+ };
146
+ if (!dynamicTextElement.isTextTool) {
147
+ measureTextSettings.width = dynamicTextElement.size.width - padding * 2;
148
+ }
149
+ try {
150
+ const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
151
+ const width = dimensions.width + padding * 2;
152
+ const height = dimensions.height + padding * 2;
153
+ size = {
154
+ width,
155
+ height: dynamicTextElement.isTextTool ? height : Math.max(size.height, height),
146
156
  };
147
- if (!dynamicTextElement.isTextTool) {
148
- measureTextSettings.width = dynamicTextElement.size.width - padding * 2;
149
- }
150
- try {
151
- const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
152
- const width = dimensions.width + padding * 2;
153
- const height = dimensions.height + padding * 2;
154
- size = {
155
- width,
156
- height: dynamicTextElement.isTextTool ? height : Math.max(size.height, height),
157
- };
158
- }
159
- catch (e) { }
160
157
  }
158
+ catch (e) { }
161
159
  return size;
162
160
  }
163
161
  static getTextFromFrameMemberValues(displayFunction, property, memberValues) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contrail/documents",
3
- "version": "1.1.16",
3
+ "version": "1.1.17",
4
4
  "description": "Documents library for contrail platform",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",