@twreporter/react-components 8.15.0-rc.8 → 8.15.0-rc.9

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.15.0-rc.9](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.15.0-rc.8...@twreporter/react-components@8.15.0-rc.9) (2022-11-30)
+
+**Note:** Version bump only for package @twreporter/react-components
+
+
+
+
+
 # [8.15.0-rc.8](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.15.0-rc.7...@twreporter/react-components@8.15.0-rc.8) (2022-11-29)
 
 **Note:** Version bump only for package @twreporter/react-components

package/lib/bookmark-list/bookmarks.js

@@ -33,7 +33,7 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _map = _interopRequireDefault(require("lodash/map"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -52,12 +52,12 @@ var PageContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 var Column = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "bookmarks__Column",
   componentId: "sc-1m95x6z-1"
-})(["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  "]))));
+})(["margin:0 auto;width:97%;max-width:834px;", " ", ""], _mediaQuery["default"].tabletOnly(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    width: 100%;\n    max-width: 707px;\n  "]))), _mediaQuery["default"].mobileOnly(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    width: 100%;\n  "]))));
 
 var StatusBar = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "bookmarks__StatusBar",
   componentId: "sc-1m95x6z-2"
-})(["", " ", " 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  "]))));
+})(["", " padding-bottom:64px;width:stretch;"], _mediaQuery["default"].mobileOnly(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    padding-left: 1em;\n    padding-right: 1em;\n  "]))));
 
 var TitleContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "bookmarks__TitleContainer",

package/lib/listing-page/components/list.js

@@ -19,13 +19,13 @@ var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/med
 
 var _date = require("@twreporter/core/lib/utils/date");
 
-var _mockupSpec = _interopRequireDefault(require("../constants/mockup-spec"));
+var _font = require("@twreporter/core/lib/constants/font");
 
-var _listItem = _interopRequireDefault(require("./list-item"));
+var _mockupSpec = _interopRequireDefault(require("../constants/mockup-spec"));
 
-var _pageContent = _interopRequireDefault(require("./page-content"));
+var _color = _interopRequireDefault(require("../constants/color"));
 
-var _titleBar = require("../../title-bar");
+var _listItem = _interopRequireDefault(require("./list-item"));
 
 var _isFetchingWrapper = _interopRequireDefault(require("../../is-fetching-wrapper"));
 
@@ -35,7 +35,7 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _map = _interopRequireDefault(require("lodash/map"));
 
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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); }
 
@@ -71,10 +71,20 @@ var _ = {
   map: _map["default"]
 };
 
+var Container = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "list__Container",
+  componentId: "sc-1olquk4-0"
+})(["margin:45px auto 0 auto;"]);
+
+var Header = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "list__Header",
+  componentId: "sc-1olquk4-1"
+})(["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));
+
 var FlexItems = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "list__FlexItems",
-  componentId: "sc-1olquk4-0"
-})(["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  "]))));
+  componentId: "sc-1olquk4-2"
+})(["width:", "px;margin:0 auto;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(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    width: ", "px;\n  "])), _mockupSpec["default"].desktop.maxWidth), _mediaQuery["default"].tabletOnly(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    width: ", "px;\n  "])), _mockupSpec["default"].tablet.maxWidth), _mediaQuery["default"].mobileOnly(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    width: 100%;\n    > div:nth-child(odd) {\n      margin-right: 0;\n    }\n    justify-content: center;\n  "]))));
 
 var Items = (0, _isFetchingWrapper["default"])(FlexItems);
 
@@ -143,11 +153,9 @@ var List = /*#__PURE__*/function (_PureComponent) {
         }));
       });
 
