From f5a19b03d7dd0934a0cf6ecfa31449d803578157 Mon Sep 17 00:00:00 2001
From: ST-1580 <steep1580@yandex.ru>
Date: Fri, 22 Oct 2021 11:03:42 +0300
Subject: [PATCH] Support for text with newlines in Acroform TextFields (#3298)

---
 src/modules/acroform.js                       | 102 ++++++++++++------
 test/reference/textfieldMultiline.pdf         | Bin 0 -> 3650 bytes
 .../reference/textfieldMultilineSmallForm.pdf | Bin 0 -> 3746 bytes
 test/specs/acroform.spec.js                   |  36 +++++++
 4 files changed, 105 insertions(+), 33 deletions(-)
 create mode 100644 test/reference/textfieldMultiline.pdf
 create mode 100644 test/reference/textfieldMultilineSmallForm.pdf

diff --git a/src/modules/acroform.js b/src/modules/acroform.js
index d333eb28d..d440d51f6 100644
--- a/src/modules/acroform.js
+++ b/src/modules/acroform.js
@@ -217,6 +217,11 @@ var calculateX = function(formObject, text) {
       : text;
   // split into array of words
   var textSplit = text.split(" ");
+  if (formObject.multiline) {
+    textSplit = textSplit.map(word => word.split("\n"));
+  } else {
+    textSplit = textSplit.map(word => [word]);
+  }
 
   var fontSize = maxFontSize; // The Starting fontSize (The Maximum)
   var lineSpacing = 2;
@@ -229,7 +234,7 @@ var calculateX = function(formObject, text) {
 
   var isSmallerThanWidth = function(i, lastLine, fontSize) {
     if (i + 1 < textSplit.length) {
-      var tmp = lastLine + " " + textSplit[i + 1];
+      var tmp = lastLine + " " + textSplit[i + 1][0];
       var TextWidth = calculateFontSpace(tmp, formObject, fontSize).width;
       var FieldWidth = width - 2 * borderPadding;
       return TextWidth <= FieldWidth;
@@ -253,6 +258,7 @@ var calculateX = function(formObject, text) {
     var firstWordInLine = 0,
       lastWordInLine = 0;
     var lastLength;
+    var currWord = 0;
 
     if (fontSize <= 0) {
       // In case, the Text doesn't fit at all
@@ -269,51 +275,81 @@ var calculateX = function(formObject, text) {
 
     var lastLine = "";
     var lineCount = 0;
-    Line: for (var i in textSplit) {
+    Line: for (var i = 0; i < textSplit.length; i++) {
       if (textSplit.hasOwnProperty(i)) {
-        lastLine += textSplit[i] + " ";
-        // Remove last blank
-        lastLine =
-          lastLine.substr(lastLine.length - 1) == " "
-            ? lastLine.substr(0, lastLine.length - 1)
-            : lastLine;
-        var key = parseInt(i);
-        var nextLineIsSmaller = isSmallerThanWidth(key, lastLine, fontSize);
-        var isLastWord = i >= textSplit.length - 1;
-        if (nextLineIsSmaller && !isLastWord) {
-          lastLine += " ";
-          continue; // Line
-        } else if (!nextLineIsSmaller && !isLastWord) {
-          if (!formObject.multiline) {
+        let isWithNewLine = false;
+        if (textSplit[i].length !== 1 && currWord !== textSplit[i].length - 1) {
+          if (
+            (textHeight + lineSpacing) * (lineCount + 2) + lineSpacing >
+            height
+          ) {
             continue FontSize;
+          }
+
+          lastLine += textSplit[i][currWord];
+          isWithNewLine = true;
+          lastWordInLine = i;
+          i--;
+        } else {
+          lastLine += textSplit[i][currWord] + " ";
+          lastLine =
+            lastLine.substr(lastLine.length - 1) == " "
+              ? lastLine.substr(0, lastLine.length - 1)
+              : lastLine;
+          var key = parseInt(i);
+          var nextLineIsSmaller = isSmallerThanWidth(key, lastLine, fontSize);
+          var isLastWord = i >= textSplit.length - 1;
+
+          if (nextLineIsSmaller && !isLastWord) {
+            lastLine += " ";
+            currWord = 0;
+            continue; // Line
+          } else if (!nextLineIsSmaller && !isLastWord) {
+            if (!formObject.multiline) {
+              continue FontSize;
+            } else {
+              if (
+                (textHeight + lineSpacing) * (lineCount + 2) + lineSpacing >
+                height
+              ) {
+                // If the Text is higher than the
+                // FieldObject
+                continue FontSize;
+              }
+              lastWordInLine = key;
+              // go on
+            }
+          } else if (isLastWord) {
+            lastWordInLine = key;
           } else {
             if (
+              formObject.multiline &&
               (textHeight + lineSpacing) * (lineCount + 2) + lineSpacing >
-              height
+                height
             ) {
-              // If the Text is higher than the
-              // FieldObject
+              // If the Text is higher than the FieldObject
               continue FontSize;
             }
-            lastWordInLine = key;
-            // go on
-          }
-        } else if (isLastWord) {
-          lastWordInLine = key;
-        } else {
-          if (
-            formObject.multiline &&
-            (textHeight + lineSpacing) * (lineCount + 2) + lineSpacing > height
-          ) {
-            // If the Text is higher than the FieldObject
-            continue FontSize;
           }
         }
+        // Remove last blank
 
         var line = "";
 
         for (var x = firstWordInLine; x <= lastWordInLine; x++) {
-          line += textSplit[x] + " ";
+          var currLine = textSplit[x];
+          if (formObject.multiline) {
+            if (x === lastWordInLine) {
+              line += currLine[currWord] + " ";
+              currWord = (currWord + 1) % currLine.length;
+              continue;
+            }
+            if (x === firstWordInLine) {
+              line += currLine[currLine.length - 1] + " ";
+              continue;
+            }
+          }
+          line += currLine[0] + " ";
         }
 
         // Remove last blank
@@ -347,7 +383,7 @@ var calculateX = function(formObject, text) {
 
         // Reset for next iteration step
         lastLength = 0;
-        firstWordInLine = lastWordInLine + 1;
+        firstWordInLine = isWithNewLine ? lastWordInLine : lastWordInLine + 1;
         lineCount++;
 
         lastLine = "";
diff --git a/test/reference/textfieldMultiline.pdf b/test/reference/textfieldMultiline.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a78ceb310e7c7770280583cb73567d58e0409b84
GIT binary patch
literal 3650
zcmcIn+iu%N5PjdTm=_~93X!|Zs{+G-NSTchr*dVYDQe__l2#54iF8P+wfjx^g8WST
zDV<r87A?jX6p<bzYIb)n=M0C32N&aLAPkEgeEa9?zsv#-`Rs-rADi+0tpf8RxmFCn
z3zbzMaCOSesVehLF;^wX+VDXw(j>_5;EJQc89Ija!MBCs4?i(;lx2BU!W9FDwgW?3
zm}eDwEWy?uPEMH078IEN*9kE5TxHkQXYe?~^|C5dvS!?HJot-o_?ZPUGa~`Qg?Pz?
zZ`cr@<H9wQzF|3FTiozHh!^ZIR(DmDs@3A{5yUs_G^S{c!zM13)+@YZ=KFMksS_+y
z(0OkN2TG_p=sq08Y$yh9*L8mCY$8KjRRlKfT!PJqE@3&Z;7TA?o`t0d!|}nE2q4(D
zV{jW|MlqQ29W!G%)Bz^58$861nE4wVj#$7#ysX*MP&4y#GpjUvAJfIPs*r*UKt_K7
zkLtkOx9O9m&8+tEd+opDCCZC6rh(sjhhS##K(_QP!*-$m!DM^A(U2%?r^6!F1Hp%o
zeIXLLft+b3J;Oy3kxWdA>u%!^ubDJB2kCl-Z)rM5n#BP%AF``g2V$ttBH6*StKp+n
zYK33fDQ41Z2)_qRgguL;C#9k*FyE=wpQ=jdNe3zd2=O`1=J_JcuEG46W}~c3TLada
z7G)KFP71Ijws_L~k&ecvX{zDtgAamywfONF2x8!IV?0^^U@}{!Up6==9vbfl;UKoR
zW!vIUXF)*hFB9sv=kW+}D5k2|0}9)z{1ggJ?0q#ucPiIYVwZ+Cf&CHCouSX?u-``L
z4*c)u5vOZa4yO4!$@b6;{fWKHMIC=nbK&K=ScgBWl2tn2L;Ww$#%=xkN<zLo9sfvf
zmt%Yc%#sRa#O`2x)l)#eJpC^3*Ry=}fBknx+C`DiFBM7=69pma4OC2Eo~=>+1<h~R
z{GO2{p$Fjcv3_b(L!c;(BoH%ng+hk#p-UU|2&YR2L?ag?7lc++X!StU63~o%5L!5)
zbx5kN_JFR0mMv&TU!o0%&O{p!y=g`$47$^}O-XK;jhLZaAITos9p_m4Vl!6-9Nv^v
zy)<lt<W-1@vr6-9oKy-9$8RN<LU7>-fqKpRiCb?te{<9kQ?fs(!vybx9Q6$e>9SSO
zlUtRI=H$E8mZ%G=caUvXD}<N!o+tPD2055yD$G}#HI9<eyvRv~L5<B;#N8EYiON^n
zj6Zz9bsSW|OK5EpwUu6lthJ%&Kv(qH+Bg>2vkAL*mRqP)ch6b`{f<9}Xy37ULquxF
zHY92v+XT1!HsSaD35)38IcxWG77mK+-F+VK)hqDbrMGYBV!J(#AyLBjY*P08$?sq#
zZMT=R^f|WrP7J?`RaGSE3N;4Zdzb0oia0l?d0v6;J-h+VvSkjsz3I;wuHZOuBhR-Y
sKN|b)Xlyx=$3<WbM^1P;a_qo9dCeC6I#X6jQR!~8xWISDgVRa$ANDxsVgLXD

literal 0
HcmV?d00001

diff --git a/test/reference/textfieldMultilineSmallForm.pdf b/test/reference/textfieldMultilineSmallForm.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e589d69905cc2e7becee0653ef4a4e6bce8c1633
GIT binary patch
literal 3746
zcmcIn+iv4F5Pj!Y%uBEd3QHtK$<iVSV9QZA*le9TLbqtJ53)^X71&Z%lG~);)Gz4I
zw4c%$%8C^$Hxz3>IP!>`%Q?g0$-%`a>IutX2Y>(b*T2jG4*B$k9Ut5A{jCQ3BDvNK
zzYCpJAn@&k*%Mvn>td!$khS5Ho~Ow$zk@4|1~+gm>4UF?<p*DwJ;<`WD&dNOOUr?w
zEzGkDJ(i%1hm#YgvpEH(-*p1aKG)fG^%eS@;rp^Gbh2XHa{KTH<M1OJ#>|cc2oK@~
z6TYP&KF1f=O!}7Nf^xX!_aUCM!&u){QL2~o_eT)lu+x~LZ5(dmQfZySOJ;ve=a@Rd
zG69qKnsA_mHXFT%jhGF^z~!dSFRevnXsU`p;mQRl9(aW1tb!|nSoIw=Nz0X>BmxLZ
zxfWL#Gm62E@0cCKp$Raa-ry#F#Oz<-aKO&<>>8G7rs1tmEX2Jvy@nfRU#_Q>q5E?>
zzt$CUb^+J|KS7@g$6~kjlBFr7_VH_-P|Hh{7c0ygzs(B4?BPRqNZ+xPhc#lQSX`%<
zHl&NdX|ay=!|+qcz7gr%LXHjd((;gWBp-9)raL*rD<&<@!NKnH4f_K_dXIV)o58&7
z31zloZ@d+>?YbA;g^%7+tNqMQG4oEt`5hc1JQIjiQfhhv`-5KouB&vGw2&n{5zf<W
zmd{h<-Ts_rgRD#&1LBevWfgu+3UDMIp=9$zx^9ca;O)VC!+bga{uu~j>~SAGTYqmn
zU8djGIENnk^gH1ow#U9X5zl8qK<qCQYR{MP2yy79y4V8>+o}H?3Y*ybYKHdIuZPMm
z4NU_3BcMH_U(R8_jnKYOp3WmqSGw#?@>P=Up&7aZewT|n{+{N->vORVe^w>Sbhd~3
zU!RTJ`uCNDe0@6pmfS8zcm+(83T4XfV0_apAYY$;m-nk_zWl%bTO;kF$Y+-trH+k)
z6ZH%#GO*89s4j<_zv1TZ8A%?x0FRH&El&-BqBD{}%+Qkq=JudR1!jcPqYGjqM<Wk}
zQEX`KgQz8@9r+-PFhgrVs<C#4u7puJXhvV635U)^6A--_MkoxrGq_FYI<+_2hjM+S
zl4N_FW9{?xOc!u?Q&RQPQWnX#5EX5e=GiEzG#rlJOD=`rk_(C2FZh8w?>K*V)Vj81
zcTk53o`W3q5DE3NQRw4aoegH>yV0(w3#t#0t(QxLm)4#q_xTz*7-u@nm+KXdlEJLV
zNwh(Y%~tc>6?%cnS}MjLKH#}7s_X?cHi=ryyoIc>Ne|WRj*W9-fj--HT&T`o?zl+B
z&N_#n-?6z~*XH|3-Q#rvgLG_9#1*pNiHq_aA=&ZgDm<h+HqYzE^?4^h6t~!NkM~OM
zb#Rd)=-?-xz(6XuQyU7tPR=sm*g-pSgEm%Gk)%u17<Be7(?2zFZcp;O0@HhV0M4>S
z4yL{7#|W<Am=B`CC>$vs$${^<ec=uHsS1_gs^1@}(aBqun17ebDk&<{ZI0jpJ2*HU
GNB;o|^a#fQ

literal 0
HcmV?d00001

diff --git a/test/specs/acroform.spec.js b/test/specs/acroform.spec.js
index 42e411b07..b7582a826 100644
--- a/test/specs/acroform.spec.js
+++ b/test/specs/acroform.spec.js
@@ -973,6 +973,42 @@ describe("Module: Acroform Integration Test", function() {
     comparePdf(doc.output(), "password.pdf", "acroform");
   });
 
+  it("Check multiline text", function() {
+    var doc = new jsPDF({
+      orientation: "p",
+      unit: "mm",
+      format: "a4",
+      floatPrecision: 2
+    });
+    doc.text("TextField:", 10, 145);
+    var textField = new TextField();
+    textField.Rect = [50, 140, 100, 100];
+    textField.multiline = true;
+    textField.V = "A\nB\nC";
+
+    doc.addField(textField);
+
+    comparePdf(doc.output(), "textfieldMultiline.pdf", "acroform");
+  });
+
+  it("Check multiline text in small form", function() {
+    var doc = new jsPDF({
+      orientation: "p",
+      unit: "mm",
+      format: "a4",
+      floatPrecision: 2
+    });
+    doc.text("TextField:", 10, 145);
+    var textField = new TextField();
+    textField.Rect = [50, 140, 100, 15];
+    textField.multiline = true;
+    textField.V = "A\nLong line Long line Long line Long line Long line \nC";
+
+    doc.addField(textField);
+
+    comparePdf(doc.output(), "textfieldMultilineSmallForm.pdf", "acroform");
+  });
+
   it("should add a RadioGroup Cross", function() {
     var doc = new jsPDF({
       orientation: "p",