hexo-component-inferno 4.0.0 → 4.2.0

package/lib/view/widget/categories.js

@@ -22,6 +22,21 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/i18n'),
+  translate = _require3.translate;
+
+/**
+ * Get the first value that is set, i.e., neither null nor undefined.
+ * @private
+ */
+function firstSet() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  return values.find(function (value) {
+    return value !== null && typeof value !== 'undefined';
+  });
+}
 
 /**
  * Categories widget JSX component.
@@ -66,8 +81,14 @@ var Categories = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
         title = _this$props.title,
         showCount = _this$props.showCount,
-        categories = _this$props.categories;
-      return (0, _inferno.createVNode)(1, "div", "card widget", (0, _inferno.createVNode)(1, "div", "card-content", (0, _inferno.createVNode)(1, "div", "menu", [(0, _inferno.createVNode)(1, "h3", "menu-label", title, 0), (0, _inferno.createVNode)(1, "ul", "menu-list", this.renderList(categories, showCount), 0)], 4), 2), 2, {
+        categories = _this$props.categories,
+        moreUrl = _this$props.moreUrl,
+        moreTitle = _this$props.moreTitle;
+      return (0, _inferno.createVNode)(1, "div", "card widget", (0, _inferno.createVNode)(1, "div", "card-content", (0, _inferno.createVNode)(1, "div", "menu", [(0, _inferno.createVNode)(1, "h3", "menu-label", title, 0), (0, _inferno.createVNode)(1, "ul", "menu-list", [this.renderList(categories, showCount), moreUrl ? (0, _inferno.createVNode)(1, "li", null, (0, _inferno.createVNode)(1, "a", "level is-mobile", [(0, _inferno.createVNode)(1, "span", "level-start", (0, _inferno.createVNode)(1, "span", "level-item", moreTitle, 0), 2), (0, _inferno.createVNode)(1, "span", "level-end", (0, _inferno.createVNode)(1, "span", "level-item icon is-small", (0, _inferno.createVNode)(1, "i", "fas fa-chevron-right"), 2, {
+        "aria-hidden": "true"
+      }), 2)], 4, {
+        "href": moreUrl
+      }), 2) : null], 0)], 4), 2), 2, {
         "data-type": "categories"
       });
     }
@@ -106,23 +127,22 @@ Categories.Cacheable = cacheComponent(Categories, 'widget.categories', function
     widget = _props$widget === void 0 ? {} : _props$widget;
   var _widget$categories = widget.categories,
     categories = _widget$categories === void 0 ? props.site.categories : _widget$categories,
-    _widget$orderBy = widget.orderBy,
-    orderBy = _widget$orderBy === void 0 ? 'name' : _widget$orderBy,
     _widget$order = widget.order,
     order = _widget$order === void 0 ? 1 : _widget$order,
-    _widget$showCurrent = widget.showCurrent,
-    showCurrent = _widget$showCurrent === void 0 ? false : _widget$showCurrent,
-    _widget$showCount = widget.showCount,
-    showCount = _widget$showCount === void 0 ? true : _widget$showCount;
+    amount = widget.amount;
+  // Snake case, like the tags widget, or camel case, which this widget used to read
+  var orderBy = firstSet(widget.order_by, widget.orderBy, 'name');
+  var showCurrent = firstSet(widget.show_current, widget.showCurrent, false);
+  var showCount = firstSet(widget.show_count, widget.showCount, true);
   var url_for = helper.url_for,
-    _p = helper._p;
+    _p = helper._p,
+    __ = helper.__;
   if (!categories || !categories.length) {
     return null;
   }
-  var depth = 0;
-  try {
-    depth = parseInt(props.depth, 10);
-  } catch (e) {}
+
+  // 0 or no depth shows all levels
+  var depth = parseInt(firstSet(widget.depth, props.depth), 10) || 0;
   function prepareQuery(parent) {
     var query = {};
     if (parent) {
@@ -163,10 +183,16 @@ Categories.Cacheable = cacheComponent(Categories, 'widget.categories', function
       };
     });
   }
+
+  // Only limit the top-level categories, and link to the category page when some are not shown
+  var list = hierarchicalList(0);
+  var hasMore = amount > 0 && list.length > amount;
   return {
     showCount: showCount,
-    categories: hierarchicalList(0),
-    title: _p('common.category', Infinity)
+    categories: hasMore ? list.slice(0, amount) : list,
+    title: _p('common.category', Infinity),
+    moreUrl: hasMore ? url_for('categories/') : null,
+    moreTitle: translate(__, 'widget.more', 'More')
   };
 });
 module.exports = Categories;

package/lib/view/widget/links.js

@@ -95,7 +95,7 @@ var Links = /*#__PURE__*/function (_Component) {
 Links.Cacheable = cacheComponent(Links, 'widget.links', function (props) {
   var helper = props.helper,
     widget = props.widget;
-  if (!Object.keys(widget.links).length) {
+  if (!widget.links || !Object.keys(widget.links).length) {
     return null;
   }
   return {

package/lib/view/widget/subscribe_email.js

@@ -22,10 +22,14 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/deprecate'),
+  deprecate = _require3.deprecate;
 
 /**
  * Google FeedBurner widget JSX component.
  *
+ * @deprecated Google FeedBurner stopped email subscriptions in July 2021. Use the follow.it widget
+ *     instead.
  * @see https://feedburner.google.com/
  * @example
  * <SubscribeEmail
@@ -43,6 +47,7 @@ var SubscribeEmail = /*#__PURE__*/function (_Component) {
   return _createClass(SubscribeEmail, [{
     key: "render",
     value: function render() {
+      deprecate('widget.subscribe_email', 'Google FeedBurner stopped email subscriptions in July 2021. Use the follow.it widget instead.');
       var _this$props = this.props,
         title = _this$props.title,
         description = _this$props.description,

package/lib/view/widget/tags.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/i18n'),
+  translate = _require3.translate;
 
 /**
  * Tags widget JSX component.
@@ -50,12 +52,18 @@ var Tags = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
         tags = _this$props.tags,
         title = _this$props.title,
-        showCount = _this$props.showCount;
-      return (0, _inferno.createVNode)(1, "div", "card widget", (0, _inferno.createVNode)(1, "div", "card-content", (0, _inferno.createVNode)(1, "div", "menu", [(0, _inferno.createVNode)(1, "h3", "menu-label", title, 0), (0, _inferno.createVNode)(1, "div", "field is-grouped is-grouped-multiline", tags.map(function (tag) {
+        showCount = _this$props.showCount,
+        moreUrl = _this$props.moreUrl,
+        moreTitle = _this$props.moreTitle;
+      return (0, _inferno.createVNode)(1, "div", "card widget", (0, _inferno.createVNode)(1, "div", "card-content", (0, _inferno.createVNode)(1, "div", "menu", [(0, _inferno.createVNode)(1, "h3", "menu-label", title, 0), (0, _inferno.createVNode)(1, "div", "field is-grouped is-grouped-multiline", [tags.map(function (tag) {
         return (0, _inferno.createVNode)(1, "div", "control", (0, _inferno.createVNode)(1, "a", "tags has-addons", [(0, _inferno.createVNode)(1, "span", "tag", tag.name, 0), showCount ? (0, _inferno.createVNode)(1, "span", "tag", tag.count, 0) : null], 0, {
           "href": tag.url
         }), 2);
-      }), 0)], 4), 2), 2, {
+      }), moreUrl ? (0, _inferno.createVNode)(1, "div", "control", (0, _inferno.createVNode)(1, "a", "tags has-addons", (0, _inferno.createVNode)(1, "span", "tag", [(0, _inferno.createVNode)(1, "span", null, moreTitle, 0), (0, _inferno.createVNode)(1, "span", "icon is-small", (0, _inferno.createVNode)(1, "i", "fas fa-chevron-right"), 2, {
+        "aria-hidden": "true"
+      })], 4), 2, {
+        "href": moreUrl
+      }), 2) : null], 0)], 4), 2), 2, {
         "data-type": "tags"
       });
     }
@@ -94,19 +102,24 @@ Tags.Cacheable = cacheComponent(Tags, 'widget.tags', function (props) {
     show_count = _widget$show_count === void 0 ? true : _widget$show_count;
   var tags = props.tags || props.site.tags;
   var url_for = helper.url_for,
-    _p = helper._p;
+    _p = helper._p,
+    __ = helper.__;
   if (!tags || !tags.length) {
     return null;
   }
   tags = tags.sort(order_by).filter(function (tag) {
     return tag.length;
   });
-  if (amount) {
+  // Link to the tag page when some of the tags are not shown
+  var hasMore = amount > 0 && tags.length > amount;
+  if (hasMore) {
     tags = tags.limit(amount);
   }
   return {
     showCount: show_count,
     title: _p('common.tag', Infinity),
+    moreUrl: hasMore ? url_for('tags/') : null,
+    moreTitle: translate(__, 'widget.more', 'More'),
     tags: tags.map(function (tag) {
       return {
         name: tag.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-component-inferno",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "description": "A collection of Inferno.js layout components and utility scripts for Hexo",
   "main": "lib/index.js",
   "repository": "https://github.com/ppoffice/hexo-component-inferno",
@@ -44,13 +44,15 @@
     "eslint-plugin-jest": "^27.6.3",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-react": "^7.33.2",
-    "hexo": "^7.1.1",
+    "hexo": "^8.1.2",
     "hexo-renderer-marked": "^6.2.0",
     "html-minifier": "^4.0.0",
     "inferno-server": "^8.2.3",
     "inferno-test-utils": "^8.2.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "jquery": "^3.7.1",
+    "jsdom": "^20.0.3",
     "jsdoc": "^4.0.2",
     "minami": "^1.2.3",
     "prettier": "^3.2.4",