diff --git a/package-lock.json b/package-lock.json index d51979b..8c59b6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-pivottable", - "version": "0.6.0", + "version": "0.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3014,12 +3014,6 @@ "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", "dev": true }, - "fast-isnumeric": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fast-isnumeric/-/fast-isnumeric-1.1.1.tgz", - "integrity": "sha1-V7gcB6PAnLnsO++cFhgYmS2JNkM=", - "dev": true - }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -7950,15 +7944,41 @@ } } }, + "react-is": { + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==", + "dev": true + }, "react-plotly.js": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/react-plotly.js/-/react-plotly.js-1.0.4.tgz", - "integrity": "sha512-clcj6DqS2ujAXBKBj5PV7NGoHUXULyP1df2TLZxkOclSUyDs/iD39sMuhADc9/WyI3qj4sHACY4zQNxe+MTNtQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-plotly.js/-/react-plotly.js-2.3.0.tgz", + "integrity": "sha512-+eNqIQtGe/WmgsZ+IDxOt8Zy/QXRTmbgqq+yID6dNsCG5zst946fZlLR+u0U7yt2z3IsatAyKAPXUZh5DHUR5Q==", "dev": true, "requires": { - "fast-isnumeric": "1.1.1", - "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.7.2" + }, + "dependencies": { + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "react-is": "16.8.6" + } + } } }, "react-proxy": { diff --git a/src/TableRenderers.jsx b/src/TableRenderers.jsx index 849894d..8ff10e3 100644 --- a/src/TableRenderers.jsx +++ b/src/TableRenderers.jsx @@ -56,6 +56,7 @@ function makeRenderer(opts = {}) { class TableRenderer extends React.PureComponent { render() { const pivotData = new PivotData(this.props); + const id = pivotData.props.id; const colAttrs = pivotData.props.cols; const rowAttrs = pivotData.props.rows; const rowKeys = pivotData.getRowKeys(); @@ -133,7 +134,7 @@ function makeRenderer(opts = {}) { : null; return ( - +
{colAttrs.map(function(c, j) { return ( diff --git a/src/Utilities.js b/src/Utilities.js index 6d3eefb..0660902 100644 --- a/src/Utilities.js +++ b/src/Utilities.js @@ -770,6 +770,7 @@ PivotData.forEachRecord = function(input, derivedAttributes, f) { }; PivotData.defaultProps = { + id:"pvtTable", aggregators: aggregators, cols: [], rows: [], @@ -783,6 +784,7 @@ PivotData.defaultProps = { }; PivotData.propTypes = { + id: PropTypes.string, data: PropTypes.oneOfType([PropTypes.array, PropTypes.object, PropTypes.func]) .isRequired, aggregatorName: PropTypes.string,