@uppy/status-bar - npm Package Compare versions

Comparing version 0.27.1 to 0.27.2

lib/index.js

@@ -171,2 +171,5 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
     });
+    var startedFiles = Object.keys(files).filter(function (file) {
+      return files[file].progress.uploadStarted || files[file].progress.preprocess || files[file].progress.postprocess;
+    });
     var processingFiles = Object.keys(files).filter(function (file) {
@@ -216,3 +219,3 @@ return files[file].progress.preprocess || files[file].progress.postprocess;
       newFiles: newFiles.length,
-      inProgress: inProgressFiles.length,
+      numUploads: startedFiles.length,
       totalSpeed: totalSpeed,
@@ -219,0 +222,0 @@ totalETA: totalETA,

lib/StatusBar.js

@@ -185,7 +185,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var progressDetails = function progressDetails(props) {
+var ProgressDetails = function ProgressDetails(props) {
   return h(
     'div',
     { 'class': 'uppy-StatusBar-statusSecondary' },
-    props.inProgress > 1 && props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.inProgress }) + ' \xB7 ',
+    props.numUploads > 1 && props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.numUploads }) + ' \xB7 ',
     props.i18n('dataUploadedOfTotal', { complete: props.totalUploadedSize, total: props.totalSize }) + ' \xB7 ',
@@ -196,3 +196,3 @@ props.i18n('xTimeLeft', { time: props.totalETA })
 
-var ThrottledProgressDetails = throttle(progressDetails, 500, { leading: true, trailing: true });
+var ThrottledProgressDetails = throttle(ProgressDetails, 500, { leading: true, trailing: true });
 
@@ -199,0 +199,0 @@ var ProgressBarUploading = function ProgressBarUploading(props) {

package.json

 {
   "name": "@uppy/status-bar",
   "description": "A progress bar for Uppy, with many bells and whistles.",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "license": "MIT",
@@ -30,3 +30,3 @@ "main": "lib/index.js",
   "dependencies": {
-    "@uppy/utils": "0.27.0",
+    "@uppy/utils": "0.27.1",
     "classnames": "^2.2.6",
@@ -38,8 +38,7 @@ "lodash.throttle": "^4.1.1",
   "devDependencies": {
-    "@uppy/core": "0.27.0"
+    "@uppy/core": "0.27.1"
   },
   "peerDependencies": {
     "@uppy/core": "^0.27.0"
-  },
-  "gitHead": "6b82d12d42a0dfdd9e0677a18efcaf44c251c58c"
+  }
 }

src/index.js

@@ -159,2 +159,7 @@ const { Plugin } = require('@uppy/core')
     })
+    const startedFiles = Object.keys(files).filter((file) => {
+      return files[file].progress.uploadStarted ||
+        files[file].progress.preprocess ||
+        files[file].progress.postprocess
+    })
     const processingFiles = Object.keys(files).filter((file) => {
@@ -210,3 +215,3 @@ return files[file].progress.preprocess || files[file].progress.postprocess
       newFiles: newFiles.length,
-      inProgress: inProgressFiles.length,
+      numUploads: startedFiles.length,
       totalSpeed: totalSpeed,
@@ -213,0 +218,0 @@ totalETA: totalETA,

src/StatusBar.js

@@ -179,5 +179,5 @@ const throttle = require('lodash.throttle')
 
-const progressDetails = (props) => {
+const ProgressDetails = (props) => {
   return <div class="uppy-StatusBar-statusSecondary">
-    { props.inProgress > 1 && props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.inProgress }) + ' \u00B7 ' }
+    { props.numUploads > 1 && props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.numUploads }) + ' \u00B7 ' }
     { props.i18n('dataUploadedOfTotal', { complete: props.totalUploadedSize, total: props.totalSize }) + ' \u00B7 ' }
@@ -188,3 +188,3 @@ { props.i18n('xTimeLeft', { time: props.totalETA }) }
 
-const ThrottledProgressDetails = throttle(progressDetails, 500, { leading: true, trailing: true })
+const ThrottledProgressDetails = throttle(ProgressDetails, 500, { leading: true, trailing: true })
 
@@ -191,0 +191,0 @@ const ProgressBarUploading = (props) => {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

83400

increased by0.55%

Lines of code

1411

increased by0.57%

Dependency changes

• - Removed@uppy/utils@0.27.0(transitive)

• Updated@uppy/utils@0.27.1