@twreporter/universal-header 2.12.1 → 2.12.2-rc.0

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.
 
+## [2.12.2-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.12.1...@twreporter/universal-header@2.12.2-rc.0) (2024-04-17)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
 ## [2.12.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.12.1-rc.1...@twreporter/universal-header@2.12.1) (2024-04-08)
 
 **Note:** Version bump only for package @twreporter/universal-header

package/lib/components/hamburger-menu.js

@@ -51,10 +51,6 @@ var _rwd = require("@twreporter/react-components/lib/rwd");
 
 var _hamburgerFooter = _interopRequireDefault(require("./hamburger-footer"));
 
-var _hamburgerFooterOld = _interopRequireDefault(require("./hamburger-footer-old"));
-
-var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
-
 var _map = _interopRequireDefault(require("lodash/map"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
@@ -81,7 +77,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var Footer = _featureFlag.MY_READING ? _hamburgerFooter["default"] : _hamburgerFooterOld["default"];
 var _ = {
   map: _map["default"]
 }; // global var
@@ -382,7 +377,7 @@ var HamburgerMenu = function HamburgerMenu(_ref2) {
     autofocus: false,
     widthType: "stretch",
     placeholder: "\u95DC\u9375\u5B57\u641C\u5C0B"
-  })), /*#__PURE__*/_react["default"].createElement(Content, null), /*#__PURE__*/_react["default"].createElement(Footer, null), /*#__PURE__*/_react["default"].createElement(ActionSection, null, /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndAbove, null, /*#__PURE__*/_react["default"].createElement(_actionButton.DesktopHamburgerAction, null)), /*#__PURE__*/_react["default"].createElement(_rwd.MobileOnly, null, /*#__PURE__*/_react["default"].createElement(StyledMobileHamburgerAction, null))));
+  })), /*#__PURE__*/_react["default"].createElement(Content, null), /*#__PURE__*/_react["default"].createElement(_hamburgerFooter["default"], null), /*#__PURE__*/_react["default"].createElement(ActionSection, null, /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndAbove, null, /*#__PURE__*/_react["default"].createElement(_actionButton.DesktopHamburgerAction, null)), /*#__PURE__*/_react["default"].createElement(_rwd.MobileOnly, null, /*#__PURE__*/_react["default"].createElement(StyledMobileHamburgerAction, null))));
 };
 
 var _default = HamburgerMenu;

package/lib/constants/footer.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MEMBER_ORDER = exports.FOOTER_PATH = exports.FOOTER_ORDER = exports.FOOTER_LABEL = exports.FOOTER_KEY = exports.FOOTER_ICON = void 0;
-
-var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
+exports.footerKey = exports.MEMBER_ORDER = exports.FOOTER_PATH = exports.FOOTER_ORDER = exports.FOOTER_LABEL = exports.FOOTER_KEY = exports.FOOTER_ICON = void 0;
 
 var _FOOTER_PATH, _FOOTER_LABEL, _FOOTER_ICON;
 
@@ -19,32 +17,19 @@ var footerKey = {
   member: 'member',
   myReading: 'myreading',
   bookmark: 'bookmark',
-  history: 'history'
+  history: 'history',
+  publicationAndMerchandise: 'publication-and-merchandise'
 };
-
-if (_featureFlag.PUB_AND_MERC_BTN) {
-  footerKey.publicationAndMerchandise = 'publication-and-merchandise';
-}
-
+exports.footerKey = footerKey;
 var FOOTER_KEY = Object.freeze(footerKey);
 exports.FOOTER_KEY = FOOTER_KEY;
 var FOOTER_PATH = (_FOOTER_PATH = {}, _defineProperty(_FOOTER_PATH, footerKey.foundation, '/categories/foundation'), _defineProperty(_FOOTER_PATH, footerKey.aboutUs, '/about-us'), _defineProperty(_FOOTER_PATH, footerKey.influenceReport, '/a/impact-and-annual-report'), _defineProperty(_FOOTER_PATH, footerKey.member, '/account'), _defineProperty(_FOOTER_PATH, footerKey.myReading, '/myreading'), _defineProperty(_FOOTER_PATH, footerKey.bookmark, '/myreading/saved'), _defineProperty(_FOOTER_PATH, footerKey.history, '/myreading/history'), _FOOTER_PATH);
 exports.FOOTER_PATH = FOOTER_PATH;
