Merge branch 'master' into bug/S1637-extra-space-above-toc

src/base-interfaces.ts

@@ -152,7 +152,8 @@ export interface ISurvey extends ITextProcessor, ISurveyErrorOwner {
     question: IQuestion,
     name: string,
     files: File[],
-    uploadingCallback: (status: string, data: any) => any
+    // uploadingCallback: (status: string | Array<any>, data: any) => any
+    uploadingCallback: (data: any | Array<any>, errors?: any | Array<any>) => any
   ): any;
   downloadFile(
     question: IQuestion,

src/localization/english.ts

@@ -46,6 +46,7 @@ export var englishStrings = {
   urlGetChoicesError:
     "The request returned empty data or the 'path' property is incorrect",
   exceedMaxSize: "The file size should not exceed {0}.",
+  noUploadFilesHandler: "Files cannot be uploaded. Please add a handler for the 'onUploadFiles' event.",
   otherRequiredError: "Response required: enter another value.",
   uploadingFile:
     "Your file is uploading. Please wait several seconds and try again.",

src/question_file.ts

@@ -625,15 +625,25 @@ export class QuestionFileModel extends Question {
         });
       } else {
         if (this.survey) {
-          this.survey.uploadFiles(this, this.name, files, (status, data) => {
-            if (status === "error") {
-              this.errors.push(new UploadingFileError(data, this));
-              this.stateChanged("error");
-              this.stateChanged("loaded");
+          this.survey.uploadFiles(this, this.name, files, (arg1: any, arg2: any) => {
+            if (Array.isArray(arg1)) {
+              this.value = (this.value || []).concat(
+                arg1.map((r: any) => {
+                  return {
+                    name: r.file.name,
+                    type: r.file.type,
+                    content: r.content,
+                  };
+                })
+              );
+              if (Array.isArray(arg2)) {
+                arg2.forEach(error => this.errors.push(new UploadingFileError(error, this)));
+                this.stateChanged("error");
+              }
             }
-            if (status === "success") {
+            if (arg1 === "success" && Array.isArray(arg2)) {
               this.value = (this.value || []).concat(
-                data.map((r: any) => {
+                arg2.map((r: any) => {
                   return {
                     name: r.file.name,
                     type: r.file.type,
@@ -642,6 +652,16 @@ export class QuestionFileModel extends Question {
                 })
               );
             }
+            if (arg1 === "error") {
+              if (typeof (arg2) === "string") {
+                this.errors.push(new UploadingFileError(arg2, this));
+              }
+              if (Array.isArray(arg2) && arg2.length > 0) {
+                arg2.forEach(error => this.errors.push(new UploadingFileError(error, this)));
+              }
+              this.stateChanged("error");
+            }
+            this.stateChanged("loaded");
           });
         }
       }

src/survey-events-api.ts

@@ -40,9 +40,9 @@ export interface MatrixDropdownQuestionEventMixin {
   question: QuestionMatrixDropdownModelBase;
 }
 export interface MatrixDynamicQuestionEventMixin {
- /**
-  * A Dynamic Matrix question instance for which the event is raised.
-  */
+  /**
+   * A Dynamic Matrix question instance for which the event is raised.
+   */
   question: QuestionMatrixDynamicModel;
 }
 export interface PanelEventMixin {
@@ -284,11 +284,11 @@ export interface ElementRemovedEvent {
    */
   name: string;
 }
-export interface QuestionAddedEvent extends QuestionEventMixin, ElementAddedEvent {}
-export interface QuestionRemovedEvent extends QuestionEventMixin, ElementRemovedEvent {}
-export interface PanelAddedEvent extends PanelEventMixin, ElementAddedEvent {}
-export interface PanelRemovedEvent extends PanelEventMixin, ElementRemovedEvent {}
-export interface PageAddedEvent extends PageEventMixin {}
+export interface QuestionAddedEvent extends QuestionEventMixin, ElementAddedEvent { }
+export interface QuestionRemovedEvent extends QuestionEventMixin, ElementRemovedEvent { }
+export interface PanelAddedEvent extends PanelEventMixin, ElementAddedEvent { }
+export interface PanelRemovedEvent extends PanelEventMixin, ElementRemovedEvent { }
+export interface PageAddedEvent extends PageEventMixin { }
 export interface ValidateQuestionEvent extends QuestionEventMixin {
   /**
    * An error message that you should specify if validation fails.
@@ -495,9 +495,9 @@ export interface LoadFilesEvent extends FileQuestionEventMixin {
 }
 export interface UploadFilesEvent extends LoadFilesEvent {
   /**
-   * A callback function that you should call when a file is uploaded successfully or when file upload fails. Pass `"success"` or `"error"` as the first argument to indicate the operation status. As the second argument, you can pass the uploaded file's data if file upload was successful or an error message if file upload failed.
+   * A callback function that you should call when a file is uploaded successfully or when file upload fails. Pass an array of successfully uploaded files as the first argument. As the second argument, you can pass an array of error messages if file upload failed.
    */
-  callback: (status: string, data?: any) => any;
+  callback: (data: any | Array<any>, errors?: any | Array<any>) => any;
   /**
    * An array of JavaScript <a href="https://developer.mozilla.org/en-US/docs/Web/API/File" target="_blank">File</a> objects that represent files to upload.
    */
@@ -756,7 +756,7 @@ export interface MatrixCellValueBaseEvent extends MatrixDropdownQuestionEventMix
 
 }
 
-export interface MatrixCellValueChangedEvent extends MatrixCellValueBaseEvent {}
+export interface MatrixCellValueChangedEvent extends MatrixCellValueBaseEvent { }
 export interface MatrixCellValueChangingEvent extends MatrixCellValueBaseEvent {
   /**
    * A previous cell value.

src/survey.ts

@@ -5019,18 +5019,18 @@ export class SurveyModel extends SurveyElementCore
    * @param question A [File Upload question instance](https://surveyjs.io/form-library/documentation/api-reference/file-model).
    * @param name The File Upload question's [`name`](https://surveyjs.io/form-library/documentation/api-reference/file-model#name).
    * @param files An array of JavaScript <a href="https://developer.mozilla.org/en-US/docs/Web/API/File" target="_blank">File</a> objects that represent files to upload.
-   * @param callback A callback function that allows you to get the upload status (`"success"` or `"error"`) and file data.
+   * @param callback A callback function that allows you to access successfully uploaded files as the first argument. If any files fail to upload, the second argument contains an array of error messages.
    * @see onUploadFiles
    * @see downloadFile
    */
   public uploadFiles(
     question: QuestionFileModel,
     name: string,
     files: File[],
-    callback: (status: string, data: any) => any
+    callback: (data: any | Array<any>, errors?: any | Array<any>) => any
   ) {
     if (this.onUploadFiles.isEmpty) {
-      callback("error", files);
+      callback("error", this.getLocString("noUploadFilesHandler"));
     } else {
       this.onUploadFiles.fire(this, {
         question: question,
@@ -5130,7 +5130,7 @@ export class SurveyModel extends SurveyElementCore
   protected uploadFilesCore(
     name: string,
     files: File[],
-    uploadingCallback: (status: string, data: any) => any
+    uploadingCallback: (data: any | Array<any>, errors?: any | Array<any>,) => any
   ) {
     var responses: Array<any> = [];
     files.forEach((file) => {
@@ -7174,6 +7174,7 @@ export class SurveyModel extends SurveyElementCore
   public stopMovingQuestion(): void {
     this.isMovingQuestion = false;
   }
+  get isQuestionDragging(): boolean { return this.isMovingQuestion; }
   private needRenderIcons = true;
 
   private skippedPages: Array<{ from: any, to: any }> = [];