@twreporter/react-components 8.15.0-rc.5 → 8.15.0-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 +36 -0
- package/lib/bookmark-list/bookmarks.js +3 -3
- package/lib/input/components/search-bar.js +14 -4
- package/lib/input/constants/type.js +20 -0
- package/lib/input/stories/search-bar.stories.js +5 -1
- package/lib/listing-page/components/list.js +12 -20
- package/lib/listing-page/components/{topics/page-content.js → page-content.js} +4 -4
- package/lib/listing-page/components/topics/index.js +14 -5
- package/lib/listing-page/components/topics/section.js +9 -15
- package/lib/rwd.js +51 -0
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,42 @@
|
|
|
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
|
+
# [8.15.0-rc.7](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.15.0-rc.6...@twreporter/react-components@8.15.0-rc.7) (2022-11-25)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add title bar to topic & refine style ([70bb908](https://github.com/twreporter/twreporter-npm-packages/commit/70bb908caca7a6e488cc714d842db0d322d4fe7f))
|
|
12
|
+
* fix bookmark status bar style ([e26e9d1](https://github.com/twreporter/twreporter-npm-packages/commit/e26e9d1f73ecd5692625a6ea3002721e905604ea))
|
|
13
|
+
* fix bookmark title style ([1359c67](https://github.com/twreporter/twreporter-npm-packages/commit/1359c6788e716cf43cba474b1d8f3142ed9c7f88))
|
|
14
|
+
* fix bookmark width ([5887126](https://github.com/twreporter/twreporter-npm-packages/commit/588712652c7b3130ea2d535312fb7fc3a792740b))
|
|
15
|
+
* fix topic content margin ([1c3aa52](https://github.com/twreporter/twreporter-npm-packages/commit/1c3aa52dbe4b123012f8bc5fd9b1a48f15e056d8))
|
|
16
|
+
* fix topic page content width ([4e07fbb](https://github.com/twreporter/twreporter-npm-packages/commit/4e07fbb5bf6018a82494dfe511f0ce70c017dac8))
|
|
17
|
+
* fix topic title margin ([5f85e69](https://github.com/twreporter/twreporter-npm-packages/commit/5f85e69ce3968828ff8ba3d7061e0200c99a0e3c))
|
|
18
|
+
* refine tag page style ([62265b8](https://github.com/twreporter/twreporter-npm-packages/commit/62265b85cb4df93d69f876ff0cf2989601b238ba))
|
|
19
|
+
* refine tag page style ([b9b3676](https://github.com/twreporter/twreporter-npm-packages/commit/b9b3676478c2aa8720b96c7e8affa30d515b2969))
|
|
20
|
+
* remove unused import ([fff1a13](https://github.com/twreporter/twreporter-npm-packages/commit/fff1a13212c11fb2ac40935486942709096bac24))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
# [8.15.0-rc.6](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.15.0-rc.5...@twreporter/react-components@8.15.0-rc.6) (2022-11-25)
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
### Bug Fixes
|
|
30
|
+
|
|
31
|
+
* add constants file to manage prop types ([4841e86](https://github.com/twreporter/twreporter-npm-packages/commit/4841e868cad52cfd2168f0c146de30950e27c996))
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
### Features
|
|
35
|
+
|
|
36
|
+
* add mobile & tablet view for new info structure ([b0e158c](https://github.com/twreporter/twreporter-npm-packages/commit/b0e158c751230723626c9cb9de83641f0588c189))
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
6
42
|
# [8.15.0-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.15.0-rc.4...@twreporter/react-components@8.15.0-rc.5) (2022-11-07)
|
|
7
43
|
|
|
8
44
|
|
|
@@ -33,7 +33,7 @@ var _get = _interopRequireDefault(require("lodash/get"));
|
|
|
33
33
|
|
|
34
34
|
var _map = _interopRequireDefault(require("lodash/map"));
|
|
35
35
|
|
|
36
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
|
|
36
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
|
|
37
37
|
|
|
38
38
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
39
39
|
|
|
@@ -52,12 +52,12 @@ var PageContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
52
52
|
var Column = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
53
53
|
displayName: "bookmarks__Column",
|
|
54
54
|
componentId: "sc-1m95x6z-1"
|
|
55
|
-
})(["margin:0 auto;width:97%;max-width:
|
|
55
|
+
})(["margin:0 auto;width:97%;max-width:922px;", " ", ""], _mediaQuery["default"].tabletOnly(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n width: 100%;\n max-width: 698px;\n "]))), _mediaQuery["default"].mobileOnly(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n width: 100%;\n "]))));
|
|
56
56
|
|
|
57
57
|
var StatusBar = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
58
58
|
displayName: "bookmarks__StatusBar",
|
|
59
59
|
componentId: "sc-1m95x6z-2"
|
|
60
|
-
})(["", " padding-bottom:64px;width:stretch;"], _mediaQuery["default"].mobileOnly(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n padding-left:
|
|
60
|
+
})(["", " ", " padding-bottom:64px;width:stretch;"], _mediaQuery["default"].mobileOnly(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n padding-left: 24px;\n padding-right: 24px;\n padding-bottom: 24px;\n "]))), _mediaQuery["default"].tabletOnly(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n padding-bottom: 32px;\n "]))));
|
|
61
61
|
|
|
62
62
|
var TitleContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
63
63
|
displayName: "bookmarks__TitleContainer",
|
|
@@ -15,6 +15,8 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
|
15
15
|
|
|
16
16
|
var _theme = require("../utils/theme");
|
|
17
17
|
|
|
18
|
+
var _type = require("../constants/type");
|
|
19
|
+
|
|
18
20
|
var _icon = require("../../icon");
|
|
19
21
|
|
|
20
22
|
var _button = require("../../button");
|
|
@@ -27,7 +29,7 @@ var _theme2 = require("@twreporter/core/lib/constants/theme");
|
|
|
27
29
|
|
|
28
30
|
var _get = _interopRequireDefault(require("lodash/get"));
|
|
29
31
|
|
|
30
|
-
var _excluded = ["placeholder", "theme", "releaseBranch", "onSearch", "onClose", "handleBlur", "autofocus"];
|
|
32
|
+
var _excluded = ["placeholder", "theme", "releaseBranch", "onSearch", "onClose", "handleBlur", "autofocus", "widthType"];
|
|
31
33
|
|
|
32
34
|
var _templateObject, _templateObject2;
|
|
33
35
|
|
|
@@ -71,8 +73,12 @@ var InputContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
71
73
|
var Container = /*#__PURE__*/_styledComponents["default"].form.withConfig({
|
|
72
74
|
displayName: "search-bar__Container",
|
|
73
75
|
componentId: "sc-1mjh7mz-1"
|
|
74
|
-
})(["display:flex;align-items:center;", "{", " ", "}"
|
|
76
|
+
})(["display:flex;align-items:center;", " ", "{", " &,& > input{", "}", "}"], function (props) {
|
|
77
|
+
return props.widthType === 'stretch' ? 'width: 100%;' : '';
|
|
78
|
+
}, InputContainer, function (props) {
|
|
75
79
|
return props.focus ? "\n background-color: ".concat(props.focusBgColor, ";\n border: 1px solid ").concat(props.borderColor, ";\n ") : '';
|
|
80
|
+
}, function (props) {
|
|
81
|
+
return props.widthType === 'stretch' ? 'width: 100%;' : '';
|
|
76
82
|
}, _mediaQuery["default"].desktopAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n ", "\n "])), function (props) {
|
|
77
83
|
return props.focus ? "\n background-color: ".concat(props.desktopBgColor, ";\n ") : '';
|
|
78
84
|
}));
|
|
@@ -110,6 +116,8 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
110
116
|
handleBlur = _ref$handleBlur === void 0 ? defaultFunc : _ref$handleBlur,
|
|
111
117
|
_ref$autofocus = _ref.autofocus,
|
|
112
118
|
autofocus = _ref$autofocus === void 0 ? true : _ref$autofocus,
|
|
119
|
+
_ref$widthType = _ref.widthType,
|
|
120
|
+
widthType = _ref$widthType === void 0 ? _type.WIDTH_TYPE.fit : _ref$widthType,
|
|
113
121
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
114
122
|
|
|
115
123
|
var _useState = (0, _react.useState)(''),
|
|
@@ -174,7 +182,8 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
174
182
|
focus: focus,
|
|
175
183
|
focusBgColor: focusBgColor,
|
|
176
184
|
desktopBgColor: desktopBgColor,
|
|
177
|
-
borderColor: borderColor
|
|
185
|
+
borderColor: borderColor,
|
|
186
|
+
widthType: widthType
|
|
178
187
|
}, props), /*#__PURE__*/_react["default"].createElement(InputContainer, {
|
|
179
188
|
bgColor: bgColor
|
|
180
189
|
}, /*#__PURE__*/_react["default"].createElement(Input, {
|
|
@@ -205,7 +214,8 @@ SearchBar.propTypes = {
|
|
|
205
214
|
onSearch: _propTypes["default"].func,
|
|
206
215
|
onClose: _propTypes["default"].func,
|
|
207
216
|
handleBlur: _propTypes["default"].func,
|
|
208
|
-
autofocus: _propTypes["default"].bool
|
|
217
|
+
autofocus: _propTypes["default"].bool,
|
|
218
|
+
widthType: _type.WIDTH_PROP_TYPE
|
|
209
219
|
};
|
|
210
220
|
var _default = SearchBar;
|
|
211
221
|
exports["default"] = _default;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.WIDTH_PROP_TYPE = exports.WIDTH_TYPE = void 0;
|
|
7
|
+
|
|
8
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
+
|
|
10
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
11
|
+
|
|
12
|
+
var WIDTH_TYPE = {
|
|
13
|
+
fit: 'fit',
|
|
14
|
+
stretch: 'stretch'
|
|
15
|
+
};
|
|
16
|
+
exports.WIDTH_TYPE = WIDTH_TYPE;
|
|
17
|
+
|
|
18
|
+
var WIDTH_PROP_TYPE = _propTypes["default"].oneOf([WIDTH_TYPE.fit, WIDTH_TYPE.stretch]);
|
|
19
|
+
|
|
20
|
+
exports.WIDTH_PROP_TYPE = WIDTH_PROP_TYPE;
|
|
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _searchBar = _interopRequireDefault(require("../components/search-bar"));
|
|
11
11
|
|
|
12
|
+
var _type = require("../constants/type");
|
|
13
|
+
|
|
12
14
|
var _releaseBranch = require("@twreporter/core/lib/constants/release-branch");
|
|
13
15
|
|
|
14
16
|
var _theme = require("@twreporter/core/lib/constants/theme");
|
|
@@ -48,5 +50,7 @@ searchBar.args = {
|
|
|
48
50
|
theme: _theme.THEME.normal,
|
|
49
51
|
releaseBranch: _releaseBranch.BRANCH.master,
|
|
50
52
|
onSearch: onSearch,
|
|
51
|
-
onClose: onClose
|
|
53
|
+
onClose: onClose,
|
|
54
|
+
autofocus: false,
|
|
55
|
+
widthType: _type.WIDTH_TYPE.fit
|
|
52
56
|
};
|
|
@@ -19,14 +19,14 @@ var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/med
|
|
|
19
19
|
|
|
20
20
|
var _date = require("@twreporter/core/lib/utils/date");
|
|
21
21
|
|
|
22
|
-
var _font = require("@twreporter/core/lib/constants/font");
|
|
23
|
-
|
|
24
22
|
var _mockupSpec = _interopRequireDefault(require("../constants/mockup-spec"));
|
|
25
23
|
|
|
26
|
-
var _color = _interopRequireDefault(require("../constants/color"));
|
|
27
|
-
|
|
28
24
|
var _listItem = _interopRequireDefault(require("./list-item"));
|
|
29
25
|
|
|
26
|
+
var _pageContent = _interopRequireDefault(require("./page-content"));
|
|
27
|
+
|
|
28
|
+
var _titleBar = require("../../title-bar");
|
|
29
|
+
|
|
30
30
|
var _isFetchingWrapper = _interopRequireDefault(require("../../is-fetching-wrapper"));
|
|
31
31
|
|
|
32
32
|
var _forEach = _interopRequireDefault(require("lodash/forEach"));
|
|
@@ -35,7 +35,7 @@ var _get = _interopRequireDefault(require("lodash/get"));
|
|
|
35
35
|
|
|
36
36
|
var _map = _interopRequireDefault(require("lodash/map"));
|
|
37
37
|
|
|
38
|
-
var _templateObject, _templateObject2, _templateObject3
|
|
38
|
+
var _templateObject, _templateObject2, _templateObject3;
|
|
39
39
|
|
|
40
40
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
41
41
|
|
|
@@ -71,20 +71,10 @@ var _ = {
|
|
|
71
71
|
map: _map["default"]
|
|
72
72
|
};
|
|
73
73
|
|
|
74
|
-
var Container = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
75
|
-
displayName: "list__Container",
|
|
76
|
-
componentId: "sc-1olquk4-0"
|
|
77
|
-
})(["margin:45px auto 0 auto;"]);
|
|
78
|
-
|
|
79
|
-
var Header = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
80
|
-
displayName: "list__Header",
|
|
81
|
-
componentId: "sc-1olquk4-1"
|
|
82
|
-
})(["font-size:36px;font-weight:", ";color:", ";margin:0 auto 45px auto;text-align:center;", ""], _font.fontWeight.bold, _color["default"].darkDarkGray, _mediaQuery["default"].mobileOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: ", "%;\n text-align: left;\n "])), _mockupSpec["default"].mobile.cardWidth / _mockupSpec["default"].mobile.maxWidth * 100));
|
|
83
|
-
|
|
84
74
|
var FlexItems = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
85
75
|
displayName: "list__FlexItems",
|
|
86
|
-
componentId: "sc-1olquk4-
|
|
87
|
-
})(["width:", "px;margin:
|
|
76
|
+
componentId: "sc-1olquk4-0"
|
|
77
|
+
})(["width:", "px;margin:64px auto 0;display:flex;justify-content:flex-start;align-items:flex-start;flex-wrap:wrap;> div:nth-child(odd){margin-right:", "px;}", " ", " ", ""], _mockupSpec["default"].hd.maxWidth, _mockupSpec["default"].marginBetweenItems, _mediaQuery["default"].desktopOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: ", "px;\n "])), _mockupSpec["default"].desktop.maxWidth), _mediaQuery["default"].tabletOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: ", "px;\n margin-top: 32px;\n "])), _mockupSpec["default"].tablet.maxWidth), _mediaQuery["default"].mobileOnly(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n width: 100%;\n margin-top: 24px;\n > div:nth-child(odd) {\n margin-right: 0;\n }\n justify-content: center;\n "]))));
|
|
88
78
|
|
|
89
79
|
var Items = (0, _isFetchingWrapper["default"])(FlexItems);
|
|
90
80
|
|
|
@@ -153,9 +143,11 @@ var List = /*#__PURE__*/function (_PureComponent) {
|
|
|
153
143
|
}));
|
|
154
144
|
});
|
|
155
145
|
|
|
156
|
-
var headerTitle = catName ||
|
|
157
|
-
var headerJSX = headerTitle ? /*#__PURE__*/_react["default"].createElement(
|
|
158
|
-
|
|
146
|
+
var headerTitle = catName || tagName;
|
|
147
|
+
var headerJSX = headerTitle ? /*#__PURE__*/_react["default"].createElement(_titleBar.TitleBar, {
|
|
148
|
+
title: headerTitle !== null && headerTitle !== void 0 ? headerTitle : ''
|
|
149
|
+
}) : null;
|
|
150
|
+
return /*#__PURE__*/_react["default"].createElement(_pageContent["default"], null, headerJSX, /*#__PURE__*/_react["default"].createElement(Items, {
|
|
159
151
|
isFetching: isFetching,
|
|
160
152
|
showSpinner: showSpinner
|
|
161
153
|
}, listJSX));
|
|
@@ -7,7 +7,7 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
9
9
|
|
|
10
|
-
var _predefinedCss = require("
|
|
10
|
+
var _predefinedCss = require("../constants/predefined-css");
|
|
11
11
|
|
|
12
12
|
var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
|
|
13
13
|
|
|
@@ -23,9 +23,9 @@ var styles = {
|
|
|
23
23
|
// px
|
|
24
24
|
mobile: 95,
|
|
25
25
|
// %
|
|
26
|
-
tablet:
|
|
26
|
+
tablet: 698,
|
|
27
27
|
// px
|
|
28
|
-
desktop:
|
|
28
|
+
desktop: 922 // px
|
|
29
29
|
|
|
30
30
|
},
|
|
31
31
|
titlePadding: 0,
|
|
@@ -37,7 +37,7 @@ var styles = {
|
|
|
37
37
|
|
|
38
38
|
var PageContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
39
39
|
displayName: "page-content__PageContent",
|
|
40
|
-
componentId: "sc-
|
|
40
|
+
componentId: "sc-10tix5l-0"
|
|
41
41
|
})(["min-width:", "px;width:", "%;", " ", " margin:0 auto;", ""], styles.contentWidth.min, styles.contentWidth.mobile, _mediaQuery["default"].tabletOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: ", "px;\n "])), styles.contentWidth.tablet), _mediaQuery["default"].desktopAndAbove(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: ", "px;\n "])), styles.contentWidth.desktop), _predefinedCss.resetLinkStyle);
|
|
42
42
|
|
|
43
43
|
var _default = PageContent;
|
|
@@ -19,7 +19,7 @@ var _postItem = _interopRequireDefault(require("./post-item"));
|
|
|
19
19
|
|
|
20
20
|
var _topicItem = _interopRequireDefault(require("./topic-item"));
|
|
21
21
|
|
|
22
|
-
var _pageContent = _interopRequireDefault(require("
|
|
22
|
+
var _pageContent = _interopRequireDefault(require("../page-content"));
|
|
23
23
|
|
|
24
24
|
var _section = require("./section");
|
|
25
25
|
|
|
@@ -29,6 +29,8 @@ var _color = _interopRequireDefault(require("../../constants/color"));
|
|
|
29
29
|
|
|
30
30
|
var _font = require("@twreporter/core/lib/constants/font");
|
|
31
31
|
|
|
32
|
+
var _titleBar = require("@twreporter/react-components/lib/title-bar");
|
|
33
|
+
|
|
32
34
|
var _get = _interopRequireDefault(require("lodash/get"));
|
|
33
35
|
|
|
34
36
|
var _map = _interopRequireDefault(require("lodash/map"));
|
|
@@ -71,6 +73,8 @@ var NoData = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
|
71
73
|
componentId: "sc-1n6udj1-0"
|
|
72
74
|
})(["width:100%;font-size:16px;color:", ";font-weight:", ";text-align:center;"], _color["default"].darkGray, _font.fontWeight.normal);
|
|
73
75
|
|
|
76
|
+
var topicTitleText = '深度專題';
|
|
77
|
+
|
|
74
78
|
var Topics = /*#__PURE__*/function (_Component) {
|
|
75
79
|
_inherits(Topics, _Component);
|
|
76
80
|
|
|
@@ -164,9 +168,11 @@ var Topics = /*#__PURE__*/function (_Component) {
|
|
|
164
168
|
|
|
165
169
|
topTopicName = _.get(topics, [0, 'topic_name'], '');
|
|
166
170
|
topicUrl = _.get(topics, [0, 'linkTo'], '');
|
|
167
|
-
topSectionJSX = [/*#__PURE__*/_react["default"].createElement(
|
|
168
|
-
key: "top-title"
|
|
169
|
-
|
|
171
|
+
topSectionJSX = [/*#__PURE__*/_react["default"].createElement(_titleBar.TitleBar, {
|
|
172
|
+
key: "top-title",
|
|
173
|
+
title: topicTitleText,
|
|
174
|
+
subtitle: _topics.TEXT.SECTION_TITLE_FEATURED
|
|
175
|
+
}), /*#__PURE__*/_react["default"].createElement(_section.TopSectionContent, {
|
|
170
176
|
key: "top-section",
|
|
171
177
|
topicName: topTopicName,
|
|
172
178
|
topicUrl: topicUrl
|
|
@@ -176,7 +182,10 @@ var Topics = /*#__PURE__*/function (_Component) {
|
|
|
176
182
|
}
|
|
177
183
|
|
|
178
184
|
var WrappedListSectionContent = (0, _isFetchingWrapper["default"])( /*#__PURE__*/_react["default"].createElement(_section.ListSectionContent, null, listedTopicsJSX));
|
|
179
|
-
return /*#__PURE__*/_react["default"].createElement(_pageContent["default"], null, topSectionJSX, isFetching && isFirstPage ? null : /*#__PURE__*/_react["default"].createElement(
|
|
185
|
+
return /*#__PURE__*/_react["default"].createElement(_pageContent["default"], null, topSectionJSX, isFetching && isFirstPage ? null : /*#__PURE__*/_react["default"].createElement(_titleBar.TitleBar, {
|
|
186
|
+
title: topicTitleText,
|
|
187
|
+
subtitle: _topics.TEXT.SECTION_TITLE_OTHERS
|
|
188
|
+
}), /*#__PURE__*/_react["default"].createElement(WrappedListSectionContent, {
|
|
180
189
|
isFetching: isFetching,
|
|
181
190
|
showSpinner: showSpinner
|
|
182
191
|
}));
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.ListSectionContent = exports.TopSectionContent = void 0;
|
|
7
7
|
|
|
8
8
|
var _reactRouterDom = require("react-router-dom");
|
|
9
9
|
|
|
@@ -50,13 +50,14 @@ var styles = {
|
|
|
50
50
|
goToTopicMargin: [20, 'auto', 0, 'auto'],
|
|
51
51
|
goToTopicPadding: [14, 0, 14, 0],
|
|
52
52
|
sectionMargin: {
|
|
53
|
-
mobile: [
|
|
54
|
-
tablet: [
|
|
55
|
-
desktop: [
|
|
53
|
+
mobile: [24, 0, 36, 0],
|
|
54
|
+
tablet: [32, 0, 64, 0],
|
|
55
|
+
desktop: [64, 0, 64, 0]
|
|
56
56
|
},
|
|
57
57
|
titleMargin: {
|
|
58
58
|
mobile: [0, 0, 24, 0],
|
|
59
|
-
tablet: [0, 0,
|
|
59
|
+
tablet: [0, 0, 32, 0],
|
|
60
|
+
desktop: [0, 0, 64, 0]
|
|
60
61
|
},
|
|
61
62
|
titlePadding: [16, 0, 16, 0]
|
|
62
63
|
};
|
|
@@ -65,21 +66,14 @@ var StyledLink = /*#__PURE__*/(0, _styledComponents["default"])(_reactRouterDom.
|
|
|
65
66
|
componentId: "sc-125nvxn-0"
|
|
66
67
|
})(["", " display:block;margin:", ";"], _predefinedCss.resetLinkStyle, (0, _css.arrayToCssShorthand)(styles.goToTopicMargin));
|
|
67
68
|
|
|
68
|
-
var SectionTitle = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
69
|
-
displayName: "section__SectionTitle",
|
|
70
|
-
componentId: "sc-125nvxn-1"
|
|
71
|
-
})(["width:100%;border-bottom:2px solid ", ";padding:", ";color:", ";font-size:18px;font-weight:", ";line-height:1;margin:", ";", ""], _color["default"].gray, (0, _css.arrayToCssShorthand)(styles.titlePadding), _color["default"].darkGray, _font.fontWeight.bold, (0, _css.arrayToCssShorthand)(styles.titleMargin.mobile), _mediaQuery["default"].tabletAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n margin: ", ";\n "])), (0, _css.arrayToCssShorthand)(styles.titleMargin.tablet)));
|
|
72
|
-
|
|
73
|
-
exports.SectionTitle = SectionTitle;
|
|
74
|
-
|
|
75
69
|
var SectionContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
76
70
|
displayName: "section__SectionContent",
|
|
77
|
-
componentId: "sc-125nvxn-
|
|
78
|
-
})(["width:100%;
|
|
71
|
+
componentId: "sc-125nvxn-1"
|
|
72
|
+
})(["width:100%;", " ", " ", ""], _mediaQuery["default"].mobileOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n margin: ", ";\n "])), (0, _css.arrayToCssShorthand)(styles.sectionMargin.mobile)), _mediaQuery["default"].tabletOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n margin: ", ";\n "])), (0, _css.arrayToCssShorthand)(styles.sectionMargin.tablet)), _mediaQuery["default"].desktopAndAbove(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n margin: ", ";\n "])), (0, _css.arrayToCssShorthand)(styles.sectionMargin.desktop)));
|
|
79
73
|
|
|
80
74
|
var GoToTopic = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
81
75
|
displayName: "section__GoToTopic",
|
|
82
|
-
componentId: "sc-125nvxn-
|
|
76
|
+
componentId: "sc-125nvxn-2"
|
|
83
77
|
})(["color:", ";text-align:center;line-height:1;padding:", ";span{display:inline-block;max-width:400px;", " white-space:nowrap;overflow:hidden;text-overflow:ellipsis;letter-spacing:0.1px;font-size:16px;font-weight:", ";}svg{height:16px;vertical-align:baseline;margin-left:0.5em;}"], _color["default"].blue, (0, _css.arrayToCssShorthand)(styles.goToTopicPadding), _mediaQuery["default"].mobileOnly(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n max-width: 290px;\n "]))), _font.fontWeight.normal);
|
|
84
78
|
|
|
85
79
|
var TopSectionContent = function TopSectionContent(props) {
|
package/lib/rwd.js
ADDED
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.TabletAndAbove = exports.TabletAndBelow = exports.DesktopAndAbove = exports.MobileOnly = exports.DesktopOnly = void 0;
|
|
7
|
+
|
|
8
|
+
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
9
|
+
|
|
10
|
+
var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
|
|
11
|
+
|
|
12
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
|
|
13
|
+
|
|
14
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
15
|
+
|
|
16
|
+
function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
|
|
17
|
+
|
|
18
|
+
var DesktopOnly = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
19
|
+
displayName: "rwd__DesktopOnly",
|
|
20
|
+
componentId: "gntj1s-0"
|
|
21
|
+
})(["display:none;", ""], _mediaQuery["default"].desktopOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n display: block;\n "]))));
|
|
22
|
+
|
|
23
|
+
exports.DesktopOnly = DesktopOnly;
|
|
24
|
+
|
|
25
|
+
var MobileOnly = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
26
|
+
displayName: "rwd__MobileOnly",
|
|
27
|
+
componentId: "gntj1s-1"
|
|
28
|
+
})(["display:none;", ""], _mediaQuery["default"].mobileOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n display: block;\n "]))));
|
|
29
|
+
|
|
30
|
+
exports.MobileOnly = MobileOnly;
|
|
31
|
+
|
|
32
|
+
var DesktopAndAbove = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
33
|
+
displayName: "rwd__DesktopAndAbove",
|
|
34
|
+
componentId: "gntj1s-2"
|
|
35
|
+
})(["display:none;", ""], _mediaQuery["default"].desktopAndAbove(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n display: block;\n "]))));
|
|
36
|
+
|
|
37
|
+
exports.DesktopAndAbove = DesktopAndAbove;
|
|
38
|
+
|
|
39
|
+
var TabletAndBelow = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
40
|
+
displayName: "rwd__TabletAndBelow",
|
|
41
|
+
componentId: "gntj1s-3"
|
|
42
|
+
})(["display:none;", ""], _mediaQuery["default"].tabletAndBelow(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n display: block;\n "]))));
|
|
43
|
+
|
|
44
|
+
exports.TabletAndBelow = TabletAndBelow;
|
|
45
|
+
|
|
46
|
+
var TabletAndAbove = /*#__PURE__*/_styledComponents["default"].div.withConfig({
|
|
47
|
+
displayName: "rwd__TabletAndAbove",
|
|
48
|
+
componentId: "gntj1s-4"
|
|
49
|
+
})(["display:none;", ""], _mediaQuery["default"].tabletAndAbove(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n display: block;\n "]))));
|
|
50
|
+
|
|
51
|
+
exports.TabletAndAbove = TabletAndAbove;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@twreporter/react-components",
|
|
3
|
-
"version": "8.15.0-rc.
|
|
3
|
+
"version": "8.15.0-rc.7",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"repository": "https://github.com/twreporter/twreporter-npm-packages.git",
|
|
6
6
|
"author": "twreporter <developer@twreporter.org>",
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"babel-loader": "^8.2.4",
|
|
45
45
|
"chromatic": "^6.5.4"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "cbe1101c3a42d3869970fafb01cc40776ab0d2d2"
|
|
48
48
|
}
|