survey-pdf 2.2.5 → 2.3.0

package/fesm/pdf-form-filler-shared.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v2.2.5
+ * surveyjs - SurveyJS PDF library v2.3.0
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/fesm/pdf-form-filler.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v2.2.5
+ * surveyjs - SurveyJS PDF library v2.3.0
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/fesm/pdf-form-filler.node.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v2.2.5
+ * surveyjs - SurveyJS PDF library v2.3.0
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/fesm/survey.pdf.fonts.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v2.2.5
+ * surveyjs - SurveyJS PDF library v2.3.0
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/fesm/survey.pdf.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v2.2.5
+ * surveyjs - SurveyJS PDF library v2.3.0
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -1710,19 +1710,6 @@ class SurveyHelper {
             return text.renderedHtml;
         return text.renderedText || text.renderedHtml;
     }
-    static getDropdownQuestionValue(question) {
-        const qDropDown = question;
-        if (qDropDown.isOtherSelected) {
-            return qDropDown.otherText;
-        }
-        else if (!!question.displayValue) {
-            return question.displayValue;
-        }
-        else if (qDropDown.showOptionsCaption) {
-            return qDropDown.optionsCaption;
-        }
-        return '';
-    }
     static getContentQuestion(question) {
         return !!question.contentQuestion ? question.contentQuestion : question;
     }
@@ -7834,6 +7821,19 @@ class FlatSelectBase extends FlatQuestion {
         this.controller = controller;
         this.question = question;
     }
