chore: use await for React15Tabulator also

Author: ngduc

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [0.12.6] - 2020-04-29
+## [0.12.7] - 2020-04-29
 - upgraded tabulator to 4.6.2
 - fixed: use ReactDOM.render instead of renderToString
 

lib/React15Tabulator.d.ts

@@ -10,7 +10,7 @@ export default class extends React.Component<IProps, Partial<IState>> {
     htmlProps: any;
     mainId: string;
     table: any;
-    componentDidMount(): void;
+    componentDidMount(): Promise<void>;
     componentWillUnmount(): void;
     componentWillReceiveProps(props: IProps): void;
     pickValidHTMLProps: () => void;

lib/React15Tabulator.js

@@ -23,6 +23,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 exports.__esModule = true;
 var React = require("react");
 var ReactDOM = require("react-dom");
@@ -54,23 +90,34 @@ var default_1 = /** @class */ (function (_super) {
         return _this;
     }
     default_1.prototype.componentDidMount = function () {
-        var domEle = ReactDOM.findDOMNode(this.ref); // mounted DOM element
-        var that = this;
-        var _a = this.props, columns = _a.columns, data = _a.data, options = _a.options;
-        var propOptions = ConfigUtils_1.propsToOptions(this.props);
-        new Tabulator(domEle, __assign(__assign(__assign(__assign({ columns: columns }, propOptions), { layout: 'fitColumns', // fit columns to width of table (optional)
-            tableBuilding: function () {
-                that.table = this; // keep table instance
-                that.props.tableBuilding ? that.props.tableBuilding() : '';
-            },
-            dataLoaded: function () {
-                that.props.dataLoaded ? that.props.dataLoaded() : '';
-            }, invalidOptionWarnings: false }), options), { data: data }));
-        // await table.setData(data);
-        // console.log('- componentDidMount');
-        if (data && data.length > 0) {
-            this.setState({ data: data });
-        }
+        return __awaiter(this, void 0, void 0, function () {
+            var domEle, that, _a, columns, data, options, propOptions;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        domEle = ReactDOM.findDOMNode(this.ref);
+                        that = this;
+                        _a = this.props, columns = _a.columns, data = _a.data, options = _a.options;
+                        return [4 /*yield*/, ConfigUtils_1.propsToOptions(this.props)];
+                    case 1:
+                        propOptions = _b.sent();
+                        new Tabulator(domEle, __assign(__assign(__assign(__assign({ columns: columns }, propOptions), { layout: 'fitColumns', // fit columns to width of table (optional)
+                            tableBuilding: function () {
+                                that.table = this; // keep table instance
+                                that.props.tableBuilding ? that.props.tableBuilding() : '';
+                            },
+                            dataLoaded: function () {
+                                that.props.dataLoaded ? that.props.dataLoaded() : '';
+                            }, invalidOptionWarnings: false }), options), { data: data }));
+                        // await table.setData(data);
+                        // console.log('- componentDidMount');
+                        if (data && data.length > 0) {
+                            this.setState({ data: data });
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     default_1.prototype.componentWillUnmount = function () {
         this.table.destroy();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-tabulator",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "description": "React Tabulator is based on tabulator - a JS table library with many advanced features.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

src/React15Tabulator.tsx

@@ -23,11 +23,11 @@ export default class extends React.Component<IProps, Partial<IState>> {
   mainId = `tabulator-${+new Date()}-${Math.floor(Math.random() * 9999999)}`; // random id
   table: any = null; // will be set once Tabulator instantiated
 
-  componentDidMount() {
+  async componentDidMount() {
     const domEle: any = ReactDOM.findDOMNode(this.ref); // mounted DOM element
     const that = this;
     const { columns, data, options } = this.props;
-    const propOptions = propsToOptions(this.props);
+    const propOptions = await propsToOptions(this.props);
 
     new Tabulator(domEle, {
       columns,