@sb1/ffe-tables-react 8.0.21 → 8.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/DefaultTable/DefaultTable.js +8 -10
- package/es/SortableTable/SortableTable.js +4 -6
- package/es/Table.js +1 -1
- package/es/TableParts/TableFooter.js +3 -3
- package/es/TableParts/TableHeaders.js +4 -4
- package/lib/DefaultTable/DefaultTable.js +8 -10
- package/lib/SortableTable/SortableTable.js +4 -6
- package/lib/Table.js +1 -1
- package/lib/TableParts/TableFooter.js +3 -3
- package/lib/TableParts/TableHeaders.js +4 -4
- package/package.json +6 -5
|
@@ -55,7 +55,8 @@ var DefaultTable = /*#__PURE__*/function (_Component) {
|
|
|
55
55
|
key: "renderTableHeaders",
|
|
56
56
|
value: function renderTableHeaders() {
|
|
57
57
|
var _this$props2 = this.props,
|
|
58
|
-
columns = _this$props2.columns,
|
|
58
|
+
_this$props2$columns = _this$props2.columns,
|
|
59
|
+
columns = _this$props2$columns === void 0 ? [] : _this$props2$columns,
|
|
59
60
|
headerRender = _this$props2.headerRender;
|
|
60
61
|
if (!columns.length) {
|
|
61
62
|
return null;
|
|
@@ -97,9 +98,12 @@ var DefaultTable = /*#__PURE__*/function (_Component) {
|
|
|
97
98
|
key: "getData",
|
|
98
99
|
value: function getData() {
|
|
99
100
|
var _this$props4 = this.props,
|
|
100
|
-
data = _this$props4.data,
|
|
101
|
-
|
|
102
|
-
|
|
101
|
+
_this$props4$data = _this$props4.data,
|
|
102
|
+
data = _this$props4$data === void 0 ? [] : _this$props4$data,
|
|
103
|
+
_this$props4$offset = _this$props4.offset,
|
|
104
|
+
offset = _this$props4$offset === void 0 ? 0 : _this$props4$offset,
|
|
105
|
+
_this$props4$limit = _this$props4.limit,
|
|
106
|
+
limit = _this$props4$limit === void 0 ? 0 : _this$props4$limit;
|
|
103
107
|
if (!offset && !limit) {
|
|
104
108
|
return data;
|
|
105
109
|
}
|
|
@@ -200,10 +204,4 @@ DefaultTable.propTypes = {
|
|
|
200
204
|
footerRender: PropTypes.func,
|
|
201
205
|
className: PropTypes.string
|
|
202
206
|
};
|
|
203
|
-
DefaultTable.defaultProps = {
|
|
204
|
-
columns: [],
|
|
205
|
-
data: [],
|
|
206
|
-
offset: 0,
|
|
207
|
-
limit: 0
|
|
208
|
-
};
|
|
209
207
|
export default DefaultTable;
|
|
@@ -28,7 +28,8 @@ var SortableTable = /*#__PURE__*/function (_Component) {
|
|
|
28
28
|
_classCallCheck(this, SortableTable);
|
|
29
29
|
_this = _callSuper(this, SortableTable, [props]);
|
|
30
30
|
_defineProperty(_this, "sort", function (columns, data, sortBy, descending) {
|
|
31
|
-
var onSort = _this.props.onSort
|
|
31
|
+
var _this$props$onSort = _this.props.onSort,
|
|
32
|
+
onSort = _this$props$onSort === void 0 ? function () {} : _this$props$onSort;
|
|
32
33
|
var tableData = sortData(columns, data, sortBy, descending);
|
|
33
34
|
onSort({
|
|
34
35
|
sortBy: sortBy,
|
|
@@ -41,7 +42,8 @@ var SortableTable = /*#__PURE__*/function (_Component) {
|
|
|
41
42
|
return sortBy ? _this.sort(columns, data, sortBy, descending) : data;
|
|
42
43
|
}));
|
|
43
44
|
var _sortBy = props.sortBy,
|
|
44
|
-
|
|
45
|
+
_props$descending = props.descending,
|
|
46
|
+
_descending = _props$descending === void 0 ? false : _props$descending;
|
|
45
47
|
_this.state = {
|
|
46
48
|
sortBy: _sortBy,
|
|
47
49
|
descending: _descending
|
|
@@ -196,8 +198,4 @@ SortableTable.propTypes = {
|
|
|
196
198
|
footerRender: PropTypes.func,
|
|
197
199
|
className: PropTypes.string
|
|
198
200
|
};
|
|
199
|
-
SortableTable.defaultProps = {
|
|
200
|
-
descending: false,
|
|
201
|
-
onSort: function onSort() {}
|
|
202
|
-
};
|
|
203
201
|
export default SortableTable;
|
package/es/Table.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var _excluded = ["sortable"];
|
|
2
2
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
3
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var
|
|
3
|
+
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { node, bool, func, number, oneOf, oneOfType, arrayOf, shape, string } from 'prop-types';
|
|
6
6
|
import DefaultTable from './DefaultTable/DefaultTable';
|
|
@@ -42,7 +42,7 @@ var TableFooter = function TableFooter(_ref) {
|
|
|
42
42
|
'ffe-table__content--text-right': column.alignRight
|
|
43
43
|
})
|
|
44
44
|
};
|
|
45
|
-
if (typeof column.columnFooterRender ===
|
|
45
|
+
if (typeof column.columnFooterRender === 'function') {
|
|
46
46
|
return column.columnFooterRender(column.footer, dataWindow, tdProps, spanProps, columns, index);
|
|
47
47
|
}
|
|
48
48
|
return /*#__PURE__*/React.createElement(TableCell, {
|
|
@@ -54,11 +54,11 @@ var TableFooter = function TableFooter(_ref) {
|
|
|
54
54
|
}, column.footer);
|
|
55
55
|
});
|
|
56
56
|
var trProps = {
|
|
57
|
-
className:
|
|
57
|
+
className: 'ffe-table__row',
|
|
58
58
|
children: footerContent
|
|
59
59
|
};
|
|
60
60
|
var trDefault = /*#__PURE__*/React.createElement("tr", trProps);
|
|
61
|
-
var footerRendered = typeof footerRender ===
|
|
61
|
+
var footerRendered = typeof footerRender === 'function' ? footerRender(trProps, columns) : trDefault;
|
|
62
62
|
return /*#__PURE__*/React.createElement("tfoot", {
|
|
63
63
|
className: "ffe-table__footer"
|
|
64
64
|
}, footerRendered);
|
|
@@ -24,7 +24,7 @@ var TableHeaders = function TableHeaders(_ref) {
|
|
|
24
24
|
'ffe-table--hide-xlg': column.hideOnDesktop
|
|
25
25
|
}),
|
|
26
26
|
'aria-sort': column.ariaSort,
|
|
27
|
-
scope:
|
|
27
|
+
scope: 'col'
|
|
28
28
|
};
|
|
29
29
|
var spanProps = {
|
|
30
30
|
className: classNames('ffe-table__content', {
|
|
@@ -32,7 +32,7 @@ var TableHeaders = function TableHeaders(_ref) {
|
|
|
32
32
|
})
|
|
33
33
|
};
|
|
34
34
|
var thContentDefault = /*#__PURE__*/React.createElement("span", spanProps, column.header);
|
|
35
|
-
if (typeof column.columnHeaderRender ===
|
|
35
|
+
if (typeof column.columnHeaderRender === 'function') {
|
|
36
36
|
return column.columnHeaderRender(column.header, dataWindow, spanProps, thProps, columns, index);
|
|
37
37
|
}
|
|
38
38
|
return /*#__PURE__*/React.createElement("th", _extends({
|
|
@@ -40,11 +40,11 @@ var TableHeaders = function TableHeaders(_ref) {
|
|
|
40
40
|
}, thProps), thContentDefault);
|
|
41
41
|
});
|
|
42
42
|
var trProps = {
|
|
43
|
-
className:
|
|
43
|
+
className: 'ffe-table__row',
|
|
44
44
|
children: headerContent
|
|
45
45
|
};
|
|
46
46
|
var trDefault = /*#__PURE__*/React.createElement("tr", trProps);
|
|
47
|
-
var headerRendered = typeof headerRender ===
|
|
47
|
+
var headerRendered = typeof headerRender === 'function' ? headerRender(trProps, columns) : trDefault;
|
|
48
48
|
return /*#__PURE__*/React.createElement("thead", {
|
|
49
49
|
className: "ffe-table__head"
|
|
50
50
|
}, headerRendered);
|
|
@@ -64,7 +64,8 @@ var DefaultTable = /*#__PURE__*/function (_Component) {
|
|
|
64
64
|
key: "renderTableHeaders",
|
|
65
65
|
value: function renderTableHeaders() {
|
|
66
66
|
var _this$props2 = this.props,
|
|
67
|
-
columns = _this$props2.columns,
|
|
67
|
+
_this$props2$columns = _this$props2.columns,
|
|
68
|
+
columns = _this$props2$columns === void 0 ? [] : _this$props2$columns,
|
|
68
69
|
headerRender = _this$props2.headerRender;
|
|
69
70
|
if (!columns.length) {
|
|
70
71
|
return null;
|
|
@@ -106,9 +107,12 @@ var DefaultTable = /*#__PURE__*/function (_Component) {
|
|
|
106
107
|
key: "getData",
|
|
107
108
|
value: function getData() {
|
|
108
109
|
var _this$props4 = this.props,
|
|
109
|
-
data = _this$props4.data,
|
|
110
|
-
|
|
111
|
-
|
|
110
|
+
_this$props4$data = _this$props4.data,
|
|
111
|
+
data = _this$props4$data === void 0 ? [] : _this$props4$data,
|
|
112
|
+
_this$props4$offset = _this$props4.offset,
|
|
113
|
+
offset = _this$props4$offset === void 0 ? 0 : _this$props4$offset,
|
|
114
|
+
_this$props4$limit = _this$props4.limit,
|
|
115
|
+
limit = _this$props4$limit === void 0 ? 0 : _this$props4$limit;
|
|
112
116
|
if (!offset && !limit) {
|
|
113
117
|
return data;
|
|
114
118
|
}
|
|
@@ -209,10 +213,4 @@ DefaultTable.propTypes = {
|
|
|
209
213
|
footerRender: _propTypes.default.func,
|
|
210
214
|
className: _propTypes.default.string
|
|
211
215
|
};
|
|
212
|
-
DefaultTable.defaultProps = {
|
|
213
|
-
columns: [],
|
|
214
|
-
data: [],
|
|
215
|
-
offset: 0,
|
|
216
|
-
limit: 0
|
|
217
|
-
};
|
|
218
216
|
var _default = exports.default = DefaultTable;
|
|
@@ -37,7 +37,8 @@ var SortableTable = /*#__PURE__*/function (_Component) {
|
|
|
37
37
|
_classCallCheck(this, SortableTable);
|
|
38
38
|
_this = _callSuper(this, SortableTable, [props]);
|
|
39
39
|
_defineProperty(_this, "sort", function (columns, data, sortBy, descending) {
|
|
40
|
-
var onSort = _this.props.onSort
|
|
40
|
+
var _this$props$onSort = _this.props.onSort,
|
|
41
|
+
onSort = _this$props$onSort === void 0 ? function () {} : _this$props$onSort;
|
|
41
42
|
var tableData = (0, _sortData.default)(columns, data, sortBy, descending);
|
|
42
43
|
onSort({
|
|
43
44
|
sortBy: sortBy,
|
|
@@ -50,7 +51,8 @@ var SortableTable = /*#__PURE__*/function (_Component) {
|
|
|
50
51
|
return sortBy ? _this.sort(columns, data, sortBy, descending) : data;
|
|
51
52
|
}));
|
|
52
53
|
var _sortBy = props.sortBy,
|
|
53
|
-
|
|
54
|
+
_props$descending = props.descending,
|
|
55
|
+
_descending = _props$descending === void 0 ? false : _props$descending;
|
|
54
56
|
_this.state = {
|
|
55
57
|
sortBy: _sortBy,
|
|
56
58
|
descending: _descending
|
|
@@ -205,8 +207,4 @@ SortableTable.propTypes = {
|
|
|
205
207
|
footerRender: _propTypes.default.func,
|
|
206
208
|
className: _propTypes.default.string
|
|
207
209
|
};
|
|
208
|
-
SortableTable.defaultProps = {
|
|
209
|
-
descending: false,
|
|
210
|
-
onSort: function onSort() {}
|
|
211
|
-
};
|
|
212
210
|
var _default = exports.default = SortableTable;
|
package/lib/Table.js
CHANGED
|
@@ -11,7 +11,7 @@ var _SortableTable = _interopRequireDefault(require("./SortableTable/SortableTab
|
|
|
11
11
|
var _excluded = ["sortable"];
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
13
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
14
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var
|
|
14
|
+
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
|
|
15
15
|
var Table = function Table(props) {
|
|
16
16
|
var sortable = props.sortable,
|
|
17
17
|
rest = _objectWithoutProperties(props, _excluded);
|
|
@@ -49,7 +49,7 @@ var TableFooter = function TableFooter(_ref) {
|
|
|
49
49
|
'ffe-table__content--text-right': column.alignRight
|
|
50
50
|
})
|
|
51
51
|
};
|
|
52
|
-
if (typeof column.columnFooterRender ===
|
|
52
|
+
if (typeof column.columnFooterRender === 'function') {
|
|
53
53
|
return column.columnFooterRender(column.footer, dataWindow, tdProps, spanProps, columns, index);
|
|
54
54
|
}
|
|
55
55
|
return /*#__PURE__*/_react.default.createElement(_TableCell.default, {
|
|
@@ -61,11 +61,11 @@ var TableFooter = function TableFooter(_ref) {
|
|
|
61
61
|
}, column.footer);
|
|
62
62
|
});
|
|
63
63
|
var trProps = {
|
|
64
|
-
className:
|
|
64
|
+
className: 'ffe-table__row',
|
|
65
65
|
children: footerContent
|
|
66
66
|
};
|
|
67
67
|
var trDefault = /*#__PURE__*/_react.default.createElement("tr", trProps);
|
|
68
|
-
var footerRendered = typeof footerRender ===
|
|
68
|
+
var footerRendered = typeof footerRender === 'function' ? footerRender(trProps, columns) : trDefault;
|
|
69
69
|
return /*#__PURE__*/_react.default.createElement("tfoot", {
|
|
70
70
|
className: "ffe-table__footer"
|
|
71
71
|
}, footerRendered);
|
|
@@ -31,7 +31,7 @@ var TableHeaders = function TableHeaders(_ref) {
|
|
|
31
31
|
'ffe-table--hide-xlg': column.hideOnDesktop
|
|
32
32
|
}),
|
|
33
33
|
'aria-sort': column.ariaSort,
|
|
34
|
-
scope:
|
|
34
|
+
scope: 'col'
|
|
35
35
|
};
|
|
36
36
|
var spanProps = {
|
|
37
37
|
className: (0, _classnames.default)('ffe-table__content', {
|
|
@@ -39,7 +39,7 @@ var TableHeaders = function TableHeaders(_ref) {
|
|
|
39
39
|
})
|
|
40
40
|
};
|
|
41
41
|
var thContentDefault = /*#__PURE__*/_react.default.createElement("span", spanProps, column.header);
|
|
42
|
-
if (typeof column.columnHeaderRender ===
|
|
42
|
+
if (typeof column.columnHeaderRender === 'function') {
|
|
43
43
|
return column.columnHeaderRender(column.header, dataWindow, spanProps, thProps, columns, index);
|
|
44
44
|
}
|
|
45
45
|
return /*#__PURE__*/_react.default.createElement("th", _extends({
|
|
@@ -47,11 +47,11 @@ var TableHeaders = function TableHeaders(_ref) {
|
|
|
47
47
|
}, thProps), thContentDefault);
|
|
48
48
|
});
|
|
49
49
|
var trProps = {
|
|
50
|
-
className:
|
|
50
|
+
className: 'ffe-table__row',
|
|
51
51
|
children: headerContent
|
|
52
52
|
};
|
|
53
53
|
var trDefault = /*#__PURE__*/_react.default.createElement("tr", trProps);
|
|
54
|
-
var headerRendered = typeof headerRender ===
|
|
54
|
+
var headerRendered = typeof headerRender === 'function' ? headerRender(trProps, columns) : trDefault;
|
|
55
55
|
return /*#__PURE__*/_react.default.createElement("thead", {
|
|
56
56
|
className: "ffe-table__head"
|
|
57
57
|
}, headerRendered);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sb1/ffe-tables-react",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.23",
|
|
4
4
|
"description": "React implementation of ffe-tables",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "SpareBank 1",
|
|
@@ -21,12 +21,13 @@
|
|
|
21
21
|
"build": "ffe-buildtool babel",
|
|
22
22
|
"watch": "ffe-buildtool babel-watch",
|
|
23
23
|
"lint": "eslint src",
|
|
24
|
+
"lint:fix": "eslint src --fix",
|
|
24
25
|
"test": "ffe-buildtool jest",
|
|
25
26
|
"test:watch": "ffe-buildtool jest --watch"
|
|
26
27
|
},
|
|
27
28
|
"dependencies": {
|
|
28
|
-
"@sb1/ffe-icons-react": "^9.0.
|
|
29
|
-
"@sb1/ffe-tables": "^14.0.
|
|
29
|
+
"@sb1/ffe-icons-react": "^9.0.9",
|
|
30
|
+
"@sb1/ffe-tables": "^14.0.13",
|
|
30
31
|
"classnames": "^2.3.1",
|
|
31
32
|
"deep-equal": "^1.0.1",
|
|
32
33
|
"memoize-one": "^5.0.0",
|
|
@@ -35,7 +36,7 @@
|
|
|
35
36
|
"shallow-equals": "^1.0.0"
|
|
36
37
|
},
|
|
37
38
|
"devDependencies": {
|
|
38
|
-
"@sb1/ffe-buildtool": "^0.5.
|
|
39
|
+
"@sb1/ffe-buildtool": "^0.5.2",
|
|
39
40
|
"react": "^16.9.0",
|
|
40
41
|
"react-dom": "^16.9.0",
|
|
41
42
|
"sinon": "^7.2.3"
|
|
@@ -46,5 +47,5 @@
|
|
|
46
47
|
"publishConfig": {
|
|
47
48
|
"access": "public"
|
|
48
49
|
},
|
|
49
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "c2e7c509b580bc205ca92d91b7e2e2c0503a0087"
|
|
50
51
|
}
|