@twreporter/universal-header 2.4.2-rc.5 → 2.4.2-rc.7
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.
- package/CHANGELOG.md +24 -0
- package/lib/components/tab-bar.js +1 -1
- package/lib/utils/links.js +13 -2
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,30 @@
|
|
|
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
|
+
## [2.4.2-rc.7](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.2-rc.6...@twreporter/universal-header@2.4.2-rc.7) (2023-02-20)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add missing import ([6c016ae](https://github.com/twreporter/twreporter-npm-packages/commit/6c016aed11d920056f2b6cbc8c53399ebb50882f))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [2.4.2-rc.6](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.2-rc.5...@twreporter/universal-header@2.4.2-rc.6) (2023-02-18)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* address review comment ([914fd68](https://github.com/twreporter/twreporter-npm-packages/commit/914fd68e1e6c284b61b594cc7c8df97568c3d201))
|
|
23
|
+
* latest icon should active when click latest tags ([819a3a8](https://github.com/twreporter/twreporter-npm-packages/commit/819a3a88ef3547261799c6d0a1d088b522962acd))
|
|
24
|
+
* remove unnecessary try-catch ([4f57abd](https://github.com/twreporter/twreporter-npm-packages/commit/4f57abd5e340638cb03339ae1edc15cbc36a89e1))
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
6
30
|
## [2.4.2-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.2-rc.4...@twreporter/universal-header@2.4.2-rc.5) (2023-02-18)
|
|
7
31
|
|
|
8
32
|
**Note:** Version bump only for package @twreporter/universal-header
|
|
@@ -83,7 +83,7 @@ var TabBar = function TabBar() {
|
|
|
83
83
|
borderColor = _selectTabBarTheme.borderColor;
|
|
84
84
|
|
|
85
85
|
var isHomeActive = !isHamburgerMenuOpen && pathname === '/';
|
|
86
|
-
var isLatestActive = !isHamburgerMenuOpen && pathname
|
|
86
|
+
var isLatestActive = !isHamburgerMenuOpen && (0, _links.checkPathnameParent)(pathname, 'latest');
|
|
87
87
|
var isBookmarkActive = !isHamburgerMenuOpen && pathname === '/bookmarks';
|
|
88
88
|
var hamburgerIconText = isHamburgerMenuOpen ? '關閉選單' : '選單';
|
|
89
89
|
return /*#__PURE__*/_react["default"].createElement(TabBarContainer, {
|
package/lib/utils/links.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.getFooterLinks = getFooterLinks;
|
|
|
13
13
|
exports.getSocialMediaLinks = getSocialMediaLinks;
|
|
14
14
|
exports.getChannelLinks = getChannelLinks;
|
|
15
15
|
exports.getTabBarLinks = getTabBarLinks;
|
|
16
|
-
exports.getCategoryLink = exports.checkReferrer = void 0;
|
|
16
|
+
exports.getCategoryLink = exports.checkPathnameParent = exports.checkReferrer = void 0;
|
|
17
17
|
|
|
18
18
|
var _services = require("../constants/services");
|
|
19
19
|
|
|
@@ -37,6 +37,8 @@ var _reduce = _interopRequireDefault(require("lodash/reduce"));
|
|
|
37
37
|
|
|
38
38
|
var _split = _interopRequireDefault(require("lodash/split"));
|
|
39
39
|
|
|
40
|
+
var _indexOf = _interopRequireDefault(require("lodash/indexOf"));
|
|
41
|
+
|
|
40
42
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
41
43
|
|
|
42
44
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
@@ -44,7 +46,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
|
44
46
|
var _ = {
|
|
45
47
|
forEach: _forEach["default"],
|
|
46
48
|
reduce: _reduce["default"],
|
|
47
|
-
split: _split["default"]
|
|
49
|
+
split: _split["default"],
|
|
50
|
+
indexOf: _indexOf["default"]
|
|
48
51
|
};
|
|
49
52
|
var originsForClient = _requestOrigins["default"].forClientSideRendering;
|
|
50
53
|
/**
|
|
@@ -115,6 +118,14 @@ var checkReferrer = function checkReferrer() {
|
|
|
115
118
|
|
|
116
119
|
exports.checkReferrer = checkReferrer;
|
|
117
120
|
|
|
121
|
+
var checkPathnameParent = function checkPathnameParent() {
|
|
122
|
+
var pathname = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
123
|
+
var parent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
124
|
+
return _.indexOf(_.split(pathname, '/'), parent) === 1;
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
exports.checkPathnameParent = checkPathnameParent;
|
|
128
|
+
|
|
118
129
|
var getCategoryLink = function getCategoryLink() {
|
|
119
130
|
var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
|
|
120
131
|
var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@twreporter/universal-header",
|
|
3
|
-
"version": "2.4.2-rc.
|
|
3
|
+
"version": "2.4.2-rc.7",
|
|
4
4
|
"description": "Universal header of TWReporter sites",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@twreporter/core": "^1.8.2-rc.3",
|
|
24
|
-
"@twreporter/react-components": "^8.16.0-rc.
|
|
24
|
+
"@twreporter/react-components": "^8.16.0-rc.3",
|
|
25
25
|
"lodash": "^4.17.11",
|
|
26
26
|
"prop-types": "^15.6.2",
|
|
27
27
|
"querystring": "^0.2.0",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"@storybook/testing-library": "^0.0.13",
|
|
49
49
|
"babel-loader": "^8.2.5"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "cef8afa31f15e754fe932b1c0e586e7ced1e1060"
|
|
52
52
|
}
|