@capillarytech/creatives-library 7.5.1 → 7.5.3

package/components/FormBuilder/index.js

@@ -841,7 +841,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           let errorString = "";
           for (var i = 0; i < data.selectedLanguages.length; i+= 1) {
             const currentLang = data.selectedLanguages[i];
-            const content = data[currentLang]['template-content'];
+            const content = (data[currentLang] || {})['template-content'];
             const tagValidationResponse = this.validateTags(content, tags, injectedTags);
             if (errorData[index][currentLang] === undefined) {
               errorData[index][currentLang] = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.5.1",
+  "version": "7.5.3",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/smsCharCountV2.js

@@ -70,47 +70,35 @@ export function updateCharCount(content = '', isUnicodeEnabled) {
   const noOfOptout = (content.match(optoutTag) || []).length;
   content = showOptoutCount ? content.replace(optoutTag, "") : content;
   var chars_arr = contentOriginal.split("");
+  var chars_arr_optedOut = content.split("");
   var coding = '7bit';
   var parts = 1;
-  var part = 1;
   var chars_used = 0;
   var chars_sms = 160;
-  var sms_parts_container = [];
   var partc = [];
-  for (let i = 0; i < chars_arr.length; i++) {
-    if (charset7bit.indexOf(chars_arr[i]) >= 0) {
+  for (let i = 0; i < chars_arr_optedOut.length; i++) {
+    if (charset7bit.indexOf(chars_arr_optedOut[i]) >= 0) {
       chars_used = chars_used + 1;
-    } else if (charset7bitext.indexOf(chars_arr[i]) >= 0) {
+    } else if (charset7bitext.indexOf(chars_arr_optedOut[i]) >= 0) {
       chars_used = chars_used + 2;
     } else {
       coding = '16bit';
-      chars_used = chars_arr.length;
+      chars_used = chars_arr_optedOut.length;
       break;
     }
   }
-  chars_used = showOptoutCount && optoutUrl && optoutUrl.length ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
+  chars_used = showOptoutCount && optoutUrl && optoutUrl.length ? (chars_used + ((optoutUrl && optoutUrl.length) || 0) * noOfOptout) : chars_used + optoutTagLength;
   if (coding == '7bit') {
     if (chars_used > 160) {
       var parts = Math.ceil(chars_used / 153);
       var part_chars_used = 7;
       chars_sms = 153;
       for (let i = 0; i < chars_arr.length; i++) {
-        if (part_chars_used + 1 > 160) {
-          part = part + 1;
-          part_chars_used = 7;
-          sms_parts_container.push(partc);
-        }
-        if (charset7bitext.indexOf(chars_arr[i]) >= 0 && part_chars_used + 2 > 160) {
-          part = part + 1;
+        if (part_chars_used + 1 > 160 || (charset7bitext.indexOf(chars_arr[i]) >= 0 && part_chars_used + 2 > 160)) {
           part_chars_used = 7;
-          sms_parts_container.push(partc);
         }
         partc = [...partc, charToSpan(chars_arr[i], coding, isUnicodeEnabled)];
-        if (charset7bitext.indexOf(chars_arr[i]) == -1) {
-          part_chars_used = part_chars_used + 1;
-        } else {
-          part_chars_used = part_chars_used + 2;
-        }
+        part_chars_used = charset7bitext.indexOf(chars_arr[i]) == -1 ? part_chars_used + 1 : part_chars_used + 2;
       }
     } else {
       chars_sms = 160;
@@ -125,7 +113,6 @@ export function updateCharCount(content = '', isUnicodeEnabled) {
       chars_sms = 67;
       for (let i = 0; i < chars_arr.length; i++) {
         if (part_chars_used + 1 > 70) {
-          part = part + 1;
           part_chars_used = 3;
         }
         partc = [...partc, charToSpan(chars_arr[i], coding, isUnicodeEnabled)];

package/v2Components/FormBuilder/index.js

@@ -924,7 +924,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           let errorString = "";
           for (var i = 0; i < data.selectedLanguages.length; i+= 1) {
             const currentLang = data.selectedLanguages[i];
-            const content = data[currentLang]['template-content'];
+            const content = (data[currentLang] || {})['template-content'];
             if (!content) {
               return false;
             }