@twreporter/universal-header 2.7.0-rc.0 → 2.7.0-rc.10

package/CHANGELOG.md

@@ -3,6 +3,100 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.7.0-rc.10](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.9...@twreporter/universal-header@2.7.0-rc.10) (2023-08-16)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.9](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.8...@twreporter/universal-header@2.7.0-rc.9) (2023-08-16)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.8](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.7...@twreporter/universal-header@2.7.0-rc.8) (2023-08-15)
+
+
+### Bug Fixes
+
+* typo and clientWidth ([3bb5f97](https://github.com/twreporter/twreporter-npm-packages/commit/3bb5f977164cb7ad835eae2037b89a5640d2dcb5))
+
+
+### Features
+
+* check if is at account page ([948f941](https://github.com/twreporter/twreporter-npm-packages/commit/948f941f6ff8b8082282d6bdd686aa5dfb7267a7))
+
+
+
+
+
+# [2.7.0-rc.7](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.6...@twreporter/universal-header@2.7.0-rc.7) (2023-08-14)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.6](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.5...@twreporter/universal-header@2.7.0-rc.6) (2023-08-11)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.4...@twreporter/universal-header@2.7.0-rc.5) (2023-07-27)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.4](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.3...@twreporter/universal-header@2.7.0-rc.4) (2023-07-14)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.3](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.2...@twreporter/universal-header@2.7.0-rc.3) (2023-07-07)
+
+
+### Bug Fixes
+
+* close hamburger menu after clicking action button ([7237a79](https://github.com/twreporter/twreporter-npm-packages/commit/7237a79aaf70bb3c60be119dcacc281207b3c7b2))
+
+
+
+
+
+# [2.7.0-rc.2](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.1...@twreporter/universal-header@2.7.0-rc.2) (2023-07-06)
+
+
+### Bug Fixes
+
+* signin path typo ([a72142e](https://github.com/twreporter/twreporter-npm-packages/commit/a72142e4a6c2cb132c1b61fd710f4c7bee092371))
+
+
+
+
+
+# [2.7.0-rc.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.0...@twreporter/universal-header@2.7.0-rc.1) (2023-07-04)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
 # [2.7.0-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.6.1-rc.1...@twreporter/universal-header@2.7.0-rc.0) (2023-07-04)
 
 

package/lib/components/action-button-item.js

@@ -171,7 +171,8 @@ var ActionButton = function ActionButton(_ref2) {
       buttonWidth: buttonWidth,
       buttonSize: buttonSize,
       key: action.key,
-      isForHambuger: isForHambuger
+      isForHambuger: isForHambuger,
+      callback: callback
     });
   }));
 };

package/lib/components/action-button.js

@@ -1,16 +1,20 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MobileHamburgerAction = exports.DesktopHamburgerAction = exports.MobileHeaderAction = exports.DesktopHeaderAction = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _actions = require("../constants/actions");
 
 var _actionItemTypes = require("../constants/action-item-types");
 
+var _headerContext = require("../contexts/header-context");
+
 var _actionButtonItem = _interopRequireDefault(require("./action-button-item"));
 
 var _actionButtonItemOld = _interopRequireDefault(require("./action-button-item-old"));
@@ -21,6 +25,10 @@ var _map = _interopRequireDefault(require("lodash/map"));
 
 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 || 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); }
 
 var _ = {
@@ -61,6 +69,9 @@ exports.MobileHeaderAction = MobileHeaderAction;
 var DesktopHamburgerAction = function DesktopHamburgerAction(_ref3) {
   var props = _extends({}, _ref3);
 
+  var _useContext = (0, _react.useContext)(_headerContext.HamburgerContext),
+      closeHamburgerMenu = _useContext.closeHamburgerMenu;
+
   var actionProps = getActionProps('hamburger');
   return /*#__PURE__*/_react["default"].createElement(ActionButton, _extends({
     actions: actionProps,
@@ -68,7 +79,8 @@ var DesktopHamburgerAction = function DesktopHamburgerAction(_ref3) {
     textType: _actionItemTypes.TEXT_TYPE.full,
     buttonWidth: _actionItemTypes.BUTTON_WIDTH_TYPE.stretch,
     buttonSize: _actionItemTypes.BUTTON_SIZE_TYPE.L,
-    isForHambuger: true
+    isForHambuger: true,
+    callback: closeHamburgerMenu
   }, props));
 };
 
@@ -77,13 +89,17 @@ exports.DesktopHamburgerAction = DesktopHamburgerAction;
 var MobileHamburgerAction = function MobileHamburgerAction(_ref4) {
   var props = _extends({}, _ref4);
 
+  var _useContext2 = (0, _react.useContext)(_headerContext.HamburgerContext),
+      closeHamburgerMenu = _useContext2.closeHamburgerMenu;
+
   var actionProps = getActionProps('hamburger');
   return /*#__PURE__*/_react["default"].createElement(ActionButton, _extends({
     actions: actionProps,
     textType: _actionItemTypes.TEXT_TYPE.full,
     buttonWidth: _actionItemTypes.BUTTON_WIDTH_TYPE.stretch,
     buttonSize: _actionItemTypes.BUTTON_SIZE_TYPE.L,
-    isForHambuger: true
+    isForHambuger: true,
+    callback: closeHamburgerMenu
   }, props));
 };
 

package/lib/components/header.js

@@ -51,7 +51,13 @@ var _hook = require("@twreporter/react-components/lib/hook");
 
 var _rwd = require("@twreporter/react-components/lib/rwd");
 
-var _split = _interopRequireDefault(require("lodash/split"));
+var _entityPath = _interopRequireDefault(require("@twreporter/core/lib/constants/entity-path"));
+
+var _some = _interopRequireDefault(require("lodash/some"));
+
+var _includes = _interopRequireDefault(require("lodash/includes"));
+
+var _throttle = _interopRequireDefault(require("lodash/throttle"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11;
 
@@ -76,7 +82,9 @@ 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 _ = {
-  split: _split["default"]
+  some: _some["default"],
+  includes: _includes["default"],
+  throttle: _throttle["default"]
 };
 var narrowHeaderHeight = 65;
 var channelHeight = 50;
@@ -213,11 +221,11 @@ var HideOnArticle = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   return props.isOnArticlePage ? 'display: none;' : '';
 });
 
-var ShowOnArticle = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "header__ShowOnArticle",
+var PrevButton = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "header__PrevButton",
   componentId: "sc-1krza7i-14"
 })(["", " margin-right:16px;"], function (props) {
-  return props.isOnArticlePage ? '' : 'display: none;';
+  return props.isShow ? '' : 'display: none;';
 });
 
 var Header = function Header() {
@@ -261,7 +269,32 @@ var Header = function Header() {
     closeHamburgerMenu: closeHamburger,
     isHamburgerMenuOpen: showHamburger
   };
-  var isOnArticlePage = _.split(pathname, '/')[1] === 'a';
+
+  var isOnArticlePage = _.includes(pathname, _entityPath["default"].article);
+
+  var needPrevIconAccountRoute = ["".concat(_entityPath["default"].account, "/donation-history"), "".concat(_entityPath["default"].account, "/email-subscription")];
+
+  var isOnNeedPrevIconAccountPage = _.some(needPrevIconAccountRoute, function (el) {
+    return _.includes(pathname, el);
+  });
+
+  var _useState3 = (0, _react.useState)(0),
+      _useState4 = _slicedToArray(_useState3, 2),
+      currentClientWidth = _useState4[0],
+      setCurrentClientWidth = _useState4[1];
+
+  (0, _react.useEffect)(function () {
+    var handleResize = _.throttle(function () {
+      setCurrentClientWidth(document.body.clientWidth);
+    });
+
+    handleResize();
+    window.addEventListener('resize', handleResize);
+    return function () {
+      window.removeEventListener('resize', handleResize);
+    };
+  }, []);
+  var showPrevIcon = isOnArticlePage || isOnNeedPrevIconAccountPage && currentClientWidth < 768; // only show it on mobile
 
   var BackToPrevIcon = /*#__PURE__*/_react["default"].createElement(_icon.Arrow, {
     direction: "left",
@@ -306,8 +339,8 @@ var Header = function Header() {
   var MobileHeaderJSX = /*#__PURE__*/_react["default"].createElement(HeaderSection, null, /*#__PURE__*/_react["default"].createElement(TopRow, {
     toUseNarrow: toUseNarrow,
     topRowBgColor: topRowBgColor
-  }, /*#__PURE__*/_react["default"].createElement(FlexGroup, null, /*#__PURE__*/_react["default"].createElement(ShowOnArticle, {
-    isOnArticlePage: isOnArticlePage
+  }, /*#__PURE__*/_react["default"].createElement(FlexGroup, null, /*#__PURE__*/_react["default"].createElement(PrevButton, {
+    isShow: showPrevIcon
   }, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
     iconComponent: BackToPrevIcon,
     theme: theme,

package/lib/utils/links.js

@@ -134,7 +134,7 @@ function getLink() {
 function getLoginLink() {
   var releaseBranch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultReleaseBranch;
   return {
-    to: accountsBaseURL[releaseBranch] + '/login',
+    to: accountsBaseURL[releaseBranch] + '/signin',
     isExternal: true
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.7.0-rc.0",
+  "version": "2.7.0-rc.10",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@twreporter/core": "^1.11.0-rc.1",
-    "@twreporter/react-components": "^8.18.1-rc.2",
+    "@twreporter/core": "^1.11.0-rc.4",
+    "@twreporter/react-components": "^8.18.1-rc.9",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
@@ -48,5 +48,5 @@
     "@storybook/testing-library": "^0.0.13",
     "babel-loader": "^8.2.5"
   },
-  "gitHead": "30f280e3fc57a8a93e27e7a14d52965459e7502d"
+  "gitHead": "6a8580df3e6dff2b05dab051a639fa60cd36d8b8"
 }