+    generateItemComment(point, item) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const commentModel = this.question.getCommentTextAreaModel(item);
+            return yield SurveyHelper.createCommentFlat(point, this.question, this.controller, {
+                fieldName: commentModel.id,
+                rows: SurveyHelper.OTHER_ROWS_COUNT,
+                value: commentModel.getTextValue(),
+                shouldRenderBorders: settings.readOnlyCommentRenderMode === 'textarea',
+                isReadOnly: this.question.isReadOnly,
+                isMultiline: true,
+            });
+        });
+    }
     generateFlatComposite(point, item, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const compositeFlat = new CompositeBrick();
@@ -7845,18 +7845,10 @@ class FlatSelectBase extends FlatQuestion {
             if (item.locText.renderedHtml !== null) {
                 compositeFlat.addBrick(yield SurveyHelper.createTextFlat(textPoint, this.question, this.controller, item.locText, TextBrick));
             }
-            if (item === this.question.otherItem && (item.value === this.question.value ||
-                (typeof this.question.isOtherSelected !== 'undefined' && this.question.isOtherSelected))) {
-                const otherPoint = SurveyHelper.createPoint(compositeFlat);
+            if (item.isCommentShowing) {
+                const otherPoint = SurveyHelper.createPoint(compositeFlat, true, false);
                 otherPoint.yTop += this.controller.unitHeight * SurveyHelper.GAP_BETWEEN_ROWS;
-                compositeFlat.addBrick(yield SurveyHelper.createCommentFlat(otherPoint, this.question, this.controller, {
-                    fieldName: this.question.id + '_comment' + index,
-                    rows: SurveyHelper.OTHER_ROWS_COUNT,
-                    value: this.question.comment !== undefined && this.question.comment !== null ? this.question.comment : '',
-                    shouldRenderBorders: settings.readOnlyCommentRenderMode === 'textarea',
-                    isReadOnly: this.question.isReadOnly,
-                    isMultiline: true,
-                }));
+                compositeFlat.addBrick(yield this.generateItemComment(otherPoint, item));
             }
             return compositeFlat;
         });
@@ -7899,10 +7891,9 @@ class FlatSelectBase extends FlatQuestion {
             const flats = [];
             for (let row of rows) {
                 const rowFlat = new CompositeBrick();
-                this.controller.pushMargins(this.controller.margins.left, this.controller.margins.right);
                 for (let colIndex = 0; colIndex < row.length; colIndex++) {
                     const item = row[colIndex];
-                    this.controller.pushMargins(this.controller.margins.left, this.controller.margins.right);
+                    this.controller.pushMargins();
                     SurveyHelper.setColumnMargins(this.controller, colCount, colIndex);
                     currPoint.xLeft = this.controller.margins.left;
                     const itemFlat = yield this.generateFlatComposite(currPoint, item, visibleChoices.indexOf(item));
@@ -8141,7 +8132,7 @@ class DropdownBrick extends PdfBrick {
             comboBox.fontSize = this.fontSize;
             comboBox.readOnly = this.question.isReadOnly;
             comboBox.isUnicode = SurveyHelper.isCustomFont(this.controller, comboBox.fontName);
-            comboBox.V = this.getCorrectedText(SurveyHelper.getDropdownQuestionValue(this.question));
+            comboBox.V = this.getCorrectedText(this.question.readOnlyText || '');
             this.controller.doc.addField(comboBox);
             SurveyHelper.renderFlatBorders(this.controller, this);
         });
@@ -8155,27 +8146,33 @@ class FlatDropdown extends FlatQuestion {
         this.controller = controller;
         this.question = question;
     }
+    generateItemComment(point) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const commentModel = this.question.getCommentTextAreaModel(this.question.selectedItem);
+            return yield SurveyHelper.createCommentFlat(point, this.question, this.controller, {
+                fieldName: commentModel.id,
+                rows: SurveyHelper.OTHER_ROWS_COUNT,
+                value: commentModel.getTextValue(),
+                shouldRenderBorders: settings.readOnlyCommentRenderMode === 'textarea',
+                isReadOnly: this.question.isReadOnly,
+                isMultiline: true,
+            });
+        });
+    }
     generateFlatsContent(point) {
         return __awaiter(this, void 0, void 0, function* () {
             const valueBrick = !this.shouldRenderAsComment ? new DropdownBrick(this.question, this.controller, SurveyHelper.createTextFieldRect(point, this.controller)) : yield SurveyHelper.createCommentFlat(point, this.question, this.controller, {
                 fieldName: this.question.id,
                 shouldRenderBorders: settings.readOnlyTextRenderMode === 'input',
-                value: SurveyHelper.getDropdownQuestionValue(this.question),
+                value: this.question.readOnlyText || '',
                 isReadOnly: this.question.isReadOnly,
                 placeholder: SurveyHelper.getLocString(this.question.locPlaceholder)
             });
             const compositeFlat = new CompositeBrick(valueBrick);
-            if (this.question.isOtherSelected) {
+            if (this.question.isShowingChoiceComment) {
                 const otherPoint = SurveyHelper.createPoint(compositeFlat);
                 otherPoint.yTop += this.controller.unitHeight * SurveyHelper.GAP_BETWEEN_ROWS;
-                compositeFlat.addBrick(yield SurveyHelper.createCommentFlat(otherPoint, this.question, this.controller, {
-                    fieldName: this.question.id + '_comment',
-                    rows: SurveyHelper.OTHER_ROWS_COUNT,
-                    value: this.question.comment !== undefined && this.question.comment !== null ? this.question.comment : '',
-                    shouldRenderBorders: settings.readOnlyCommentRenderMode === 'textarea',
-                    isReadOnly: this.question.isReadOnly,
-                    isMultiline: true,
-                }));
+                compositeFlat.addBrick(yield this.generateItemComment(otherPoint));
             }
             return [compositeFlat];
         });
@@ -8907,10 +8904,10 @@ class FlatMatrix extends FlatQuestion {
     }
 }
 FlatMatrix.GAP_BETWEEN_ROWS = 0.5;
-class FlatMatrixRow extends FlatRadiogroup {
+class FlatMatrixRow {
     constructor(survey, question, controller, row, rowIndex, key, isFirst = false, isVertical = false, rowTitleWidth, columnWidth) {
-        super(survey, question, controller);
         this.survey = survey;
+        this.question = question;
         this.controller = controller;
         this.row = row;
         this.rowIndex = rowIndex;
@@ -8919,7 +8916,6 @@ class FlatMatrixRow extends FlatRadiogroup {
         this.isVertical = isVertical;
         this.rowTitleWidth = rowTitleWidth;
         this.columnWidth = columnWidth;
-        this.questionMatrix = question;
     }
     generateFlatsContent(point) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -8928,25 +8924,40 @@ class FlatMatrixRow extends FlatRadiogroup {
                 yield this.generateFlatsHorizontallyCells(point);
         });
     }
+    generateFlatItem(rect, item, index, key, context = {}) {
+        const fieldName = this.question.id + key;
+        const isChecked = this.row.isChecked(item);
+        if (this.question.isMultiSelect) {
+            return new CheckItemBrick(this.controller, rect, fieldName + 'index' + index, { question: this.question, index, checked: isChecked, item, readOnly: this.question.isReadOnly });
+        }
+        else {
+            if (index === 0) {
+                this.radioGroupWrap = new RadioGroupWrap(fieldName, this.controller, Object.assign({ readOnly: this.question.isReadOnly, question: this.question }, context));
+                this.question.pdfRadioGroupWrap = this.radioGroupWrap;
+            }
+            else if (typeof this.radioGroupWrap === 'undefined') {
+                this.radioGroupWrap = this.question.pdfRadioGroupWrap;
+            }
+            return new RadioItemBrick(this.controller, rect, { question: this.question, index: index, checked: isChecked, item: item }, this.radioGroupWrap);
+        }
+    }
     generateTextComposite(point, column, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const currPoint = SurveyHelper.clone(point);
-            const checked = this.row.value == column.value;
             const itemRect = SurveyHelper.createRect(currPoint, SurveyHelper.getPageAvailableWidth(this.controller), this.controller.unitHeight);
-            const radioFlat = this.generateFlatItem(itemRect, column, index, this.key, checked, { row: this.row, rowIndex: this.rowIndex });
+            const radioFlat = this.generateFlatItem(itemRect, column, index, this.key, { row: this.row, rowIndex: this.rowIndex });
             currPoint.yTop = radioFlat.yBot + this.controller.unitHeight * SurveyHelper.GAP_BETWEEN_ITEM_TEXT;
-            const cellTextFlat = yield SurveyHelper.createTextFlat(currPoint, this.questionMatrix, this.controller, this.questionMatrix.getCellDisplayLocText(this.row.name, column), TextBrick);
+            const cellTextFlat = yield SurveyHelper.createTextFlat(currPoint, this.question, this.controller, this.question.getCellDisplayLocText(this.row.name, column), TextBrick);
             return new CompositeBrick(radioFlat, cellTextFlat);
         });
     }