-var FOOTER_LABEL = (_FOOTER_LABEL = {}, _defineProperty(_FOOTER_LABEL, footerKey.foundation, '基金會消息'), _defineProperty(_FOOTER_LABEL, footerKey.aboutUs, '關於我們'), _defineProperty(_FOOTER_LABEL, footerKey.influenceReport, '影響力報告'), _defineProperty(_FOOTER_LABEL, footerKey.openLab, '報導者開放實驗室'), _defineProperty(_FOOTER_LABEL, footerKey.member, '個人專區'), _defineProperty(_FOOTER_LABEL, footerKey.myReading, '我的閱讀'), _defineProperty(_FOOTER_LABEL, footerKey.bookmark, '已收藏'), _defineProperty(_FOOTER_LABEL, footerKey.history, '造訪紀錄'), _FOOTER_LABEL);
+var FOOTER_LABEL = (_FOOTER_LABEL = {}, _defineProperty(_FOOTER_LABEL, footerKey.foundation, '基金會消息'), _defineProperty(_FOOTER_LABEL, footerKey.aboutUs, '關於我們'), _defineProperty(_FOOTER_LABEL, footerKey.influenceReport, '影響力報告'), _defineProperty(_FOOTER_LABEL, footerKey.openLab, '報導者開放實驗室'), _defineProperty(_FOOTER_LABEL, footerKey.member, '個人專區'), _defineProperty(_FOOTER_LABEL, footerKey.myReading, '我的閱讀'), _defineProperty(_FOOTER_LABEL, footerKey.bookmark, '已收藏'), _defineProperty(_FOOTER_LABEL, footerKey.history, '造訪紀錄'), _defineProperty(_FOOTER_LABEL, footerKey.publicationAndMerchandise, '出版品與周邊'), _FOOTER_LABEL);
 exports.FOOTER_LABEL = FOOTER_LABEL;
-
-if (_featureFlag.PUB_AND_MERC_BTN) {
-  FOOTER_LABEL[footerKey.publicationAndMerchandise] = '出版品與周邊';
-}
-
 var FOOTER_ICON = (_FOOTER_ICON = {}, _defineProperty(_FOOTER_ICON, footerKey.member, 'member'), _defineProperty(_FOOTER_ICON, footerKey.myReading, 'kid_star'), _defineProperty(_FOOTER_ICON, footerKey.bookmark, 'bookmark_basic'), _defineProperty(_FOOTER_ICON, footerKey.history, 'history'), _FOOTER_ICON);
 exports.FOOTER_ICON = FOOTER_ICON;
-var FOOTER_ORDER = [footerKey.foundation, footerKey.aboutUs, footerKey.influenceReport, footerKey.openLab];
+var FOOTER_ORDER = [footerKey.foundation, footerKey.aboutUs, footerKey.influenceReport, footerKey.openLab, footerKey.publicationAndMerchandise];
 exports.FOOTER_ORDER = FOOTER_ORDER;
-
-if (_featureFlag.PUB_AND_MERC_BTN) {
-  FOOTER_ORDER.push(footerKey.publicationAndMerchandise);
-}
-
 var MEMBER_ORDER = [footerKey.member, footerKey.myReading, footerKey.bookmark, footerKey.history];
 exports.MEMBER_ORDER = MEMBER_ORDER;

package/lib/containers/header.js

@@ -17,10 +17,6 @@ var _propTypes = require("../constants/prop-types");
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _headerOld = _interopRequireDefault(require("../components/header-old"));
-
-var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
-
 var _get = _interopRequireDefault(require("lodash/get"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -51,7 +47,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 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; }
 
-var Header = _featureFlag.MY_READING ? _header["default"] : _headerOld["default"];
 var _ = {
   get: _get["default"]
 };
@@ -208,7 +203,7 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
       };
       return /*#__PURE__*/_react["default"].createElement(_headerContext["default"].Provider, {
         value: contextValue
-      }, /*#__PURE__*/_react["default"].createElement(Header, {
+      }, /*#__PURE__*/_react["default"].createElement(_header["default"], {
         hamburgerContext: hamburgerContext
       }));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.12.1",
+  "version": "2.12.2-rc.0",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@twreporter/core": "^1.19.0",
-    "@twreporter/react-components": "^8.27.0",
+    "@twreporter/core": "^1.19.1-rc.0",
+    "@twreporter/react-components": "^8.27.1-rc.0",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
@@ -51,5 +51,5 @@
     "babel-loader": "^8.2.5",
     "react-dom": "16.8.6"
   },
-  "gitHead": "1830217a1fe0e48d9b170037426dc36253441470"
+  "gitHead": "2ccfeb87fefdcc4fc6c267c01987f41da353b65a"
 }

package/lib/components/hamburger-footer-old.js

