Bladeren bron

remove valuemin/valuemax from ProgressBarProcessing, keep it on the parent

Artur Paikin 7 jaren geleden
bovenliggende
commit
a833784872
1 gewijzigde bestanden met toevoegingen van 4 en 9 verwijderingen
  1. 4 9
      src/plugins/StatusBar/StatusBar.js

+ 4 - 9
src/plugins/StatusBar/StatusBar.js

@@ -116,8 +116,7 @@ module.exports = (props) => {
            style="width: ${width}%"
            style="width: ${width}%"
            role="progressbar"
            role="progressbar"
            aria-valuemin="0"
            aria-valuemin="0"
-           aria-valuemax="100"
-           aria-valuenow="${progressValue}"></div>
+           aria-valuemax="100"></div>
       ${progressBarContent}
       ${progressBarContent}
       <div class="UppyStatusBar-actions">
       <div class="UppyStatusBar-actions">
         ${props.newFiles && !props.hideUploadButton ? UploadBtn(props) : ''}
         ${props.newFiles && !props.hideUploadButton ? UploadBtn(props) : ''}
@@ -126,8 +125,8 @@ module.exports = (props) => {
     </div>
     </div>
   `
   `
 
 
-  if (progressMode === 'determinate') {
-    statusBarEl.setAttribute('aria-valuenow', progressValue)
+  if (progressValue) {
+    statusBarEl.querySelector('.UppyStatusBar-progress').setAttribute('aria-valuenow', progressValue)
   }
   }
 
 
   return statusBarEl
   return statusBarEl
@@ -156,15 +155,11 @@ const RetryBtn = (props) => {
 
 
 const ProgressBarProcessing = (props) => {
 const ProgressBarProcessing = (props) => {
   const value = Math.round(props.value * 100)
   const value = Math.round(props.value * 100)
+
   return html`
   return html`
     <div class="UppyStatusBar-content">
     <div class="UppyStatusBar-content">
-      <div role="progressbar"
-           aria-valuemin="0"
-           aria-valuemax="100"
-           aria-valuenow="${value}">
         ${props.mode === 'determinate' ? `${value}%・` : ''}
         ${props.mode === 'determinate' ? `${value}%・` : ''}
         ${props.message}
         ${props.message}
-      </div>
     </div>
     </div>
   `
   `
 }
 }