@mjhls/mjh-framework 1.0.125 → 1.0.127

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.125
+# mjh-framework v. 1.0.127
 
 
 > Foundation Framework

package/dist/index.es.js

@@ -9158,6 +9158,35 @@ var main_47 = main.osName;
 var main_48 = main.osVersion;
 var main_49 = main.withOrientationChange;
 
+var asyncToGenerator = function (fn) {
+  return function () {
+    var gen = fn.apply(this, arguments);
+    return new Promise(function (resolve, reject) {
+      function step(key, arg) {
+        try {
+          var info = gen[key](arg);
+          var value = info.value;
+        } catch (error) {
+          reject(error);
+          return;
+        }
+
+        if (info.done) {
+          resolve(value);
+        } else {
+          return Promise.resolve(value).then(function (value) {
+            step("next", value);
+          }, function (err) {
+            step("throw", err);
+          });
+        }
+      }
+
+      return step("next");
+    });
+  };
+};
+
 var classCallCheck = function (instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -12685,43 +12714,57 @@ var MasterDeck = function (_React$Component) {
           to: to + per
         };
       }, _this.loadData);
-    }, 0), _this.loadData = function () {
-      var _this$state = _this.state,
-          from = _this$state.from,
-          to = _this$state.to,
-          data = _this$state.data,
-          query = _this$state.query,
-          page = _this$state.page;
-      var client = _this.props.client;
+    }, 0), _this.loadData = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var _this$state, from, to, data, query, page, _this$props, client, dataHandler, params;
 
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _this$state = _this.state, from = _this$state.from, to = _this$state.to, data = _this$state.data, query = _this$state.query, page = _this$state.page;
+              _this$props = _this.props, client = _this$props.client, dataHandler = _this$props.dataHandler;
+              params = _extends({}, _this.params, { from: from, to: to });
 
-      var params = _extends({}, _this.params, { from: from, to: to
-        // const queryUpdated = query.replace('$from', params.from).replace('$to', params.to)
-        // const query = '*[_type == "article" && defined(title) && defined(thumbnail)][$from...$to] { title, summary, thumbnail { asset-> }, url }'
-      });client.fetch(query, params).then(function (dataArr) {
-        if (_this.pointer && _this.pointerArray) {
-          var pointer = _this.pointer;
-          dataArr = dataArr[_this.pointerArray][pointer];
-        }
-        dataArr = dataArr.map(function (item) {
-          return _extends({}, item, {
-            pageNumber: page
-          });
-        });
 
-        _this.setState(function () {
-          if (dataArr.length > 0) {
-            return {
-              data: [].concat(toConsumableArray(data), toConsumableArray(dataArr)),
-              scrolling: true
-            };
-          } else {
-            return {
-              scrolling: false
-            };
+              if (dataHandler) {
+                dataHandler.then(function (dataArr) {
+                  loadDataFinished(data, dataArr, page);
+                });
+              } else {
+                client.fetch(query, params).then(function (dataArr) {
+                  loadDataFinished(data, dataArr, page);
+                });
+              }
+
+            case 4:
+            case 'end':
+              return _context.stop();
           }
+        }
+      }, _callee, _this2);
+    })), _this.loadDataFinished = function (data, dataArr, page) {
+      if (_this.pointer && _this.pointerArray) {
+        var pointer = _this.pointer;
+        dataArr = dataArr[_this.pointerArray][pointer];
+      }
+      dataArr = dataArr.map(function (item) {
+        return _extends({}, item, {
+          pageNumber: page
         });
       });
+
+      _this.setState(function () {
+        if (dataArr.length > 0) {
+          return {
+            data: [].concat(toConsumableArray(data), toConsumableArray(dataArr)),
+            scrolling: true
+          };
+        } else {
+          return {
+            scrolling: false
+          };
+        }
+      });
     }, _this.urlFor = function (source) {
       var client = _this.props.client;
 
@@ -12738,10 +12781,10 @@ var MasterDeck = function (_React$Component) {
       }
     }, _this.changePageNumber = function (pageNumber) {
       console.log(pageNumber);
-      var _this$props = _this.props,
-          seoPaginate = _this$props.seoPaginate,
-          pageview = _this$props.pageview,
-          router = _this$props.router;
+      var _this$props2 = _this.props,
+          seoPaginate = _this$props2.seoPaginate,
+          pageview = _this$props2.pageview,
+          router = _this$props2.router;
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {