Merge branch 'master' into master

Author: securedeveloper

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="0.6.0"></a>
+# [0.6.0](https://github.com/securedeveloper/react-data-export/compare/v0.5.0...v0.6.0) (2020-01-20)
+
+
+### Features
+
+* if the header has style then the style should be used ([855d37a](https://github.com/securedeveloper/react-data-export/commit/855d37a))
+
+
+
 <a name="0.5.0"></a>
 # [0.5.0](https://github.com/securedeveloper/react-data-export/compare/v0.4.2...v0.5.0) (2018-09-24)
 

dist/ExcelPlugin/utils/DataUtil.js

@@ -71,7 +71,7 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) {
                 fixRange(range, 0, 0, rowCount, xSteps, ySteps);
                 var colTitle = col;
                 if ((typeof col === 'undefined' ? 'undefined' : _typeof(col)) === 'object') {
-                    colTitle = col.title;
+                    //colTitle = col.title; //moved to getHeaderCell
                     columnsWidth.push(col.width || { wpx: 80 }); /* wch (chars), wpx (pixels) - e.g. [{wch:6},{wpx:50}] */
                 }
                 getHeaderCell(colTitle, cellRef, ws);
@@ -102,8 +102,8 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) {
 
 function getHeaderCell(v, cellRef, ws) {
     var cell = {};
-    var headerCellStyle = { font: { bold: true } };
-    cell.v = v;
+    var headerCellStyle = v.style ? v.style : { font: { bold: true } }; //if style is then use it
+    cell.v = v.title;
     cell.t = 's';
     cell.s = headerCellStyle;
     ws[cellRef] = cell;

examples/styled_excel_sheet.md

@@ -62,5 +62,8 @@ class App extends Component {
 ```
 
 ## Output
-![Download Button](http://i64.tinypic.com/2mey8na.jpg)
-![Excel File Outpu](http://i63.tinypic.com/2qko404.jpg)
+![Download Button](https://blvenglu.sirv.com/github/download_styled_excel_sheet.png)
+![Excel File Outpu](https://blvenglu.sirv.com/github/styled_excel_sheet.png)
+[Codesandbox](https://codesandbox.io/s/styledexcelsheet-hf5oo "Codesandbox | styled_excel_sheet")
+
+

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-data-export",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
   "description": "A set of tools to export dataset from react to different formats.",

package.json

@@ -58,7 +58,7 @@ const excelSheetFromDataSet = (dataSet) => {
                 fixRange(range, 0, 0, rowCount, xSteps, ySteps);
                 var colTitle = col;
                 if (typeof col === 'object'){
-                    colTitle = col.title;
+                    //colTitle = col.title; //moved to getHeaderCell
                     columnsWidth.push(col.width || {wpx:80}); /* wch (chars), wpx (pixels) - e.g. [{wch:6},{wpx:50}] */
                 }
                 getHeaderCell(colTitle, cellRef, ws);
@@ -89,8 +89,8 @@ const excelSheetFromDataSet = (dataSet) => {
 
 function getHeaderCell(v, cellRef, ws) {
     var cell = {};
-    var headerCellStyle = {font: {bold: true}};
-    cell.v = v;
+    var headerCellStyle = v.style ? v.style : { font: { bold: true } }; //if style is then use it
+    cell.v = v.title;
     cell.t = 's';
     cell.s = headerCellStyle;
     ws[cellRef] = cell;