Resolve conflict

Author: Bunlong

CHANGELOG.md

@@ -1,3 +1,33 @@
+## 4.3.0 (2023-10-10)
+
+### ✨ Features
+
+ * Enable async callback function for CSVDownloader
+
+Credits
+
+* [@JakeHaitsma](https://github.com/JakeHaitsma)
+
+## 4.2.2 (2023-10-09)
+
+### ✨ Features
+
+ * Fix type
+
+Credits
+
+* [@Bunlong](https://github.com/Bunlong)
+
+## 4.2.0 (2023-10-07)
+
+### ✨ Features
+
+ * Upgrade dependencies
+
+Credits
+
+* [@Bunlong](https://github.com/Bunlong)
+
 ## 4.1.0 (2022-08-07)
 
 ### ✨ Bugs

README.md

@@ -713,7 +713,7 @@ export default function CSVDownloader() {
 
 #### Data as a Function/Callback
 
-`data={}` can be a function that returns a data object.
+`data={}` can be a synchronous or asynchronous function that returns a data object.
 
 ```javascript
 import React from 'react';
@@ -809,7 +809,7 @@ export default function JsonToCSV() {
  const { jsonToCSV } = usePapaParse();
 
  const handleJsonToCSV = () => {
- const jsonData = `[
+ const jsonData = [
  {
  "Column 1": "1-1",
  "Column 2": "1-2",
@@ -834,7 +834,7 @@ export default function JsonToCSV() {
  "Column 3": 6,
  "Column 4": 7
  }
- ]`;
+ ];
  const results = jsonToCSV(jsonData);
  console.log('---------------------------');
  console.log('Results:', results);
@@ -886,7 +886,19 @@ readRemoteFile(url, {
 
 ## 📜 Changelog
 
-Latest version 4.1.0 (2022-08-07):
+Latest version 4.3.0 (2023-10-10):
+
+ * Enable async callback function for CSVDownloader
+
+Version 4.2.2 (2023-10-09):
+
+ * Fix type
+
+Version 4.2.0 (2023-10-07):
+
+ * Upgrade dependencies
+
+Version 4.1.0 (2022-08-07):
 
  * Import readString, readRemoteFile and jsonToCSV as pure function
 
@@ -911,7 +923,7 @@ Details changes for each release are documented in the [CHANGELOG.md](https://gi
 
 ## 🛣️ Roadmap
 
-### 🆕 v4.1.x
+### 🆕 v4.4.x
 
  * CSVReader multiple files drag and drop
 
@@ -1205,6 +1217,15 @@ How to contribute:
   </sub>
   </a>
  </td>
+ <td align="center">
+  <a href="https://github.com/s5s5">
+  <img src="https://avatars.githubusercontent.com/u/6137499?v=4" width="100" alt="Jake Haitsma" />
+  <br />
+  <sub>
+  <b>Jake Haitsma</b>
+  </sub>
+  </a>
+ </td>
  </tr>
 </table>
 

docs/package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-papaparse-docs",
- "version": "3.17.1",
+ "version": "4.2.2",
  "description": "react-papaparse docs.",
  "main": "index.js",
  "scripts": {
@@ -19,7 +19,7 @@
  "raw-loader": "^4.0.0",
  "react": "17.0.2",
  "react-dom": "17.0.2",
- "react-papaparse": "^4.0.0",
+ "react-papaparse": "^4.2.2",
  "react-tabs": "^3.1.0"
  },
  "devDependencies": {

docs/pages/_app.js

@@ -149,7 +149,7 @@ class CustomApp extends App {
  react-papaparse by{' '}
  <a href="https://github.com/bunlong">Bunlong</a>
  <br />
- &copy; 2018-2022
+ &copy; 2018-2023
  </div>
 
  <div className="grid-15 mobile-grid-50 links">
@@ -160,10 +160,20 @@ class CustomApp extends App {
 
  <div className="grid-15 mobile-grid-50 links">
  <h5>Project</h5>
+ <a href="https://github.com/Bunlong/next-qrcode" target="_blank">
+ next-qrcode
+ </a>
  <a href="https://github.com/Bunlong/next-share" target="_blank">
  next-share
  </a>
  </div>
+
+ <div className="grid-15 mobile-grid-50 links">
+ <h5>Pattern</h5>
+ <a href="https://reactpatterns.js.org" target="_blank">
+ React Patterns
+ </a>
+ </div>
  </div>
  </div>
  </footer>

docs/src/components/screens/docs/Navbar.js

@@ -19,7 +19,7 @@ const Navbar = () => {
  </div>
  <div className="grid-20 hide-on-mobile text-center">
  <a href="/" className="text-logo">
- react-papaparse 3
+ react-papaparse 4
  </a>
  </div>
  <div className="grid-40 mobile-grid-50 text-right">

docs/src/components/screens/indexes/Download.js

@@ -17,7 +17,7 @@ const Download = () => {
  <br />
  <b style={{ display: 'block', textAlign: 'center' }}>yarn</b>
  <pre>
- <code className="language-bash">$ yarn add react-papaparse</code>
+ <code className="language-bash">$ yarn add react-papaparse --save</code>
  </pre>
  </div>
  <div className="clear" />

docs/src/components/screens/indexes/Unparse.js

@@ -23,7 +23,7 @@ export default function JsonToCSV() {
  const { jsonToCSV } = usePapaParse();
 
  const handleJsonToCSV = () => {
- const jsonData = '[
+ const jsonData = [
  {
  "Column 1": "1-1",
  "Column 2": "1-2",
@@ -48,7 +48,7 @@ export default function JsonToCSV() {
  "Column 3": 6,
  "Column 4": 7
  }
- ]';
+ ];
  const results = jsonToCSV(jsonData);
  console.log('---------------------------');
  console.log('Results:', results);

examples/jsonToCSV.tsx

@@ -6,7 +6,7 @@ export default function JsonToCSV() {
  const { jsonToCSV } = usePapaParse();
 
  const handleJsonToCSV = () => {
- const jsonData = `[
+ const jsonData = [
  {
  "Column 1": "1-1",
  "Column 2": "1-2",
@@ -31,7 +31,7 @@ export default function JsonToCSV() {
  "Column 3": 6,
  "Column 4": 7
  }
- ]`;
+ ];
  const results = jsonToCSV(jsonData);
  console.log('---------------------------');
  console.log('Results:', results);

package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-papaparse",
- "version": "4.2.0",
+ "version": "4.3.0",
  "description": "The fastest in-browser CSV (or delimited text) parser for React. It is full of useful features such as CSVReader, CSVDownloader, readString, jsonToCSV, readRemoteFile, ... etc.",
  "author": "Bunlong <bunlong.van@gmail.com>",
  "license": "MIT",
@@ -108,7 +108,7 @@
  "dist"
  ],
  "dependencies": {
- "@types/papaparse": "^5.3.7",
+ "@types/papaparse": "^5.3.9",
  "papaparse": "^5.4.1"
  },
  "bundlesize": [
@@ -118,7 +118,7 @@
  },
  {
  "path": "./dist/*.ts",
- "maxSize": "1000 B"
+ "maxSize": "1039 B"
  }
  ]
 }

src/jsonToCSV.ts

@@ -1,5 +1,8 @@
-import PapaParse, { UnparseConfig } from 'papaparse';
+import PapaParse, { UnparseObject, UnparseConfig } from 'papaparse';
 
-export function jsonToCSV(json: any, options: UnparseConfig = {}) {
+export function jsonToCSV<T>(
+ json: T[] | UnparseObject<T>,
+ options: UnparseConfig = {},
+) {
  return PapaParse.unparse(json, options);
 }