Merge pull request #29 from Bunlong/3.3.0

Bunlong · web-flow · commit b5aaa2c5efb6 · 2020-05-25T23:56:34.000+07:00
Disable progress bar
diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "1.0.0",
+  "version": "3.3.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "raw-loader": "^4.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
+    "react-papaparse": "^3.3.0",
     "react-tabs": "^3.1.0"
   }
 }
diff --git a/docs/src/components/screens/docs/CSVToJSON.js b/docs/src/components/screens/docs/CSVToJSON.js
@@ -72,9 +72,10 @@ const CSVToJSON = () => {
             <li><code>onError</code> is error handling function.</li>
             <li><code>noClick</code> If true, disables click to open the native file selection dialog.</li>
             <li><code>noDrag</code> If true, disables drag 'n' drop.</li>
-            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
+            <li><code>noProgressBar</code> If true, disables progress bar.</li>
             <li><code>progressBarColor</code> is a property to be used to set the color of progress bar (for example, <code>progressBarColor='#659cef'</code>).</li>
             <li><code>style</code> is some styles to be applied to the <code>{'<input>'}</code> element.</li>
+            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
             <li>Doesn't return anything. Results are provided asynchronously to a callback function.</li>
           </ul>
         </div>
@@ -106,10 +107,11 @@ const CSVToJSON = () => {
           <ul>
             <li><code>onDrop</code> is the function to be called passing loaded results.</li>
             <li><code>onError</code> is error handling function.</li>
-            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
+            <li><code>noProgressBar</code> If true, disables progress bar.</li>
             <li><code>progressBarColor</code> is a property to be used to set the color of progress bar (for example, <code>progressBarColor='#659cef'</code>).</li>
             <li><code>style</code> is some styles to be applied to the <code>{'<input>'}</code> element.</li>
             <li><code>addRemoveButton</code> If true, this will add a button to remove or cancel (if already uploading) the file.</li>
+            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
             <li>Doesn't return anything. Results are provided asynchronously to a callback function.</li>
           </ul>
         </div>
@@ -143,10 +145,11 @@ const CSVToJSON = () => {
             <li><code>onDrop</code> is the function to be called passing loaded results.</li>
             <li><code>onError</code> is error handling function.</li>
             <li><code>noClick</code> If true, disables click to open the native file selection dialog.</li>
-            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
+            <li><code>noProgressBar</code> If true, disables progress bar.</li>
             <li><code>progressBarColor</code> is a property to be used to set the color of progress bar (for example, <code>progressBarColor='#659cef'</code>).</li>
             <li><code>style</code> is some styles to be applied to the <code>{'<input>'}</code> element.</li>
             <li><code>addRemoveButton</code> If true, this will add a button to remove or cancel (if already uploading) the file.</li>
+            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
             <li>Doesn't return anything. Results are provided asynchronously to a callback function.</li>
           </ul>
         </div>
@@ -180,10 +183,11 @@ const CSVToJSON = () => {
             <li><code>onDrop</code> is the function to be called passing loaded results.</li>
             <li><code>onError</code> is error handling function.</li>
             <li><code>noDrag</code> If true, disables drag 'n' drop.</li>
-            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
+            <li><code>noProgressBar</code> If true, disables progress bar.</li>
             <li><code>progressBarColor</code> is a property to be used to set the color of progress bar (for example, <code>progressBarColor='#659cef'</code>).</li>
             <li><code>style</code> is some styles to be applied to the <code>{'<input>'}</code> element.</li>
             <li><code>addRemoveButton</code> If true, this will add a button to remove or cancel (if already uploading) the file.</li>
+            <li><code>config</code> is a <a href='#config'>config object</a> which contains a callback.</li>
             <li>Doesn't return anything. Results are provided asynchronously to a callback function.</li>
           </ul>
         </div>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-papaparse",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Fast and powerful React CSV parser for the browser that supports web workers and streaming large files. Converts CSV to JSON and JSON to CSV.",
   "author": "Bunlong <bunlong.van@gmail.com>",
   "license": "MIT",
diff --git a/src/CSVReader.tsx b/src/CSVReader.tsx
@@ -89,6 +89,7 @@ interface Props {
   progressBarColor?: string;
   addRemoveButton?: boolean;
   onRemoveFile?: (data: any) => void;
+  noProgressBar?: boolean;
 }
 
 interface State {
@@ -439,13 +440,16 @@ export default class CSVReader extends React.Component<Props, State> {
                     ref={this.fileNameInfoRef}
                   />
                 </div>
-                {files && files.length > 0 && !isCanceled && (
-                  <ProgressBar
-                    progressBarColor={progressBarColor || ''}
-                    progressBar={progressBar}
-                    displayProgressBarStatus={displayProgressBarStatus}
-                  />
-                )}
+                {files &&
+                  files.length > 0 &&
+                  !isCanceled &&
+                  !this.props.noProgressBar && (
+                    <ProgressBar
+                      progressBarColor={progressBarColor || ''}
+                      progressBar={progressBar}
+                      displayProgressBarStatus={displayProgressBarStatus}
+                    />
+                  )}
               </div>
             ) : (
               children
@@ -454,14 +458,17 @@ export default class CSVReader extends React.Component<Props, State> {
         ) : (
           <div ref={this.dropAreaRef}>
             {this.renderChildren()}
-            {files && files.length > 0 && !isCanceled && (
-              <ProgressBar
-                progressBarColor={progressBarColor || ''}
-                progressBar={progressBar}
-                displayProgressBarStatus={displayProgressBarStatus}
-                isButtonProgressBar
-              />
-            )}
+            {files &&
+              files.length > 0 &&
+              !isCanceled &&
+              !this.props.noProgressBar && (
+                <ProgressBar
+                  progressBarColor={progressBarColor || ''}
+                  progressBar={progressBar}
+                  displayProgressBarStatus={displayProgressBarStatus}
+                  isButtonProgressBar
+                />
+              )}
           </div>
         )}
       </>
diff --git a/supports/default/package.json b/supports/default/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "create-next-app-cli",
+  "name": "create-next-app",
   "version": "0.1.0",
   "description": "",
   "main": "index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "docs",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "3.3.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
`@@ -17,6 +17,7 @@`
`17`	`17`	`"raw-loader": "^4.0.0",`
`18`	`18`	`"react": "^16.12.0",`
`19`	`19`	`"react-dom": "^16.12.0",`
	`20`	`+ "react-papaparse": "^3.3.0",`
`20`	`21`	`"react-tabs": "^3.1.0"`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-papaparse",`
`3`		`- "version": "3.2.1",`
	`3`	`+ "version": "3.3.0",`
`4`	`4`	`"description": "Fast and powerful React CSV parser for the browser that supports web workers and streaming large files. Converts CSV to JSON and JSON to CSV.",`
`5`	`5`	`"author": "Bunlong <bunlong.van@gmail.com>",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "create-next-app-cli",`
	`2`	`+ "name": "create-next-app",`
`3`	`3`	`"version": "0.1.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`