-    generateItemCompoiste(point, column, index) {
+    generateItemComposite(point, column, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const currPoint = SurveyHelper.clone(point);
-            const checked = this.row.value == column.value;
             const itemRect = SurveyHelper.createRect(currPoint, this.controller.unitHeight, this.controller.unitHeight);
-            const radioFlat = this.generateFlatItem(SurveyHelper.moveRect(SurveyHelper.scaleRect(itemRect, SurveyHelper.SELECT_ITEM_FLAT_SCALE), itemRect.xLeft), column, index, this.key, checked, { row: this.row, rowIndex: this.rowIndex });
+            const radioFlat = this.generateFlatItem(SurveyHelper.moveRect(SurveyHelper.scaleRect(itemRect, SurveyHelper.SELECT_ITEM_FLAT_SCALE), itemRect.xLeft), column, index, this.key, { row: this.row, rowIndex: this.rowIndex });
             currPoint.xLeft = radioFlat.xRight + this.controller.unitWidth * SurveyHelper.GAP_BETWEEN_ITEM_TEXT;
-            const radioText = yield SurveyHelper.createTextFlat(currPoint, this.questionMatrix, this.controller, column.locText, TextBrick);
+            const radioText = yield SurveyHelper.createTextFlat(currPoint, this.question, this.controller, column.locText, TextBrick);
             return new CompositeBrick(radioFlat, radioText);
         });
     }
