@twreporter/universal-header 2.5.0-rc.1 → 2.5.0-rc.2

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/tab-bar.js +37 -21
  3. package/package.json +3 -3
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
+ # [2.5.0-rc.2](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.5.0-rc.1...@twreporter/universal-header@2.5.0-rc.2) (2023-05-03)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * add MaterialIcon component to support google material symbols ([af520b1](https://github.com/twreporter/twreporter-npm-packages/commit/af520b1c300c9b092d6c79d983b777c5ce6646e2))
12
+
13
+
14
+
15
+
16
+
6
17
  # [2.5.0-rc.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.5.0-rc.0...@twreporter/universal-header@2.5.0-rc.1) (2023-04-28)
7
18
 
8
19
  **Note:** Version bump only for package @twreporter/universal-header
package/lib/components/tab-bar.js CHANGED
@@ -19,7 +19,7 @@ var _theme = require("../utils/theme");
19
19
 
20
20
  var _customizedLink = _interopRequireDefault(require("@twreporter/react-components/lib/customized-link"));
21
21
 
22
- var _icon = require("@twreporter/react-components/lib/icon");
22
+ var _materialIcon = _interopRequireDefault(require("@twreporter/react-components/lib/material-icon"));
23
23
 
24
24
  var _button = require("@twreporter/react-components/lib/button");
25
25
 
@@ -29,22 +29,19 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
29
29
 
30
30
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
31
31
 
32
- // context
33
- // utils
34
- // @twreporter
32
+ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
33
+
35
34
  var TabBarContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
36
35
  displayName: "tab-bar__TabBarContainer",
37
36
  componentId: "bdt7uj-0"
38
- })(["display:flex;justify-content:space-between;padding:4px 16px;border-top:1px solid ", ";background-color:", ";padding-bottom:env(safe-area-inset-bottom,0);a{text-decoration:none;}"], function (props) {
39
- return props.borderColor;
40
- }, function (props) {
37
+ })(["display:flex;justify-content:space-between;padding:8px 16px;box-shadow:0px 0px 2px rgba(0,0,0,0.15);background-color:", ";padding-bottom:calc(8px + env(safe-area-inset-bottom,0));a{text-decoration:none;}a:visited,a:active{color:inherit;}"], function (props) {
41
38
  return props.bgColor;
42
39
  });
43
40
 
44
- var ButtonContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
41
+ var ButtonContainer = /*#__PURE__*/(0, _styledComponents["default"])(_customizedLink["default"]).withConfig({
45
42
  displayName: "tab-bar__ButtonContainer",
46
43
  componentId: "bdt7uj-1"
47
- })(["display:flex;justify-content:center;margin-right:8px;flex:1;&:last-child{margin-right:0;}a{text-decoration:none;}"]);
44
+ })(["display:flex;justify-content:center;margin-right:8px;flex:1;text-decoration:none;&:last-child{margin-right:0;}"]);
48
45
 