-      var headerTitle = catName || tagName;
-      var headerJSX = headerTitle ? /*#__PURE__*/_react["default"].createElement(_titleBar.TitleBar, {
-        title: headerTitle !== null && headerTitle !== void 0 ? headerTitle : ''
-      }) : null;
-      return /*#__PURE__*/_react["default"].createElement(_pageContent["default"], null, headerJSX, /*#__PURE__*/_react["default"].createElement(Items, {
+      var headerTitle = catName || (tagName ? "#".concat(tagName) : '');
+      var headerJSX = headerTitle ? /*#__PURE__*/_react["default"].createElement(Header, null, headerTitle) : null;
+      return /*#__PURE__*/_react["default"].createElement(Container, null, headerJSX, /*#__PURE__*/_react["default"].createElement(Items, {
         isFetching: isFetching,
         showSpinner: showSpinner
       }, listJSX));

package/lib/listing-page/components/topics/index.js

@@ -19,7 +19,7 @@ var _postItem = _interopRequireDefault(require("./post-item"));
 
 var _topicItem = _interopRequireDefault(require("./topic-item"));
 
-var _pageContent = _interopRequireDefault(require("../page-content"));
+var _pageContent = _interopRequireDefault(require("./page-content"));
 
 var _section = require("./section");
 
@@ -29,8 +29,6 @@ var _color = _interopRequireDefault(require("../../constants/color"));
 
 var _font = require("@twreporter/core/lib/constants/font");
 
-var _titleBar = require("@twreporter/react-components/lib/title-bar");
-
 var _get = _interopRequireDefault(require("lodash/get"));
 
 var _map = _interopRequireDefault(require("lodash/map"));
@@ -73,8 +71,6 @@ var NoData = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "sc-1n6udj1-0"
 })(["width:100%;font-size:16px;color:", ";font-weight:", ";text-align:center;"], _color["default"].darkGray, _font.fontWeight.normal);
 
-var topicTitleText = '深度專題';
-
 var Topics = /*#__PURE__*/function (_Component) {
   _inherits(Topics, _Component);
 
@@ -168,11 +164,9 @@ var Topics = /*#__PURE__*/function (_Component) {
 
         topTopicName = _.get(topics, [0, 'topic_name'], '');
         topicUrl = _.get(topics, [0, 'linkTo'], '');
-        topSectionJSX = [/*#__PURE__*/_react["default"].createElement(_titleBar.TitleBar, {
-          key: "top-title",
-          title: topicTitleText,
-          subtitle: _topics.TEXT.SECTION_TITLE_FEATURED
-        }), /*#__PURE__*/_react["default"].createElement(_section.TopSectionContent, {
+        topSectionJSX = [/*#__PURE__*/_react["default"].createElement(_section.SectionTitle, {
+          key: "top-title"
+        }, _topics.TEXT.SECTION_TITLE_FEATURED), /*#__PURE__*/_react["default"].createElement(_section.TopSectionContent, {
           key: "top-section",
           topicName: topTopicName,
           topicUrl: topicUrl
@@ -182,10 +176,7 @@ var Topics = /*#__PURE__*/function (_Component) {
       }
 
       var WrappedListSectionContent = (0, _isFetchingWrapper["default"])( /*#__PURE__*/_react["default"].createElement(_section.ListSectionContent, null, listedTopicsJSX));
-      return /*#__PURE__*/_react["default"].createElement(_pageContent["default"], null, topSectionJSX, isFetching && isFirstPage ? null : /*#__PURE__*/_react["default"].createElement(_titleBar.TitleBar, {
-        title: topicTitleText,
-        subtitle: _topics.TEXT.SECTION_TITLE_OTHERS
-      }), /*#__PURE__*/_react["default"].createElement(WrappedListSectionContent, {
+      return /*#__PURE__*/_react["default"].createElement(_pageContent["default"], null, topSectionJSX, isFetching && isFirstPage ? null : /*#__PURE__*/_react["default"].createElement(_section.SectionTitle, null, _topics.TEXT.SECTION_TITLE_OTHERS), /*#__PURE__*/_react["default"].createElement(WrappedListSectionContent, {
         isFetching: isFetching,
         showSpinner: showSpinner
       }));

package/lib/listing-page/components/{page-content.js → topics/page-content.js}

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _predefinedCss = require("../constants/predefined-css");
+var _predefinedCss = require("../../constants/predefined-css");
 
 var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
 
@@ -23,9 +23,9 @@ var styles = {
     // px
     mobile: 95,
     // %
-    tablet: 698,
+    tablet: 700,
     // px
-    desktop: 922 // px
+    desktop: 870 // px
 
   },
   titlePadding: 0,
@@ -37,7 +37,7 @@ var styles = {
 
 var PageContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "page-content__PageContent",
-  componentId: "sc-10tix5l-0"
+  componentId: "sc-1x8tj4h-0"
 })(["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);
 
 var _default = PageContent;

package/lib/listing-page/components/topics/section.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ListSectionContent = exports.TopSectionContent = void 0;
+exports.SectionTitle = exports.ListSectionContent = exports.TopSectionContent = void 0;
 
 var _reactRouterDom = require("react-router-dom");
 
@@ -50,14 +50,13 @@ var styles = {
   goToTopicMargin: [20, 'auto', 0, 'auto'],
   goToTopicPadding: [14, 0, 14, 0],
   sectionMargin: {
-    mobile: [24, 0, 36, 0],
-    tablet: [32, 0, 64, 0],
-    desktop: [64, 0, 64, 0]
+    mobile: [0, 0, 35, 0],
+    tablet: [0, 0, 42, 0],
+    desktop: [0, 0, 60, 0]
   },
   titleMargin: {
     mobile: [0, 0, 24, 0],
-    tablet: [0, 0, 32, 0],
-    desktop: [0, 0, 64, 0]
+    tablet: [0, 0, 42, 0]
   },
   titlePadding: [16, 0, 16, 0]
 };
@@ -66,14 +65,21 @@ var StyledLink = /*#__PURE__*/(0, _styledComponents["default"])(_reactRouterDom.
   componentId: "sc-125nvxn-0"
 })(["", " display:block;margin:", ";"], _predefinedCss.resetLinkStyle, (0, _css.arrayToCssShorthand)(styles.goToTopicMargin));
 
+var SectionTitle = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "section__SectionTitle",
+  componentId: "sc-125nvxn-1"
+})(["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)));
+
+exports.SectionTitle = SectionTitle;
+
 var SectionContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "section__SectionContent",
-  componentId: "sc-125nvxn-1"
-})(["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)));
+  componentId: "sc-125nvxn-2"
+})(["width:100%;margin:", ";", " ", ""], (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)));
 
 var GoToTopic = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "section__GoToTopic",
-  componentId: "sc-125nvxn-2"
+  componentId: "sc-125nvxn-3"
 })(["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);
 
 var TopSectionContent = function TopSectionContent(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-components",
-  "version": "8.15.0-rc.8",
+  "version": "8.15.0-rc.9",
   "main": "lib/index.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
   "author": "twreporter <developer@twreporter.org>",
@@ -44,5 +44,5 @@
     "babel-loader": "^8.2.4",
     "chromatic": "^6.5.4"
   },
-  "gitHead": "6cf08259d9965b896761da96342763481d167b14"
+  "gitHead": "27fdc99343bb0eb42e6afff0b1538c8eb3b5dfca"
 }