survey-pdf 2.2.0 → 2.2.2

package/fesm/survey.pdf.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v2.2.0
+ * surveyjs - SurveyJS PDF library v2.2.2
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -13,7 +13,6 @@ var SurveyPDFModule = /*#__PURE__*/Object.freeze({
     get BooleanItemBrick () { return BooleanItemBrick; },
     get CheckItemBrick () { return CheckItemBrick; },
     get CheckboxItemBrick () { return CheckboxItemBrick; },
-    get CommentBrick () { return CommentBrick; },
     get CompositeBrick () { return CompositeBrick; },
     get CustomBrick () { return CustomBrick; },
     get DocController () { return DocController; },
@@ -59,7 +58,6 @@ var SurveyPDFModule = /*#__PURE__*/Object.freeze({
     get SurveyHelper () { return SurveyHelper; },
     get SurveyPDF () { return SurveyPDF; },
     get TextBoldBrick () { return TextBoldBrick; },
-    get TextBoxBrick () { return TextBoxBrick; },
     get TextBrick () { return TextBrick; },
     get TextFieldBrick () { return TextFieldBrick; },
     get TitlePanelBrick () { return TitlePanelBrick; },
@@ -307,6 +305,7 @@ class FlatSurvey {
                         rowFlats.push(...yield this.generateFlatsPanel(survey, controller, element, currPoint));
                     }
                     else {
+                        yield element.waitForQuestionIsReady();
                         rowFlats.push(...yield SurveyHelper.generateQuestionFlats(survey, controller, element, currPoint));
                     }
                 }
@@ -644,7 +643,15 @@ class FlatQuestion {
             const otherTextFlat = yield SurveyHelper.createTextFlat(point, this.question, this.controller, text, TextBrick);
             const otherPoint = SurveyHelper.createPoint(otherTextFlat);
             otherPoint.yTop += this.controller.unitHeight * SurveyHelper.GAP_BETWEEN_ROWS;
-            return new CompositeBrick(otherTextFlat, yield SurveyHelper.createCommentFlat(otherPoint, this.question, this.controller, false, { rows: SurveyHelper.OTHER_ROWS_COUNT }));
+            return new CompositeBrick(otherTextFlat, 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,
+                placeholder: ''
+            }));
         });
     }
     generateFlatsComposite(point) {
@@ -867,16 +874,142 @@ class DescriptionBrick extends TextBrick {
     }
 }
 
