From e04d0a62b9a5e782aa81635dd8a166d73d5050f6 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Sun, 2 Jul 2023 18:50:25 +0300
Subject: [PATCH 1/2] Add supportCamera boolean property into file question
 #6463

---
 .../src/questions/file.component.html             |  1 +
 src/knockout/templates/question-file.html         |  2 +-
 src/question_file.ts                              |  5 +++++
 src/react/reactquestion_file.tsx                  |  1 +
 src/vue/file.vue                                  |  1 +
 tests/markup/etalon_file.ts                       | 15 +++++++++++++++
 tests/markup/snapshots/file-camera.snap.html      | 14 ++++++++++++++
 7 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/markup/snapshots/file-camera.snap.html

diff --git a/packages/survey-angular-ui/src/questions/file.component.html b/packages/survey-angular-ui/src/questions/file.component.html
index 25840b5878..20840bb9ee 100644
--- a/packages/survey-angular-ui/src/questions/file.component.html
+++ b/packages/survey-angular-ui/src/questions/file.component.html
@@ -13,6 +13,7 @@
     [attr.multiple]="model.multipleRendered"
     [attr.title]="model.inputTitle"
     [attr.accept]="model.acceptedTypes"
+    [attr.capture]="model.renderCapture"
   />
   <input
     *ngIf="model.isReadOnly"
diff --git a/src/knockout/templates/question-file.html b/src/knockout/templates/question-file.html
index 59ec760c46..88bce41391 100644
--- a/src/knockout/templates/question-file.html
+++ b/src/knockout/templates/question-file.html
@@ -1,7 +1,7 @@
 <script type="text/html" id="survey-question-file">
   <div data-bind="css: question.fileRootCss">
       <!-- ko ifnot: question.isInputReadOnly -->
-      <input type="file" tabindex="-1" data-bind="css: question.cssClasses.fileInput, attr: { id: question.inputId, 'aria-required': question.ariaRequired, 'aria-label': question.ariaLabel, 'aria-invalid': question.ariaInvalid, 'aria-describedby': question.ariaDescribedBy, multiple: question.allowMultiple ? 'multiple' : undefined, title: koInputTitle, accept: question.acceptedTypes }, event: { change: question.dochange }">
+      <input type="file" tabindex="-1" data-bind="css: question.cssClasses.fileInput, attr: { id: question.inputId, 'aria-required': question.ariaRequired, 'aria-label': question.ariaLabel, 'aria-invalid': question.ariaInvalid, 'aria-describedby': question.ariaDescribedBy, multiple: question.allowMultiple ? 'multiple' : undefined, title: koInputTitle, accept: question.acceptedTypes, capture: question.renderCapture }, event: { change: question.dochange }">
       <!-- /ko -->
       <!-- ko if: question.isReadOnly -->
       <input type="file" disabled data-bind="css: question.getReadOnlyFileCss(), attr: { id: question.inputId, placeholder: question.title, multiple: question.allowMultiple ? 'multiple' : undefined }" style="color: transparent;"/>
diff --git a/src/question_file.ts b/src/question_file.ts
index bfee5f1417..533d1b6702 100644
--- a/src/question_file.ts
+++ b/src/question_file.ts
@@ -40,6 +40,7 @@ export class QuestionFileModel extends Question {
 
   @property({ defaultValue: 0 }) indexToShow: number;
   @property({ defaultValue: false }) containsMultiplyFiles: boolean;
+  @property() supportCamera: boolean;
 
   public mobileFileNavigator: ActionContainer = new ActionContainer();
   protected prevFileAction: Action;
@@ -240,6 +241,9 @@ export class QuestionFileModel extends Question {
       }
     );
   }
+  public get renderCapture(): string {
+    return this.supportCamera ? "camera" : undefined;
+  }
 
   get multipleRendered() {
     return this.allowMultiple ? "multiple" : undefined;
@@ -608,6 +612,7 @@ Serializer.addClass(
     { name: "correctAnswer", visible: false },
     { name: "validators", visible: false },
     { name: "needConfirmRemoveFile:boolean" },
+    { name: "supportCamera:switch", visible: false }
   ],
   function () {
     return new QuestionFileModel("");
diff --git a/src/react/reactquestion_file.tsx b/src/react/reactquestion_file.tsx
index 823fcab433..0de7aacfa3 100644
--- a/src/react/reactquestion_file.tsx
+++ b/src/react/reactquestion_file.tsx
@@ -56,6 +56,7 @@ export class SurveyQuestionFile extends SurveyQuestionElementBase {
           multiple={this.question.allowMultiple}
           title={this.question.inputTitle}
           accept={this.question.acceptedTypes}
+          capture={this.question.renderCapture}
         />
     );
     return (
diff --git a/src/vue/file.vue b/src/vue/file.vue
index 2943f8fa82..51778c741c 100644
--- a/src/vue/file.vue
+++ b/src/vue/file.vue
@@ -14,6 +14,7 @@
       :multiple="question.multipleRendered"
       v-bind:title="question.inputTitle"
       v-bind:accept="question.acceptedTypes"
+      :capture="question.renderCapture"
     />
     <input
       v-if="question.isReadOnly"
diff --git a/tests/markup/etalon_file.ts b/tests/markup/etalon_file.ts
index 9fa80ccc8e..c9a4b5e0bd 100644
--- a/tests/markup/etalon_file.ts
+++ b/tests/markup/etalon_file.ts
@@ -508,6 +508,21 @@ registerMarkupTests(
       ]
     },
     snapshot: "file-image-size",
+  },
+  {
+    name: "Test file question empty (default)",
+    json: {
+      questions: [
+        {
+          name: "name",
+          type: "file",
+          title: "Question title",
+          titleLocation: "hidden",
+          supportCamera: true
+        }
+      ]
+    },
+    snapshot: "file-camera",
   }
   ]
 );
