PRINT startY for bulletPoints direct after titles

AndreKelling · Feb 21, 2024 · 7318d18 · 7318d18
1 parent f696a23
commit 7318d18
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspdf-product-label-54x70",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "main": "src/app.js",
   "author": "André Kelling",
   "description": "Dymo Label PDF printing 54 x 70mm.",

diff --git a/src/print/index.js b/src/print/index.js
@@ -28,9 +28,9 @@ export default (printDataArr) => {
     // <><>><><>><>><><><><><>>><><<><><><><>
 
     printDataArr.forEach((printData, index) => {
-        titles(doc, printData, pageWidth);
+        const startY = titles(doc, printData, pageWidth);
 
-        bulletPoints(doc, printData.bulletPoints, pageWidth);
+        bulletPoints(doc, printData.bulletPoints, pageWidth, startY);
 
         // print qr code before text. so that any white margin from image is below text.
         qrCode(doc, printData.qrCode, pageWidth);

diff --git a/src/print/partials/bullet-points.js b/src/print/partials/bullet-points.js
@@ -6,14 +6,14 @@ import JsPDF from 'jspdf';
  * @param {JsPDF} doc
  * @param {string[]} bulletPoints
  * @param {number} pageWidth
+ * @param {number} startY
  */
-export default (doc, bulletPoints, pageWidth) => {
+export default (doc, bulletPoints, pageWidth, startY) => {
     if (!bulletPoints) {
         return;
     }
 
     const startX = 2;
-    let startY = doc.vars.startY.bulletPoints;
     const lineSpacing = doc.vars.lineSpacing - 1;
 
     doc.setFontSize(doc.vars.fontSizes.SmallestFontSize);

diff --git a/src/print/partials/settings.js b/src/print/partials/settings.js
@@ -20,7 +20,6 @@ export default (doc) => {
     doc.vars.startY = {
         logo:1,
         titles:14,
-        bulletPoints:35,
         productCode:52,
         qrCode:50,
         productId:67.5

diff --git a/src/print/partials/titles.js b/src/print/partials/titles.js
@@ -6,6 +6,8 @@ import JsPDF from 'jspdf';
  * @param {JsPDF} doc
  * @param {PrintData} printData
  * @param {number} pageWidth
+ *
+ * @return number
  */
 export default (doc, printData, pageWidth) => {
     const pageCenterX = pageWidth / 2;
@@ -31,6 +33,9 @@ export default (doc, printData, pageWidth) => {
     doc.setFontSize(doc.vars.fontSizes.SubTitleFontSize);
     const productColour = printData.productColour;
     if (productColour) {
-        doc.text(productColour, pageCenterX, startY + 1, {align: 'center'});
+        doc.text(productColour, pageCenterX, startY, {align: 'center'});
+        startY += doc.vars.lineSpacing;
     }
+
+    return startY;
 }