+class LinkBrick extends TextBrick {
+    constructor(textFlat, link) {
+        super(textFlat.question, textFlat.controller, textFlat, textFlat.text);
+        this.link = link;
+        this.textColor = LinkBrick.COLOR;
+    }
+    renderInteractive() {
+        const _super = Object.create(null, {
+            renderInteractive: { get: () => super.renderInteractive }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let oldTextColor = this.controller.doc.getTextColor();
+            this.controller.doc.setTextColor(SurveyHelper.BACKGROUND_COLOR);
+            let descent = this.controller.unitHeight *
+                (this.controller.doc.getLineHeightFactor() -
+                    LinkBrick.SCALE_FACTOR_MAGIC);
+            let yTopLink = this.yTop +
+                (this.yBot - this.yTop) - descent;
+            this.controller.doc.textWithLink(this.text, this.xLeft, yTopLink, { url: this.link });
+            yield _super.renderInteractive.call(this);
+            this.controller.doc.setTextColor(oldTextColor);
+        });
+    }
+    renderReadOnly() {
+        const _super = Object.create(null, {
+            renderInteractive: { get: () => super.renderInteractive }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (SurveyHelper.getReadonlyRenderAs(this.question, this.controller) !== 'text') {
+                return this.renderInteractive();
+            }
+            yield _super.renderInteractive.call(this);
+        });
+    }
+}
+LinkBrick.SCALE_FACTOR_MAGIC = 0.955;
+LinkBrick.COLOR = '#0000EE';
+
+class HTMLBrick extends PdfBrick {
+    constructor(question, controller, rect, html, isImage = false) {
+        super(question, controller, rect);
+        this.html = html;
+        if (isImage) {
+            this.margins = {
+                top: 0.0,
+                bottom: 0.0
+            };
+        }
+        else {
+            this.margins = {
+                top: controller.margins.top,
+                bottom: controller.margins.bot
+            };
+        }
+    }
+    renderInteractive() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let oldFontSize = this.controller.fontSize;
+            this.controller.fontSize = this.fontSize;
+            yield new Promise((resolve) => {
+                this.controller.doc.fromHTML(this.html, this.xLeft, this.yTop, {
+                    width: this.width, pagesplit: true,
+                }, function () {
+                    [].slice.call(document.querySelectorAll('.sjs-pdf-hidden-html-div')).forEach(function (el) {
+                        el.parentNode.removeChild(el);
+                    });
+                    resolve();
+                }, this.margins);
+            });
+            this.controller.fontSize = oldFontSize;
+        });
+    }
+}
+
+class ImageBrick extends PdfBrick {
+    constructor(question, controller, image, point, originalWidth, originalHeight) {
+        super(question, controller, {
+            xLeft: point.xLeft,
+            xRight: point.xLeft + (originalWidth || 0),
+            yTop: point.yTop,
+            yBot: point.yTop + (originalHeight || 0)
+        });
+        this.image = image;
+        this.originalWidth = originalWidth;
+        this.originalHeight = originalHeight;
+        this.isPageBreak = this.originalHeight === undefined;
+    }
+    renderInteractive() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield new Promise((resolve) => {
+                try {
+                    this.controller.doc.addImage(this.image, 'PNG', this.xLeft, this.yTop, this.originalWidth, this.originalHeight);
+                }
+                finally {
+                    resolve();
+                }
+            });
+        });
+    }
+}
+
+class EmptyBrick extends PdfBrick {
+    constructor(rect, controller = null, isBorderVisible = false) {
+        super(null, controller, rect);
+        this.controller = controller;
+        this.isBorderVisible = false;
+        this.isBorderVisible = isBorderVisible;
+    }
+    resizeBorder(isIncrease) {
+        const coef = isIncrease ? 1 : -1;
+        const borderPadding = this.controller.doc.getFontSize() * SurveyHelper.VALUE_READONLY_PADDING_SCALE;
+        this.xLeft -= coef * borderPadding;
+        this.xRight += coef * borderPadding;
+        this.yBot += coef * borderPadding;
+    }
+    renderInteractive() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isBorderVisible) {
+                this.resizeBorder(true);
+                SurveyHelper.renderFlatBorders(this.controller, this);
+                this.resizeBorder(false);
+            }
+        });
+    }
+}
+
 class TextFieldBrick extends PdfBrick {
-    constructor(question, controller, rect, isQuestion, fieldName, value, placeholder, isReadOnly, isMultiline, inputType) {
+    constructor(question, controller, rect, options) {
+        var _a, _b, _c, _d;
         super(question, controller, rect);
-        this.isQuestion = isQuestion;
-        this.fieldName = fieldName;
-        this.value = value;
-        this.placeholder = placeholder;
-        this.isReadOnly = isReadOnly;
-        this.isMultiline = isMultiline;
-        this.inputType = inputType;
+        this.question = question;
+        this.options = options;
+        options.isMultiline = (_a = options.isMultiline) !== null && _a !== void 0 ? _a : false;
+        options.placeholder = (_b = options.placeholder) !== null && _b !== void 0 ? _b : '';
+        options.inputType = (_c = options.inputType) !== null && _c !== void 0 ? _c : '';
+        options.value = (_d = options.value) !== null && _d !== void 0 ? _d : '';
         this.question = question;
     }
     renderColorQuestion() {
@@ -887,25 +1020,25 @@ class TextFieldBrick extends PdfBrick {
     }
     renderInteractive() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.inputType === 'color') {
+            if (this.options.inputType === 'color') {
                 this.renderColorQuestion();
                 return;
             }
-            const inputField = this.inputType === 'password' ?
+            const inputField = this.options.inputType === 'password' ?
                 new this.controller.doc.AcroFormPasswordField() :
                 new this.controller.doc.AcroFormTextField();
-            inputField.fieldName = this.fieldName;
+            inputField.fieldName = this.options.fieldName;
             inputField.fontName = this.controller.fontName;
             inputField.fontSize = this.fontSize;
             inputField.isUnicode = SurveyHelper.isCustomFont(this.controller, inputField.fontName);
-            if (this.inputType !== 'password') {
-                inputField.V = ' ' + this.getCorrectedText(this.value);
-                inputField.DV = ' ' + this.getCorrectedText(this.placeholder);
+            if (this.options.inputType !== 'password') {
+                inputField.V = ' ' + this.getCorrectedText(this.options.value);
+                inputField.DV = ' ' + this.getCorrectedText(this.options.placeholder);
             }
             else
                 inputField.value = '';
-            inputField.multiline = this.isMultiline;
-            inputField.readOnly = this.isReadOnly;
+            inputField.multiline = this.options.isMultiline;
+            inputField.readOnly = this.options.isReadOnly;
             inputField.color = this.textColor;
             let formScale = SurveyHelper.formScale(this.controller, this);
             inputField.maxFontSize = this.controller.fontSize * formScale;
@@ -915,10 +1048,10 @@ class TextFieldBrick extends PdfBrick {
         });
     }
     shouldRenderFlatBorders() {
-        return settings.readOnlyTextRenderMode === 'input';
+        return this.options.shouldRenderBorders;
     }
     getShouldRenderReadOnly() {
-        return SurveyHelper.shouldRenderReadOnly(this.question, this.controller, this.isReadOnly);
+        return SurveyHelper.shouldRenderReadOnly(this.question, this.controller, this.options.isReadOnly);
     }
     get textBrick() {
         return this._textBrick;
@@ -969,7 +1102,7 @@ class TextFieldBrick extends PdfBrick {
     renderReadOnly() {
         return __awaiter(this, void 0, void 0, function* () {
             this.controller.pushMargins(this.xLeft, this.controller.paperWidth - this.xRight);
-            if (this.inputType === 'color') {
+            if (this.options.inputType === 'color') {
                 this.renderColorQuestion();
             }
             else {
@@ -979,7 +1112,7 @@ class TextFieldBrick extends PdfBrick {
         });
     }
     unfold() {
-        if (this.getShouldRenderReadOnly() && this.inputType !== 'color') {
+        if (this.getShouldRenderReadOnly() && this.options.inputType !== 'color') {
             return this.textBrick.unfold();
         }
         else {
@@ -1024,152 +1157,6 @@ class TextFieldBrick extends PdfBrick {
     }
 }
 
-class TextBoxBrick extends TextFieldBrick {
-    constructor(question, controller, rect, isQuestion = true, isMultiline = false, index = 0) {
-        super(question, controller, rect, isQuestion, question.id + (isQuestion ? '' : '_comment' + index), SurveyHelper.getQuestionOrCommentValue(question, isQuestion), isQuestion && question.locPlaceHolder ? SurveyHelper.getLocString(question.locPlaceHolder) : '', question.isReadOnly, isMultiline, question.inputType);
-        this.isQuestion = isQuestion;
-        this.isMultiline = isMultiline;
-    }
-}
-
-class CommentBrick extends TextBoxBrick {
-    constructor(question, controller, rect, isQuestion, index = 0) {
-        super(question, controller, rect, isQuestion, true, index);
-        this.controller = controller;
-    }
-    shouldRenderFlatBorders() {
-        if (this.isQuestion && this.question.getType() !== 'comment')
-            return super.shouldRenderFlatBorders();
-        return settings.readOnlyCommentRenderMode === 'textarea';
-    }
-}
-
-class LinkBrick extends TextBrick {
-    constructor(textFlat, link) {
-        super(textFlat.question, textFlat.controller, textFlat, textFlat.text);
-        this.link = link;
-        this.textColor = LinkBrick.COLOR;
-    }
-    renderInteractive() {
-        const _super = Object.create(null, {
-            renderInteractive: { get: () => super.renderInteractive }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let oldTextColor = this.controller.doc.getTextColor();
-            this.controller.doc.setTextColor(SurveyHelper.BACKGROUND_COLOR);
-            let descent = this.controller.unitHeight *
-                (this.controller.doc.getLineHeightFactor() -
-                    LinkBrick.SCALE_FACTOR_MAGIC);
-            let yTopLink = this.yTop +
-                (this.yBot - this.yTop) - descent;
-            this.controller.doc.textWithLink(this.text, this.xLeft, yTopLink, { url: this.link });
-            yield _super.renderInteractive.call(this);
-            this.controller.doc.setTextColor(oldTextColor);
-        });
-    }
-    renderReadOnly() {
-        const _super = Object.create(null, {
-            renderInteractive: { get: () => super.renderInteractive }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            if (SurveyHelper.getReadonlyRenderAs(this.question, this.controller) !== 'text') {
-                return this.renderInteractive();
-            }
-            yield _super.renderInteractive.call(this);
-        });
-    }
-}
-LinkBrick.SCALE_FACTOR_MAGIC = 0.955;
-LinkBrick.COLOR = '#0000EE';
-
-class HTMLBrick extends PdfBrick {
-    constructor(question, controller, rect, html, isImage = false) {
-        super(question, controller, rect);
-        this.html = html;
-        if (isImage) {
-            this.margins = {
-                top: 0.0,
-                bottom: 0.0
-            };
-        }
-        else {
-            this.margins = {
-                top: controller.margins.top,
-                bottom: controller.margins.bot
-            };
-        }
-    }
-    renderInteractive() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let oldFontSize = this.controller.fontSize;
-            this.controller.fontSize = this.fontSize;
-            yield new Promise((resolve) => {
-                this.controller.doc.fromHTML(this.html, this.xLeft, this.yTop, {
-                    width: this.width, pagesplit: true,
-                }, function () {
-                    [].slice.call(document.querySelectorAll('.sjs-pdf-hidden-html-div')).forEach(function (el) {
-                        el.parentNode.removeChild(el);
-                    });
-                    resolve();
-                }, this.margins);
-            });
-            this.controller.fontSize = oldFontSize;
-        });
-    }
-}
-
-class ImageBrick extends PdfBrick {
-    constructor(question, controller, image, point, originalWidth, originalHeight) {
-        super(question, controller, {
-            xLeft: point.xLeft,
-            xRight: point.xLeft + (originalWidth || 0),
-            yTop: point.yTop,
-            yBot: point.yTop + (originalHeight || 0)
-        });
-        this.image = image;
-        this.originalWidth = originalWidth;
-        this.originalHeight = originalHeight;
-        this.isPageBreak = this.originalHeight === undefined;
-    }
-    renderInteractive() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield new Promise((resolve) => {
-                try {
-                    this.controller.doc.addImage(this.image, 'PNG', this.xLeft, this.yTop, this.originalWidth, this.originalHeight);
-                }
-                finally {
-                    resolve();
-                }
-            });
-        });
-    }
-}
-
-class EmptyBrick extends PdfBrick {
-    constructor(rect, controller = null, isBorderVisible = false) {
-        super(null, controller, rect);
-        this.controller = controller;
-        this.isBorderVisible = false;
-        this.isBorderVisible = isBorderVisible;
-    }
-    resizeBorder(isIncrease) {
-        const coef = isIncrease ? 1 : -1;
-        const borderPadding = this.controller.doc.getFontSize() * SurveyHelper.VALUE_READONLY_PADDING_SCALE;
-        this.xLeft -= coef * borderPadding;
-        this.xRight += coef * borderPadding;
-        this.yBot += coef * borderPadding;
-    }
-    renderInteractive() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isBorderVisible) {
-                this.resizeBorder(true);
-                SurveyHelper.renderFlatBorders(this.controller, this);
-                this.resizeBorder(false);
-            }
-        });
-    }
-}
-
 class SurveyHelper {
     static parseWidth(width, maxWidth, columnsCount = 1, defaultUnit) {
         if (width.indexOf('calc') === 0) {
@@ -1537,35 +1524,26 @@ class SurveyHelper {
     static getReadonlyRenderAs(question, controller) {
         return question.readonlyRenderAs === 'auto' ? controller.readonlyRenderAs : question.readonlyRenderAs;
     }
-    static createCommentFlat(point_1, question_1, controller_1, isQuestion_1) {
-        return __awaiter(this, arguments, void 0, function* (point, question, controller, isQuestion, options = {}) {
-            var _a, _b, _c;
-            const rect = this.createTextFieldRect(point, controller, (_a = options.rows) !== null && _a !== void 0 ? _a : 1);
+    static createCommentFlat(point, question, controller, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            options.rows = (_a = options.rows) !== null && _a !== void 0 ? _a : 1;
+            options.value = (_b = options.value) !== null && _b !== void 0 ? _b : '';
+            const rect = this.createTextFieldRect(point, controller, options.rows);
             let textFlat;
-            if ((_b = options.readOnly) !== null && _b !== void 0 ? _b : SurveyHelper.shouldRenderReadOnly(question, controller)) {
-                const renderedValue = (_c = options.value) !== null && _c !== void 0 ? _c : this.getQuestionOrCommentValue(question, isQuestion);
-                textFlat = yield this.createReadOnlyTextFieldTextFlat(point, controller, question, renderedValue);
+            if (SurveyHelper.shouldRenderReadOnly(question, controller, options.isReadOnly)) {
+                textFlat = yield this.createReadOnlyTextFieldTextFlat(point, controller, question, options.value);
                 const padding = controller.unitHeight * this.VALUE_READONLY_PADDING_SCALE;
                 if (textFlat.yBot + padding > rect.yBot)
                     rect.yBot = textFlat.yBot + padding;
             }
-            const comment = new CommentBrick(question, controller, rect, isQuestion, options.index);
-            if (options.readOnly !== null && options.readOnly !== undefined) {
-                comment.isReadOnly = options.readOnly;
-            }
+            const comment = new TextFieldBrick(question, controller, rect, options);
             if (textFlat) {
                 comment.textBrick = textFlat;
             }
             return comment;
         });
     }
-    static getQuestionOrCommentValue(question, isQuestion = true) {
-        return isQuestion ? (question.value !== undefined && question.value !== null ? question.value : '') :
-            (question.comment !== undefined && question.comment !== null ? question.comment : '');
-    }
-    static getQuestionOrCommentDisplayValue(question, isQuestion = true) {
-        return isQuestion ? question.displayValue : SurveyHelper.getQuestionOrCommentValue(question, isQuestion);
-    }
     static get hasDocument() {
         return typeof document !== 'undefined';
     }
@@ -5623,13 +5601,11 @@ function setRadioAppearance(doc) {
     };
 
     Renderer.prototype.splitFragmentsIntoLines = function (fragments, styles) {
-      var currentLineLength, defaultFontSize, ff, fontMetrics, fontMetricsCache, fragment, fragmentChopped, fragmentLength, fragmentSpecificMetrics, fs, k, line, lines, maxLineLength, style;
+      var currentLineLength, defaultFontSize, ff, fragment, fragmentChopped, fragmentLength, fragmentSpecificMetrics, fs, k, line, lines, maxLineLength, style;
       defaultFontSize = 12;
       k = this.pdf.internal.scaleFactor;
-      fontMetricsCache = {};
       ff = void 0;
       fs = void 0;
-      fontMetrics = void 0;
       fragment = void 0;
       style = void 0;
       fragmentSpecificMetrics = void 0;
@@ -5639,7 +5615,8 @@ function setRadioAppearance(doc) {
       lines = [line];
       currentLineLength = 0;
       maxLineLength = this.settings.width;
-
+      const oldFontName = this.pdf.getFont().fontName;
+      const oldFontStyle = this.pdf.getFont().fontStyle;
       while (fragments.length) {
         fragment = fragments.shift();
         style = styles.shift();
@@ -5647,18 +5624,10 @@ function setRadioAppearance(doc) {
         if (fragment) {
           ff = style["font-family"];
           fs = style["font-style"];
-          fontMetrics = fontMetricsCache[ff + fs];
-
-          if (!fontMetrics) {
-            fontMetrics = this.pdf.internal.getFont(ff, fs).metadata.Unicode;
-            fontMetricsCache[ff + fs] = fontMetrics;
-          }
-
+          this.pdf.setFont(ff, fs);
           fragmentSpecificMetrics = {
-            widths: fontMetrics.widths,
-            kerning: fontMetrics.kerning,
-            fontSize: style["font-size"] * defaultFontSize,
-            textIndent: currentLineLength
+            textIndent: currentLineLength,
+            fontSize: style["font-size"] * defaultFontSize
           };
           fragmentLength = this.pdf.getStringUnitWidth(fragment, fragmentSpecificMetrics) * fragmentSpecificMetrics.fontSize / k;
 
@@ -5707,7 +5676,7 @@ function setRadioAppearance(doc) {
           }
         }
       }
-
+      this.pdf.setFont(oldFontName, oldFontStyle);
       return lines;
     };
 
@@ -7586,42 +7555,6 @@ class SurveyPDF extends SurveyModel {
         // eslint-disable-next-line no-console
         console.error('As of v1.9.101, the haveCommercialLicense property is not supported. To activate your license, use the setLicenseKey(key) method as shown on the following page: https://surveyjs.io/remove-alert-banner');
     }
-    ensureQuestionDisplayValue(question) {
-        question.displayValue;
-    }
-    waitForQuestionIsReady(question) {
-        return new Promise((resolve) => {
-            this.ensureQuestionDisplayValue(question);
-            if (question.isReady) {
-                resolve();
-            }
-            else {
-                const readyCallback = (_, options) => {
-                    if (options.isReady) {
-                        question.onReadyChanged.remove(readyCallback);
-                        resolve();
-                    }
-                };
-                question.onReadyChanged.add(readyCallback);
-            }
-        });
-    }
-    waitForCoreIsReady() {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const question of this.getAllQuestions()) {
-                if (!!question.contentPanel) {
-                    const list = [];
-                    question.contentPanel.addQuestionsToList(list);
-                    for (const innerQuestion of list) {
-                        yield this.waitForQuestionIsReady(innerQuestion);
-                    }
-                    continue;
-                }
-                else
-                    yield this.waitForQuestionIsReady(SurveyHelper.getContentQuestion(question));
-            }
-        });
-    }
     getUpdatedCheckItemAcroformOptions(options) {
         this.onRenderCheckItemAcroform.fire(this, options);
     }
@@ -7646,7 +7579,6 @@ class SurveyPDF extends SurveyModel {
     renderSurvey(controller) {
         return __awaiter(this, void 0, void 0, function* () {
             this.visiblePages.forEach(page => page.onFirstRendering());
-            yield this.waitForCoreIsReady();
             const flats = yield FlatSurvey.generateFlats(this, controller);
             this.correctBricksPosition(controller, flats);
             const packs = PagePacker.pack(flats, controller);
@@ -7916,7 +7848,14 @@ class FlatSelectBase extends FlatQuestion {
                 (typeof this.question.isOtherSelected !== 'undefined' && this.question.isOtherSelected))) {
                 const otherPoint = SurveyHelper.createPoint(compositeFlat);
                 otherPoint.yTop += this.controller.unitHeight * SurveyHelper.GAP_BETWEEN_ROWS;
-                compositeFlat.addBrick(yield SurveyHelper.createCommentFlat(otherPoint, this.question, this.controller, false, { index, rows: SurveyHelper.OTHER_ROWS_COUNT }));
+                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,
+                }));
             }
             return compositeFlat;
         });
@@ -7942,11 +7881,41 @@ class FlatSelectBase extends FlatQuestion {
             else if (colCount > 1) {
                 currentColCount = (SurveyHelper.getColumnWidth(this.controller, colCount) <
                     this.controller.measureText(SurveyHelper.MATRIX_COLUMN_WIDTH).width) ? 1 : colCount;
+                if (currentColCount == colCount) {
+                    return yield this.generateColumns(point);
+                }
             }
             return (currentColCount == 1) ? yield this.generateVerticallyItems(point, visibleChoices) :
                 yield this.generateHorisontallyItems(point, currentColCount);
         });
     }
+    generateRows(point, rows) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const visibleChoices = this.getVisibleChoices();
+            const currPoint = SurveyHelper.clone(point);
+            const colCount = ((_a = rows[0]) !== null && _a !== void 0 ? _a : []).length;
+            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);
+                    SurveyHelper.setColumnMargins(this.controller, colCount, colIndex);
+                    currPoint.xLeft = this.controller.margins.left;
+                    const itemFlat = yield this.generateFlatComposite(currPoint, item, visibleChoices.indexOf(item));
+                    rowFlat.addBrick(itemFlat);
+                    this.controller.popMargins();
+                }
+                const rowLineFlat = SurveyHelper.createRowlineFlat(SurveyHelper.createPoint(rowFlat), this.controller);
+                currPoint.yTop = rowLineFlat.yBot +
+                    SurveyHelper.GAP_BETWEEN_ROWS * this.controller.unitHeight;
+                flats.push(rowFlat, rowLineFlat);
+            }
+            return flats;
+        });
+    }
     generateVerticallyItems(point, itemValues) {
         return __awaiter(this, void 0, void 0, function* () {
             const currPoint = SurveyHelper.clone(point);
@@ -7959,28 +7928,35 @@ class FlatSelectBase extends FlatQuestion {
             return flats;
         });
     }
-    generateHorisontallyItems(point, colCount) {
+    generateColumns(point) {
         return __awaiter(this, void 0, void 0, function* () {
-            const visibleChoices = this.getVisibleChoices();
-            const currPoint = SurveyHelper.clone(point);
-            const flats = [];
-            let row = new CompositeBrick();
-            for (let i = 0; i < visibleChoices.length; i++) {
-                this.controller.pushMargins(this.controller.margins.left, this.controller.margins.right);
-                SurveyHelper.setColumnMargins(this.controller, colCount, i % colCount);
-                currPoint.xLeft = this.controller.margins.left;
-                const itemFlat = yield this.generateFlatComposite(currPoint, visibleChoices[i], i);
-                row.addBrick(itemFlat);
-                this.controller.popMargins();
-                if (i % colCount === colCount - 1 || i === visibleChoices.length - 1) {
-                    const rowLineFlat = SurveyHelper.createRowlineFlat(SurveyHelper.createPoint(row), this.controller);
-                    currPoint.yTop = rowLineFlat.yBot +
-                        SurveyHelper.GAP_BETWEEN_ROWS * this.controller.unitHeight;
-                    flats.push(row, rowLineFlat);
-                    row = new CompositeBrick();
+            const columns = this.question.columns;
+            const rowsCount = columns.reduce((max, column) => Math.max(max, column.length), 0);
+            const rows = [];
+            for (let i = 0; i < rowsCount; i++) {
+                const row = [];
+                for (let column of columns) {
+                    if (column[i]) {
+                        row.push(column[i]);
+                    }
                 }
+                rows.push(row);
             }
-            return flats;
+            return yield this.generateRows(point, rows);
+        });
+    }
+    generateHorisontallyItems(point, colCount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rows = [];
+            const visibleChoices = this.getVisibleChoices();
+            visibleChoices.forEach((item, index) => {
+                const rowIndex = Math.floor(index / colCount);
+                const colIndex = index % colCount;
+                if (!rows[rowIndex])
+                    rows[rowIndex] = [];
+                rows[rowIndex][colIndex] = item;
+            });
+            return yield this.generateRows(point, rows);
         });
     }
 }
@@ -8125,7 +8101,15 @@ class FlatComment extends FlatQuestion {
     }
     generateFlatsContent(point) {
         return __awaiter(this, void 0, void 0, function* () {
-            return [yield SurveyHelper.createCommentFlat(point, this.question, this.controller, true, { rows: this.question.rows })];
+            return [yield SurveyHelper.createCommentFlat(point, this.question, this.controller, {
+                    rows: this.question.rows,
+                    isReadOnly: this.question.isReadOnly,
+                    isMultiline: true,
+                    fieldName: this.question.id,
+                    placeholder: SurveyHelper.getLocString(this.question.locPlaceHolder),
+                    shouldRenderBorders: settings.readOnlyCommentRenderMode === 'textarea',
+                    value: this.question.value
+                })];
         });
     }
 }
