Merge branch 'master' into fix-int-cells-in-dataSet

Author: securedeveloper

.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 language: node_js
 node_js:
+  - '10'
   - '9'
   - '8'
-  - '6'

README.md

@@ -1,5 +1,10 @@
 # React-Data-Export
 
+##### :warning: A complete re-write is coming soon (we won't need xlsx package anymore (It will be backward compatible):warning: 
+
+## :new: I am re-writing complete excel api in JavaScript, please consider contributing or putting your ideas here https://github.com/securedeveloper/javascript-excel (After finishing will update this library)
+(:exclamation::exclamation::exclamation:The purpose of having a new library is that open source libraries either does not support styling and rest functionality in excel or they are too heavy to  consider)
+
 [![npm version](https://badge.fury.io/js/react-data-export.svg)](https://badge.fury.io/js/react-data-export)
 [![dependencies Status](https://david-dm.org/securedeveloper/react-data-export/status.svg)](https://david-dm.org/securedeveloper/react-data-export)
 [![devDependencies Status](https://david-dm.org/securedeveloper/react-data-export/dev-status.svg)](https://david-dm.org/securedeveloper/react-data-export?type=dev)

dist/ExcelPlugin/utils/DataUtil.js

@@ -64,16 +64,26 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) {
 
         rowCount += ySteps;
 
+        var columnsWidth = [];
         if (columns.length >= 0) {
             columns.forEach(function (col, index) {
                 var cellRef = _xlsx2.default.utils.encode_cell({ c: xSteps + index, r: rowCount });
                 fixRange(range, 0, 0, rowCount, xSteps, ySteps);
-                getHeaderCell(col, cellRef, ws);
+                var colTitle = col;
+                if ((typeof col === 'undefined' ? 'undefined' : _typeof(col)) === 'object') {
+                    colTitle = col.title;
+                    columnsWidth.push(col.width || { wpx: 80 }); /* wch (chars), wpx (pixels) - e.g. [{wch:6},{wpx:50}] */
+                }
+                getHeaderCell(colTitle, cellRef, ws);
             });
 
             rowCount += 1;
         }
 
+        if (columnsWidth.length > 0) {
+            ws['!cols'] = columnsWidth;
+        }
+
         for (var R = 0; R != data.length; ++R, rowCount++) {
             for (var C = 0; C != data[R].length; ++C) {
                 var cellRef = _xlsx2.default.utils.encode_cell({ c: C + xSteps, r: rowCount });

examples/styled_excel_sheet.md

@@ -8,7 +8,11 @@ const ExcelSheet = ReactExport.ExcelFile.ExcelSheet;
 
 const multiDataSet = [
     {
-        columns: ["Headings", "Text Style", "Colors"],
+        columns: [
+            {title: "Headings", width: {wpx: 80}},//pixels width 
+            {title: "Text Style", width: {wch: 40}},//char width 
+            {title: "Colors", width: {wpx: 90}},
+        ],
         data: [
             [
                 {value: "H1", style: {font: {sz: "24", bold: true}}},

jest.config.js

@@ -1,19 +1,19 @@
 module.exports = {
-  name: 'react-data-export-jest',
-  verbose: true,
-  collectCoverage: true,
-  coveragePathIgnorePatterns: [
-    'node_modules',
-  ],
-  testEnvironment: 'jest-environment-jsdom-global',
-  testRegex: '(/test/unit.*\\.test)\\.js',
-  setupFiles: [
-    './test/global.js'
-  ],
-  modulePathIgnorePatterns: [
-    'global.js'
-  ],
-  testPathIgnorePatterns: [
-    '__snapshots__'
-  ]
+    name: 'react-data-export-jest',
+    verbose: true,
+    collectCoverage: true,
+    coveragePathIgnorePatterns: [
+        'node_modules',
+    ],
+    testEnvironment: 'node',
+    testRegex: '(/test/unit.*\\.test)\\.js',
+    setupFiles: [
+        './test/global.js'
+    ],
+    modulePathIgnorePatterns: [
+        'global.js'
+    ],
+    testPathIgnorePatterns: [
+        '__snapshots__'
+    ]
 };