@@ -8954,26 +8965,26 @@ class FlatMatrixRow extends FlatRadiogroup {
         return __awaiter(this, void 0, void 0, function* () {
             const cells = [];
             const currPoint = SurveyHelper.clone(point);
-            if (this.questionMatrix.hasRows) {
+            if (this.question.hasRows) {
                 this.controller.pushMargins();
                 currPoint.xLeft = this.controller.margins.left;
                 this.controller.margins.right += (SurveyHelper.getPageAvailableWidth(this.controller) - this.rowTitleWidth);
-                cells.push(yield SurveyHelper.createTextFlat(currPoint, this.questionMatrix, this.controller, this.row.locText, TextBrick));
+                cells.push(yield SurveyHelper.createTextFlat(currPoint, this.question, this.controller, this.row.locText, TextBrick));
                 currPoint.xLeft += this.rowTitleWidth + this.controller.unitWidth * SurveyHelper.GAP_BETWEEN_COLUMNS;
                 this.controller.popMargins();
             }
-            for (let i = 0; i < this.questionMatrix.visibleColumns.length; i++) {
-                const column = this.questionMatrix.visibleColumns[i];
-                const checked = this.row.value == column.value;
+            for (let i = 0; i < this.question.visibleColumns.length; i++) {
+                const column = this.question.visibleColumns[i];
+                this.row.value == column.value;
                 this.controller.pushMargins();
                 this.controller.margins.left = currPoint.xLeft;
                 this.controller.margins.right += (SurveyHelper.getPageAvailableWidth(this.controller) - this.columnWidth);
-                if (this.questionMatrix.hasCellText) {
+                if (this.question.hasCellText) {
                     cells.push(yield this.generateTextComposite(currPoint, column, i));
                 }
                 else {
                     const itemRect = SurveyHelper.createRect(currPoint, this.controller.unitHeight, this.controller.unitHeight);
-                    cells.push(this.generateFlatItem(SurveyHelper.moveRect(SurveyHelper.scaleRect(itemRect, SurveyHelper.SELECT_ITEM_FLAT_SCALE), currPoint.xLeft), column, i, this.key, checked, { row: this.row, rowIndex: this.rowIndex }));
+                    cells.push(this.generateFlatItem(SurveyHelper.moveRect(SurveyHelper.scaleRect(itemRect, SurveyHelper.SELECT_ITEM_FLAT_SCALE), currPoint.xLeft), column, i, this.key, { row: this.row, rowIndex: this.rowIndex }));
                 }
                 currPoint.xLeft += this.columnWidth + this.controller.unitWidth * SurveyHelper.GAP_BETWEEN_COLUMNS;
                 this.controller.popMargins();
@@ -8986,17 +8997,28 @@ class FlatMatrixRow extends FlatRadiogroup {
         return __awaiter(this, void 0, void 0, function* () {
             const cells = [];
             const currPoint = SurveyHelper.clone(point);
-            if (this.questionMatrix.hasRows) {
-                const rowTextFlat = yield SurveyHelper.createTextFlat(currPoint, this.questionMatrix, this.controller, this.row.locText, TextBrick);
+            if (this.question.hasRows) {
+                const rowTextFlat = yield SurveyHelper.createTextFlat(currPoint, this.question, this.controller, this.row.locText, TextBrick);
                 currPoint.yTop = rowTextFlat.yBot + FlatQuestion.CONTENT_GAP_VERT_SCALE * this.controller.unitHeight;
                 cells.push(rowTextFlat);
             }
-            this.generateFlatComposite = (this.questionMatrix.hasCellText) ? this.generateTextComposite : this.generateItemCompoiste;
-            cells.push(...yield this.generateVerticallyItems(currPoint, this.questionMatrix.visibleColumns));
+            cells.push(...yield this.generateVerticallyItems(currPoint, this.question.visibleColumns));
             const compositeBrick = new CompositeBrick(...cells);
             return [compositeBrick, SurveyHelper.createRowlineFlat(SurveyHelper.createPoint(compositeBrick), this.controller)];
         });
     }
+    generateVerticallyItems(point, itemValues) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const currPoint = SurveyHelper.clone(point);
+            const flats = [];
+            for (let i = 0; i < itemValues.length; i++) {
+                const itemFlat = yield ((this.question.hasCellText) ? this.generateTextComposite : this.generateItemComposite).call(this, currPoint, itemValues[i], i);
+                currPoint.yTop = itemFlat.yBot + SurveyHelper.GAP_BETWEEN_ROWS * this.controller.unitHeight;
+                flats.push(itemFlat);
+            }
+            return flats;
+        });
+    }
 }
 Serializer.removeProperty('matrix', 'renderAs');
 Serializer.addProperty('matrix', {
@@ -9353,7 +9375,7 @@ class CustomBrick extends PdfBrick {
     }
 }
 
-checkLibraryVersion(`${"2.2.5"}`, 'survey-pdf');
+checkLibraryVersion(`${"2.3.0"}`, 'survey-pdf');
 
 export { BooleanItemBrick, CheckItemBrick, CheckboxItemBrick, CompositeBrick, CustomBrick, DocController, DocOptions, DrawCanvas, DropdownBrick, EmptyBrick, EventHandler, FlatBooleanCheckbox as FlatBoolean, FlatCheckbox, FlatComment, FlatCustomModel, FlatDropdown, FlatExpression, FlatFile, FlatHTML, FlatImage, FlatImagePicker, FlatMatrix, FlatMatrixDynamic, FlatMatrixMultiple, FlatMultipleText, FlatPanelDynamic, FlatQuestion, FlatQuestionDefault, FlatRadiogroup, FlatRanking, FlatRating, FlatRepository, FlatSelectBase, FlatSignaturePad, FlatSlider, FlatSurvey, FlatTextbox, HTMLBrick, HorizontalAlign, ImageBrick, LinkBrick, PagePacker, PdfBrick, RadioItemBrick, RankingItemBrick, RowlineBrick, SurveyHelper, SurveyPDF, TextBoldBrick, TextBrick, TextFieldBrick, TitlePanelBrick, VerticalAlign };
 //# sourceMappingURL=survey.pdf.mjs.map