@mjhls/mjh-framework 1.0.56 → 1.0.58

package/dist/index.js

@@ -3821,7 +3821,7 @@ var DeckContent = function (_React$Component) {
       data: _this.data,
       dataKeptToCompareNewDatarecord: _this.data,
       per: _this.params ? _this.params.to : 2,
-      page: 1,
+      page: _this.props.currentPage || 1,
       from: _this.params ? _this.params.from : 0,
       to: _this.params ? _this.params.to : 2,
       total_pages: null,
@@ -3839,17 +3839,16 @@ var DeckContent = function (_React$Component) {
         return {
           page: page + 1,
           from: from + per,
-          to: to + per,
-          currentPage: currentPage + 1
+          to: to + per
         };
       }, _this.loadData);
-    }, 500), _this.loadData = function () {
+    }, 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,
-          currentPage = _this$state.currentPage;
+          page = _this$state.page;
       var client = _this.props.client;
 
 
@@ -3863,7 +3862,7 @@ var DeckContent = function (_React$Component) {
         }
         dataArr = dataArr.map(function (item) {
           return _extends({}, item, {
-            pageNumber: currentPage
+            pageNumber: page
           });
         });
 
@@ -3899,13 +3898,29 @@ var DeckContent = function (_React$Component) {
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
+
+        var path = router$$1.asPath;
+        var qrIndex = path.indexOf('?');
+        if (qrIndex > 0) {
+          path = path.substring(1, qrIndex);
+        }
+
+        pageNumber = parseInt(pageNumber);
+
+        var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
         if (currentPage !== pageNumber) {
+
           lib_3.refresh();
           if (pageview) {
-            pageview(router$$1.asPath + '?page=' + pageNumber);
+            _this.setState({
+              currentPage: pageNumber
+            }, function () {
+              pageview(newPath);
+            });
           }
         }
-        window.history.pushState('page' + pageNumber, '', '?page=' + pageNumber);
+
+        window.history.pushState(newPath, '', newPath);
       }
     }, _this.cardLoader = function (page, columns, variant) {
       var mode = variant && variant === 'bottom' ? 'column-reverse' : 'column';
@@ -3924,12 +3939,14 @@ var DeckContent = function (_React$Component) {
             lgVar = 6;
           }
 
+          var pageNumber = row.pageNumber || _this.state.page;
+
           return React__default.createElement(
             VisibilitySensor,
             {
               key: itemCounter,
               onChange: function onChange(isVisible) {
-                isVisible && _this.changePageNumber(row.pageNumber || _this.props.currentPage);
+                isVisible && _this.changePageNumber(pageNumber);
               } },
             React__default.createElement(
               Col,
@@ -5418,15 +5435,15 @@ var TaxonomyCard = function TaxonomyCard(props) {
   );
 };
 
-/*
-GROQ query -
-*[_type == "article" && references(*[_type == 'documentGroup' && name == 'test']._id)][0...10]{
-  title,
-  published,
-  "thumbnail":  thumbnail.asset->url,
-	"url": url.current
-}
-
+/*
+GROQ query -
+*[_type == "article" && references(*[_type == 'documentGroup' && name == 'test']._id)][0...10]{
+  title,
+  published,
+  "thumbnail":  thumbnail.asset->url,
+	"url": url.current
+}
+
 */
 var GroupDeck = function GroupDeck(props) {
   // Props should be an array of objects containing Thumbnail, title, and URL