@mjhls/mjh-framework 1.0.56 → 1.0.57

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.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)

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import React__default, { Component, useState, createElement, createContext } from 'react';
+import React__default, { Component, useState, createContext, createElement } from 'react';
 import PropTypes from 'prop-types';
 import reactDom from 'react-dom';
 import Row from 'react-bootstrap/Row';
@@ -3814,7 +3814,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,
@@ -3832,17 +3832,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;
 
 
@@ -3856,7 +3855,7 @@ var DeckContent = function (_React$Component) {
         }
         dataArr = dataArr.map(function (item) {
           return _extends({}, item, {
-            pageNumber: currentPage
+            pageNumber: page
           });
         });
 
@@ -3892,13 +3891,21 @@ var DeckContent = function (_React$Component) {
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
+        var newPath = pageNumber === 1 ? '' + router.pathname : router.pathname + '?page=' + pageNumber;
         if (currentPage !== pageNumber) {
+          console.error('currentPage:', currentPage);
+          console.error('pageNumber:', pageNumber);
           lib_3.refresh();
           if (pageview) {
-            pageview(router.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';
@@ -3917,12 +3924,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,
@@ -5411,15 +5420,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