@@ -8172,12 +8156,25 @@ class FlatDropdown extends FlatQuestion {
     }
     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, true, { value: SurveyHelper.getDropdownQuestionValue(this.question) });
+            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),
+                isReadOnly: this.question.isReadOnly,
+                placeholder: SurveyHelper.getLocString(this.question.locPlaceholder)
+            });
             const compositeFlat = new CompositeBrick(valueBrick);
             if (this.question.isOtherSelected) {
                 const otherPoint = SurveyHelper.createPoint(compositeFlat);
                 otherPoint.yTop += this.controller.unitHeight * SurveyHelper.GAP_BETWEEN_ROWS;
-                compositeFlat.addBrick(yield SurveyHelper.createCommentFlat(otherPoint, this.question, this.controller, false, { rows: SurveyHelper.OTHER_ROWS_COUNT }));
+                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,
+                }));
             }
             return [compositeFlat];
         });
@@ -8193,7 +8190,12 @@ class FlatExpression extends FlatQuestion {
     }
     generateFlatsContent(point) {
         return __awaiter(this, void 0, void 0, function* () {
-            return [yield SurveyHelper.createCommentFlat(point, this.question, this.controller, true, { value: this.question.displayValue, readOnly: true })];
+            return [yield SurveyHelper.createCommentFlat(point, this.question, this.controller, {
+                    value: this.question.displayValue,
+                    isReadOnly: true,
+                    fieldName: this.question.id,
+                    shouldRenderBorders: settings.readOnlyTextRenderMode === 'input',
+                })];
         });
     }
 }
