Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ngduc/react-tabulator
Browse files Browse the repository at this point in the history
  • Loading branch information
ngduc committed Oct 7, 2020
2 parents 28970f2 + 3db6aec commit 30ce2ab
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
## [0.14.1] - 2020-10-07
## [0.14.2] - 2020-10-07
- upgraded tabulator-tables to 4.8.2

## [0.14.0] - 2020-09-20
## [0.14.1] - 2020-09-21
- added cross-env for Windows dev env.
- fixed undefined this.table in componentDidMount.
- upgraded tabulator to 4.8.1
- fixed: broken rowSelectionChanged

## [0.13.2] - 2020-07-18
- upgraded tabulator to 4.7.2
Expand Down
2 changes: 1 addition & 1 deletion lib/ConfigUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ exports.propsToOptions = function (props) { return __awaiter(void 0, void 0, voi
'groupVisibilityChanged', 'groupClick', 'groupDblClick', 'groupContext', 'groupTap', 'groupDblTap', 'groupTapHold',
'movableRowsSendingStart', 'movableRowsSent', 'movableRowsSentFailed', 'movableRowsSendingStop', 'movableRowsReceivingStart', 'movableRowsReceived', 'movableRowsReceivedFailed', 'movableRowsReceivingStop',
'validationFailed', 'clipboardCopied', 'clipboardPasted', 'clipboardPasteError',
'downloadReady', 'downloadComplete', 'selectableCheck'];
'downloadReady', 'downloadComplete'];
for (_a = 0, callbackNames_1 = callbackNames; _a < callbackNames_1.length; _a++) {
callbackName = callbackNames_1[_a];
output[callbackName] = props[callbackName] || NOOPS;
Expand Down
4 changes: 2 additions & 2 deletions lib/ReactTabulatorExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ var default_1 = /** @class */ (function (_super) {
};
return (React.createElement("div", null,
React.createElement(ReactTabulator_1["default"], { ref: function (ref) { return (_this.ref = ref); }, columns: columns, data: data, rowClick: this.rowClick, options: options, "data-custom-attr": "test-custom-attribute", className: "custom-css-class" }),
React.createElement("div", null,
React.createElement("i", null,
"Selected Name: ",
this.state.selectedName),
React.createElement("strong", null, this.state.selectedName)),
React.createElement("h3", null,
"Asynchronous data: (e.g. fetch) - ",
React.createElement("button", { onClick: this.setData }, "Set Data"),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tabulator",
"version": "0.14.1",
"version": "0.14.2",
"description": "React Tabulator is based on tabulator - a JS table library with many advanced features.",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion src/ConfigUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export const propsToOptions = async (props: any) => {
'groupVisibilityChanged','groupClick','groupDblClick','groupContext','groupTap','groupDblTap','groupTapHold',
'movableRowsSendingStart','movableRowsSent','movableRowsSentFailed','movableRowsSendingStop','movableRowsReceivingStart','movableRowsReceived','movableRowsReceivedFailed','movableRowsReceivingStop',
'validationFailed','clipboardCopied','clipboardPasted','clipboardPasteError',
'downloadReady','downloadComplete', 'selectableCheck'];
'downloadReady','downloadComplete']; // don't add "selectableCheck" here, it will break "rowSelectionChanged"

for (const callbackName of callbackNames) {
output[callbackName] = props[callbackName] || NOOPS
Expand Down
4 changes: 3 additions & 1 deletion src/ReactTabulatorExample.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ export default class extends React.Component<IProps> {
data-custom-attr="test-custom-attribute"
className="custom-css-class"
/>
<div>Selected Name: {this.state.selectedName}</div>
<i>
Selected Name: <strong>{this.state.selectedName}</strong>
</i>

<h3>
Asynchronous data: (e.g. fetch) - <button onClick={this.setData}>Set Data</button>{' '}
Expand Down

0 comments on commit 30ce2ab

Please sign in to comment.