49
46
  var TabBar = function TabBar() {
50
47
  var _useContext = (0, _react.useContext)(_headerContext["default"]),
@@ -54,6 +51,7 @@ var TabBar = function TabBar() {
54
51
  pathname = _useContext.pathname;
55
52
 
56
53
  var _useContext2 = (0, _react.useContext)(_headerContext.HamburgerContext),
54
+ closeHamburgerMenu = _useContext2.closeHamburgerMenu,
57
55
  toggleHamburger = _useContext2.toggleHamburger,
58
56
  isHamburgerMenuOpen = _useContext2.isHamburgerMenuOpen;
59
57
 
@@ -62,20 +60,32 @@ var TabBar = function TabBar() {
62
60
  latest = _getTabBarLinks.latest,
63
61
  bookmark = _getTabBarLinks.bookmark;
64
62
 
65
- var HomeIcon = /*#__PURE__*/_react["default"].createElement(_icon.Home, {
66
- releaseBranch: releaseBranch
63
+ var HomeIcon = /*#__PURE__*/_react["default"].createElement(_materialIcon["default"], {
64
+ icon: "home",
65
+ weight: 400,
66
+ grade: 0,
67
+ size: 24
67
68
  });
68
69
 
69
- var ClockIcon = /*#__PURE__*/_react["default"].createElement(_icon.Clock, {
70
- releaseBranch: releaseBranch
70
+ var ClockIcon = /*#__PURE__*/_react["default"].createElement(_materialIcon["default"], {
71
+ icon: "schedule",
72
+ weight: 400,
73
+ grade: 0,
74
+ size: 24
71
75
  });
72
76
 
73
- var BookmarkIcon = /*#__PURE__*/_react["default"].createElement(_icon.Bookmark, {
74
- releaseBranch: releaseBranch
77
+ var BookmarkIcon = /*#__PURE__*/_react["default"].createElement(_materialIcon["default"], {
78
+ icon: "bookmark",
79
+ weight: 400,
80
+ grade: 0,
81
+ size: 24
75
82
  });
76
83
 
77
- var HamburgerIcon = /*#__PURE__*/_react["default"].createElement(_icon.Hamburger, {
78
- releaseBranch: releaseBranch
84
+ var HamburgerIcon = /*#__PURE__*/_react["default"].createElement(_materialIcon["default"], {
85
+ icon: "menu",
86
+ weight: 400,
87
+ grade: 0,
88
+ size: 24
79
89
  });
80
90
 
81
91
  var _selectTabBarTheme = (0, _theme.selectTabBarTheme)(theme),
@@ -89,22 +99,28 @@ var TabBar = function TabBar() {
89
99
  return /*#__PURE__*/_react["default"].createElement(TabBarContainer, {
90
100
  bgColor: bgColor,
91
101
  borderColor: borderColor
92
- }, /*#__PURE__*/_react["default"].createElement(ButtonContainer, null, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], home, /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
102
+ }, /*#__PURE__*/_react["default"].createElement(ButtonContainer, _extends({}, home, {
103
+ onClick: closeHamburgerMenu
104
+ }), /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
93
105
  text: "\u9996\u9801",
94
106
  iconComponent: HomeIcon,
95
107
  theme: theme,
96
108
  active: isHomeActive
97
- }))), /*#__PURE__*/_react["default"].createElement(ButtonContainer, null, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], latest, /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
109
+ })), /*#__PURE__*/_react["default"].createElement(ButtonContainer, _extends({}, latest, {
110
+ onClick: closeHamburgerMenu
111
+ }), /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
98
112
  text: "\u6700\u65B0",
99
113
  iconComponent: ClockIcon,
100
114
  theme: theme,
101
115
  active: isLatestActive
102
- }))), /*#__PURE__*/_react["default"].createElement(ButtonContainer, null, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], bookmark, /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
116
+ })), /*#__PURE__*/_react["default"].createElement(ButtonContainer, _extends({}, bookmark, {
117
+ onClick: closeHamburgerMenu
118
+ }), /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
103
119
  text: "\u6211\u7684\u66F8\u7C64",
104
120
  iconComponent: BookmarkIcon,
105
121
  theme: theme,
106
122
  active: isBookmarkActive
107
- }))), /*#__PURE__*/_react["default"].createElement(ButtonContainer, {
123
+ })), /*#__PURE__*/_react["default"].createElement(ButtonContainer, {
108
124
  onClick: toggleHamburger
109
125
  }, /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
110
126
  text: hamburgerIconText,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@twreporter/universal-header",
3
- "version": "2.5.0-rc.1",
3
+ "version": "2.5.0-rc.2",
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.9.0-rc.1",
24
- "@twreporter/react-components": "^8.17.0-rc.9",
24
+ "@twreporter/react-components": "^8.17.0-rc.10",
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": "b19c17b200ea41950a1ea26d71d8d983d18549b0"
51
+ "gitHead": "5683a389b16e6ed857cd3faad348951f556f3746"
52
52
  }