@@ -8751,11 +8753,19 @@ class FlatTextbox extends FlatQuestion {
     }
     generateFlatsContent(point) {
         return __awaiter(this, void 0, void 0, function* () {
+            const options = {
+                fieldName: this.question.id,
+                inputType: this.question.inputType,
+                value: this.question.inputValue,
+                isReadOnly: this.question.isReadOnly,
+                shouldRenderBorders: settings.readOnlyTextRenderMode === 'input',
+                placeholder: SurveyHelper.getLocString(this.question.locPlaceHolder)
+            };
             if (!this.shouldRenderAsComment) {
                 const rect = SurveyHelper.createTextFieldRect(point, this.controller);
-                return [new TextBoxBrick(this.question, this.controller, rect)];
+                return [new TextFieldBrick(this.question, this.controller, rect, Object.assign({}, options))];
             }
-            return [yield SurveyHelper.createCommentFlat(point, this.question, this.controller, true, { rows: FlatTextbox.MULTILINE_TEXT_ROWS_COUNT })];
+            return [yield SurveyHelper.createCommentFlat(point, this.question, this.controller, Object.assign({ rows: FlatTextbox.MULTILINE_TEXT_ROWS_COUNT, isMultiline: true }, options))];
         });
     }
 }
@@ -9280,7 +9290,7 @@ class CustomBrick extends PdfBrick {
     }
 }
 
-checkLibraryVersion(`${"2.2.0"}`, 'survey-pdf');
+checkLibraryVersion(`${"2.2.2"}`, 'survey-pdf');
 
-export { BooleanItemBrick, CheckItemBrick, CheckboxItemBrick, CommentBrick, 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, FlatSurvey, FlatTextbox, HTMLBrick, HorizontalAlign, ImageBrick, LinkBrick, PagePacker, PdfBrick, RadioItemBrick, RankingItemBrick, RowlineBrick, SurveyHelper, SurveyPDF, TextBoldBrick, TextBoxBrick, TextBrick, TextFieldBrick, TitlePanelBrick, VerticalAlign };
+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, FlatSurvey, FlatTextbox, HTMLBrick, HorizontalAlign, ImageBrick, LinkBrick, PagePacker, PdfBrick, RadioItemBrick, RankingItemBrick, RowlineBrick, SurveyHelper, SurveyPDF, TextBoldBrick, TextBrick, TextFieldBrick, TitlePanelBrick, VerticalAlign };
 //# sourceMappingURL=survey.pdf.mjs.map