@twreporter/react-article-components 1.7.3-rc.4 → 1.7.3-rc.5

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 (3) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/lib/components/aside/metadata.js +6 -3
  3. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -3,6 +3,17 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [1.7.3-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.7.3-rc.4...@twreporter/react-article-components@1.7.3-rc.5) (2023-02-16)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * fix category link issue & add error handling ([9bd5f76](https://github.com/twreporter/twreporter-npm-packages/commit/9bd5f76a8b37eff4c634c17dfde30cbe7ac6f1b9))
12
+
13
+
14
+
15
+
16
+
6
17
  ## [1.7.3-rc.4](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.7.3-rc.3...@twreporter/react-article-components@1.7.3-rc.4) (2023-02-13)
7
18
 
8
19
 
package/lib/components/aside/metadata.js CHANGED
@@ -33,6 +33,8 @@ var _theme = require("@twreporter/core/lib/constants/theme");
33
33
 
34
34
  var _color = require("@twreporter/core/lib/constants/color");
35
35
 
36
+ var _categorySet = require("@twreporter/core/lib/constants/category-set");
37
+
36
38
  var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
37
39
 
38
40
  var _link = _interopRequireDefault(require("@twreporter/react-components/lib/text/link"));
@@ -204,7 +206,7 @@ var CategorySet = function CategorySet(props) {
204
206
  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
205
207
 
206
208
  var categorySetJSX = _.map(props.categorySet, function (set, index) {
207
- var _set$category, _set$category2, _set$subcategory, _set$subcategory2, _set$category3;
209
+ var _set$category, _set$category2, _set$subcategory, _set$subcategory2;
208
210
 
209
211
  var genLink = function genLink(path, name) {
210
212
  var isCategory = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -220,9 +222,10 @@ var CategorySet = function CategorySet(props) {
220
222
  }));
221
223
  };
222
224
 
223
- return /*#__PURE__*/_react["default"].createElement(LinkContainer, {
225
+ var categoryPath = (0, _categorySet.GET_CATEGORY_PATH_FROM_ID)(set === null || set === void 0 ? void 0 : (_set$category = set.category) === null || _set$category === void 0 ? void 0 : _set$category.id);
226
+ return categoryPath ? /*#__PURE__*/_react["default"].createElement(LinkContainer, {
224
227
  key: "categorySet-".concat(index)
225
- }, genLink("/categories/".concat(set === null || set === void 0 ? void 0 : (_set$category = set.category) === null || _set$category === void 0 ? void 0 : _set$category.id), set === null || set === void 0 ? void 0 : (_set$category2 = set.category) === null || _set$category2 === void 0 ? void 0 : _set$category2.name, true), set !== null && set !== void 0 && (_set$subcategory = set.subcategory) !== null && _set$subcategory !== void 0 && _set$subcategory.id && set !== null && set !== void 0 && (_set$subcategory2 = set.subcategory) !== null && _set$subcategory2 !== void 0 && _set$subcategory2.name ? genLink("/tags/".concat(set.subcategory.id), set.subcategory.name) : genLink("/categories/".concat(set === null || set === void 0 ? void 0 : (_set$category3 = set.category) === null || _set$category3 === void 0 ? void 0 : _set$category3.id), '全部'));
228
+ }, genLink("/categories/".concat(categoryPath), set === null || set === void 0 ? void 0 : (_set$category2 = set.category) === null || _set$category2 === void 0 ? void 0 : _set$category2.name, true), set !== null && set !== void 0 && (_set$subcategory = set.subcategory) !== null && _set$subcategory !== void 0 && _set$subcategory.id && set !== null && set !== void 0 && (_set$subcategory2 = set.subcategory) !== null && _set$subcategory2 !== void 0 && _set$subcategory2.name ? genLink("/tags/".concat(set.subcategory.id), set.subcategory.name) : genLink("/categories/".concat(categoryPath), '全部')) : null;
226
229
  });
227
230
 
228
231
  return /*#__PURE__*/_react["default"].createElement(CategorySetFlexBox, null, categorySetJSX);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@twreporter/react-article-components",
3
- "version": "1.7.3-rc.4",
3
+ "version": "1.7.3-rc.5",
4
4
  "description": "The Reporter react article components, which are used in article page",
5
5
  "main": "lib/components/article-page.js",
6
6
  "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
@@ -24,10 +24,10 @@
24
24
  "webpack-dev-server": "^3.7.2"
25
25
  },
26
26
  "dependencies": {
27
- "@twreporter/core": "^1.8.2-rc.1",
28
- "@twreporter/react-components": "^8.16.0-rc.0",
29
- "@twreporter/redux": "^7.5.0-rc.2",
30
- "@twreporter/universal-header": "^2.4.2-rc.3",
27
+ "@twreporter/core": "^1.8.2-rc.2",
28
+ "@twreporter/react-components": "^8.16.0-rc.1",
29
+ "@twreporter/redux": "^7.5.0-rc.3",
30
+ "@twreporter/universal-header": "^2.4.2-rc.4",
31
31
  "howler": "^2.2.3",
32
32
  "lodash": "^4.17.11",
33
33
  "memoize-one": "^5.0.5",
@@ -40,5 +40,5 @@
40
40
  "files": [
41
41
  "lib"
42
42
  ],
43
- "gitHead": "1ebf9eeda3976aad554b576bf974c2718752ef4e"
43
+ "gitHead": "fb0222caf63c434282f2e9f76c6d9ebb5c5304da"
44
44
  }