@mjhls/mjh-framework 1.0.612 → 1.0.613

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/View.js +42 -7
  3. package/dist/esm/View.js +42 -7
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # mjh-framework v. 1.0.612
2
+ # mjh-framework v. 1.0.613
3
3
 
4
4
  > Foundation Framework
5
5
 
package/dist/cjs/View.js CHANGED
@@ -1306,8 +1306,13 @@ var View = function View(props) {
1306
1306
  description = _props$article.description,
1307
1307
  title = _props$article.title;
1308
1308
 
1309
+ var _useState = React.useState(0),
1310
+ _useState2 = slicedToArray._slicedToArray(_useState, 2),
1311
+ currentPage = _useState2[0],
1312
+ setCurrentPage = _useState2[1];
1309
1313
  // Logging GA pageview for the initial article with custom dimensions
1310
1314
 
1315
+
1311
1316
  React.useEffect(function () {
1312
1317
  if (pageview && setCustomDimensions) {
1313
1318
  var timer = void 0;
@@ -1360,7 +1365,18 @@ var View = function View(props) {
1360
1365
  article.contextualAD = Ads.getNativeContextualAD(getTargeting.getTargeting(props, 'native-ad'));
1361
1366
  }
1362
1367
  }
1363
-
1368
+ React.useEffect(function () {
1369
+ router.asPath && router.asPath.length > 0 && router.asPath.includes('?') && router.asPath.split('?')[1].split('&').forEach(function (item) {
1370
+ if (item.includes('page=')) {
1371
+ setCurrentPage(item.split('=')[1]);
1372
+ } else {
1373
+ setCurrentPage(0);
1374
+ }
1375
+ });
1376
+ if (!router.asPath.includes('page=') && currentPage !== 0) {
1377
+ setCurrentPage(0);
1378
+ }
1379
+ }, [router]);
1364
1380
  return React__default.createElement(
1365
1381
  React__default.Fragment,
1366
1382
  null,
@@ -1370,21 +1386,40 @@ var View = function View(props) {
1370
1386
  React__default.createElement(
1371
1387
  'title',
1372
1388
  { key: 'title' },
1373
- article && article.seo && article.seo.seo_title ? article.seo.seo_title : article.title + ' | ' + props.cache.siteSettingCache.name
1389
+ article && article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + article.title + (currentPage > 0 ? ' | Page ' + currentPage : '') + ' | ' + props.cache.siteSettingCache.name
1374
1390
  ),
1375
- shareOptions.shareSummary && React__default.createElement('meta', { name: 'description', key: 'description', content: article.seo && article.seo.meta_description ? article.seo.meta_description : shareOptions.shareSummary ? shareOptions.shareSummary : '' }),
1391
+ shareOptions.shareSummary && React__default.createElement('meta', {
1392
+ name: 'description',
1393
+ key: 'description',
1394
+ content: article.seo && article.seo.meta_description ? '' + article.seo.meta_description + (currentPage > 0 ? ' | Page ' + currentPage : '') : shareOptions.shareSummary ? '' + shareOptions.shareSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + (currentPage > 0 ? 'Page ' + currentPage : '') }),
1376
1395
  React__default.createElement('meta', { name: 'keywords', content: getKeywords(article).join(','), key: 'keywords' }),
1377
1396
  passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
1378
1397
  React__default.createElement('meta', { property: 'og:url', content: shareOptions.shareUrl, key: 'og:url' }),
1379
- React__default.createElement('meta', { property: 'og:title', content: article.seo && article.seo.seo_title ? article.seo.seo_title : shareOptions.shareTitle, key: 'og:title' }),
1398
+ React__default.createElement('meta', {
1399
+ property: 'og:title',
1400
+ content: article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1401
+ key: 'og:title'
1402
+ }),
1380
1403
  React__default.createElement('meta', { property: 'og:image', content: shareOptions.shareImage, key: 'og:image' }),
1381
1404
  React__default.createElement('meta', { property: 'og:site_name', content: props.Settings.title, key: 'og:site_name' }),
1382
- React__default.createElement('meta', { property: 'og:description', content: shareOptions.shareSummary ? shareOptions.shareSummary : '', key: 'og:description' }),
1405
+ React__default.createElement('meta', {
1406
+ property: 'og:description',
1407
+ content: shareOptions.shareSummary ? '' + shareOptions.shareSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1408
+ key: 'og:description'
1409
+ }),
1383
1410
  React__default.createElement('meta', { name: 'twitter:card', content: 'summary', key: 'twitter:card' }),
1384
- React__default.createElement('meta', { name: 'twitter:title', content: article.seo && article.seo.seo_title ? article.seo.seo_title : shareOptions.shareTitle, key: 'twitter:title' }),
1411
+ React__default.createElement('meta', {
1412
+ name: 'twitter:title',
1413
+ content: article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1414
+ key: 'twitter:title'
1415
+ }),
1385
1416
  React__default.createElement('meta', { name: 'twitter:image', content: shareOptions.shareImage, key: 'twitter:image' }),
1386
1417
  React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
1387
- React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary ? shareOptions.shareSummary : '', key: 'twitter:description' }),
1418
+ React__default.createElement('meta', {
1419
+ name: 'twitter:description',
1420
+ content: shareOptions.shareSummary ? '' + shareOptions.shareSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1421
+ key: 'twitter:description'
1422
+ }),
1388
1423
  React__default.createElement('link', { rel: 'canonical', href: shareOptions.shareUrl, key: 'canonical' }),
1389
1424
  React__default.createElement(
1390
1425
  'noscript',
package/dist/esm/View.js CHANGED
@@ -1300,8 +1300,13 @@ var View = function View(props) {
1300
1300
  description = _props$article.description,
1301
1301
  title = _props$article.title;
1302
1302
 
1303
+ var _useState = useState(0),
1304
+ _useState2 = _slicedToArray(_useState, 2),
1305
+ currentPage = _useState2[0],
1306
+ setCurrentPage = _useState2[1];
1303
1307
  // Logging GA pageview for the initial article with custom dimensions
1304
1308
 
1309
+
1305
1310
  useEffect(function () {
1306
1311
  if (pageview && setCustomDimensions) {
1307
1312
  var timer = void 0;
@@ -1354,7 +1359,18 @@ var View = function View(props) {
1354
1359
  article.contextualAD = Ads.getNativeContextualAD(getTargeting(props, 'native-ad'));
1355
1360
  }
1356
1361
  }
1357
-
1362
+ useEffect(function () {
1363
+ router.asPath && router.asPath.length > 0 && router.asPath.includes('?') && router.asPath.split('?')[1].split('&').forEach(function (item) {
1364
+ if (item.includes('page=')) {
1365
+ setCurrentPage(item.split('=')[1]);
1366
+ } else {
1367
+ setCurrentPage(0);
1368
+ }
1369
+ });
1370
+ if (!router.asPath.includes('page=') && currentPage !== 0) {
1371
+ setCurrentPage(0);
1372
+ }
1373
+ }, [router]);
1358
1374
  return React__default.createElement(
1359
1375
  React__default.Fragment,
1360
1376
  null,
@@ -1364,21 +1380,40 @@ var View = function View(props) {
1364
1380
  React__default.createElement(
1365
1381
  'title',
1366
1382
  { key: 'title' },
1367
- article && article.seo && article.seo.seo_title ? article.seo.seo_title : article.title + ' | ' + props.cache.siteSettingCache.name
1383
+ article && article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + article.title + (currentPage > 0 ? ' | Page ' + currentPage : '') + ' | ' + props.cache.siteSettingCache.name
1368
1384
  ),
1369
- shareOptions.shareSummary && React__default.createElement('meta', { name: 'description', key: 'description', content: article.seo && article.seo.meta_description ? article.seo.meta_description : shareOptions.shareSummary ? shareOptions.shareSummary : '' }),
1385
+ shareOptions.shareSummary && React__default.createElement('meta', {
1386
+ name: 'description',
1387
+ key: 'description',
1388
+ content: article.seo && article.seo.meta_description ? '' + article.seo.meta_description + (currentPage > 0 ? ' | Page ' + currentPage : '') : shareOptions.shareSummary ? '' + shareOptions.shareSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + (currentPage > 0 ? 'Page ' + currentPage : '') }),
1370
1389
  React__default.createElement('meta', { name: 'keywords', content: getKeywords(article).join(','), key: 'keywords' }),
1371
1390
  passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
1372
1391
  React__default.createElement('meta', { property: 'og:url', content: shareOptions.shareUrl, key: 'og:url' }),
1373
- React__default.createElement('meta', { property: 'og:title', content: article.seo && article.seo.seo_title ? article.seo.seo_title : shareOptions.shareTitle, key: 'og:title' }),
1392
+ React__default.createElement('meta', {
1393
+ property: 'og:title',
1394
+ content: article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1395
+ key: 'og:title'
1396
+ }),
1374
1397
  React__default.createElement('meta', { property: 'og:image', content: shareOptions.shareImage, key: 'og:image' }),
1375
1398
  React__default.createElement('meta', { property: 'og:site_name', content: props.Settings.title, key: 'og:site_name' }),
1376
- React__default.createElement('meta', { property: 'og:description', content: shareOptions.shareSummary ? shareOptions.shareSummary : '', key: 'og:description' }),
1399
+ React__default.createElement('meta', {
1400
+ property: 'og:description',
1401
+ content: shareOptions.shareSummary ? '' + shareOptions.shareSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1402
+ key: 'og:description'
1403
+ }),
1377
1404
  React__default.createElement('meta', { name: 'twitter:card', content: 'summary', key: 'twitter:card' }),
1378
- React__default.createElement('meta', { name: 'twitter:title', content: article.seo && article.seo.seo_title ? article.seo.seo_title : shareOptions.shareTitle, key: 'twitter:title' }),
1405
+ React__default.createElement('meta', {
1406
+ name: 'twitter:title',
1407
+ content: article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1408
+ key: 'twitter:title'
1409
+ }),
1379
1410
  React__default.createElement('meta', { name: 'twitter:image', content: shareOptions.shareImage, key: 'twitter:image' }),
1380
1411
  React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
1381
- React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary ? shareOptions.shareSummary : '', key: 'twitter:description' }),
1412
+ React__default.createElement('meta', {
1413
+ name: 'twitter:description',
1414
+ content: shareOptions.shareSummary ? '' + shareOptions.shareSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + (currentPage > 0 ? ' | Page ' + currentPage : ''),
1415
+ key: 'twitter:description'
1416
+ }),
1382
1417
  React__default.createElement('link', { rel: 'canonical', href: shareOptions.shareUrl, key: 'canonical' }),
1383
1418
  React__default.createElement(
1384
1419
  'noscript',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.612",
3
+ "version": "1.0.613",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",