@twreporter/universal-header 3.0.0-rc.0 → 3.0.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.
- package/CHANGELOG.md +19 -0
- package/lib/components/action-button-item.js +8 -8
- package/lib/components/hamburger-footer.js +18 -18
- package/lib/components/hamburger-footer.stories.js +2 -2
- package/lib/components/hamburger-menu-item.js +13 -13
- package/lib/components/hamburger-menu-item.stories.js +2 -2
- package/lib/components/hamburger-menu.js +9 -9
- package/lib/components/header.js +32 -32
- package/lib/components/icons.js +5 -5
- package/lib/components/slogan.js +2 -2
- package/lib/components/tab-bar.js +3 -3
- package/package.json +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,25 @@
|
|
|
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
|
+
# [3.0.0-rc.2](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@3.0.0-rc.1...@twreporter/universal-header@3.0.0-rc.2) (2024-05-14)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* upgrade `styled-component` version to v6 ([df93639](https://github.com/twreporter/twreporter-npm-packages/commit/df93639b1b1591d1506cf4cab13f6cda8d6c8aba))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
# [3.0.0-rc.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@3.0.0-rc.0...@twreporter/universal-header@3.0.0-rc.1) (2024-05-10)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @twreporter/universal-header
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
6
25
|
# [3.0.0-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.12.3-rc.4...@twreporter/universal-header@3.0.0-rc.0) (2024-05-08)
|
|
7
26
|
|
|
8
27
|
|
|
@@ -63,23 +63,23 @@ var StyledPillButton = /*#__PURE__*/(0, _styledComponents["default"])(_button.Pi
|
|
|
63
63
|
displayName: "action-button-item__StyledPillButton",
|
|
64
64
|
componentId: "z0zuf3-0"
|
|
65
65
|
})(["justify-content:center;", ""], function (props) {
|
|
66
|
-
return props
|
|
66
|
+
return props.$buttonWidth === 'stretch' ? 'width: auto;' : '';
|
|
67
67
|
});
|
|
68
68
|
|
|
69
69
|
var ActionItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
70
70
|
displayName: "action-button-item__ActionItem",
|
|
71
71
|
componentId: "z0zuf3-1"
|
|
72
72
|
})(["display:flex;align-items:center;justify-content:center;margin:", ";&:first-child{margin-top:0;margin-left:0;}a{text-decoration:none;}"], function (props) {
|
|
73
|
-
return (0, _css.arrayToCssShorthand)(styles.itemMargin[props
|
|
73
|
+
return (0, _css.arrayToCssShorthand)(styles.itemMargin[props.$direction]);
|
|
74
74
|
});
|
|
75
75
|
|
|
76
76
|
var ActionsContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
77
77
|
displayName: "action-button-item__ActionsContainer",
|
|
78
78
|
componentId: "z0zuf3-2"
|
|
79
79
|
})(["display:flex;align-items:center;flex-direction:", ";&,", ",a{", "}"], function (props) {
|
|
80
|
-
return props
|
|
80
|
+
return props.$direction;
|
|
81
81
|
}, ActionItem, function (props) {
|
|
82
|
-
return props
|
|
82
|
+
return props.$buttonWidth === 'stretch' ? 'width: 100%;' : '';
|
|
83
83
|
});
|
|
84
84
|
|
|
85
85
|
var ActionButtonItem = function ActionButtonItem(_ref) {
|
|
@@ -122,7 +122,7 @@ var ActionButtonItem = function ActionButtonItem(_ref) {
|
|
|
122
122
|
var buttonType = _actions.ACTION_BUTTON_TYPE[actionKey];
|
|
123
123
|
return /*#__PURE__*/_react["default"].createElement(ActionItem, {
|
|
124
124
|
onClick: callback,
|
|
125
|
-
direction: direction
|
|
125
|
+
$direction: direction
|
|
126
126
|
}, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], _extends({
|
|
127
127
|
id: actionId
|
|
128
128
|
}, actionLink), /*#__PURE__*/_react["default"].createElement(StyledPillButton, {
|
|
@@ -130,7 +130,7 @@ var ActionButtonItem = function ActionButtonItem(_ref) {
|
|
|
130
130
|
theme: buttonTheme,
|
|
131
131
|
type: buttonType,
|
|
132
132
|
size: buttonSize,
|
|
133
|
-
buttonWidth: buttonWidth
|
|
133
|
+
$buttonWidth: buttonWidth
|
|
134
134
|
})));
|
|
135
135
|
};
|
|
136
136
|
|
|
@@ -164,8 +164,8 @@ var ActionButton = function ActionButton(_ref2) {
|
|
|
164
164
|
rest = _objectWithoutProperties(_ref2, _excluded);
|
|
165
165
|
|
|
166
166
|
return /*#__PURE__*/_react["default"].createElement(ActionsContainer, _extends({
|
|
167
|
-
direction: direction,
|
|
168
|
-
buttonWidth: buttonWidth
|
|
167
|
+
$direction: direction,
|
|
168
|
+
$buttonWidth: buttonWidth
|
|
169
169
|
}, rest), _.map(actions, function (action) {
|
|
170
170
|
return /*#__PURE__*/_react["default"].createElement(ActionButtonItem, {
|
|
171
171
|
action: action,
|
|
@@ -62,21 +62,21 @@ var LinkItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
62
62
|
displayName: "hamburger-footer__LinkItem",
|
|
63
63
|
componentId: "i02xyc-1"
|
|
64
64
|
})(["padding:8px 32px;display:flex;align-items:center;color:", ";svg{height:18px;width:18px;margin-right:4px;background-color:", ";}", " &:active{color:", ";background-color:", ";svg{background-color:", ";}}"], function (props) {
|
|
65
|
-
return props
|
|
65
|
+
return props.$color;
|
|
66
66
|
}, function (props) {
|
|
67
|
-
return props
|
|
67
|
+
return props.$color;
|
|
68
68
|
}, _mediaQuery["default"].desktopAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n &:hover {\n color: ", ";\n background-color: ", ";\n svg {\n background-color: ", ";\n }\n }\n "])), function (props) {
|
|
69
|
-
return props
|
|
69
|
+
return props.$hoverColor;
|
|
70
70
|
}, function (props) {
|
|
71
|
-
return props
|
|
71
|
+
return props.$hoverBgColor;
|
|
72
72
|
}, function (props) {
|
|
73
|
-
return props
|
|
73
|
+
return props.$hoverColor;
|
|
74
74
|
}), function (props) {
|
|
75
|
-
return props
|
|
75
|
+
return props.$activeColor;
|
|
76
76
|
}, function (props) {
|
|
77
|
-
return props
|
|
77
|
+
return props.$activeBgColor;
|
|
78
78
|
}, function (props) {
|
|
79
|
-
return props
|
|
79
|
+
return props.$activeColor;
|
|
80
80
|
});
|
|
81
81
|
|
|
82
82
|
var LinkSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -132,11 +132,11 @@ var Footer = function Footer(_ref) {
|
|
|
132
132
|
key: key,
|
|
133
133
|
onClick: closeHamburgerMenu
|
|
134
134
|
}), /*#__PURE__*/_react["default"].createElement(LinkItem, {
|
|
135
|
-
color: color,
|
|
136
|
-
hoverColor: hoverColor,
|
|
137
|
-
hoverBgColor: hoverBgColor,
|
|
138
|
-
activeColor: activeColor,
|
|
139
|
-
activeBgColor: activeBgColor
|
|
135
|
+
$color: color,
|
|
136
|
+
$hoverColor: hoverColor,
|
|
137
|
+
$hoverBgColor: hoverBgColor,
|
|
138
|
+
$activeColor: activeColor,
|
|
139
|
+
$activeBgColor: activeBgColor
|
|
140
140
|
}, /*#__PURE__*/_react["default"].createElement(_icon.Icon, {
|
|
141
141
|
filename: _footer.FOOTER_ICON[key],
|
|
142
142
|
releaseBranch: releaseBranch
|
|
@@ -157,11 +157,11 @@ var Footer = function Footer(_ref) {
|
|
|
157
157
|
key: key,
|
|
158
158
|
onClick: closeHamburgerMenu
|
|
159
159
|
}), /*#__PURE__*/_react["default"].createElement(LinkItem, {
|
|
160
|
-
color: color,
|
|
161
|
-
hoverColor: hoverColor,
|
|
162
|
-
hoverBgColor: hoverBgColor,
|
|
163
|
-
activeColor: activeColor,
|
|
164
|
-
activeBgColor: activeBgColor
|
|
160
|
+
$color: color,
|
|
161
|
+
$hoverColor: hoverColor,
|
|
162
|
+
$hoverBgColor: hoverBgColor,
|
|
163
|
+
$activeColor: activeColor,
|
|
164
|
+
$activeBgColor: activeBgColor
|
|
165
165
|
}, /*#__PURE__*/_react["default"].createElement(_paragraph.P2, {
|
|
166
166
|
text: label
|
|
167
167
|
})));
|
|
@@ -35,7 +35,7 @@ var StyledFooter = /*#__PURE__*/(0, _styledComponents["default"])(_hamburgerFoot
|
|
|
35
35
|
displayName: "hamburger-footerstories__StyledFooter",
|
|
36
36
|
componentId: "sc-2581a8-0"
|
|
37
37
|
})(["width:375px;background-color:", ";padding:16px 0;"], function (props) {
|
|
38
|
-
return props
|
|
38
|
+
return props.$bgColor;
|
|
39
39
|
});
|
|
40
40
|
|
|
41
41
|
var getBgColor = function getBgColor(theme) {
|
|
@@ -66,7 +66,7 @@ var footer = {
|
|
|
66
66
|
return /*#__PURE__*/_react["default"].createElement(_headerContext["default"].Provider, {
|
|
67
67
|
value: context
|
|
68
68
|
}, /*#__PURE__*/_react["default"].createElement(StyledFooter, {
|
|
69
|
-
bgColor: bgColor
|
|
69
|
+
$bgColor: bgColor
|
|
70
70
|
}));
|
|
71
71
|
},
|
|
72
72
|
parameters: {
|
|
@@ -60,15 +60,15 @@ var ItemContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
60
60
|
displayName: "hamburger-menu-item__ItemContainer",
|
|
61
61
|
componentId: "t1lhbb-2"
|
|
62
62
|
})(["", "{padding:8px 32px;}cursor:pointer;color:", ";a,a:visited,a:link{text-decoration:none;color:", ";}svg{background-color:", ";}", " &:active{background-color:", ";}"], StyledP1, function (props) {
|
|
63
|
-
return props
|
|
63
|
+
return props.$color;
|
|
64
64
|
}, function (props) {
|
|
65
|
-
return props
|
|
65
|
+
return props.$color;
|
|
66
66
|
}, function (props) {
|
|
67
|
-
return props
|
|
67
|
+
return props.$color;
|
|
68
68
|
}, _mediaQuery["default"].desktopAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n &:hover {\n background-color: ", ";\n }\n "])), function (props) {
|
|
69
|
-
return props
|
|
69
|
+
return props.$hoverBgColor;
|
|
70
70
|
}), function (props) {
|
|
71
|
-
return props
|
|
71
|
+
return props.$activeBgColor;
|
|
72
72
|
});
|
|
73
73
|
|
|
74
74
|
var SubItemContainer = /*#__PURE__*/(0, _styledComponents["default"])(ItemContainer).withConfig({
|
|
@@ -79,7 +79,7 @@ var DropdownItemContainer = /*#__PURE__*/(0, _styledComponents["default"])(ItemC
|
|
|
79
79
|
displayName: "hamburger-menu-item__DropdownItemContainer",
|
|
80
80
|
componentId: "t1lhbb-4"
|
|
81
81
|
})(["padding:8px 32px;display:flex;align-items:center;justify-content:space-between;svg{transform:rotate(", ");transition:all 300ms;}"], function (props) {
|
|
82
|
-
return props
|
|
82
|
+
return props.$rotate;
|
|
83
83
|
});
|
|
84
84
|
|
|
85
85
|
var MenuLinkItem = function MenuLinkItem(_ref) {
|
|
@@ -129,9 +129,9 @@ var MenuSubItem = function MenuSubItem(_ref2) {
|
|
|
129
129
|
activeBgColor = _selectHamburgerItemT2.activeBgColor;
|
|
130
130
|
|
|
131
131
|
return /*#__PURE__*/_react["default"].createElement(SubItemContainer, _extends({
|
|
132
|
-
color: color,
|
|
133
|
-
hoverBgColor: hoverBgColor,
|
|
134
|
-
activeBgColor: activeBgColor
|
|
132
|
+
$color: color,
|
|
133
|
+
$hoverBgColor: hoverBgColor,
|
|
134
|
+
$activeBgColor: activeBgColor
|
|
135
135
|
}, props), /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], link, /*#__PURE__*/_react["default"].createElement(StyledP2, {
|
|
136
136
|
text: text,
|
|
137
137
|
weight: "bold"
|
|
@@ -162,10 +162,10 @@ var MenuDropdownItem = function MenuDropdownItem(_ref3) {
|
|
|
162
162
|
|
|
163
163
|
var iconRotateDeg = isActive ? '-180deg' : '0';
|
|
164
164
|
return /*#__PURE__*/_react["default"].createElement(DropdownItemContainer, _extends({
|
|
165
|
-
color: color,
|
|
166
|
-
hoverBgColor: hoverBgColor,
|
|
167
|
-
activeBgColor: activeBgColor,
|
|
168
|
-
rotate: iconRotateDeg
|
|
165
|
+
$color: color,
|
|
166
|
+
$hoverBgColor: hoverBgColor,
|
|
167
|
+
$activeBgColor: activeBgColor,
|
|
168
|
+
$rotate: iconRotateDeg
|
|
169
169
|
}, props), /*#__PURE__*/_react["default"].createElement(_paragraph.P1, {
|
|
170
170
|
text: text,
|
|
171
171
|
weight: "bold"
|
|
@@ -47,7 +47,7 @@ var Container = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
47
47
|
displayName: "hamburger-menu-itemstories__Container",
|
|
48
48
|
componentId: "xfb28s-0"
|
|
49
49
|
})(["width:375px;background-color:", ";padding:16px 0;box-shadow:0px 0px 24px rgba(0,0,0,0.1);"], function (props) {
|
|
50
|
-
return props
|
|
50
|
+
return props.$bgColor;
|
|
51
51
|
});
|
|
52
52
|
|
|
53
53
|
var getBgColor = function getBgColor(theme) {
|
|
@@ -78,7 +78,7 @@ var menuLinkItem = {
|
|
|
78
78
|
return /*#__PURE__*/_react["default"].createElement(_headerContext["default"].Provider, {
|
|
79
79
|
value: context
|
|
80
80
|
}, /*#__PURE__*/_react["default"].createElement(Container, {
|
|
81
|
-
bgColor: bgColor
|
|
81
|
+
$bgColor: bgColor
|
|
82
82
|
}, /*#__PURE__*/_react["default"].createElement(_hamburgerMenuItem.MenuLinkItem, props)));
|
|
83
83
|
},
|
|
84
84
|
args: {
|
|
@@ -87,13 +87,13 @@ var MenuContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
87
87
|
displayName: "hamburger-menu__MenuContainer",
|
|
88
88
|
componentId: "sc-15rzowt-0"
|
|
89
89
|
})(["width:", ";height:100vh;max-height:100vh;overflow-y:scroll;overscroll-behavior:contain;background-color:", ";-webkit-overflow-scrolling:touch;", " ", " &::-webkit-scrollbar{background-color:transparent;width:4px;}&::-webkit-scrollbar-thumb{background-color:", ";border-radius:2px;}"], _hamburgerMenu.MENU_WIDTH.desktop, function (props) {
|
|
90
|
-
return props
|
|
90
|
+
return props.$bgColor;
|
|
91
91
|
}, _mediaQuery["default"].tabletOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: ", ";\n "])), _hamburgerMenu.MENU_WIDTH.tablet), _mediaQuery["default"].mobileOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: ", ";\n height: ", ";\n max-height: ", ";\n padding-bottom: ", "px;\n "])), _hamburgerMenu.MENU_WIDTH.mobile, function (props) {
|
|
92
|
-
return props
|
|
92
|
+
return props.$mobileHeight;
|
|
93
93
|
}, function (props) {
|
|
94
|
-
return props
|
|
94
|
+
return props.$mobileHeight;
|
|
95
95
|
}, reserveHeightForIos15 + 48), function (props) {
|
|
96
|
-
return props
|
|
96
|
+
return props.$scrollBarColor;
|
|
97
97
|
});
|
|
98
98
|
|
|
99
99
|
var CloseSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -140,7 +140,7 @@ var SubContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
140
140
|
displayName: "hamburger-menu__SubContainer",
|
|
141
141
|
componentId: "sc-15rzowt-9"
|
|
142
142
|
})(["max-height:", ";overflow:hidden;transition:max-height 300ms ease-in-out;"], function (props) {
|
|
143
|
-
return props
|
|
143
|
+
return props.$isActive ? '300px' : '0';
|
|
144
144
|
});
|
|
145
145
|
|
|
146
146
|
var DividerContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -239,7 +239,7 @@ var DropdownContent = function DropdownContent(_ref) {
|
|
|
239
239
|
onClick: handleClick,
|
|
240
240
|
key: dropdownKey
|
|
241
241
|
}), /*#__PURE__*/_react["default"].createElement(SubContainer, {
|
|
242
|
-
isActive: isActive,
|
|
242
|
+
$isActive: isActive,
|
|
243
243
|
onClick: closeHamburgerMenu
|
|
244
244
|
}, subItemJSX));
|
|
245
245
|
};
|
|
@@ -351,9 +351,9 @@ var HamburgerMenu = function HamburgerMenu(_ref2) {
|
|
|
351
351
|
setMobileHeight("".concat(window.innerHeight + reserveHeightForIos15, "px"));
|
|
352
352
|
}, []);
|
|
353
353
|
return /*#__PURE__*/_react["default"].createElement(MenuContainer, _extends({
|
|
354
|
-
bgColor: bgColor,
|
|
355
|
-
scrollBarColor: scrollBarColor,
|
|
356
|
-
mobileHeight: mobileHeight
|
|
354
|
+
$bgColor: bgColor,
|
|
355
|
+
$scrollBarColor: scrollBarColor,
|
|
356
|
+
$mobileHeight: mobileHeight
|
|
357
357
|
}, props), /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndAbove, null, /*#__PURE__*/_react["default"].createElement(CloseSection, null, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
|
|
358
358
|
iconComponent: CloseIcon,
|
|
359
359
|
theme: menuTheme,
|
package/lib/components/header.js
CHANGED
|
@@ -113,15 +113,15 @@ var HeaderContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
113
113
|
displayName: "header__HeaderContainer",
|
|
114
114
|
componentId: "sc-1krza7i-0"
|
|
115
115
|
})(["position:", ";top:0;width:100%;background-color:", ";transform:translateY( ", " );transition:transform 300ms ", ";", ""], function (props) {
|
|
116
|
-
return props
|
|
116
|
+
return props.$theme === _theme2["default"].transparent ? 'fixed' : 'sticky';
|
|
117
117
|
}, function (props) {
|
|
118
|
-
return props
|
|
118
|
+
return props.$bgColor;
|
|
119
119
|
}, function (props) {
|
|
120
|
-
return props
|
|
120
|
+
return props.$hideHeader ? "".concat(-narrowHeaderHeight, "px") : '0';
|
|
121
121
|
}, function (props) {
|
|
122
|
-
return props
|
|
122
|
+
return props.$hideHeader ? 'ease-in' : 'ease-out';
|
|
123
123
|
}, _mediaQuery["default"].mobileOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n ", "\n "])), function (props) {
|
|
124
|
-
return props
|
|
124
|
+
return props.$forceShowOnMobile ? 'transform: translateY(0);' : '';
|
|
125
125
|
}));
|
|
126
126
|
|
|
127
127
|
var HeaderSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -153,36 +153,36 @@ var TopRow = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
153
153
|
displayName: "header__TopRow",
|
|
154
154
|
componentId: "sc-1krza7i-6"
|
|
155
155
|
})(["display:flex;align-items:center;justify-content:space-between;padding:", " 16px;z-index:", ";background-color:", ";", "{opacity:", ";transition:opacity ", ";transition-delay:", ";}", "{opacity:", ";transition:opacity ", ";transition-delay:", ";}", "{margin-left:", ";transform:translateX(", ");transition:all ", ";transition-delay:", ";img,a{height:", ";transition:height ", ";transition-delay:", ";}}", ""], function (props) {
|
|
156
|
-
return props
|
|
156
|
+
return props.$toUseNarrow ? '16px' : '24px';
|
|
157
157
|
}, zIndex.topRow, function (props) {
|
|
158
|
-
return props
|
|
158
|
+
return props.$topRowBgColor;
|
|
159
159
|
}, ShowWhenNarrow, function (props) {
|
|
160
|
-
return props
|
|
160
|
+
return props.$toUseNarrow ? '1' : '0';
|
|
161
161
|
}, animation.step3Duration, function (props) {
|
|
162
|
-
return props
|
|
162
|
+
return props.$toUseNarrow ? '350ms' : 0;
|
|
163
163
|
}, HideWhenNarrow, function (props) {
|
|
164
|
-
return props
|
|
164
|
+
return props.$toUseNarrow ? '0' : '1';
|
|
165
165
|
}, animation.step3Duration, function (props) {
|
|
166
|
-
return props
|
|
166
|
+
return props.$toUseNarrow ? animation.step3Delay : 0;
|
|
167
167
|
}, LogoContainer, function (props) {
|
|
168
|
-
return props
|
|
168
|
+
return props.$toUseNarrow ? '24px' : '0';
|
|
169
169
|
}, function (props) {
|
|
170
|
-
return props
|
|
170
|
+
return props.$toUseNarrow ? '0' : '-24px';
|
|
171
171
|
}, animation.step3Duration, function (props) {
|
|
172
|
-
return props
|
|
172
|
+
return props.$toUseNarrow ? animation.step3Delay : 0;
|
|
173
173
|
}, function (props) {
|
|
174
|
-
return props
|
|
174
|
+
return props.$toUseNarrow ? '24px' : '32px';
|
|
175
175
|
}, animation.step3Duration, function (props) {
|
|
176
|
-
return props
|
|
176
|
+
return props.$toUseNarrow ? animation.step3Delay : 0;
|
|
177
177
|
}, _mediaQuery["default"].tabletAndBelow(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n padding: 16px 0;\n "]))));
|
|
178
178
|
|
|
179
179
|
var StyledDivider = /*#__PURE__*/(0, _styledComponents["default"])(_divider["default"]).withConfig({
|
|
180
180
|
displayName: "header__StyledDivider",
|
|
181
181
|
componentId: "sc-1krza7i-7"
|
|
182
182
|
})(["opacity:", ";transition:opacity ", ";transition-delay:", ";"], function (props) {
|
|
183
|
-
return props
|
|
183
|
+
return props.$toUseNarrow ? '0' : '1';
|
|
184
184
|
}, animation.step2Duration, function (props) {
|
|
185
|
-
return props
|
|
185
|
+
return props.$toUseNarrow ? animation.step2Delay : 0;
|
|
186
186
|
});
|
|
187
187
|
|
|
188
188
|
var IconContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -204,11 +204,11 @@ var HamburgerContainer = /*#__PURE__*/_styledComponents["default"].div.withConfi
|
|
|
204
204
|
displayName: "header__HamburgerContainer",
|
|
205
205
|
componentId: "sc-1krza7i-11"
|
|
206
206
|
})(["z-index:", ";position:absolute;top:0;left:-", ";transition:transform 300ms ease-in-out;transform:translateX( ", " );", " ", ""], zIndex.hamburger, _hamburgerMenu.MENU_WIDTH.desktop, function (props) {
|
|
207
|
-
return props
|
|
207
|
+
return props.$showHamburger ? _hamburgerMenu.MENU_WIDTH.desktop : 0;
|
|
208
208
|
}, _mediaQuery["default"].tabletOnly(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n left: -", ";\n transform: translateX(", ");\n "])), _hamburgerMenu.MENU_WIDTH.tablet, function (props) {
|
|
209
209
|
return props.showHamburger ? _hamburgerMenu.MENU_WIDTH.tablet : 0;
|
|
210
210
|
}), _mediaQuery["default"].mobileOnly(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n left: 0;\n transform: none;\n opacity: ", ";\n "])), function (props) {
|
|
211
|
-
return props
|
|
211
|
+
return props.$showHamburger ? 1 : 0;
|
|
212
212
|
}));
|
|
213
213
|
|
|
214
214
|
var TabBarContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -220,14 +220,14 @@ var HideOnArticle = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
220
220
|
displayName: "header__HideOnArticle",
|
|
221
221
|
componentId: "sc-1krza7i-13"
|
|
222
222
|
})(["", ""], function (props) {
|
|
223
|
-
return props
|
|
223
|
+
return props.$isOnArticlePage ? 'display: none;' : '';
|
|
224
224
|
});
|
|
225
225
|
|
|
226
226
|
var PrevButton = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
227
227
|
displayName: "header__PrevButton",
|
|
228
228
|
componentId: "sc-1krza7i-14"
|
|
229
229
|
})(["", " margin-right:8px;padding:4px;transform:translateX(-8px);"], function (props) {
|
|
230
|
-
return props
|
|
230
|
+
return props.$isShow ? '' : 'display: none;';
|
|
231
231
|
});
|
|
232
232
|
|
|
233
233
|
var Header = function Header(_ref) {
|
|
@@ -322,8 +322,8 @@ var Header = function Header(_ref) {
|
|
|
322
322
|
};
|
|
323
323
|
|
|
324
324
|
var DesktopHeaderJSX = /*#__PURE__*/_react["default"].createElement(HeaderSection, null, /*#__PURE__*/_react["default"].createElement(TopRow, {
|
|
325
|
-
toUseNarrow: toUseNarrow,
|
|
326
|
-
topRowBgColor: topRowBgColor
|
|
325
|
+
$toUseNarrow: toUseNarrow,
|
|
326
|
+
$topRowBgColor: topRowBgColor
|
|
327
327
|
}, /*#__PURE__*/_react["default"].createElement(FlexGroup, null, /*#__PURE__*/_react["default"].createElement(ShowWhenNarrow, null, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
|
|
328
328
|
iconComponent: HamburgerIcon,
|
|
329
329
|
theme: theme,
|
|
@@ -332,7 +332,7 @@ var Header = function Header(_ref) {
|
|
|
332
332
|
type: logoType,
|
|
333
333
|
releaseBranch: releaseBranch
|
|
334
334
|
}))), /*#__PURE__*/_react["default"].createElement(HideWhenNarrow, null, /*#__PURE__*/_react["default"].createElement(_slogan["default"], null))), /*#__PURE__*/_react["default"].createElement(FlexGroup, null, /*#__PURE__*/_react["default"].createElement(HideWhenNarrow, null, /*#__PURE__*/_react["default"].createElement(_actionButton.DesktopHeaderAction, null)), /*#__PURE__*/_react["default"].createElement(IconContainer, null, /*#__PURE__*/_react["default"].createElement(_icons["default"], null)))), /*#__PURE__*/_react["default"].createElement(StyledDivider, {
|
|
335
|
-
toUseNarrow: toUseNarrow
|
|
335
|
+
$toUseNarrow: toUseNarrow
|
|
336
336
|
}), /*#__PURE__*/_react["default"].createElement(ChannelContainer, null, /*#__PURE__*/_react["default"].createElement(_CSSTransition["default"], {
|
|
337
337
|
"in": !toUseNarrow,
|
|
338
338
|
classNames: "channel-effect",
|
|
@@ -350,7 +350,7 @@ var Header = function Header(_ref) {
|
|
|
350
350
|
toUseNarrow: toUseNarrow,
|
|
351
351
|
topRowBgColor: topRowBgColor
|
|
352
352
|
}, /*#__PURE__*/_react["default"].createElement(FlexGroup, null, /*#__PURE__*/_react["default"].createElement(PrevButton, {
|
|
353
|
-
isShow: showPrevIcon,
|
|
353
|
+
$isShow: showPrevIcon,
|
|
354
354
|
onClick: gotoPrev
|
|
355
355
|
}, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
|
|
356
356
|
iconComponent: BackToPrevIcon,
|
|
@@ -363,13 +363,13 @@ var Header = function Header(_ref) {
|
|
|
363
363
|
return /*#__PURE__*/_react["default"].createElement(_headerContext.HamburgerContext.Provider, {
|
|
364
364
|
value: contextValue
|
|
365
365
|
}, /*#__PURE__*/_react["default"].createElement(HeaderContainer, {
|
|
366
|
-
bgColor: bgColor,
|
|
367
|
-
hideHeader: hideHeader,
|
|
368
|
-
forceShowOnMobile: showHamburger,
|
|
369
|
-
theme: theme
|
|
366
|
+
$bgColor: bgColor,
|
|
367
|
+
$hideHeader: hideHeader,
|
|
368
|
+
$forceShowOnMobile: showHamburger,
|
|
369
|
+
$theme: theme
|
|
370
370
|
}, /*#__PURE__*/_react["default"].createElement(_rwd.DesktopAndAbove, null, DesktopHeaderJSX), /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndBelow, null, MobileHeaderJSX)), /*#__PURE__*/_react["default"].createElement(HamburgerContainer, {
|
|
371
371
|
ref: ref,
|
|
372
|
-
showHamburger: showHamburger
|
|
372
|
+
$showHamburger: showHamburger
|
|
373
373
|
}, /*#__PURE__*/_react["default"].createElement(_CSSTransition["default"], {
|
|
374
374
|
"in": showHamburger,
|
|
375
375
|
classNames: "hamburger-effect",
|
|
@@ -380,7 +380,7 @@ var Header = function Header(_ref) {
|
|
|
380
380
|
},
|
|
381
381
|
unmountOnExit: true
|
|
382
382
|
}, /*#__PURE__*/_react["default"].createElement(_hamburgerMenu2["default"], null))), /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndBelow, null, /*#__PURE__*/_react["default"].createElement(HideOnArticle, {
|
|
383
|
-
isOnArticlePage: isOnArticlePage
|
|
383
|
+
$isOnArticlePage: isOnArticlePage
|
|
384
384
|
}, /*#__PURE__*/_react["default"].createElement(TabBarContainer, null, /*#__PURE__*/_react["default"].createElement(_tabBar["default"], {
|
|
385
385
|
toggleHamburger: toggleHamburger
|
|
386
386
|
})))));
|
package/lib/components/icons.js
CHANGED
|
@@ -63,7 +63,7 @@ var Container = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
63
63
|
displayName: "icons__Container",
|
|
64
64
|
componentId: "ay66zn-2"
|
|
65
65
|
})(["opacity:", ";transition:opacity 300ms ease;"], function (props) {
|
|
66
|
-
return props
|
|
66
|
+
return props.$isSearchOpened ? '0' : '1';
|
|
67
67
|
});
|
|
68
68
|
|
|
69
69
|
var LogContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
@@ -75,9 +75,9 @@ var SearchContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
75
75
|
displayName: "icons__SearchContainer",
|
|
76
76
|
componentId: "ay66zn-4"
|
|
77
77
|
})(["opacity:", ";transition:opacity 300ms ease;position:absolute;right:0;top:-8px;z-index:", ";"], function (props) {
|
|
78
|
-
return props
|
|
78
|
+
return props.$isSearchOpened ? '1' : '0';
|
|
79
79
|
}, function (props) {
|
|
80
|
-
return props
|
|
80
|
+
return props.$isSearchOpened ? 999 : -1;
|
|
81
81
|
});
|
|
82
82
|
|
|
83
83
|
var MemberButtonType = {
|
|
@@ -200,12 +200,12 @@ var SearchIcon = function SearchIcon() {
|
|
|
200
200
|
key: "search"
|
|
201
201
|
}, /*#__PURE__*/_react["default"].createElement(Container, {
|
|
202
202
|
onClick: handleClickSearch,
|
|
203
|
-
isSearchOpened: isSearchOpened
|
|
203
|
+
$isSearchOpened: isSearchOpened
|
|
204
204
|
}, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
|
|
205
205
|
iconComponent: Icon,
|
|
206
206
|
theme: theme
|
|
207
207
|
})), /*#__PURE__*/_react["default"].createElement(SearchContainer, {
|
|
208
|
-
isSearchOpened: isSearchOpened
|
|
208
|
+
$isSearchOpened: isSearchOpened
|
|
209
209
|
}, /*#__PURE__*/_react["default"].createElement(_input.SearchBar, {
|
|
210
210
|
placeholder: "\u95DC\u9375\u5B57\u641C\u5C0B",
|
|
211
211
|
theme: theme,
|
package/lib/components/slogan.js
CHANGED
|
@@ -33,7 +33,7 @@ var SloganContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
33
33
|
displayName: "slogan__SloganContainer",
|
|
34
34
|
componentId: "sc-1eoofl8-0"
|
|
35
35
|
})(["color:", ";display:flex;align-items:center;cursor:default;font-family:", ";font-weight:", ";font-size:14px;"], function (props) {
|
|
36
|
-
return props
|
|
36
|
+
return props.$color;
|
|
37
37
|
}, _fonts["default"].family.serif, _font.fontWeight.normal);
|
|
38
38
|
|
|
39
39
|
var Slogan = function Slogan(_ref) {
|
|
@@ -44,7 +44,7 @@ var Slogan = function Slogan(_ref) {
|
|
|
44
44
|
|
|
45
45
|
var color = (0, _theme.selectSloganTheme)(theme);
|
|
46
46
|
return /*#__PURE__*/_react["default"].createElement(SloganContainer, _extends({
|
|
47
|
-
color: color
|
|
47
|
+
$color: color
|
|
48
48
|
}, props), _slogan["default"]);
|
|
49
49
|
};
|
|
50
50
|
|
|
@@ -37,7 +37,7 @@ var TabBarContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
37
37
|
displayName: "tab-bar__TabBarContainer",
|
|
38
38
|
componentId: "bdt7uj-0"
|
|
39
39
|
})(["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;background-color:inherit;}"], function (props) {
|
|
40
|
-
return props
|
|
40
|
+
return props.$bgColor;
|
|
41
41
|
});
|
|
42
42
|
|
|
43
43
|
var buttonContainerCss = /*#__PURE__*/(0, _styledComponents.css)(["display:flex;justify-content:center;margin-right:8px;flex:1;&:last-child{margin-right:0;}"]);
|
|
@@ -116,8 +116,8 @@ var TabBar = function TabBar() {
|
|
|
116
116
|
var isMyReadingActive = !isHamburgerMenuOpen && pathname === '/myreading';
|
|
117
117
|
var hamburgerIconText = isHamburgerMenuOpen ? '關閉選單' : '選單';
|
|
118
118
|
return /*#__PURE__*/_react["default"].createElement(TabBarContainer, {
|
|
119
|
-
bgColor: bgColor,
|
|
120
|
-
borderColor: borderColor
|
|
119
|
+
$bgColor: bgColor,
|
|
120
|
+
$borderColor: borderColor
|
|
121
121
|
}, /*#__PURE__*/_react["default"].createElement(ButtonLinkContainer, _extends({}, home, {
|
|
122
122
|
onClick: closeHamburgerMenu
|
|
123
123
|
}), /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@twreporter/universal-header",
|
|
3
|
-
"version": "3.0.0-rc.
|
|
3
|
+
"version": "3.0.0-rc.2",
|
|
4
4
|
"description": "Universal header of TWReporter sites",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
],
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@twreporter/core": "^1.21.0-rc.
|
|
24
|
-
"@twreporter/react-components": "^9.0.0-rc.
|
|
23
|
+
"@twreporter/core": "^1.21.0-rc.3",
|
|
24
|
+
"@twreporter/react-components": "^9.0.0-rc.2",
|
|
25
25
|
"lodash": "^4.17.11",
|
|
26
26
|
"prop-types": "^15.6.2",
|
|
27
27
|
"querystring": "^0.2.0",
|
|
@@ -31,7 +31,8 @@
|
|
|
31
31
|
"react-transition-group": "^4.4.5",
|
|
32
32
|
"redux": "^4.0.1",
|
|
33
33
|
"redux-thunk": "^2.3.0",
|
|
34
|
-
"styled-components": "^
|
|
34
|
+
"styled-components": "^6.0.0",
|
|
35
|
+
"stylis": "^4.0.0"
|
|
35
36
|
},
|
|
36
37
|
"files": [
|
|
37
38
|
"lib"
|
|
@@ -51,5 +52,5 @@
|
|
|
51
52
|
"babel-loader": "^8.2.5",
|
|
52
53
|
"react-dom": "^18.2.0"
|
|
53
54
|
},
|
|
54
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "536cda99a9af7fe0d7404a8fcf8db55c762b8bb1"
|
|
55
56
|
}
|