@sb1/ffe-tables-react 7.0.0 → 7.0.1

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.
@@ -29,8 +29,18 @@ var SortableTable = /*#__PURE__*/function (_Component) {
29
29
  var _this;
30
30
  _classCallCheck(this, SortableTable);
31
31
  _this = _super.call(this, props);
32
+ _defineProperty(_assertThisInitialized(_this), "sort", function (columns, data, sortBy, descending) {
33
+ var onSort = _this.props.onSort;
34
+ var tableData = sortData(columns, data, sortBy, descending);
35
+ onSort({
36
+ sortBy: sortBy,
37
+ descending: descending,
38
+ tableData: tableData
39
+ });
40
+ return tableData;
41
+ });
32
42
  _defineProperty(_assertThisInitialized(_this), "sortTableData", memoize(function (columns, data, sortBy, descending) {
33
- return sortBy ? sortData(columns, data, sortBy, descending) : data;
43
+ return sortBy ? _this.sort(columns, data, sortBy, descending) : data;
34
44
  }));
35
45
  var _sortBy = props.sortBy,
36
46
  _descending = props.descending;
@@ -53,22 +63,12 @@ var SortableTable = /*#__PURE__*/function (_Component) {
53
63
  }, {
54
64
  key: "tableHeaderClicked",
55
65
  value: function tableHeaderClicked(columnKey) {
56
- var _this2 = this;
57
- var _this$props = this.props,
58
- columns = _this$props.columns,
59
- data = _this$props.data;
60
- this.setState(function (prevState, currentProps) {
66
+ this.setState(function (prevState) {
61
67
  var descending = columnKey === prevState.sortBy ? !prevState.descending : false;
62
68
  return {
63
69
  sortBy: columnKey,
64
70
  descending: descending
65
71
  };
66
- }, function () {
67
- return _this2.props.onSort({
68
- sortBy: columnKey,
69
- descending: _this2.state.descending,
70
- tableData: _this2.sortTableData(columns, data, columnKey, _this2.state.descending)
71
- });
72
72
  });
73
73
  }
74
74
  }, {
@@ -90,7 +90,7 @@ var SortableTable = /*#__PURE__*/function (_Component) {
90
90
  }, {
91
91
  key: "decorateSortableTableHeader",
92
92
  value: function decorateSortableTableHeader(column) {
93
- var _this3 = this;
93
+ var _this2 = this;
94
94
  if (column.header === '') {
95
95
  return /*#__PURE__*/React.createElement("span", {
96
96
  className: "ffe-sortable-table__header"
@@ -102,7 +102,7 @@ var SortableTable = /*#__PURE__*/function (_Component) {
102
102
  return /*#__PURE__*/React.createElement("span", {
103
103
  tabIndex: "0",
104
104
  onKeyDown: function onKeyDown(event) {
105
- return _this3.handleKeyPress(column.key, event);
105
+ return _this2.handleKeyPress(column.key, event);
106
106
  },
107
107
  className: classNames('ffe-sortable-table__header', {
108
108
  'ffe-sortable-table__header--active': this.state.sortBy === column.key
@@ -118,30 +118,30 @@ var SortableTable = /*#__PURE__*/function (_Component) {
118
118
  }, {
119
119
  key: "render",
120
120
  value: function render() {
121
- var _this4 = this;
121
+ var _this3 = this;
122
122
  var sortableColumns = this.props.columns.map(function (column) {
123
123
  return _objectSpread(_objectSpread({}, column), {}, {
124
- ariaSort: _this4.getAriaSort(column),
125
- header: _this4.decorateSortableTableHeader(column)
124
+ ariaSort: _this3.getAriaSort(column),
125
+ header: _this3.decorateSortableTableHeader(column)
126
126
  });
127
127
  });
128
128
  var caption = this.props.caption;
129
- var _this$props2 = this.props,
130
- expandedContentMapper = _this$props2.expandedContentMapper,
131
- condensed = _this$props2.condensed,
132
- columnLayoutMobile = _this$props2.columnLayoutMobile,
133
- smallHeader = _this$props2.smallHeader,
134
- alignLeft = _this$props2.alignLeft,
135
- breakpoint = _this$props2.breakpoint,
136
- limit = _this$props2.limit,
137
- offset = _this$props2.offset,
138
- srOnlyCaption = _this$props2.srOnlyCaption,
139
- className = _this$props2.className,
140
- rowRender = _this$props2.rowRender,
141
- headerRender = _this$props2.headerRender,
142
- footerRender = _this$props2.footerRender,
143
- columns = _this$props2.columns,
144
- data = _this$props2.data;
129
+ var _this$props = this.props,
130
+ expandedContentMapper = _this$props.expandedContentMapper,
131
+ condensed = _this$props.condensed,
132
+ columnLayoutMobile = _this$props.columnLayoutMobile,
133
+ smallHeader = _this$props.smallHeader,
134
+ alignLeft = _this$props.alignLeft,
135
+ breakpoint = _this$props.breakpoint,
136
+ limit = _this$props.limit,
137
+ offset = _this$props.offset,
138
+ srOnlyCaption = _this$props.srOnlyCaption,
139
+ className = _this$props.className,
140
+ rowRender = _this$props.rowRender,
141
+ headerRender = _this$props.headerRender,
142
+ footerRender = _this$props.footerRender,
143
+ columns = _this$props.columns,
144
+ data = _this$props.data;
145
145
  var _this$state = this.state,
146
146
  sortBy = _this$state.sortBy,
147
147
  descending = _this$state.descending;
@@ -38,8 +38,18 @@ var SortableTable = /*#__PURE__*/function (_Component) {
38
38
  var _this;
39
39
  _classCallCheck(this, SortableTable);
40
40
  _this = _super.call(this, props);
41
+ _defineProperty(_assertThisInitialized(_this), "sort", function (columns, data, sortBy, descending) {
42
+ var onSort = _this.props.onSort;
43
+ var tableData = (0, _sortData.default)(columns, data, sortBy, descending);
44
+ onSort({
45
+ sortBy: sortBy,
46
+ descending: descending,
47
+ tableData: tableData
48
+ });
49
+ return tableData;
50
+ });
41
51
  _defineProperty(_assertThisInitialized(_this), "sortTableData", (0, _memoizeOne.default)(function (columns, data, sortBy, descending) {
42
- return sortBy ? (0, _sortData.default)(columns, data, sortBy, descending) : data;
52
+ return sortBy ? _this.sort(columns, data, sortBy, descending) : data;
43
53
  }));
44
54
  var _sortBy = props.sortBy,
45
55
  _descending = props.descending;
@@ -62,22 +72,12 @@ var SortableTable = /*#__PURE__*/function (_Component) {
62
72
  }, {
63
73
  key: "tableHeaderClicked",
64
74
  value: function tableHeaderClicked(columnKey) {
65
- var _this2 = this;
66
- var _this$props = this.props,
67
- columns = _this$props.columns,
68
- data = _this$props.data;
69
- this.setState(function (prevState, currentProps) {
75
+ this.setState(function (prevState) {
70
76
  var descending = columnKey === prevState.sortBy ? !prevState.descending : false;
71
77
  return {
72
78
  sortBy: columnKey,
73
79
  descending: descending
74
80
  };
75
- }, function () {
76
- return _this2.props.onSort({
77
- sortBy: columnKey,
78
- descending: _this2.state.descending,
79
- tableData: _this2.sortTableData(columns, data, columnKey, _this2.state.descending)
80
- });
81
81
  });
82
82
  }
83
83
  }, {
@@ -99,7 +99,7 @@ var SortableTable = /*#__PURE__*/function (_Component) {
99
99
  }, {
100
100
  key: "decorateSortableTableHeader",
101
101
  value: function decorateSortableTableHeader(column) {
102
- var _this3 = this;
102
+ var _this2 = this;
103
103
  if (column.header === '') {
104
104
  return /*#__PURE__*/_react.default.createElement("span", {
105
105
  className: "ffe-sortable-table__header"
@@ -111,7 +111,7 @@ var SortableTable = /*#__PURE__*/function (_Component) {
111
111
  return /*#__PURE__*/_react.default.createElement("span", {
112
112
  tabIndex: "0",
113
113
  onKeyDown: function onKeyDown(event) {
114
- return _this3.handleKeyPress(column.key, event);
114
+ return _this2.handleKeyPress(column.key, event);
115
115
  },
116
116
  className: (0, _classnames.default)('ffe-sortable-table__header', {
117
117
  'ffe-sortable-table__header--active': this.state.sortBy === column.key
@@ -127,30 +127,30 @@ var SortableTable = /*#__PURE__*/function (_Component) {
127
127
  }, {
128
128
  key: "render",
129
129
  value: function render() {
130
- var _this4 = this;
130
+ var _this3 = this;
131
131
  var sortableColumns = this.props.columns.map(function (column) {
132
132
  return _objectSpread(_objectSpread({}, column), {}, {
133
- ariaSort: _this4.getAriaSort(column),
134
- header: _this4.decorateSortableTableHeader(column)
133
+ ariaSort: _this3.getAriaSort(column),
134
+ header: _this3.decorateSortableTableHeader(column)
135
135
  });
136
136
  });
137
137
  var caption = this.props.caption;
138
- var _this$props2 = this.props,
139
- expandedContentMapper = _this$props2.expandedContentMapper,
140
- condensed = _this$props2.condensed,
141
- columnLayoutMobile = _this$props2.columnLayoutMobile,
142
- smallHeader = _this$props2.smallHeader,
143
- alignLeft = _this$props2.alignLeft,
144
- breakpoint = _this$props2.breakpoint,
145
- limit = _this$props2.limit,
146
- offset = _this$props2.offset,
147
- srOnlyCaption = _this$props2.srOnlyCaption,
148
- className = _this$props2.className,
149
- rowRender = _this$props2.rowRender,
150
- headerRender = _this$props2.headerRender,
151
- footerRender = _this$props2.footerRender,
152
- columns = _this$props2.columns,
153
- data = _this$props2.data;
138
+ var _this$props = this.props,
139
+ expandedContentMapper = _this$props.expandedContentMapper,
140
+ condensed = _this$props.condensed,
141
+ columnLayoutMobile = _this$props.columnLayoutMobile,
142
+ smallHeader = _this$props.smallHeader,
143
+ alignLeft = _this$props.alignLeft,
144
+ breakpoint = _this$props.breakpoint,
145
+ limit = _this$props.limit,
146
+ offset = _this$props.offset,
147
+ srOnlyCaption = _this$props.srOnlyCaption,
148
+ className = _this$props.className,
149
+ rowRender = _this$props.rowRender,
150
+ headerRender = _this$props.headerRender,
151
+ footerRender = _this$props.footerRender,
152
+ columns = _this$props.columns,
153
+ data = _this$props.data;
154
154
  var _this$state = this.state,
155
155
  sortBy = _this$state.sortBy,
156
156
  descending = _this$state.descending;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-tables-react",
3
- "version": "7.0.0",
3
+ "version": "7.0.1",
4
4
  "description": "React implementation of ffe-tables",
5
5
  "license": "MIT",
6
6
  "author": "SpareBank 1",
@@ -46,5 +46,5 @@
46
46
  "publishConfig": {
47
47
  "access": "public"
48
48
  },
49
- "gitHead": "04e17f405e57198e2cef5e65bae130b43e8dcb81"
49
+ "gitHead": "0d0dab6097ede13d3cb89809acedd7ed4adb0714"
50
50
  }