@mjhls/mjh-framework 1.0.58 → 1.0.60

package/dist/index.js

@@ -3901,13 +3901,33 @@ var DeckContent = function (_React$Component) {
 
         var path = router$$1.asPath;
         var qrIndex = path.indexOf('?');
+        var pathname = router$$1.pathname;
+        var queryString = '';
+
         if (qrIndex > 0) {
           path = path.substring(1, qrIndex);
+
+          var partialQS = router$$1.asPath.substring(qrIndex + 1);
+          var partialQSArr = partialQS.split('&');
+
+          // exclude page=xxx from query string 
+          partialQSArr.map(function (item) {
+            var itemArr = item.split('=');
+            var key = itemArr[0];
+            var val = itemArr[1];
+
+            if (key !== 'page') {
+              queryString += (queryString.length === 0 ? '' : '&') + key + '=' + val;
+            }
+          });
+        }
+
+        if (queryString.length > 0) {
+          path += '?' + queryString;
         }
 
         pageNumber = parseInt(pageNumber);
 
-        var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
         if (currentPage !== pageNumber) {
 
           lib_3.refresh();
@@ -3915,12 +3935,31 @@ var DeckContent = function (_React$Component) {
             _this.setState({
               currentPage: pageNumber
             }, function () {
+              if (path[0] !== '/') {
+                path = '/' + path;
+              }
+
+              var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
+
+              // please leave this for later debug purpose : Yong Jun.
+              /*console.log('page change reported', {
+                currentPage: currentPage,
+                pageNumber: pageNumber,
+                pathname: pathname,
+                path: path,
+                newPath: newPath,
+                firstPage: pageNumber === 1,
+                queryString: queryString
+              })*/
+
               pageview(newPath);
+
+              router$$1.push(pathname, newPath, {
+                shallow: true
+              });
             });
           }
         }
-
-        window.history.pushState(newPath, '', newPath);
       }
     }, _this.cardLoader = function (page, columns, variant) {
       var mode = variant && variant === 'bottom' ? 'column-reverse' : 'column';
@@ -5435,15 +5474,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