@mjhls/mjh-framework 1.0.59 → 1.0.61

package/README.md

@@ -1,170 +1,170 @@
-# mjh-framework v. 1.0.55
-
-> Foundation Framework
-
-[![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-
-## Install
-
-```bash
-npm install --save @mjhls/mjh-framework
-```
-
-## Usage
-
-```jsx
-import React, { Component } from 'react'
-
-import { NavMagazine, DeckQueue } from 'mjh-framework'
-
-export default class App extends Component {
-  render() {
-    return (
-      <div>
-        <NavMagazine />
-        <DeckQueue />
-      </div>
-    )
-  }
-}
-```
-
-## Publish new updates to the npm registry
-
-```bash
-npm publish
-```
-
-## For getting updates in the template without publishing each time a change is made in the framework
-
-Link react and react-dom of the template repo, so that it can be used by the framework.
-This is to avoid the error arising due to multiple instances of React.
-
-```bash
-cd ../mjh-template/node_modules/react
-
-yarn link
-
-cd ../react-dom
-
-yarn link
-
-cd ../../../mjh-framework
-
-yarn link react && yarn link react-dom
-```
-
-Link the framework repo so that it can be used in the template
-
-```bash
-npm link
-
-cd ../mjh-template
-
-npm link @mjhls/mjh-framework
-```
-
-## Components and "props"
-
-### Deck Components
-
-- #### DeckContent
-
-  ##### Props
-
-  - mapping
-  - dataRecord
-  - query
-  - params
-  - pointer
-  - pointerArray
-  - defaultImage
-
-- #### DeckQueue
-  ##### Props
-  - page
-  - dataRecord
-  - query
-  - params
-  - pointer
-  - pointerArray
-
-### Layout Components
-
-- #### Column1
-- #### Column2
-  ##### Props
-  - rightItems
-- #### Column3
-  ##### Props
-  - leftItems
-  - rightItems
-  ##### Common Props (Column1, Column2, Column3)
-  - title
-  - children
-- #### Header
-  ##### Props
-  - title
-  - keyword
-  - description
-- #### LeftNav
-  ##### Props
-  - leftItems
-- #### AccordionPanel
-  ##### Props
-  - accordionClassName
-  - data
-
-### Navigation Components
-
-- #### NavMagazine
-  ##### Props
-  - logo
-  - dataObject
-- #### NavNative
-  ##### Props
-  - logo
-  - dataObject
-- #### NavNormal
-  ##### Props
-  - logo
-  - dataObject
-  - variant
-- #### NavDvm
-  ##### Props
-  - logo
-  - dataObject
-  - subNavHeads
-
-### Template Components
-
-- #### TemplateNormal
-  ##### Props
-  - config
-  - title
-  - keywords
-  - description
-  - website
-
-### Ad Components
-
-- #### AD300x250
-- #### AD300x250x600
-- #### AD728x90
-  ##### Common Props
-  - networkID
-  - adUnit
-
-### Serializers
-
-- #### getSerializers (function)
-  ##### arguments
-  - client
-  ##### types
-  - youtube
-  - figure
-  - slideshow
-
-## License
-
-MIT © [mjh-framework](https://github.com/mjh-framework)
+# mjh-framework v. 1.0.61
+
+> Foundation Framework
+
+[![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+
+## Install
+
+```bash
+npm install --save @mjhls/mjh-framework
+```
+
+## Usage
+
+```jsx
+import React, { Component } from 'react'
+
+import { NavMagazine, DeckQueue } from 'mjh-framework'
+
+export default class App extends Component {
+  render() {
+    return (
+      <div>
+        <NavMagazine />
+        <DeckQueue />
+      </div>
+    )
+  }
+}
+```
+
+## Publish new updates to the npm registry
+
+```bash
+npm publish
+```
+
+## For getting updates in the template without publishing each time a change is made in the framework
+
+Link react and react-dom of the template repo, so that it can be used by the framework.
+This is to avoid the error arising due to multiple instances of React.
+
+```bash
+cd ../mjh-template/node_modules/react
+
+yarn link
+
+cd ../react-dom
+
+yarn link
+
+cd ../../../mjh-framework
+
+yarn link react && yarn link react-dom
+```
+
+Link the framework repo so that it can be used in the template
+
+```bash
+npm link
+
+cd ../mjh-template
+
+npm link @mjhls/mjh-framework
+```
+
+## Components and "props"
+
+### Deck Components
+
+- #### DeckContent
+
+  ##### Props
+
+  - mapping
+  - dataRecord
+  - query
+  - params
+  - pointer
+  - pointerArray
+  - defaultImage
+
+- #### DeckQueue
+  ##### Props
+  - page
+  - dataRecord
+  - query
+  - params
+  - pointer
+  - pointerArray
+
+### Layout Components
+
+- #### Column1
+- #### Column2
+  ##### Props
+  - rightItems
+- #### Column3
+  ##### Props
+  - leftItems
+  - rightItems
+  ##### Common Props (Column1, Column2, Column3)
+  - title
+  - children
+- #### Header
+  ##### Props
+  - title
+  - keyword
+  - description
+- #### LeftNav
+  ##### Props
+  - leftItems
+- #### AccordionPanel
+  ##### Props
+  - accordionClassName
+  - data
+
+### Navigation Components
+
+- #### NavMagazine
+  ##### Props
+  - logo
+  - dataObject
+- #### NavNative
+  ##### Props
+  - logo
+  - dataObject
+- #### NavNormal
+  ##### Props
+  - logo
+  - dataObject
+  - variant
+- #### NavDvm
+  ##### Props
+  - logo
+  - dataObject
+  - subNavHeads
+
+### Template Components
+
+- #### TemplateNormal
+  ##### Props
+  - config
+  - title
+  - keywords
+  - description
+  - website
+
+### Ad Components
+
+- #### AD300x250
+- #### AD300x250x600
+- #### AD728x90
+  ##### Common Props
+  - networkID
+  - adUnit
+
+### Serializers
+
+- #### getSerializers (function)
+  ##### arguments
+  - client
+  ##### types
+  - youtube
+  - figure
+  - slideshow
+
+## License
+
+MIT © [mjh-framework](https://github.com/mjh-framework)

package/dist/index.es.js

@@ -5,7 +5,7 @@ import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
 import Link from 'next/link';
-import { withRouter } from 'next/router';
+import { withRouter, useRouter } from 'next/router';
 import Media from 'react-bootstrap/Media';
 import ListGroup from 'react-bootstrap/ListGroup';
 import Head from 'next/head';
@@ -3894,13 +3894,33 @@ var DeckContent = function (_React$Component) {
 
         var path = router.asPath;
         var qrIndex = path.indexOf('?');
+        var pathname = router.pathname;
+        var queryString = '';
+
         if (qrIndex > 0) {
           path = path.substring(1, qrIndex);
+
+          var partialQS = router.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 : '?page=' + pageNumber;
         if (currentPage !== pageNumber) {
 
           lib_3.refresh();
@@ -3908,12 +3928,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.push(pathname, newPath, {
+                shallow: true
+              });
             });
           }
         }
-
-        window.history.pushState(newPath, '', newPath);
       }
     }, _this.cardLoader = function (page, columns, variant) {
       var mode = variant && variant === 'bottom' ? 'column-reverse' : 'column';
@@ -5428,15 +5467,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
@@ -6195,8 +6234,9 @@ var Search = function Search(_ref) {
   var _ref$placeholder = _ref.placeholder,
       placeholder = _ref$placeholder === undefined ? 'Search' : _ref$placeholder,
       _ref$btnText = _ref.btnText,
-      btnText = _ref$btnText === undefined ? 'Search' : _ref$btnText,
-      router = _ref.router;
+      btnText = _ref$btnText === undefined ? 'Search' : _ref$btnText;
+
+  var router = useRouter();
 
   var _useState = useState(''),
       _useState2 = slicedToArray(_useState, 2),
@@ -6231,8 +6271,6 @@ var Search = function Search(_ref) {
   );
 };
 
-var Search$1 = withRouter(Search);
-
 var NavDvm = function NavDvm(props) {
   var logo = props.logo,
       mobileLogo = props.mobileLogo,
@@ -6327,7 +6365,7 @@ var NavDvm = function NavDvm(props) {
               }
             })
           ),
-          React__default.createElement(Search$1, null)
+          React__default.createElement(Search, null)
         )
       )
     ),