@@ -1,162 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _headerContext = _interopRequireWildcard(require("../contexts/header-context"));
-
-var _linksOld = require("../utils/links-old");
-
-var _theme = require("../utils/theme");
-
-var _footerOld = require("../constants/footer-old");
-
-var _socialMedia = require("../constants/social-media");
-
-var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
-
-var _divider = _interopRequireDefault(require("@twreporter/react-components/lib/divider"));
-
-var _customizedLink = _interopRequireDefault(require("@twreporter/react-components/lib/customized-link"));
-
-var _paragraph = require("@twreporter/react-components/lib/text/paragraph");
-
-var _button = require("@twreporter/react-components/lib/button");
-
-var _icon = require("@twreporter/react-components/lib/icon");
-
-var _theme2 = require("@twreporter/core/lib/constants/theme");
-
-var _map = _interopRequireDefault(require("lodash/map"));
-
-var _templateObject, _templateObject2;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-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); }
-
-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; }
-
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var _ = {
-  map: _map["default"]
-};
-
-var FooterContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "hamburger-footer-old__FooterContainer",
-  componentId: "sc-1otfsiv-0"
-})(["display:flex;flex-direction:column;"]);
-
-var LinkItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "hamburger-footer-old__LinkItem",
-  componentId: "sc-1otfsiv-1"
-})(["padding:8px 32px;color:", ";", " &:active{color:", ";background-color:", ";}"], function (props) {
-  return props.color;
-}, _mediaQuery["default"].desktopAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &:hover {\n      color: ", ";\n      background-color: ", ";\n    }\n  "])), function (props) {
-  return props.hoverColor;
-}, function (props) {
-  return props.hoverBgColor;
-}), function (props) {
-  return props.activeColor;
-}, function (props) {
-  return props.activeBgColor;
-});
-
-var LinkSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "hamburger-footer-old__LinkSection",
-  componentId: "sc-1otfsiv-2"
-})(["display:flex;flex-direction:column;a{text-decoration:none;}"]);
-
-var IconItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "hamburger-footer-old__IconItem",
-  componentId: "sc-1otfsiv-3"
-})(["margin-right:16px;&:last-child{margin-right:0;}", ""], _mediaQuery["default"].mobileOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    svg {\n      height: 32px;\n      width: 32px;\n    }\n  "]))));
-
-var SocialMediaSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "hamburger-footer-old__SocialMediaSection",
-  componentId: "sc-1otfsiv-4"
-})(["display:flex;justify-content:center;"]);
-
-var DividerContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "hamburger-footer-old__DividerContainer",
-  componentId: "sc-1otfsiv-5"
-})(["margin:16px 32px;"]);
-
-var Footer = function Footer(_ref) {
-  var props = _extends({}, _ref);
-
-  var _useContext = (0, _react.useContext)(_headerContext["default"]),
-      theme = _useContext.theme,
-      releaseBranch = _useContext.releaseBranch,
-      isLinkExternal = _useContext.isLinkExternal;
-
-  var _useContext2 = (0, _react.useContext)(_headerContext.HamburgerContext),
-      closeHamburgerMenu = _useContext2.closeHamburgerMenu;
-
-  var footerTheme = theme === _theme2.THEME.transparent ? _theme2.THEME.normal : theme;
-
-  var _selectHamburgerFoote = (0, _theme.selectHamburgerFooterTheme)(footerTheme),
-      color = _selectHamburgerFoote.color,
-      hoverColor = _selectHamburgerFoote.hoverColor,
-      hoverBgColor = _selectHamburgerFoote.hoverBgColor,
-      activeColor = _selectHamburgerFoote.activeColor,
-      activeBgColor = _selectHamburgerFoote.activeBgColor;
-
-  var footerLinks = (0, _linksOld.getFooterLinks)(isLinkExternal, releaseBranch);
-  var linkJSX = footerLinks ? /*#__PURE__*/_react["default"].createElement(LinkSection, null, _.map(_footerOld.FOOTER_ORDER, function (key) {
-    var link = footerLinks[key];
-    var label = _footerOld.FOOTER_LABEL[key];
-
-    if (!link || !label) {
-      return;
-    }
-
-    return /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], _extends({}, link, {
-      key: key,
-      onClick: closeHamburgerMenu
-    }), /*#__PURE__*/_react["default"].createElement(LinkItem, {
-      color: color,
-      hoverColor: hoverColor,
-      hoverBgColor: hoverBgColor,
-      activeColor: activeColor,
-      activeBgColor: activeBgColor
-    }, /*#__PURE__*/_react["default"].createElement(_paragraph.P2, {
-      text: label
-    })));
-  })) : null;
-  var socialMediaLinks = (0, _linksOld.getSocialMediaLinks)();
-  var socialMediaJSX = socialMediaLinks ? /*#__PURE__*/_react["default"].createElement(SocialMediaSection, null, _.map(_socialMedia.SOCIAL_MEDIA_ORDER, function (key) {
-    var link = socialMediaLinks[key];
-
-    if (!link) {
-      return;
-    }
-
-    var Icon = /*#__PURE__*/_react["default"].createElement(_icon.SocialMedia, {
-      mediaType: key,
-      releaseBranch: releaseBranch
-    });
-
-    return /*#__PURE__*/_react["default"].createElement(IconItem, {
-      key: key
-    }, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], link, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
-      iconComponent: Icon,
-      theme: footerTheme
-    })));
-  })) : null;
-  return /*#__PURE__*/_react["default"].createElement(FooterContainer, props, linkJSX, /*#__PURE__*/_react["default"].createElement(DividerContainer, null, /*#__PURE__*/_react["default"].createElement(_divider["default"], null)), socialMediaJSX);
-};
-
-var _default = Footer;
-exports["default"] = _default;