@twreporter/universal-header 2.7.0-rc.7 → 2.7.0-rc.8

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 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.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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.7.0-rc.7",
+  "version": "2.7.0-rc.8",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -48,5 +48,5 @@
     "@storybook/testing-library": "^0.0.13",
     "babel-loader": "^8.2.5"
   },
-  "gitHead": "ebb4e7939246d4f6a06040a1d1b4865dbb641de2"
+  "gitHead": "904a9602cd0dc520047426298d29c865645fea78"
 }