@@ -10068,7 +10106,15 @@ var YouTubePlayer$1 = function YouTubePlayer(_ref) {
   var url = _ref.url;
 
   var id = getYoutubeId(url);
-  return React__default.createElement(YouTube, { videoId: id, opts: { width: '100%' } });
+
+  var opts = {
+    width: '100%',
+    playerVars: {
+      rel: 0
+    }
+  };
+
+  return React__default.createElement(YouTube, { videoId: id, opts: opts });
 };
 
 /*
@@ -11114,5 +11160,5 @@ var getSerializers$1 = function getSerializers(client) {
   };
 };
 
-export { ContentCard as DeckContent, DeckQueue, ThumbnailCard, TaxonomyCard, GroupDeck, Column1, Column2, Column3, Header, LeftNav, AccordionPanel, NavMagazine, NavNative, NavNormal, NavDvm, TemplateNormal, AD300x250, AD300x250x600, AD728x90, getSerializers$1 as getSerializers, Search$1 as Search };
+export { ContentCard as DeckContent, DeckQueue, ThumbnailCard, TaxonomyCard, GroupDeck, Column1, Column2, Column3, Header, LeftNav, AccordionPanel, NavMagazine, NavNative, NavNormal, NavDvm, TemplateNormal, AD300x250, AD300x250x600, AD728x90, getSerializers$1 as getSerializers, Search };
 //# sourceMappingURL=index.es.js.map