\ No newline at end of file
diff --git a/tests/markup/snapshots/file-camera.snap.html b/tests/markup/snapshots/file-camera.snap.html
new file mode 100644
index 0000000000..40930aff25
--- /dev/null
+++ b/tests/markup/snapshots/file-camera.snap.html
@@ -0,0 +1,14 @@
+<div class="sv_q_file">
+	<input aria-invalid="false" aria-label="Question title" aria-required="false" capture="camera" class="sv-visuallyhidden" id="testid0i" tabindex="-1" title="Choose file(s)..." type="file">
+	<div>
+		<div class="sv-file__decorator">
+			<span class="sv-hidden">Drag and drop a file here or click the button below and choose a file to upload.</span>
+			<div>
+				<label aria-label="Choose file" class="sv_q_file_choose_button" role="button" tabindex="0">
+					<span>Choose file</span>
+				</label>
+				<span class="sv_q_file_placeholder">No file chosen</span>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file

From b555cbcf3ecc4151ef97d50d714be65f5430df24 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Mon, 3 Jul 2023 15:25:41 +0300
Subject: [PATCH 2/2] Change property name #6463

---
 src/question_file.ts                         | 6 +++---
 tests/markup/etalon_file.ts                  | 2 +-
 tests/markup/snapshots/file-camera.snap.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/question_file.ts b/src/question_file.ts
index 533d1b6702..48b7e2eec1 100644
--- a/src/question_file.ts
+++ b/src/question_file.ts
@@ -40,7 +40,7 @@ export class QuestionFileModel extends Question {
 
   @property({ defaultValue: 0 }) indexToShow: number;
   @property({ defaultValue: false }) containsMultiplyFiles: boolean;
-  @property() supportCamera: boolean;
+  @property() allowCameraAccess: boolean;
 
   public mobileFileNavigator: ActionContainer = new ActionContainer();
   protected prevFileAction: Action;
@@ -242,7 +242,7 @@ export class QuestionFileModel extends Question {
     );
   }
   public get renderCapture(): string {
-    return this.supportCamera ? "camera" : undefined;
+    return this.allowCameraAccess ? "user" : undefined;
   }
 
   get multipleRendered() {
@@ -612,7 +612,7 @@ Serializer.addClass(
     { name: "correctAnswer", visible: false },
     { name: "validators", visible: false },
     { name: "needConfirmRemoveFile:boolean" },
-    { name: "supportCamera:switch", visible: false }
+    { name: "allowCameraAccess:switch", category: "general" }
   ],
   function () {
     return new QuestionFileModel("");
diff --git a/tests/markup/etalon_file.ts b/tests/markup/etalon_file.ts
index c9a4b5e0bd..fa51d06328 100644
--- a/tests/markup/etalon_file.ts
+++ b/tests/markup/etalon_file.ts
@@ -518,7 +518,7 @@ registerMarkupTests(
           type: "file",
           title: "Question title",
           titleLocation: "hidden",
-          supportCamera: true
+          allowCameraAccess: true
         }
       ]
     },
diff --git a/tests/markup/snapshots/file-camera.snap.html b/tests/markup/snapshots/file-camera.snap.html
index 40930aff25..d92a14ddb1 100644
--- a/tests/markup/snapshots/file-camera.snap.html
+++ b/tests/markup/snapshots/file-camera.snap.html
@@ -1,5 +1,5 @@
 <div class="sv_q_file">
-	<input aria-invalid="false" aria-label="Question title" aria-required="false" capture="camera" class="sv-visuallyhidden" id="testid0i" tabindex="-1" title="Choose file(s)..." type="file">
+	<input aria-invalid="false" aria-label="Question title" aria-required="false" capture="user" class="sv-visuallyhidden" id="testid0i" tabindex="-1" title="Choose file(s)..." type="file">
 	<div>
 		<div class="sv-file__decorator">
 			<span class="sv-hidden">Drag and drop a file here or click the button below and choose a file to upload.</span>