@mjhls/mjh-framework 1.0.828 → 1.0.830

package/README.md

@@ -1,4 +1,4 @@
-# mjh-framework v. 1.0.828
+# mjh-framework v. 1.0.830
 
 [![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)
 

package/dist/cjs/GridContent.js

@@ -75,7 +75,7 @@ var GridContent = function (_React$Component) {
 
     return _ret = (_temp = (_this = inherits._possibleConstructorReturn(this, (_ref = GridContent.__proto__ || inherits._Object$getPrototypeOf(GridContent)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.mapping = _this.props.mapping, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.client = _this.props.client, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.state = {
       data: _this.data,
-      per: _this.params ? _this.params.to : 2,
+      per: _this.params ? _this.params.itemsPerPage : 10,
       page: _this.props.currentPage || 1,
       from: _this.params ? _this.params.from : 0,
       to: _this.params ? _this.params.to : 2,

package/dist/cjs/QueueDeckExpanded.js

@@ -57,11 +57,12 @@ var renderCardImage = function renderCardImage(row, client) {
   return url;
 };
 
-var loadMore = function loadMore(values, setValues, per) {
+var loadMore = function loadMore(values, setValues, itemsPerPage) {
+  console.log('Values:::', values);
   setValues({
     page: values.page + 1,
-    from: values.from + per,
-    to: values.to + per
+    from: values.from + itemsPerPage,
+    to: values.to + itemsPerPage
   });
 };
 
@@ -70,7 +71,6 @@ var loadData = function loadData(values, query, client, params, setData, setScro
     from: values.from,
     to: values.to
   });
-
   client.fetch(query, params).then(function (dataArr) {
     if (pointer && pointerArray) {
       dataArr = dataArr[pointerArray][pointer];
@@ -1396,28 +1396,24 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       scrolling = _useState6[0],
       setScrolling = _useState6[1];
 
-  var _useState7 = React.useState(params ? params.to : 0),
-      _useState8 = slicedToArray._slicedToArray(_useState7, 1),
-      per = _useState8[0];
+  var _useState7 = React.useState(initialCurrentPage || 1),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
+      currentPage = _useState8[0],
+      setCurrentPage = _useState8[1];
 
-  var _useState9 = React.useState(initialCurrentPage || 1),
+  var _useState9 = React.useState(initialData ? initialData.length : 0),
       _useState10 = slicedToArray._slicedToArray(_useState9, 2),
-      currentPage = _useState10[0],
-      setCurrentPage = _useState10[1];
-
-  var _useState11 = React.useState(initialData ? initialData.length : 0),
-      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
-      lastDataSize = _useState12[0],
-      setLastDataSize = _useState12[1];
+      lastDataSize = _useState10[0],
+      setLastDataSize = _useState10[1];
 
-  var _useState13 = React.useState({
+  var _useState11 = React.useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: initialCurrentPage ? initialCurrentPage : 1
   }),
-      _useState14 = slicedToArray._slicedToArray(_useState13, 2),
-      values = _useState14[0],
-      setValues = _useState14[1];
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      values = _useState12[0],
+      setValues = _useState12[1];
 
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
@@ -1452,7 +1448,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       setValues({
         from: params ? params.from : 0,
         to: params ? params.to : 0,
-        page: 1
+        page: initialCurrentPage ? initialCurrentPage : 1
       });
       if (initialData.length > 0) {
         setScrolling(true);
@@ -1492,7 +1488,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       React__default['default'].createElement(
         index_es.InfiniteScroll,
         { dataLength: data && data.length, next: function next() {
-            return loadMore(values, setValues, per);
+            return loadMore(values, setValues, itemsPerPage);
           }, hasMore: scrolling, scrollThreshold: 0.9 },
         React__default['default'].createElement(
           reactBootstrap.Container,
@@ -1522,7 +1518,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
             className: 'load-more-btn',
             style: { margin: 'auto', width: '100%' },
             onClick: function onClick(e) {
-              loadMore(values, setValues, per);
+              loadMore(values, setValues, itemsPerPage);
             } },
           'Load More'
         ) : React__default['default'].createElement(

package/dist/esm/GridContent.js

@@ -65,7 +65,7 @@ var GridContent = function (_React$Component) {
 
     return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = GridContent.__proto__ || _Object$getPrototypeOf(GridContent)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.mapping = _this.props.mapping, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.client = _this.props.client, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.state = {
       data: _this.data,
-      per: _this.params ? _this.params.to : 2,
+      per: _this.params ? _this.params.itemsPerPage : 10,
       page: _this.props.currentPage || 1,
       from: _this.params ? _this.params.from : 0,
       to: _this.params ? _this.params.to : 2,

package/dist/esm/QueueDeckExpanded.js

@@ -51,11 +51,12 @@ var renderCardImage = function renderCardImage(row, client) {
   return url;
 };
 
-var loadMore = function loadMore(values, setValues, per) {
+var loadMore = function loadMore(values, setValues, itemsPerPage) {
+  console.log('Values:::', values);
   setValues({
     page: values.page + 1,
-    from: values.from + per,
-    to: values.to + per
+    from: values.from + itemsPerPage,
+    to: values.to + itemsPerPage
   });
 };
 
@@ -64,7 +65,6 @@ var loadData = function loadData(values, query, client, params, setData, setScro
     from: values.from,
     to: values.to
   });
-
   client.fetch(query, params).then(function (dataArr) {
     if (pointer && pointerArray) {
       dataArr = dataArr[pointerArray][pointer];
@@ -1390,28 +1390,24 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       scrolling = _useState6[0],
       setScrolling = _useState6[1];
 
-  var _useState7 = useState(params ? params.to : 0),
-      _useState8 = _slicedToArray(_useState7, 1),
-      per = _useState8[0];
+  var _useState7 = useState(initialCurrentPage || 1),
+      _useState8 = _slicedToArray(_useState7, 2),
+      currentPage = _useState8[0],
+      setCurrentPage = _useState8[1];
 
-  var _useState9 = useState(initialCurrentPage || 1),
+  var _useState9 = useState(initialData ? initialData.length : 0),
       _useState10 = _slicedToArray(_useState9, 2),
-      currentPage = _useState10[0],
-      setCurrentPage = _useState10[1];
-
-  var _useState11 = useState(initialData ? initialData.length : 0),
-      _useState12 = _slicedToArray(_useState11, 2),
-      lastDataSize = _useState12[0],
-      setLastDataSize = _useState12[1];
+      lastDataSize = _useState10[0],
+      setLastDataSize = _useState10[1];
 
-  var _useState13 = useState({
+  var _useState11 = useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: initialCurrentPage ? initialCurrentPage : 1
   }),
-      _useState14 = _slicedToArray(_useState13, 2),
-      values = _useState14[0],
-      setValues = _useState14[1];
+      _useState12 = _slicedToArray(_useState11, 2),
+      values = _useState12[0],
+      setValues = _useState12[1];
 
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
@@ -1446,7 +1442,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       setValues({
         from: params ? params.from : 0,
         to: params ? params.to : 0,
-        page: 1
+        page: initialCurrentPage ? initialCurrentPage : 1
       });
       if (initialData.length > 0) {
         setScrolling(true);
@@ -1486,7 +1482,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       React.createElement(
         InfiniteScroll,
         { dataLength: data && data.length, next: function next() {
-            return loadMore(values, setValues, per);
+            return loadMore(values, setValues, itemsPerPage);
           }, hasMore: scrolling, scrollThreshold: 0.9 },
         React.createElement(
           Container,
@@ -1516,7 +1512,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
             className: 'load-more-btn',
             style: { margin: 'auto', width: '100%' },
             onClick: function onClick(e) {
-              loadMore(values, setValues, per);
+              loadMore(values, setValues, itemsPerPage);
             } },
           'Load More'
         ) : React.createElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.828",
+  "version": "1.0.830",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",