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

src/defaultV2-theme/blocks/sd-dropdown.scss

@@ -112,7 +112,7 @@
 }
 
 .sd-dropdown--empty:not(.sd-input--disabled) .sd-dropdown__filter-string-input::placeholder {
-  color: $foreground-light;
+  color: $font-editorfont-placeholdercolor;
 }
 
 .sd-dropdown__filter-string-input::placeholder {
@@ -127,7 +127,7 @@
 }
 
 .sd-dropdown__hint-prefix {
-  color: $foreground-light;
+  color: $font-editorfont-placeholdercolor;
 
   span {
     white-space: pre;
@@ -136,7 +136,7 @@
 
 .sd-dropdown__hint-suffix {
   display: flex;
-  color: $foreground-light;
+  color: $font-editorfont-placeholdercolor;
 
   span {
     white-space: pre;

src/defaultV2-theme/blocks/sd-input.scss

@@ -31,7 +31,7 @@
 }
 
 .sd-input::placeholder {
-  color: $foreground-light;
+  color: $font-editorfont-placeholdercolor;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;

src/defaultV2-theme/variables.scss

@@ -96,6 +96,7 @@ $font-questiondescription-size: var(--sjs-font-questiondescription-size, calc(1
 $font-editorfont-family: var(--sjs-font-editorfont-family, var(--font-family));
 $font-editorfont-weight: var(--sjs-font-editorfont-weight, 400);
 $font-editorfont-color: var(--sjs-font-editorfont-color, var(--sjs-general-forecolor, rgba(0, 0, 0, 0.91)));
+$font-editorfont-placeholdercolor: var(--sjs-font-editorfont-placeholdercolor, var(--sjs-general-forecolor-light, var(--foreground-light, #909090)));
 $font-editorfont-size: var(--sjs-font-editorfont-size, calc(1 * var(--sjs-font-size, $font-size)));
 $base-unit: var(--sjs-base-unit, var(--base-unit, 8px));
 

src/question_text.ts

@@ -65,6 +65,10 @@ export class QuestionTextModel extends QuestionTextBase {
       this.step = undefined;
     }
   }
+  public getMaxLength(): any {
+    if(this.inputType !== "text") return null;
+    return super.getMaxLength();
+  }
   public runCondition(values: HashTable<any>, properties: HashTable<any>) {
     super.runCondition(values, properties);
     if (!!this.minValueExpression || !!this.maxValueExpression) {

src/settings.ts

@@ -482,20 +482,22 @@ export var settings = {
    */
   tagboxCloseOnSelect: false,
   /**
-   * A property that allows you to display a custom confirm dialog instead of the standard browser dialog. Set this property to a function that renders your custom dialog window.
+   * A property that allows you to display a custom confirm dialog instead of the standard browser dialog.
+   *
+   * Set this property to a function that renders your custom dialog window. This function should return `true` if a user confirms an action or `false` otherwise.
    * @param message A message to be displayed in the confirm dialog window.
    */
   confirmActionFunc: function (message: string): boolean {
     return confirm(message);
   },
   /**
-   * A property that allows you to display a custom confirm dialog in async mode instead of the standard browser dialog. Set this property to a function that renders your custom dialog window in async mode.
+   * A property that allows you to display a custom confirm dialog instead of the standard browser dialog in async mode.
+   *
+   * Set this property to a function that renders your custom dialog window. This function should return `true` to be enabled; otherwise, a survey executes the [`confirmActionFunc`](#confirmActionFunc) function. Pass the dialog result as the `callback` parameter: `true` if a user confirms an action, `false` otherwise.
    * @param message A message to be displayed in the confirm dialog window.
-   * @param callback A callback function that should be called with res paramter equals to true if action is confirmed and equals to false otherwise.
+   * @param callback A callback function that should be called with `true` if a user confirms an action or `false` otherwise.
    */
-  confirmActionAsyncFunc: function (message: string, resFunc: (res: boolean) => void): boolean {
-    //when you finish with displaying your dialog, call the resFunc as resFunc(true) or resFunc(false).
-    //You should return true to tell that you use this function
+  confirmActionAsyncFunc: function (message: string, callback: (res: boolean) => void): boolean {
     return false;
   },
   /**

tests/surveyquestiontests.ts

@@ -2435,7 +2435,7 @@ QUnit.test("question.clearIncorrectValues and choicesByUrl", function (assert) {
   );
 });
 
-QUnit.test("questiontext.maxLength", function (assert) {
+QUnit.test("questiontext.maxLength & make it works for text input type only, #6750", function (assert) {
   var survey = new SurveyModel();
   var page = survey.addNewPage("p1");
   var qText = new QuestionTextModel("q1");
@@ -2447,6 +2447,16 @@ QUnit.test("questiontext.maxLength", function (assert) {
   assert.equal(qText.getMaxLength(), null, "makes it undefined");
   qText.maxLength = 5;
   assert.equal(qText.getMaxLength(), 5, "gets 5 from question");
+  qText.maxLength = -1;
+  assert.equal(qText.getMaxLength(), 10, "get from survey again");
+  qText.inputType = "date";
+  assert.equal(qText.getMaxLength(), null, "input type is 'date'");
+  qText.inputType = "number";
+  assert.equal(qText.getMaxLength(), null, "input type is 'number'");
+  qText.inputType = "color";
+  assert.equal(qText.getMaxLength(), null, "input type is 'color'");
+  qText.inputType = "text";
+  assert.equal(qText.getMaxLength(), 10, "input type is 'text'");
 });
 
 QUnit.test("Display Current/Maximum Allowed Characters when a maximum length is defined for input fields", function (assert) {