Merge branch 'master' of https://github.com/surveyjs/survey-library

surveyjs · Nov 13, 2023 · 289106c · 289106c
2 parents c78a4cc + 8b20412
commit 289106c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/question_baseselect.ts b/src/question_baseselect.ts
@@ -1797,7 +1797,7 @@ export class QuestionCheckboxBase extends QuestionSelectBase {
    * @see separateSpecialChoices
    */
   public get colCount(): number {
-    return this.getPropertyValue("colCount", this.isFlowLayout ? 0 : 1);
+    return this.getPropertyValue("colCount", this.isFlowLayout ? 0 : undefined);
   }
   public set colCount(value: number) {
     if (value < 0 || value > 5 || this.isFlowLayout) return;

diff --git a/tests/jsonobjecttests.ts b/tests/jsonobjecttests.ts
@@ -3073,4 +3073,16 @@ QUnit.test("Add a page into survey pages array", function (assert) {
   assert.equal(survey.jsonErrors.length, 2, "There are JSONs error");
   assert.equal((<any>survey.jsonErrors[0]).propertyName, "pages", "Correct property name #1");
   assert.equal((<any>survey.jsonErrors[1]).propertyName, "questions", "Correct property name #2");
+});
+QUnit.test("selectbase colCount property default value", function (assert) {
+  const q = new QuestionCheckboxModel("q");
+  assert.equal(q.colCount, 1, "Default value is 1");
+  const prop = Serializer.findProperty("checkboxbase", "colCount");
+  const defaultVal = prop.defaultValue;
+  prop.defaultValue = 0;
+  assert.equal(q.colCount, 0, "Default value is 0");
+  prop.defaultValue = 2;
+  assert.equal(q.colCount, 2, "Default value is 2");
+  prop.defaultValue = defaultVal;
+  assert.equal(q.colCount, 1, "Default value is 1 again");
 });