survey-pdf 3.0.0-beta.0 → 3.0.0-beta.1

package/README.md

@@ -4,7 +4,7 @@
 <video src="https://github.com/surveyjs/survey-pdf/assets/22315929/c6df9c60-a3ed-40e4-82e7-d7be3fa83fae"></video>
 
 
-[![Build Status](https://dev.azure.com/SurveyJS/SurveyJS%20Integration%20Tests/_apis/build/status/SurveyJS%20Library?branchName=master)](https://dev.azure.com/SurveyJS/SurveyJS%20Integration%20Tests/_build/latest?definitionId=7&branchName=master)
+[![Build Status](https://dev.azure.com/SurveyJS/V2%20Libraries/_apis/build/status%2Fpdf%2FPDF%20Main?repoName=surveyjs%2Fsurvey-pdf&branchName=master)](https://dev.azure.com/SurveyJS/V2%20Libraries/_build/latest?definitionId=165&repoName=surveyjs%2Fsurvey-pdf&branchName=master)
 <a href="https://github.com/surveyjs/survey-pdf/issues">
 <img alt="Issues" title="Open Issues" src="https://img.shields.io/github/issues/surveyjs/survey-pdf.svg">
 </a>

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

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v3.0.0-beta.0
+ * surveyjs - SurveyJS PDF library v3.0.0-beta.1
  * Copyright (c) 2015-2026 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 v3.0.0-beta.0
+ * surveyjs - SurveyJS PDF library v3.0.0-beta.1
  * Copyright (c) 2015-2026 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 v3.0.0-beta.0
+ * surveyjs - SurveyJS PDF library v3.0.0-beta.1
  * Copyright (c) 2015-2026 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/fesm/pdf-shared.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS PDF library v3.0.0-beta.0
+ * surveyjs - SurveyJS PDF library v3.0.0-beta.1
  * Copyright (c) 2015-2026 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -40,6 +40,8 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 
 function mergeRects(...rects) {
+    if (rects.length == 0)
+        return { xLeft: 0, xRight: 0, yTop: 0, yBot: 0 };
     const resultRect = {
         xLeft: rects[0].xLeft,
         xRight: rects[0].xRight,
@@ -1256,8 +1258,9 @@ class FlatQuestion {
     generateFlatsComment(point) {
         return __awaiter(this, void 0, void 0, function* () {
             const text = this.question.locCommentText;
-            const otherTextFlat = yield SurveyHelper.createTextFlat(point, this.controller, text);
+            const otherTextFlat = yield SurveyHelper.createTextFlat(point, this.controller, text, this.style.commentLabel);
             const otherPoint = SurveyHelper.createPoint(otherTextFlat);
+            otherPoint.yTop += this.style.spacing.commentLabelGap;
             const shouldRenderReadOnly = SurveyHelper.shouldRenderReadOnly(this.question, this.controller, this.question.isReadOnly);
             const style = SurveyHelper.getPatchedTextStyle(this.controller, SurveyHelper.mergeObjects({}, this.style.comment, shouldRenderReadOnly ? this.style.commentReadOnly : undefined));
             return new CompositeBrick(otherTextFlat, yield SurveyHelper.createCommentFlat(otherPoint, this.controller, {
@@ -2602,6 +2605,9 @@ class SurveyHelper {
         var _a;
         const parsedMergeAngles = typeof mergeAngles == 'object' ? mergeAngles : { top: mergeAngles, bot: mergeAngles, left: mergeAngles, right: mergeAngles };
         const parsedRadius = parseSideValues((_a = style.borderRadius) !== null && _a !== void 0 ? _a : 0);
+        Object.keys(parsedRadius).forEach((side) => {
+            parsedRadius[side] = Math.max(0, Math.min(parsedRadius[side], (rect.xRight - rect.xLeft) / 2, (rect.yBot - rect.yTop) / 2));
+        });
         function calcAngleLine(x, y, r, angle, rotAngle) {
             const l = 4 / 3 * Math.tan(angle / 4) * r;
             const base = [
@@ -7916,6 +7922,12 @@ function getDefaultStyleFromTheme(theme) {
                     fontSize: getSizeVariable('--sjs2-typography-font-size-default'),
                     lineHeight: getSizeVariable('--sjs2-typography-line-height-default')
                 },
+                commentLabel: {
+                    fontColor: getColorVariable('--sjs2-color-fg-basic-primary'),
+                    fontSize: getSizeVariable('--sjs2-typography-font-size-default'),
+                    fontStyle: 'normal',
+                    lineHeight: getSizeVariable('--sjs2-typography-line-height-default')
+                },
                 spacing: {
                     headerContentGap: getSizeVariable('--sjs2-pdf-layout-question-gap'),
                     inlineHeaderContentGap: baseSize * 1.0,
@@ -7925,6 +7937,7 @@ function getDefaultStyleFromTheme(theme) {
                     titleDescriptionGap: getSizeVariable('--sjs2-pdf-layout-question-labels-gap-vertical'),
                     titleRequiredMarkGap: baseSize / 2,
                     titleNumberGap: baseSize / 2,
+                    commentLabelGap: getSizeVariable('--sjs2-spacing-x050')
                 }
             },
             panel: {
@@ -9756,9 +9769,9 @@ class FlatPanel {
             const visibleElements = row.elements.filter(el => el.isVisible);
             visibleElements.forEach((el, i) => {
                 const style = this.survey.getElementStyle(el);
-                const minWidth = el.minWidth !== 'auto' ? SurveyHelper.parseWidth(el.minWidth, availableWidth, undefined, 'px') : style.minWidth;
+                const minWidth = el.minWidth && el.minWidth !== 'auto' ? SurveyHelper.parseWidth(el.minWidth, availableWidth, undefined, 'px') : style.minWidth;
                 const renderWidth = !!el.width ? SurveyHelper.parseWidth(el.width, availableWidth, undefined, 'px') : 0;
-                const maxWidth = SurveyHelper.parseWidth(el.maxWidth, availableWidth, undefined, 'px');
+                const maxWidth = SurveyHelper.parseWidth(el.maxWidth ? el.maxWidth : '100%', availableWidth, undefined, 'px');
                 const width = Math.min(Math.max(minWidth, renderWidth), maxWidth);
                 if (currentAvailableWidth < width + gapBetweenElements) {
                     rows.push(currentRow);
@@ -9779,7 +9792,7 @@ class FlatPanel {
             let restWidth = alignValue * row.length;
             while (expandableElements.length > 0 && restWidth > 0) {
                 expandableElements = expandableElements.filter(rowEl => {
-                    const maxWidth = SurveyHelper.parseWidth(rowEl.element.maxWidth, availableWidth, undefined, 'px');
+                    const maxWidth = SurveyHelper.parseWidth(rowEl.element.maxWidth ? rowEl.element.maxWidth : '100%', availableWidth, undefined, 'px');
                     if (maxWidth > rowEl.width + alignValue) {
                         restWidth -= alignValue;
                         rowEl.width = rowEl.width + alignValue;
@@ -10982,21 +10995,22 @@ class FlatRating extends FlatQuestion {
         const availableWidth = SurveyHelper.getPageAvailableWidth(this.controller);
         let leftWidth = availableWidth;
         this.question.visibleRateValues.forEach((item, index) => {
-            if (!res[currentRowsIndex]) {
-                res.push([]);
-            }
             const locText = this.getItemText(index, item.locText);
             const width = this.getItemWidth(locText);
-            if (currentColumnIndex !== 0 && width + this.style.spacing.choiceColumnGap > leftWidth) {
+            const itemInfo = { index, item, locText, width };
+            const widthGap = width + (currentColumnIndex == 0 ? 0 : this.style.spacing.choiceColumnGap);
+            if (currentColumnIndex !== 0 && widthGap > leftWidth) {
                 currentRowsIndex++;
-                currentColumnIndex = 0;
-                leftWidth = availableWidth;
+                leftWidth = availableWidth - width;
             }
             else {
-                leftWidth -= width + (currentColumnIndex == 0 ? 0 : this.style.spacing.choiceColumnGap);
-                currentColumnIndex++;
-                res[currentRowsIndex].push({ index, item, locText, width });
+                leftWidth -= widthGap;
+            }
+            currentColumnIndex++;
+            if (res.length <= currentRowsIndex) {
+                res.push([]);
             }
+            res[currentRowsIndex].push(itemInfo);
         });
         return res;
     }
@@ -11936,7 +11950,7 @@ class CustomBrick extends PdfBrick {
     }
 }
 
-checkLibraryVersion(`${"3.0.0-beta.0"}`, 'survey-pdf');
+checkLibraryVersion(`${"3.0.0-beta.1"}`, 'survey-pdf');
 
 function rgbaToHex(rgbaString) {
     const parts = rgbaString.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+),?\s*([0-9.]+)?\)$/);